Merge branch 'hella_online_20240911' into master_hella

README.md

@@ -5,7 +5,7 @@ dictType: DICT_TYPE.INVENTORY_STATUS,
 dictClass: 'string',
 dictAllOption:true,// true 字典中--下拉框中展示全选按钮
 dictAllValue:'全选', // 全选按钮的value值
-hiddenSearchHigh?: boolean // 是否隐藏高级筛选
+hiddenSearchHigh: boolean // 是否隐藏高级筛选
 
 **form表单查询弹窗配置**
 form: {

src/locales/en-US.ts

@@ -760,6 +760,7 @@ export default {
     变更记录:'Change Record',
     添加明细:'Add Detail',
     上传质量报告:'Upload quality report',
+    上传履历表:'Upload your resume',
     上传质检报告:'Upload the quality inspection report',
     个:'piece',
     张:'sheet',

src/locales/zh-CN.ts

@@ -760,6 +760,7 @@ export default {
     变更记录:'变更记录',
     添加明细:'添加明细',
     上传质量报告:'上传质量报告',
+    上传履历表:'上传履历表',
     上传质检报告:'上传质检报告',
     个:'个',
     张:'张',

src/views/login/components/LoginForm.vue

@@ -258,19 +258,16 @@
       }
 
       console.log('登陆res',res)
-      try{
+      const msg = await PassWordApi.validateResetTime(res.userId)
-        await PassWordApi.validateResetTime(res.userId)
+      if(msg){
-      }catch (e) {
-        if (e.code === 1002000010) {
         await ElMessageBox.alert(
-            '<strong>密码长时间未修改，存在安全隐患,请及时修改</strong>',
+          '<strong>'+msg+'</strong>',
           '重要提示',
           {
             dangerouslyUseHTMLString: true,
           }
         )
       }
-      }
       if (!res) {
         console.log('登录-195')
         getCode()

src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts

@@ -11,11 +11,7 @@ export const BackflushDetailbQadRules = reactive({
 })
 
 export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-  },
   {
     label: '制品收货记录单据号',
     field: 'productreceiptNumber',
@@ -96,6 +92,17 @@ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
     },
 
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/agvManage/backflushDetailbQad/index.vue

@@ -27,6 +27,10 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+    
+      <template #qty="{row}">
+        <span :class="{'red-text':row.qty<0}">{{ row.qty}}</span>
+      </template>
       <template #status="{row}">
         <span>{{ row.status==0?'未执行':row.status==1?'成功':'失败'}}</span>
       </template>
@@ -258,3 +262,10 @@ onMounted(async () => {
 })
 
 </script>
+
+<style lang="scss" scoped>
+  .red-text{
+    color:var(--el-color-danger);
+    font-weight:700;
+  }
+</style>

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -41,7 +41,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="t('ts.状态').replace('ts.','')" prop="status">
-                <el-switch key="status" v-model="formData.status" />
+                <el-switch key="status" v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>

src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@@ -419,7 +419,10 @@ export const ScrapJobMain = useCrudSchemas(
       sort: 'custom',
       table: {
         width: 150
-      }
+      },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     {
       label: '自动完成',

src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@@ -383,17 +383,17 @@ export const ScrapRecordMain = useCrudSchemas(
         width: 150
       }
     },
-    {
+    // {
-      label: '接口类型',
+    //   label: '接口类型',
-      field: 'interfaceType',
+    //   field: 'interfaceType',
-      dictType: DICT_TYPE.INTERFACE_TYPE,
+    //   dictType: DICT_TYPE.INTERFACE_TYPE,
-      dictClass: 'string',
+    //   dictClass: 'string',
-      isTable: true,
+    //   isTable: true,
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 150
+    //     width: 150
-      }
+    //   }
-    },
+    // },
     {
       label: '通知单描述',
       field: 'noticeRemark',
@@ -411,7 +411,10 @@ export const ScrapRecordMain = useCrudSchemas(
       sort: 'custom',
       table: {
         width: 150
-      }
+      },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     {
       label: '是否已撤销',

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@@ -1101,14 +1101,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled:true,
         min: 0,
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       disabled:true,
       min: 0,
-      precision: 6,
+      precision: 2,
     },
   },
   {

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts

@@ -159,3 +159,32 @@ export const SupplierdeliverInspectionDetailRules = reactive({
     { required: true, message: '请输入发货数量', trigger: 'blur' }
   ],
 })
+
+
+export const CurriculumVitae = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '上传履历表',
+    field: 'uploadFile',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+        upData:{
+          tableId: '',
+          tableName: 'SupplierdeliverInspectionDetail',
+        },
+        fileType:['pdf'],
+        fileSize:100,
+        limit:20000
+      }
+    },
+  }
+]))
+//表单校验
+export const CurriculumVitaeRules = reactive({
+  uploadFile: [
+    { required: true, message: '请上传文件', trigger: 'blur' }
+  ]
+})

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -152,6 +152,14 @@
     @footButtonClick="footButtonClick"
     @formSelectChange="formSelectChangeLabel"
   />
