Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/components/ImportForm/src/ImportFormStep.vue

@@ -48,9 +48,12 @@
         </el-upload>
       </div>
       <div v-if="active == 1" class="step-two-container">
-        <div class="warning-message">
+        <div class="warning-message" v-if="active == 1 && error">
           <el-icon color="#E44033" size="18" style="margin-right: 6px;"><WarningFilled /></el-icon>
           纳入受领书数量与顺引发货记录数量不一致，无法导入。以下是差异数据。
+        </div>
+        <div class="warning-message" v-if="active == 1 && !error">
+          
         </div>
         <div class="table-container">
           <Table v-clientTable
@@ -192,10 +195,12 @@ const formSchema = ref(props.formSchema)
 const rules = ref(props.rules)
 const importUrl = ref('')
 const active = ref(props.active)
+const error = ref(false)
 
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
+  error.value = false
   resetForm()
   active.value = 0 // 重置步骤
   // 重置表格数据
@@ -215,13 +220,15 @@ const submitForm = async () => {
   // 如果当前在确认数据步骤，调用确认函数
   if (active.value === 1) {
     if (props.confirmFormSuccess) {
-      const result = await props.confirmFormSuccess(props.tableObject.tableList,
+      await props.confirmFormSuccess(props.tableObject.tableList,
         (msg)=>{
           if(msg){
             message.error(msg)
+            error.value = false
             return
           }else{
             message.success(msg)
+            error.value = false
             active.value = 2  // 设置为第三步
             return
           }
@@ -231,6 +238,7 @@ const submitForm = async () => {
   }
   if(active.value === 2){
     dialogVisible.value = false
+    error.value = false
     return;
   }
   
@@ -319,18 +327,21 @@ const submitFormSuccess = (response: any) => {
             });
         })
       } else {
-        message.success('导入成功')
+        message.success('上传成功')
+        debugger
         if(response.data?.successData?.failList&&response.data?.successData?.failList.length>0) {
           console.log('设置差异数据:', response.data.successData.failList);
           console.log('使用的列定义:', props.errorTableColumns);
           props.tableObject.tableList = response.data.successData.failList;
           props.tableObject.total = response.data.successData.failList.length;
+          error.value = true;
           active.value = 1;
         } else {
           console.log('设置成功数据:', response.data.successData.successList);
           console.log('使用的列定义:', props.successTableColumns);
           props.tableObject.tableList = response.data.successData.successList;
           props.tableObject.total = response.data.successData.successList.length;
+          error.value = false;
           active.value = 1;
         }
       }

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts

@@ -945,26 +945,25 @@ export const DeliverRecordImport = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
 ]))
+
 // 导入表单校验
 export const DeliverRecordImportRules = reactive({
-  incorporationNumber: [
+  customerOrderNumber: [
-    { required: true, message: '请输入纳入受领书单号', trigger: 'blur' }
-  ],
-  orderNumber: [
     { required: true, message: '请输入订单号', trigger: 'blur' }
   ],
-  type: [
+  startDate: [
-    { required: true, message: '请选择类型', trigger: 'change' }
+    { required: true, message: '请选择开始日期', trigger: 'change' }
   ],
-  materialCode: [
+  endDate: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请选择结束日期', trigger: 'change' }
   ],
-  backNumber: [
+  startNo: [
-    { required: true, message: '请输入背番', trigger: 'blur' }
+    { required: true, message: '请输入开始序号', trigger: 'change' },
+    { type: 'number', message: '开始序号必须为数字', trigger: 'blur' }
   ],
-  quantity: [
+  endNo: [
-    { required: true, message: '请输入数量', trigger: 'change' },
+    { required: true, message: '请输入结束序号', trigger: 'change' },
-    { type: 'number', message: '数量必须为数字', trigger: 'blur' }
+    { type: 'number', message: '结束序号必须为数字', trigger: 'blur' }
   ]
 })
 

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -2364,12 +2364,18 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       type: 'Select'
     }
   },
+  
   {
-    label: '包装数量',
+    label: '包装规格',
-    field: 'packQty',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
     },
     form: {
       componentProps: {
@@ -2423,16 +2429,11 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: true
   },
   {
-    label: '包装规格',
+    label: '包装数量',
-    field: 'packUnit',
+    field: 'packQty',
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
-      width: 150,
+      width: 150
-      componentProps: {
-        disabled: true
-      }
     },
     tableForm:{
       disabled:true
@@ -2544,3 +2545,4 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
   },
 ]))
+

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -2364,12 +2364,18 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       type: 'Select'
     }
   },
+  
   {
-    label: '包装数量',
+    label: '包装规格',
-    field: 'packQty',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
     },
     form: {
       componentProps: {
@@ -2423,16 +2429,11 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: true
   },
   {
-    label: '包装规格',
+    label: '包装数量',
-    field: 'packUnit',
+    field: 'packQty',
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
-      width: 150,
+      width: 150
-      componentProps: {
-        disabled: true
-      }
     },
     tableForm:{
       disabled:true
@@ -2544,3 +2545,4 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
   },
 ]))
+

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -2364,12 +2364,18 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       type: 'Select'
     }
   },
+  
   {
-    label: '包装数量',
+    label: '包装规格',
-    field: 'packQty',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
     },
     form: {
       componentProps: {
@@ -2423,16 +2429,11 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: true
   },
   {
-    label: '包装规格',
+    label: '包装数量',
-    field: 'packUnit',
+    field: 'packQty',
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
-      width: 150,
+      width: 150
-      componentProps: {
-        disabled: true
-      }
     },
     tableForm:{
       disabled:true

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -2364,12 +2364,18 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       type: 'Select'
     }
   },
+  
   {
-    label: '包装数量',
+    label: '包装规格',
-    field: 'packQty',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
     },
     form: {
       componentProps: {
@@ -2423,16 +2429,11 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: true
   },
   {
-    label: '包装规格',
+    label: '包装数量',
-    field: 'packUnit',
+    field: 'packQty',
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
-      width: 150,
+      width: 150
-      componentProps: {
-        disabled: true
-      }
     },
     tableForm:{
       disabled:true
@@ -2544,3 +2545,4 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
   },
 ]))
+