From 54b32f86e21fffe38e9e40fe085b62ee6a5d8811 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 15:25:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      |   5 +
 .../supplierdeliverRequestMain.data.ts        | 177 ++++++++++--------
 2 files changed, 99 insertions(+), 83 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 42e86c8f6..0efeed9b4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -36,6 +36,11 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+      <template #asnNumber="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '发货单号', row.asnNumber)">
+          <span>{{ row.asnNumber }}</span>
+        </el-button>
+      </template>
       <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 93babb68f..0e5766b0b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -35,6 +35,17 @@ import { tr } from 'element-plus/es/locale'
  * @returns {Array} 供应商发货申请主表
  */
 export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    isForm: false
+  },
   {
     label: '单据号',
     field: 'number',
@@ -43,6 +54,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 180,
       fixed: 'left'
     },
+    isTable:false,
     isForm: false,
     isSearch: true,
   },
@@ -53,7 +65,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:2,
+    isTable:false,
     isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -68,16 +80,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  // {
-  //   label: '发货单号',
-  //   field: 'asnNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isSearch: true,
-  //   isForm: true
-  // },
+  
   {
     label: '要货计划单号',
     field: 'ppNumber',
@@ -86,7 +89,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:1,
+    sortTableDefault:9,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -144,6 +147,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '采购订单',
     field: 'poNumber',
     isForm:true,
+    isTable:false,
     isTableForm:false,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -163,7 +167,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isTable:false,
+    isTable:true,
+    sortTableDefault:6,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -412,6 +417,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:2,
     form: {
       value: '1',
       componentProps: {
@@ -609,70 +615,7 @@ export const SupplierdeliverRequestMainRules = reactive({
  * @returns {Array} 供应商发货申请子表
  */
 export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单号',
-        searchField: 'number',
-        searchTitle: '要货计划信息',
-        searchAllSchemas: PurchasePlanDetail.allSchemas,
-        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
-        searchCondition: [
-          {
-            key: 'number',
-            value: 'ppNumber',
-            message: '请填写要货计划单号！',
-            isMainValue: true
-          },
-          {
-            key: 'flag',
-            value: 1,
-            isMainValue: false
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-
-        ]
-      }
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单号',
-      searchField: 'number',
-      searchTitle: '要货计划信息',
-      searchAllSchemas: PurchasePlanDetail.allSchemas,
-      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
-      searchCondition: [
-        {
-          key: 'number',
-          value: 'ppNumber',
-          message: '请填写要货计划单号！',
-          isMainValue: true
-        },
-        {
-          key: 'flag',
-          value: 1,
-          isMainValue: false
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
+  
   {
     label: '订单行',
     field: 'poLine',
@@ -697,7 +640,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    sortTableDefault:2,
+    sortTableDefault:3,
     form: {
       componentProps: {
         disabled: true
@@ -714,7 +657,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    sortTableDefault:2,
+    sortTableDefault:4,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -739,6 +682,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    sortTableDefault:7,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -761,6 +705,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:8,
     tableForm: {
       disabled: false
     }
@@ -784,12 +729,12 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTable:false,
     tableForm: {
       disabled: true,
       type: 'InputNumber',
       precision: 6
     },
-    sortTableDefault:4,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -810,7 +755,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'InputNumber',
       precision: 6
     },
-    sortTableDefault:4,
+    isTable: false,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -1022,7 +967,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
-    sortTableDefault:3,
+    sortTableDefault:5,
     table: {
       width: 150
     },
@@ -1031,7 +976,73 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select'
     }
   },
-  
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    sortTableDefault:10,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        // isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '要货计划信息',
+        searchAllSchemas: PurchasePlanDetail.allSchemas,
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'ppNumber',
+            message: '请填写要货计划单号！',
+            isMainValue: true
+          },
+          {
+            key: 'flag',
+            value: 1,
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '要货计划信息',
+      searchAllSchemas: PurchasePlanDetail.allSchemas,
+      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'ppNumber',
+          message: '请填写要货计划单号！',
+          isMainValue: true
+        },
+        {
+          key: 'flag',
+          value: 1,
+          isMainValue: false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',