Merge remote-tracking branch 'remotes/origin/intex_online20250528' into intex

src/components/ImportForm/src/ImportFormStep.vue

@@ -56,7 +56,7 @@
         <div class="warning-message" v-if="active == 1 && !error">
           
         </div>
-        <div class="table-container">
+        <div class="table-container" v-loading="isShowLoading">
           <Table v-clientTable
             :columns="Array.isArray(currentColumns) ? currentColumns : []"
             :data="tableObject.tableList"
@@ -88,8 +88,8 @@
             {{ t('ts.下载差异数据') }}
           </el-button>
         </div>
-        <el-button :disabled="formLoading" type="primary" @click="submitForm" v-if="active == 0 || (active == 1 && !error)">{{ t('ts.下一步') }}</el-button>
+        <el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 0 || (active == 1 && !error)">{{ t('ts.下一步') }}</el-button>
-        <el-button :disabled="formLoading" type="primary" @click="submitForm" v-if="active == 2 || (active == 1 && error)">{{ t('ts.好的') }}</el-button>
+        <el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 2 || (active == 1 && error)">{{ t('ts.好的') }}</el-button>
         <el-button @click="dialogVisible = false">{{ t('ts.取 消') }}</el-button>
       </div>
     </template>
@@ -298,14 +298,17 @@ const open = () => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 const formRef = ref()
+const isShowLoading = ref(false)
 
 /** 提交表单 */
 const submitForm = async () => {
   // 如果当前在确认数据步骤，调用确认函数
   if (active.value === 1) {
+    isShowLoading.value = true
     if(error.value){ 
       dialogVisible.value = false
       error.value = false
+      isShowLoading.value = false
     }else{
       if (props.confirmFormSuccess) {
         await props.confirmFormSuccess(props.tableObject.tableList,
@@ -313,11 +316,13 @@ const submitForm = async () => {
             if(msg){
               message.error(msg)
               error.value = false
+              isShowLoading.value = false
               return
             }else{
               message.success("导入成功！")
               error.value = false
               active.value = 2  // 设置为第三步
+              isShowLoading.value = false
               return
             }
           }

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

@@ -43,24 +43,24 @@ export const DeliverRecordMain = useCrudSchemas(
         }
       }
     },
-    {
+    // {
-      label: '客户订单号',
+    //   label: '客户订单号',
-      field: 'customerOrderNumber',
+    //   field: 'customerOrderNumber',
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 180
+    //     width: 180
-      },
+    //   },
-      isTable: true,
+    //   isTable: true,
-      isForm: false,
+    //   isForm: false,
-      isSearch: true,
+    //   isSearch: true,
-      hiddenSearchHigh: true,
+    //   hiddenSearchHigh: true,
-      search: {
+    //   search: {
-        component: 'Input',
+    //     component: 'Input',
-        componentProps: {
+    //     componentProps: {
           
-        }
+    //     }
-      },
+    //   },
-    },
+    // },
     {
       label: '客户代码',
       field: 'customerCode',
@@ -579,6 +579,24 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isTableForm: false,
   },
+  {
+      label: '客户订单号',
+      field: 'customerOrderNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      isForm: false,
+      isSearch: true,
+      hiddenSearchHigh: false,
+      search: {
+        component: 'Input',
+        componentProps: {
+          
+        }
+      },
+    },
   {
     label: '品番',
     field: 'itemCode',

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

@@ -715,63 +715,6 @@ export const PurchasePlanDetail = useCrudSchemas(
       isDetail:false,
       isSearch:true,
     },
-    {
-      label: '订单行',
-      field: 'poLine',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      sortTableDefault: 16,
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          disabled: true,
-          isSearchList: false,
-          searchListPlaceholder: '请选择订单行',
-          searchField: 'lineNumber',
-          searchTitle: '采购订单信息',
-          searchAllSchemas: PurchaseDetail.allSchemas,
-          searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
-          searchCondition: [
-            {
-              key: 'number',
-              value: 'poNumber',
-              message: '请填写订单号！',
-              isMainValue: true
-            },
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ]
-        }
-      },
-      tableForm: {
-        multiple: true,
-        disabled: true,
-        isInpuFocusShow: false,
-        searchListPlaceholder: '请选择订单行',
-        searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
-        searchCondition: [
-          {
-            key: 'number',
-            value: 'poNumber',
-            message: '请填写订单号！',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-      }
-    },
     {
       label: '品番',
       field: 'itemCode',
@@ -851,25 +794,137 @@ export const PurchasePlanDetail = useCrudSchemas(
       }
     },
     {
-      label: '品番状态',
+      label: '计划采购数量',
-      field: 'itemStatus',
+      field: 'planQty',
       sort: 'custom',
-      dictType: DICT_TYPE.ITEM_STATUS,
+      sortSearchDefault: 9,
-      dictClass: 'string',
+      sortTableDefault: 21,
-      isTable: true,
-      sortSearchDefault: 10,
-      sortTableDefault: 19,
-      hiddenInMain: true,
       table: {
         width: 150
       },
+      tableForm: {
+        type: 'InputNumber',
+        precision: 6
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 6
+        }
+      }
+    },
+    {
+      label: '受入号',
+      field: 'receivedNumber',
+      sort: 'custom',
+      sortSearchDefault: 1001,
+      sortTableDefault: 20,
+      isSearch: true,
+      table: {
+        width: 150
+      },
+      isTableForm: true,
+      hiddenInMain: true,
+      isForm: true,
       form: {
         componentProps: {
           disabled: true
         }
       },
       tableForm: {
-        type: 'Select',
+        // type: 'Select',
+        disabled: true,
+        isPlaceholder: false
+      }
+    },
+    {
+      label: '采购计量单位',
+      field: 'purchaseStdUom',
+      dictType: DICT_TYPE.UOM,
+      sort: 'custom',
+      sortSearchDefault: 9,
+      sortTableDefault: 25,
+      isForm: false,
+      isSearch: false,
+      isTableForm: true,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '订单行',
+      field: 'poLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 16,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          disabled: true,
+          isSearchList: false,
+          searchListPlaceholder: '请选择订单行',
+          searchField: 'lineNumber',
+          searchTitle: '采购订单信息',
+          searchAllSchemas: PurchaseDetail.allSchemas,
+          searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
+          searchCondition: [
+            {
+              key: 'number',
+              value: 'poNumber',
+              message: '请填写订单号！',
+              isMainValue: true
+            },
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      tableForm: {
+        multiple: true,
+        disabled: true,
+        isInpuFocusShow: false,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'poNumber',
+            message: '请填写订单号！',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      }
+    }, 
+    {
+      label: '采购标包数量',
+      field: 'purchaseStdQty',
+      sort: 'custom',
+      sortSearchDefault: 8,
+      sortTableDefault: 24,
+      isForm: false,
+      isSearch: false,
+      isTableForm: true,
+      table: {
+        width: 150
+      },
+      tableForm: {
         disabled: true
       }
     },
@@ -894,27 +949,41 @@ export const PurchasePlanDetail = useCrudSchemas(
       sortTableDefault: 1000,
     },
     {
-      label: '受入号',
+      label: '转换率',
-      field: 'receivedNumber',
+      field: 'convertRate',
       sort: 'custom',
-      sortSearchDefault: 1001,
+      sortSearchDefault: 9,
-      sortTableDefault: 20,
+      sortTableDefault: 26,
-      isSearch:true,
+      isForm: false,
+      isSearch: false,
       table: {
         width: 150
       },
-      isTableForm: true,
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '品番状态',
+      field: 'itemStatus',
+      sort: 'custom',
+      dictType: DICT_TYPE.ITEM_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sortSearchDefault: 10,
+      sortTableDefault: 19,
       hiddenInMain: true,
-      isForm: true,
+      table: {
+        width: 150
+      },
       form: {
         componentProps: {
           disabled: true
         }
       },
       tableForm: {
-        // type: 'Select',
+        type: 'Select',
-        disabled: true,
+        disabled: true
-        isPlaceholder:false
       }
     },
     {
@@ -939,27 +1008,7 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       }
     },
-    {
+ 
-      label: '计划采购数量',
-      field: 'planQty',
-      sort: 'custom',
-      sortSearchDefault: 9,
-      sortTableDefault: 21,
-      table: {
-        width: 150
-      },
-      tableForm: {
-        type: 'InputNumber',
-        precision: 6
-      },
-      form: {
-        component: 'InputNumber',
-        componentProps: {
-          min: 0,
-          precision: 6
-        }
-      }
-    },
     // {
     //   label: '订单数量',
     //   field: 'orderQty',
@@ -978,22 +1027,7 @@ export const PurchasePlanDetail = useCrudSchemas(
     //     disabled: true
     //   }
     // },
-    {
+
-      label: '采购标包数量',
-      field: 'purchaseStdQty',
-      sort: 'custom',
-      sortSearchDefault: 8,
-      sortTableDefault:24,
-      isForm: false,
-      isSearch: false,
-      isTableForm: true,
-      table: {
-        width: 150
-      },
-      tableForm: {
-        disabled:true
-      }
-    },
     {
       label: '计划采购计量单位',
       field: 'uom',
@@ -1018,39 +1052,6 @@ export const PurchasePlanDetail = useCrudSchemas(
         disabled: true
       }
     },
-   
-    {
-      label: '采购计量单位',
-      field: 'purchaseStdUom',
-      dictType: DICT_TYPE.UOM,
-      sort: 'custom',
-      sortSearchDefault: 9,
-      sortTableDefault:25,
-      isForm: false,
-      isSearch: false,
-      isTableForm: true,
-      table: {
-        width: 150
-      },
-      tableForm: {
-        disabled: true
-      }
-    },
-    {
-      label: '转换率',
-      field: 'convertRate',
-      sort: 'custom',
-      sortSearchDefault: 9,
-      sortTableDefault: 26,
-      isForm: false,
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      tableForm: {
-        disabled: true
-      }
-    },
     {
       label: '已发采购数量',
       field: 'shippedQty',