From 4aef313e8cb08be549ab72bca0466b188c6ff2ec Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 25 Oct 2024 17:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A6=81=E8=B4=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/index.vue                |  15 +-
 .../purchasePlanMain/purchasePlanMain.data.ts | 325 ++++++++----------
 2 files changed, 150 insertions(+), 190 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 9a09917f0..9e4c11690 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -40,9 +40,9 @@
       v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
       @getSelectionRows="getSelectionRows">
-      <template #supplierCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '供应商代码', row.supplierCode)">
-          <span>{{ row.supplierCode }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '供应商代码', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row,$index }">
@@ -511,18 +511,17 @@ const getSearchTableData = async (number,formField,searchField)=>{
         if(item.field == 'deliveryDate'){
           item.componentProps.disabled = false
         }
-        
       })
-    }else{
+    }else if('update'==type){
       PurchasePlanMain.allSchemas.formSchema.forEach((item) => {
         // 供应商代码
         if(item.field == 'supplierCode'){
           item.componentProps.disabled = true
           item.componentProps.isSearchList = false
         }
-        if(item.field == 'deliveryDate'){
-          item.componentProps.disabled = true
-        }
+        // if(item.field == 'deliveryDate'){
+        //   item.componentProps.disabled = true
+        // }
       })
     }
   }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 7318f1f73..15301f1f6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -14,16 +14,55 @@ const { t } = useI18n() // 国际化
  * @returns {Array} 要货计划主表
  */
 export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '要货计划单号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    sortTableDefault:1,
+    sortSearchDefault:4,
+    isSearch: true
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PURCHASE_PLAN_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+    sortSearchDefault:6,
+    search:{
+      value:[],
+      componentProps: {
+        multiple:true
+      }
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '供应商代码',
     field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150,
-      fixed: 'left'
     },
     isSearch: true,