+  <!-- 上传履历表 -->
+  <BasicForm
+    ref="curriculumVitaeRef"
+    :formAllSchemas="CurriculumVitae.allSchemas"
+    @success="submitCurriculumVitae"
+    :tableFormRules="CurriculumVitaeRules"
+    :isBusiness="false"
+  />
   <!-- 上传质量报告 -->
   <BasicForm
     ref="ploadQualityReportRef"
@@ -199,7 +207,9 @@ import {
 } from './supplierdeliverRequestMain.data'
 import {
   SupplierdeliverInspectionDetail,
-  SupplierdeliverInspectionDetailRules
+  SupplierdeliverInspectionDetailRules,
+  CurriculumVitae,
+  CurriculumVitaeRules
 } from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
@@ -534,6 +544,16 @@ const butttondata = (row, $index) => {
       hide: isShowMainButton(row, ['1', '2', '3']),
       hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'
     }), // 上传质量报告
+    // {
+    //   label: t('ts.上传履历表'),
+    //   name: 'mainPlanCurriculumVitae',
+    //   hide: row.status!=5,
+    //   type: 'primary',
+    //   icon: '',
+    //   color: '',
+    //   hasPermi: '',
+    //   link: true // 文本展现按钮
+    // }, // 上传履历表
     defaultButtons.mainListPlanSubBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:supplierdeliver-request-main:sub'
@@ -606,6 +626,9 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanUploadQualityReport') {
     // 上传质量报告
     handleUploadQualityReport(row)
+  }else if (val == 'mainPlanCurriculumVitae') {
+    // 上传履历表
+    handleUploadCurriculumVitae(row)
   } else if (val == 'mainPlanSub') {
     // 提交审批
     handleSub(row.masterId)
@@ -948,6 +971,28 @@ const handleUploadQualityReport = async (row) => {
   //uploadQualityReportTableData.value = [tableFormKeys]
 }
 
+const curriculumVitaeRef = ref()
+const submitCurriculumVitae = async (formType, data) => {
+  console.log('上传履历表',data)
+
+}
+/** 上传质量报告 */
+const handleUploadCurriculumVitae = async (row) => {
+  const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(
+    (item) => item.field == 'uploadFile'
+  )
+  if (uploadFile) {
+    uploadFile['componentProps']['upData']['tableId'] = row.masterId
+  }
+  curriculumVitaeRef.value.open(
+    'create',
+    null,
+    { masterId: row.masterId },
+    t('ts.上传履历表'),
+    t('ts.上传履历表')
+  ) 
+}
+
 const submitFormUploadQualityReport = async (formType, data) => {
   delete data.number
   data.subList = uploadQualityReportTableData.value // 拼接子表数据参数