-    sortTableDefault:1,
+    sortTableDefault:3,
     sortSearchDefault:1,
     form: {
       labelMessage: '影响明细中物料代码，需在供应商物料中维护',
@@ -67,6 +106,17 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    sortSearchDefault:1,
+    isTable:true,
+    isForm: false
+  },
   //仅是主列表页面的筛选搜索条件
   {
     label: '送达日期',
@@ -89,24 +139,12 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  
-  {
-    label: '要货计划单号',
-    field: 'number',
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 180,
-    },
-    sortTableDefault:8,
-    sortSearchDefault:4,
-    isSearch: true
-  },
-  
   {
     label: '采购订单',
     field: 'poNumber',
     sort: 'custom',
+    sortSearchDefault:11,
+    formatter: dateFormatter2,
     table: {
       width: 150
     },
@@ -158,7 +196,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     formatter: dateFormatter2,
-    sortTableDefault:2,
+    sortTableDefault:13,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -175,6 +213,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '采购订单类型',
     field: 'type',
     sort: 'custom',
+    sortTableDefault:13,
     dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -295,33 +334,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    dictType: DICT_TYPE.PURCHASE_PLAN_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    isForm:false,
-    isSearch: true,
-    table: {
-      width: 150
-    },
-    sortTableDefault:13,
-    sortSearchDefault:6,
-    search:{
-      value:[],
-      componentProps: {
-        multiple:true
-      }
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  
   
   // {
   //   label: '自动发布',
@@ -398,6 +411,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:true,
     isForm: false,
     formatter: dateFormatter,
+    sortTableDefault:13,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -512,29 +526,13 @@ export const PurchasePlanMainRules = reactive({
  * @returns {Array} 要货计划子表
  */
 export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '要货计划单号',
-    field: 'number',
-    sort: 'custom',
-    isTableForm: false,
-    hiddenInMain:true,
-    table: {
-      width: 180
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  
   {
     label: '采购订单号',
     field: 'poNumber',
     isSearch:true,
     isTable:true,
-    sortTableDefault:9,
-    sortSearchDefault:2,
+    sortTableDefault:11,
+    sortSearchDefault:11,
     isForm:false,
     isTableForm:false,
     table: {
@@ -568,86 +566,6 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '订单号',
-  //   field: 'poNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   hiddenInMain:true,
-  //   isTableForm:false,
-  //   tableForm: {
-  //     disabled: true,
-  //     isInpuFocusShow: false,
-  //     searchListPlaceholder: '请选择订单号',
-  //     searchField: 'number',
-  //     searchTitle: '采购订单信息',
-  //     searchAllSchemas: PurchaseMain.allSchemas,
-  //     searchPage: PurchaseMainApi.getPurchaseMainPage,
-  //     searchCondition: [{
-  //       key: 'available',
-  //       value: 'TRUE',
-  //       isMainValue: false
-  //     }, {
-  //       key: 'supplierCode',
-  //       value: 'supplierCode',
-  //       message: '请填写供应商代码！',
-  //       isMainValue: true
-  //     }, {
-  //       key: 'status',
-  //       value: 2,
-  //       isMainValue: false
-  //     }
-  //     ]
-  //   },
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       disabled: true,
-  //       isSearchList: false,
-  //       searchListPlaceholder: '请选择订单号',
-  //       searchField: 'number',
-  //       searchTitle: '采购订单信息',
-  //       searchAllSchemas: PurchaseMain.allSchemas,
-  //       searchPage: PurchaseMainApi.getPurchaseMainPage,
-  //       searchCondition: [{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       },{
-  //         key: 'supplierCode',
-  //         value: 'supplierCode',
-  //         message: '请填写供应商代码！',
-  //         isMainValue: true
-  //       },{
-  //         key: 'status',
-  //         value: 2,
-  //         isMainValue: false
-  //       }]
-  //     }
-  //   }
-  // },
-  {
-    label: '计划数量',
-    field: 'planQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'InputNumber',
-      precision: 6
-    },
-    sortTableDefault:4,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    }
-  },
   {
     label: '订单行',
     field: 'poLine',
@@ -655,7 +573,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:10,
+    sortTableDefault:12,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -700,13 +618,13 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:3,
+    sortTableDefault:5,
     sortSearchDefault:5,
     isSearch:true,
     form: {
@@ -741,10 +659,54 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '受入地',
+    field: 'receivedLocation',
+    sort: 'custom',
+    sortTableDefault:6,
+    sortSearchDefault:6,
+    table: {
+      width: 150
+    },
+    isTableForm: true,
+    isForm: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      disabled:true,
+    },
+  },
+  {
+    label: '受入号',
+    field: 'receivedNumber',
+    sort: 'custom',
+    sortTableDefault:7,
+    sortSearchDefault:7,
+    table: {
+      width: 150
+    },
+    isTableForm: true,
+    isForm: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      disabled:true,
+    },
+  },
   {
     label: '订单数量',
     field: 'orderQty',
     sort: 'custom',
+    sortTableDefault:8,
+    sortSearchDefault:8,
     table: {
       width: 150
     },
@@ -753,35 +715,44 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
-    sortTableDefault:11,
     tableForm: {
       disabled: true
     }
 
   },
-  
   {
-    label: '已发货数量',
-    field: 'shippedQty',
+    label: '计划数量',
+    field: 'planQty',
     sort: 'custom',
+       sortTableDefault:9,
+    sortSearchDefault:9,
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
-    sortTableDefault:5,
+    tableForm: {
+      type: 'InputNumber',
+      precision: 6
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
   },
   {
-    label: '已收货数量',
-    field: 'receivedQty',
+    label: '已发货数量',
+    field: 'shippedQty',
     sort: 'custom',
     table: {
       width: 150
     },
     isTableForm: false,
     isForm: false,
-    sortTableDefault:6,
+    isTable: false,
   },
+
   {
     label: '在途数量',
     field: 'notReceiveQty',
@@ -791,6 +762,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
+    isTable: false,
     sortTableDefault:7,
   },
   {
@@ -800,10 +772,11 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
+       sortTableDefault:10,
+    sortSearchDefault:10,
     table: {
       width: 150
     },
-    sortTableDefault:12,
     form: {
       componentProps: {
         disabled: true
@@ -814,46 +787,34 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled:true,
     }
   },
+
   {
-    label: '受入号',
-    field: 'receivedNumber',
+    label: '要货计划单号',
+    field: 'number',
     sort: 'custom',
+    isTableForm: false,
+    hiddenInMain:true,
     table: {
-      width: 150
+      width: 180
     },
-    isTableForm: true,
-    isForm: true,
     form: {
       componentProps: {
         disabled: true
       }
-    },
-    tableForm: {
-      type: 'Select',
-      disabled:true,
-    },
-    sortTableDefault:13,
+    }
   },
-
   {
-    label: '受入地',
-    field: 'receivedLocation',
+    label: '已收货数量',
+    field: 'receivedQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: true,
-    isForm: true,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      type: 'Select',
-      disabled:true,
-    },
-    sortTableDefault:14,
+    
+    isTableForm: false,
+    isForm: false,
+    isTable: false,
+    sortTableDefault:6,
   },
   {
     label: '是否可用',