From f20ba8e27ff25b61547453d594f52cbd8f8bf2a4 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 13 Mar 2024 14:55:15 +0800
Subject: [PATCH 01/22] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/purchasereceiptRecordDetail/index.ts  |   9 +-
 .../purchasereceiptRecordMain/index.vue       |  54 ++-
 .../purchasereceiptRecordMain.data.ts         | 351 +++++++++++++++---
 3 files changed, 360 insertions(+), 54 deletions(-)

diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts
index cfba67183..2afacb3e1 100644
--- a/src/api/wms/purchasereceiptRecordDetail/index.ts
+++ b/src/api/wms/purchasereceiptRecordDetail/index.ts
@@ -45,7 +45,9 @@ export interface PurchasereceiptRecordDetailVO {
   interfaceType: string
   fromOwnerCode: string
   toOwnerCode: string
-  toBatch: string
+  toBatch: string,
+  parentPackingNumber:string
+  packingNumber:string
 }
 
 // 查询采购收货记录子列表
@@ -117,4 +119,9 @@ export const getScarceGoodsDetailPage = async (params) => {
 // 查询采购收货记录子包装数据
 export const queryPurchaseceiptChildPackingNumber = async (params) => {
   return await request.get({ url: `/wms/purchasereceipt-record-detail/pageChildPackingNumber`, params })
+}
+
+// 查询采购收货缺货记录子包装数据
+export const queryPurchaseshortageChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/purchaseshortage-detail/pageChildPackingNumber`, params })
 }
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index dc55a4063..dfd32837e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -63,7 +63,7 @@
     @tableFormButton="tableFormButton"
   />
 
-  <!-- 子包装弹窗 -->
+  <!-- 记录子包装弹窗 -->
   <BasicForm
     ref="detailParenPackingRef"
     @success="getList"
@@ -76,6 +76,19 @@
     :isShowFooterButtton="false"
   />
 
+ <!-- 缺货子包装弹窗 -->
+ <BasicForm
+    ref="outStockDetailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRecordDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :tableData="outStockPackingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
 </template>
 
 <script setup lang="ts">
@@ -185,6 +198,7 @@ const handleCreateInspectRequest = async (number:string) => {
   }
 }
 
+
 // 子包装数据
 const detailParenPackingRef = ref()
 const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
@@ -192,6 +206,14 @@ const { tableObject: packingDetatableData, tableMethods: packDetatableMethods }
 })
 const { getList:queryDetailList } = packDetatableMethods
 
+
+// 缺货子包装数据
+const outStockDetailParenPackingRef = ref()
+const { tableObject: outStockPackingDetatableData, tableMethods: outStockPackDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRecordDetailApi.queryPurchaseshortageChildPackingNumber
+})
+const { getList:queryOutStockDetailList } = outStockPackDetatableMethods
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
@@ -210,15 +232,25 @@ const buttondataTable = ref([{
     link: true, // 文本展现按钮
   }])
 
+
+const tabeKey = ref("receiptDetail");  
 // 查看其他包装规格
 const tableFormButton = async (val , row) => {
-  if (val == 'viewParentPickingNumber') { //查看其他包装规格
-        packingDetatableData.params = {
-          masterId:row.masterId,
-          parentPackingNumber:row.packingNumber
-        }
-        await queryDetailList()
-        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'receiptDetail') { //查看其他包装规格
+      packingDetatableData.params = {
+        masterId:row.masterId,
+        parentPackingNumber:row.packingNumber
+      }
+      await queryDetailList()
+      detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'scarceGoodsDetail') { //查看其他包装规格
+      outStockPackingDetatableData.params = {
+        masterId:row.masterId,
+        parentPackingNumber:row.packingNumber
+      }
+      await queryOutStockDetailList()
+      outStockDetailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
   }
 }
 
@@ -251,10 +283,12 @@ const changeTabs = (data) =>{
   if(data.prop == 'receiptDetail'){
   console.log(data)
     apiPage.value = PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
-    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas    
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'receiptDetail'
   }else if(data.prop == 'scarceGoodsDetail'){
     apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
-    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas    
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'scarceGoodsDetail'
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 6028b3c1a..8197a8b6e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -952,6 +952,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
       width: 180,
       fixed: 'left'
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '订单号',
@@ -960,6 +968,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '订单行',
@@ -968,6 +984,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料代码',
@@ -976,6 +1000,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料名称',
@@ -984,6 +1016,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料描述1',
@@ -992,6 +1032,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料描述2',
@@ -1000,6 +1048,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从批次',
@@ -1008,6 +1064,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到批次',
@@ -1016,6 +1080,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '替代批次',
@@ -1024,6 +1096,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从包装号',
@@ -1032,6 +1112,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到包装号',
@@ -1040,6 +1128,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从器具号',
@@ -1048,6 +1144,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到器具号',
@@ -1056,6 +1160,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '数量',
@@ -1066,6 +1178,12 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
   {
@@ -1079,6 +1197,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   
   {
@@ -1090,7 +1216,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
     }
+    
   },
   {
     label: '包装规格',
@@ -1102,8 +1235,16 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+    
   },
-
   {
     label: '供应商计量数量',
     field: 'supplierQty',
@@ -1113,6 +1254,12 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
   {
@@ -1126,8 +1273,15 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
-  
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -1139,6 +1293,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从库位代码',
@@ -1147,6 +1309,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到库位代码',
@@ -1155,6 +1325,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从库位组代码',
@@ -1163,6 +1341,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到库位组代码',
@@ -1171,6 +1357,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从库区代码',
@@ -1179,6 +1373,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到库区代码',
@@ -1187,6 +1389,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从货主代码',
@@ -1195,6 +1405,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到货主代码',
@@ -1203,6 +1421,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到货日期',
@@ -1218,12 +1444,18 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled: true,
         style: {width: '100%'},
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
   },
   {
     label: '生产日期',
@@ -1239,12 +1471,18 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled: true,
         style: {width: '100%'},
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
   },
   {
     label: '过期日期',
@@ -1260,12 +1498,18 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled: true,
         style: {width: '100%'},
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
   },
   {
     label: '转换率',
@@ -1276,6 +1520,12 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
   {
@@ -1285,6 +1535,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '目检照片',
@@ -1293,6 +1551,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '不合格原因',
@@ -1305,6 +1571,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '单价',
@@ -1315,6 +1589,12 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
   {
@@ -1326,17 +1606,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
- 
   {
     label: '项目代码',
     field: 'projectCode',
@@ -1344,15 +1621,15 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '接口类型',
     field: 'interfaceType',
@@ -1364,6 +1641,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '备注',
@@ -1372,33 +1657,13 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
     form: {
-      component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        disabled:true
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    tableForm: {
+      disabled: true,
+    }
   }
 ]))
\ No newline at end of file

From 5fb381e402fb874485e62eea892592c92f6cd904 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 13 Mar 2024 16:48:32 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageunit/packageunit.data.ts           |   6 +-
 .../stockup/stockupMainRequest/index.vue      |  26 +--
 .../stockupMainRequest.data.ts                | 157 +++++++++---------
 3 files changed, 96 insertions(+), 93 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index c81fe91d2..6e3fd6394 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -294,15 +294,11 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code',
         searchTitle: '包装规格信息',
         searchAllSchemas: PackageunitCopy.allSchemas,
-        searchPage: PackageunitApi.getCustomeritemPage,
+        searchPage: PackageunitApi.getPackageunitPage,
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
-          key: 'customerCode',
-          value: 'customerCode',
-          isMainValue: true
         }]
       }
     }
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index 3b61b0bac..7a77e7e45 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -324,19 +324,19 @@ const openForm = (type: string, row?: number) => {
 }
 
 // 获取部门 用于详情 部门回显
-// const { wsCache } = useCache()
-// /** 详情操作 */
-// const detailRef = ref()
-// const openDetail = (row: any, titleName: any, titleValue: any) => {
-//   if(row.deliverPlanNumber != null){
-//         trueFalse.value = false
-//     }else {
-//       trueFalse.value = true
-//     }
-//   const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-//   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-//   detailRef.value.openDetail(row, titleName, titleValue,'requestDeliverMain')
-// }
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  if(row.deliverPlanNumber != null){
+        trueFalse.value = false
+    }else {
+      trueFalse.value = true
+    }
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'stockupMainRequest')
+}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 90a3c8f1e..309b4149b 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -464,6 +464,17 @@ export const StockupDetailRequestRules = reactive({
 
 // //子表
 export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTableForm: false,
+    table: {
+      width: 100
+    },
+  },
   {
     label: '包装号',
     field: 'packingNumber',
@@ -511,6 +522,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    table: {
+      width: 100
+    },
     isSearch: true,
   },
   {
@@ -535,7 +549,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 120
     },
     tableForm: {
       disabled: true,
@@ -547,82 +561,14 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    isSearch: true,
-    isTableForm: false,
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    isSearch: true,
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择库位代码',
-      searchField: 'location',
-      searchTitle: '库位基础信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: locationApi.getLocationPage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择库位代码',
-        searchField: 'location',
-        searchTitle: '库位基础信息',
-        searchAllSchemas: Location.allSchemas,
-        searchPage: locationApi.getLocationPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: '主表ID',
-    field: 'masterId',
-    sort: 'custom',
-    isSearch: true,
-    isTableForm: false,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    isTableForm: false,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isTableForm: false,
-  },
   {
     label: '物品代码',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
     tableForm: {
       disabled: true
     },
@@ -638,6 +584,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isTableForm: false,
+    table: {
+      width: 120
+    },
   },
   {
     label: '物品描述1',
@@ -645,6 +594,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isTableForm: false,
+    table: {
+      width: 120
+    },
   },
   {
     label: '物品描述2',
@@ -652,6 +604,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isTableForm: false,
+    table: {
+      width: 120
+    },
   },
   {
     label: '项目代码',
@@ -659,6 +614,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isTableForm: false,
+    table: {
+      width: 120
+    },
   },
   {
     label: '数量',
@@ -685,6 +643,43 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码',
+      searchField: 'location',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: locationApi.getLocationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择库位代码',
+        searchField: 'location',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: locationApi.getLocationPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -692,11 +687,23 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '创建时间',
+    field: 'createTime',
     sort: 'custom',
+    formatter: dateFormatter,
     isSearch: true,
+    table: {
+      width: 120
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
     isTableForm: false,
-  }
+  },
 ]))
 

From 1cdf3bf6426627ed2d8e4ef03ed2a22a790f16d7 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 13 Mar 2024 17:05:30 +0800
Subject: [PATCH 03/22] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E7=8F=AD=E7=BB=84=E3=80=81=E4=BA=A7?=
 =?UTF-8?q?=E7=BA=BF=E6=90=9C=E7=B4=A2=E5=8F=8A=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workstation/workstation.data.ts           | 72 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index 6ba60cf79..9154437fa 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -14,6 +14,8 @@ import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/w
 import * as WorkstationApi from '@/api/wms/workstation'
 
 import { validateYS } from '@/utils/validator'
+import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data";
+import * as TeamApi from "@/api/wms/team";
 
 const { t } = useI18n() // 国际化
 
@@ -106,6 +108,74 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '班组代码',
+    field: 'teamCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择班组代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '班组信息', // 查询弹窗标题
+        searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
+        searchPage: TeamApi.getTeamPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '设备代码',
+    field: 'equipmentCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择设备代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '设备信息', // 查询弹窗标题
+        searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  // {
+  //   label: '产品代码',
+  //   field: 'productCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: true
+  // },
+  // {
+  //   label: '工序代码',
+  //   field: 'processCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: true
+  // },
   {
     label: '原料库位',
     field: 'rawLocationCode',
@@ -288,4 +358,4 @@ export const WorkstationRules = reactive({
   fgLocationCode: [
     { required: true, message: '请选择成品库位', trigger: 'change' }
   ],
-})
\ No newline at end of file
+})

From bee600f5470888d393706280363cdea6dd8346d8 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 13 Mar 2024 17:47:06 +0800
Subject: [PATCH 04/22] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                      |  2 +-
 .../stockupMainRequest/stockupMainRequest.data.ts     | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index 78976cddd..3b38b8cc0 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:12080'
+VITE_BASE_URL='http://192.168.0.113:12080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload'
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 309b4149b..32c07c6e0 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -705,5 +705,16 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
 ]))
 

From 1f2e4cd55e2bfb4c257d6bddcf2152c48f035930 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 13 Mar 2024 17:47:58 +0800
Subject: [PATCH 05/22] =?UTF-8?q?localhost=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index 3b38b8cc0..78976cddd 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://192.168.0.113:12080'
+VITE_BASE_URL='http://localhost:12080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload'

From 46f0f81c38bf0fbbb028a8b89e0db922dec78662 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 14 Mar 2024 09:31:33 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=8B=92=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptJobMain/index.vue              | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 2154d60a3..ef916e124 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -195,10 +195,19 @@ const isShowMainButton = (row,val) => {
 const butttondata = (row) => {
   return [
     // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
     // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
-  ]
+    {
+      label: '拒收',
+      name: 'mainJobClo',
+      hide: isShowMainButton(row, ['1']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: 'wms:purchasereceipt-job-main:close',
+      link: true // 文本展现按钮
+    }]
 }
 
 // 列表-操作按钮事件
@@ -207,7 +216,7 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
-  } else if (val == 'mainJobClo') { // 关闭
+  } else if (val == 'mainJobClo') { // 拒收
     handleClose(row.id)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')

From 45dd1ce4e701af18becfeaa86c88f54105f26a46 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 14 Mar 2024 10:21:56 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/putawayRequestDetail/index.ts     |   5 +
 .../putaway/putawayRequestMain/index.vue      |  59 ++-
 .../putawayRequestMain.data.ts                | 420 +++++++++++++++++-
 3 files changed, 479 insertions(+), 5 deletions(-)

diff --git a/src/api/wms/putawayRequestDetail/index.ts b/src/api/wms/putawayRequestDetail/index.ts
index 3d2f27adf..a96a2d14d 100644
--- a/src/api/wms/putawayRequestDetail/index.ts
+++ b/src/api/wms/putawayRequestDetail/index.ts
@@ -64,4 +64,9 @@ export const exportPutawayRequestDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/putaway-request-detail/get-import-template' })
+}
+
+// 查询上架申请子列表--子包装数据
+export const getPutawayRequestDetailPageChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/putaway-request-detail/pageChildPackingNumber`, params })
 }
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index 6adef8f2c..b9b8c3730 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -70,17 +70,38 @@
     fromeWhere="putawayRequest"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailButtonIsShowAdd="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/putaway-request-main/import" :importTemplateData="importTemplateData" 
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+
+  
+  <!-- 子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PutawayRequestDetailChildPackingNumber.allSchemas"
+    :tableFormRules="PutawayRequestDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { PutawayRequestMain,PutawayRequestMainRules,PutawayRequestDetail,PutawayRequestDetailRules } from './putawayRequestMain.data'
+import { PutawayRequestMain,
+  PutawayRequestMainRules,
+  PutawayRequestDetail,
+  PutawayRequestDetailRules,
+  PutawayRequestDetailChildPackingNumber } from './putawayRequestMain.data'
 import * as PutawayRequestMainApi from '@/api/wms/putawayRequestMain'
 import * as PutawayRequestDetailApi from '@/api/wms/putawayRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -202,8 +223,6 @@ const butttondata = (row) => {
     ]
 }
 
-
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
@@ -223,6 +242,7 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
@@ -312,6 +332,13 @@ const handleSubmit = async (id: number) => {
   }
 }
 
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PutawayRequestDetailApi.getPutawayRequestDetailPageChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -322,6 +349,32 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,'requestPutawayMain')
 }
 
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index d14a075c8..94673c14c 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -768,12 +768,11 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isDetail: false,
     isForm: false,
-    isTable: false,
     table: {
       width: 150,
       fixed: 'right'
     },
-    isTableForm: false,
+    isTableForm: true,
   }
 ]))
 
@@ -795,3 +794,420 @@ export const PutawayRequestDetailRules = reactive({
     { required: true, message: '请输入物料代码', trigger: 'blur' }
   ],
 })
+
+
+/**
+ * @returns {Array} 上架申请子表--子包装展示
+ */
+export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: false,
+      earchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePagePutaway,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }, {
+        key: 'workshopCode',
+        value: 'workshopCode',
+        isMainValue: true
+      }]
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: false,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseMainPage
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: false,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        isSearchList: false,
+        searchListPlaceholder: '请选择从库位代码',
+        searchField: 'code',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationPage
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled: true,
+      type:'FormDateTime',
+      valueFormat:'YYYY-MM-DDTHH:mm:ss'
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  }
+]))
\ No newline at end of file

From 568a66edcd821801b0ec09e844c39058521781de Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 14 Mar 2024 10:55:47 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/putawayJobDetail/index.ts         |   5 +
 .../putaway/putawayJobMain/index.vue          |  56 ++-
 .../putawayJobMain/putawayJobMain.data.ts     | 372 ++++++++++++++++++
 .../putawayRequestMain.data.ts                |   3 +-
 4 files changed, 434 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/putawayJobDetail/index.ts b/src/api/wms/putawayJobDetail/index.ts
index af3a1738a..2916d8d08 100644
--- a/src/api/wms/putawayJobDetail/index.ts
+++ b/src/api/wms/putawayJobDetail/index.ts
@@ -63,4 +63,9 @@ export const exportPutawayJobDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/putaway-job-detail/get-import-template' })
+}
+
+// 查询上架任务子列表--自包装数量
+export const getPutawayJobDetailPageChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/putaway-job-detail/pageChildPackingNumber`, params })
 }
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index b572a57fd..c63ba5643 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -62,12 +62,35 @@
     :detailAllSchemasRules="PutawayJobDetailRules"
     :searchTableParams="searchTableParams"
     :apiPage="PutawayJobDetailApi.getPutawayJobDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
+
+  <!-- 子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PutawayJobDetailPackingNumber.allSchemas"
+    :tableFormRules="PutawayJobDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { PutawayJobMain,PutawayJobMainRules,PutawayJobDetail,PutawayJobDetailRules } from './putawayJobMain.data'
+import { PutawayJobMain,
+  PutawayJobMainRules,
+  PutawayJobDetail,
+  PutawayJobDetailRules,
+  PutawayJobDetailPackingNumber } from './putawayJobMain.data'
 import * as PutawayJobMainApi from '@/api/wms/putawayJobMain'
 import * as PutawayJobDetailApi from '@/api/wms/putawayJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -200,12 +223,43 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PutawayJobDetailApi.getPutawayJobDetailPageChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,'jobPutawayMain')
 }
 
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
 /** 关闭按钮操作 */
 const handleClose = async (id: number) => {
   try {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index fcc7cfafe..3bb41dcd2 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -747,6 +747,17 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
 ]))
 
 //表单校验
@@ -779,3 +790,364 @@ export const PutawayJobDetailRules = reactive({
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
 })
+
+
+/**
+ * @returns {Array} 上架任务子表
+ */
+export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemdesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDateTime',
+      format:'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 94673c14c..e88e41646 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -1058,7 +1058,8 @@ export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<Cr
     tableForm: {
       disabled: true,
       type:'FormDateTime',
-      valueFormat:'YYYY-MM-DDTHH:mm:ss'
+      format:'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
     }
   },
   {

From 4236186f7ad375eb76d1a76b55662244e8e2f11f Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 14 Mar 2024 13:56:36 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptManage/putaway/putawayRequestMain/index.vue  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index b9b8c3730..ff53fd1f7 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -70,6 +70,8 @@
     fromeWhere="putawayRequest"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
   />

From cf5a8ed18c703e708e5b7e97b6bc345ea10243dc Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 14 Mar 2024 14:34:57 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E6=8C=89=E9=92=AE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/api/wms/stockupMainJob/index.ts           |  20 ++
 .../stockup/stockupMainJob/index.vue          | 278 ++++++++++-----
 .../stockupMainJob/stockupMainJob.data.ts     | 318 ++++++++++--------
 .../stockupMainRequest.data.ts                |   2 +-
 5 files changed, 405 insertions(+), 215 deletions(-)

diff --git a/.env.development b/.env.development
index 78976cddd..3b38b8cc0 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:12080'
+VITE_BASE_URL='http://192.168.0.113:12080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload'
diff --git a/src/api/wms/stockupMainJob/index.ts b/src/api/wms/stockupMainJob/index.ts
index 2f802672a..182e49185 100644
--- a/src/api/wms/stockupMainJob/index.ts
+++ b/src/api/wms/stockupMainJob/index.ts
@@ -87,4 +87,24 @@ export const exportStockupMainJob = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/stockup-main-job/get-import-template' })
+}
+
+// 承接发货任务 Excel
+export const acceptStockupMainJob = async (id) => {
+  return await request.put({ url: `/wms/stockup-main-job/accept?id=` + id })
+}
+
+// 取消承接发货任务 Excel
+export const abandonStockupMainJob = async (id) => {
+  return await request.put({ url: `/wms/stockup-main-job/abandon?id=` + id })
+}
+
+// 关闭发货任务主 Excel
+export const closeStockupMainJob = async (id) => {
+  return await request.put({ url: `/wms/stockup-main-job/close?id=` + id })
+}
+
+// 执行发货任务主
+export const executeStockupMainJob = async (data: StockupMainJobVO) => {
+  return await request.put({ url: `/wms/stockup-main-job/execute`, data })
 }
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index 579622002..a43277b5e 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -27,43 +27,53 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
+    ref="formRef"
+    @success="getList"
     :rules="StockupMainJobRules"
     :formAllSchemas="StockupMainJob.allSchemas"
-    :apiUpdate="StockupMainJobApi.updateStockupMainJob"
-    :apiCreate="StockupMainJobApi.createStockupMainJob"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="StockupDetailJob.allSchemas"
+    :tableFormRules="StockupDetailJobRules"
+    :apiUpdate="StockupJobMainApi.updateStockupMainJob"
+    :apiCreate="StockupJobMainApi.createStockupMainJob"
+    :isBusiness="true"
     @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="StockupMainJob.allSchemas" />
-
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="StockupMainJob.allSchemas"
+    :detailAllSchemas="StockupDetailJob.allSchemas"
+    :detailAllSchemasRules="StockupDetailJobRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="StockupJobDetailApi.getStockupDetailJobPage"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { StockupMainJob,StockupMainJobRules } from './stockupMainJob.data'
-import * as StockupMainJobApi from '@/api/wms/stockupMainJob'
+import { StockupMainJob,StockupMainJobRules,StockupDetailJob,StockupDetailJobRules } from './stockupMainJob.data'
+import * as StockupJobMainApi from '@/api/wms/stockupMainJob'
+import * as StockupJobDetailApi from '@/api/wms/stockupDetailJob'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
 
-defineOptions({ name: 'StockupMainJob' })
+// 备货任务主
+defineOptions({ name: 'StockupJobMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -73,22 +83,52 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(StockupMainJob.allSchemas.tableColumns)
 
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
-  })
-}
-
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
 const { tableObject, tableMethods } = useTable({
-  getListApi: StockupMainJobApi.getStockupMainJobPage // 分页接口
+  getListApi: StockupJobMainApi.getStockupMainJobPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -96,9 +136,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:stockupMainJob:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:stockupMainJob:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:stockupMainJob:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-job-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -114,78 +152,158 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'export') { // 导出
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
-// 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:stockupMainJob:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:stockupMainJob:delete'}), // 删除
-]
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
   }
 }
 
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
 }
 
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =StockupMainJob.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await StockupMainJobApi.createStockupMainJob(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await StockupMainJobApi.updateStockupMainJob(data)
-    message.success(t('common.updateSuccess'))
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+   if (val == 'mainJobExe') { // 执行
+    let aaa = {
+  "id": 6,
+  "requestNumber": "REQ4520240313-0003",
+  "deliverPlanNumber": null,
+  "fromWarehouseCode": "CKV",
+  "toWarehouseCode": "CKV",
+  "details": null,
+  "requestTime": null,
+  "requestDueTime": null,
+  "status": "1",
+  "expiredTime": null,
+  "concurrencyStamp": "1",
+  "jobStageStatus": null,
+  "priority": null,
+  "priorityincrement": null,
+  "departmentCode": null,
+  "userGroupCode": null,
+  "acceptUserId": null,
+  "acceptUserName": null,
+  "acceptTime": null,
+  "completeUserId": null,
+  "completeUserName": null,
+  "completeTime": null,
+  "fromAreaTypes": "FG",
+  "toAreaTypes": "CUST",
+  "number": "JOB3220240314-0006",
+  "businessType": "Stockup",
+  "remark": null,
+  "extraProperties": null,
+  "siteId": null,
+  "autoComplete": "FALSE",
+  "allowModifyLocation": "FALSE",
+  "allowModifyQty": "TRUE",
+  "allowBiggerQty": "TRUE",
+  "allowSmallerQty": "TRUE",
+  "allowModifyInventoryStatus": "TRUE",
+  "allowContinuousScanning": "TRUE",
+  "allowPartialComplete": "TRUE",
+  "ruleUserId": null,
+  "allowModifyBatch": "FALSE",
+  "allowModifyPackingNumber": "FALSE",
+  "fromAreaCodes": "KQV2",
+  "toAreaCodes": "CUST",
+  "serialNumber": "0",
+  "inInventoryStatuses": "OK",
+  "outInventoryStatuses": "OK",
+  "createTime": null,
+    "subList": [{
+  "id": 1,
+  "packingNumber": null,
+  "batch": "2024021801",
+  "inventoryStatus": "OK",
+  "ownerCode": null,
+  "containerNumber": null,
+  "fromLocationCode": "FG",
+  "toLocationCode": "RAW",
+  "itemCode": "FOG-LAMP-RIGHT",
+  "itemName": "HL后雾灯（新）-右\r\n",
+  "itemDesc1": "HL后雾灯（新）-右\r\n",
+  "itemDesc2": "HL后雾灯（新）-右\r\n",
+  "projectCode": "PJ001",
+  "qty": 1,
+  "uom": "EA",
+  "masterId": 6,
+  "number": "JOB3220240314-0006",
+  "remark": null,
+  "siteId": "",
+  "createTime": null,
+    "toPackingNumber": null,
+    "toContainerNumber": null,
+    "toBatch": null,
+    "handleQty": null,
+    "toInventoryStatus": null,
+        recordList: [{
+            handleQty: 10,
+            toPackingNumber: '12',
+            toContainerNumber: '001',
+            toBatch: '21',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'WIP',
+            supplierCode: '31213',
+          },{
+            handleQty: 22,
+            toPackingNumber: 'M20230421000005',
+            toContainerNumber: '001',
+            toBatch: '20230808',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'FG',
+            supplierCode: '31213',
+          }]
+      }]
+}
+    handleHandle(aaa)
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    StockupJobMainApi.abandonStockupMainJob(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    StockupJobMainApi.closeStockupMainJob(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    StockupJobMainApi.acceptStockupMainJob(row.id)
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicStockupMainJob')
+  detailRef.value.openDetail(row, titleName, titleValue,'jobStockupMain')
 }
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+const handleHandle = async (data) => {
   try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await StockupMainJobApi.deleteStockupMainJob(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
+    await message.confirm(t('common.confirmHandle'))
+    await StockupJobMainApi.executeStockupMainJob(data)
+    message.success(t('common.handleSuccess'))
     await getList()
   } catch {}
 }
@@ -198,7 +316,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await StockupMainJobApi.exportStockupMainJob(tableObject.params)
+    const data = await StockupJobMainApi.exportStockupMainJob(tableObject.params)
     download.excel(data, '备货任务主.xlsx')
   } catch {
   } finally {
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
index 1fcf6737b..30db7688f 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@@ -7,47 +7,53 @@ export const StockupMainJobRules = reactive({
 
 export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'id',
-    field: 'id',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
+    isSearch: true,
     isForm: false,
   },
   {
     label: '申请单号',
     field: 'requestNumber',
     sort: 'custom',
-    isSearch: true,
+    isForm: false,
   },
   {
     label: '发货计划单号',
     field: 'deliverPlanNumber',
     sort: 'custom',
-    isSearch: true,
+    isForm: false,
   },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
     sort: 'custom',
-    isSearch: true,
+    isForm: false,
+
   },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
-    isSearch: true,
+    isForm: false,
+
   },
   {
-    label: '明细',
-    field: 'details',
+    label: '状态',
+    field: 'status',
     sort: 'custom',
-    isSearch: true,
+
+    form: {
+      component: 'Radio'
+    },
   },
   {
     label: '申请时间',
     field: 'requestTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -69,7 +75,6 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestDueTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -86,21 +91,13 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Radio'
-    },
-  },
+ 
   {
     label: '过期时间',
     field: 'expiredTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -117,71 +114,24 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '状态',
-    field: 'jobStageStatus',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Radio'
-    },
-  },
-  {
-    label: '优先级',
-    field: 'priority',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '优先级增量',
-    field: 'priorityincrement',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
   {
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '用户组',
-    field: 'userGroupCode',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '承接人用户ID',
-    field: 'acceptUserId',
-    sort: 'custom',
-    isSearch: true,
+
   },
   {
     label: '承接人用户名',
     field: 'acceptUserName',
     sort: 'custom',
-    isSearch: true,
+
   },
   {
     label: '承接时间',
     field: 'acceptTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -198,24 +148,16 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '完成人用户ID',
-    field: 'completeUserId',
-    sort: 'custom',
-    isSearch: true,
-  },
   {
     label: '完成人用户名',
     field: 'completeUserName',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '完成时间',
     field: 'completeTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -236,25 +178,16 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
     sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
   },
   {
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
-    isSearch: true,
                 form: {
                   component: 'SelectV2'
                 },
@@ -263,14 +196,106 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    sort: 'custom',
+
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    sort: 'custom',
+
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    sort: 'custom',
+
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    sort: 'custom',
+
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    sort: 'custom',
+
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    sort: 'custom',
+
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    sort: 'custom',
+
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    sort: 'custom',
+
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    sort: 'custom',
+
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    sort: 'custom',
+
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+
+  },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    sort: 'custom',
+
+  },
+  {
+    label: '入库库存状态范围',
+    field: 'inInventoryStatuses',
+    sort: 'custom',
+
+  },
+  {
+    label: '出库库存状态范围',
+    field: 'outInventoryStatuses',
+    sort: 'custom',
   },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -282,119 +307,145 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '扩展属性',
-    field: 'extraProperties',
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const StockupDetailJobRules = reactive({
+})
+
+export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '地点ID',
-    field: 'siteId',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '自动完成',
-    field: 'autoComplete',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '允许修改库位',
-    field: 'allowModifyLocation',
+    label: '库存状态',
+    field: 'inventoryStatus',
     sort: 'custom',
     isSearch: true,
+    form: {
+      component: 'Radio'
+    },
   },
   {
-    label: '允许修改数量',
-    field: 'allowModifyQty',
+    label: '货主代码',
+    field: 'ownerCode',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '允许大于推荐数量',
-    field: 'allowBiggerQty',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '允许小于推荐数量',
-    field: 'allowSmallerQty',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '允许修改库存状态',
-    field: 'allowModifyInventoryStatus',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'Radio'
-    },
   },
   {
-    label: '允许连续扫描',
-    field: 'allowContinuousScanning',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '允许部分完成',
-    field: 'allowPartialComplete',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '权限所属人员id',
-    field: 'ruleUserId',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
   },
   {
-    label: '允许修改批次',
-    field: 'allowModifyBatch',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '允许修改箱码',
-    field: 'allowModifyPackingNumber',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
+    label: '计量单位',
+    field: 'uom',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '工作流流水号',
-    field: 'serialNumber',
+    label: '主表ID',
+    field: 'masterId',
     sort: 'custom',
     isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
   },
   {
-    label: '入库库存状态范围',
-    field: 'inInventoryStatuses',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '出库库存状态范围',
-    field: 'outInventoryStatuses',
+    label: '创建时间',
+    field: 'createTime',
     sort: 'custom',
+    formatter: dateFormatter,
     isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
   },
   {
     label: '操作',
@@ -406,3 +457,4 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 32c07c6e0..beb6c11e2 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -434,7 +434,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 150,
+      width: 300,
       fixed: 'right'
     }
   }

From 6416a680b5d93308786f2f3cf2ff4d6b0e4ec48b Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 14 Mar 2024 15:33:13 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E4=B8=BB=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=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

---
 .../itemManage/itemarea/index.vue             | 195 ++++++++++++------
 .../itemManage/itemarea/itemarea.data.ts      |  50 +++--
 2 files changed, 159 insertions(+), 86 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 4ff27d7ea..9be383b88 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -28,58 +28,71 @@
       v-model:sort="tableObject.sort"
     >
       <template #itemCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
+        <el-button type="primary" link @click="openDetail(row, '物料号', row.itemCode)">
           <span>{{ row.itemCode }}</span>
         </el-button>
         
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
+    ref="formRef"
+    @success="getList"
     :rules="ItemareaRules"
     :formAllSchemas="Itemarea.allSchemas"
+    :tableAllSchemas="ItemareaDetail.allSchemas"
+    :tableFormRules="ItemareaDetailRules"
+    :tableData="tableData"
     :apiUpdate="ItemareaApi.updateItemarea"
     :apiCreate="ItemareaApi.createItemarea"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-    :basicFormWidth="'60%'"
+    @submitForm="submitForm"
+    :isShowButton = isShowButton
   />
 
   <!-- 详情 -->
-  <Detail 
-    ref="detailRef" 
-    :isBasic="true" 
-    :allSchemas="Itemarea.allSchemas" 
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="Itemarea.allSchemas"
     :detailAllSchemas="ItemareaDetail.allSchemas"
+    :detailAllSchemasRules="ItemareaDetailRules"
     :apiCreate="ItemareaDetailApi.createItemareaDetail"
     :apiUpdate="ItemareaDetailApi.updateItemareaDetail"
     :apiPage="ItemareaDetailApi.getItemareaDetailPage"
     :apiDelete="ItemareaDetailApi.deleteItemareaDetail"
-
     @searchTableSuccessDetail="searchTableSuccessDetail"
-    />
+    :detailButtonIsShowAdd="true"
+    :detailButtonIsShowDelete="true"
+    @detailOpenForm="detailOpenForm"
+  />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/itemarea/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/itemarea/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
-<script setup lang="ts">
-import download from '@/utils/download'
-import { Itemarea,ItemareaRules,ItemareaDetail } from './itemarea.data'
-import * as ItemareaApi from '@/api/wms/itemarea'
-import * as ItemareaDetailApi from '@/api/wms/itemareaDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+  <script setup lang="ts">
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import download from '@/utils/download'
+  import { Itemarea,ItemareaRules,ItemareaDetail,ItemareaDetailRules } from './itemarea.data'
+  import * as ItemareaApi from '@/api/wms/itemarea'
+  import * as ItemareaDetailApi from '@/api/wms/itemareaDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import Detail from '@/components/Detail/src/Detail.vue'
+  
 
+// 发货申请
 defineOptions({ name: 'Itemarea' })
 
 const message = useMessage() // 消息弹窗
@@ -90,29 +103,31 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(Itemarea.allSchemas.tableColumns)
 
+const isShowButton = ref(true)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
     formRef.setValues(setV)
+    
   })
 }
-
 // 查询页面返回——详情
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-      setV[formField] = val[0][searchField]
+    setV[formField] = val[0][searchField]
     formRef.setValues(setV)
   })
 }
 
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
 const { tableObject, tableMethods } = useTable({
   getListApi: ItemareaApi.getItemareaPage // 分页接口
 })
@@ -147,22 +162,42 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:itemarea:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:itemarea:delete'}), // 删除
-]
+const butttondata = (row) => {
+  row.status = "1"
+    return [
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:itemarea:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:itemarea:delete'}), // 删除
+    ]
+}
+
+
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+ if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
@@ -170,39 +205,29 @@ const buttonTableClick = async (val, row) => {
 }
 
 /** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
 }
 
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =Itemarea.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await ItemareaApi.createItemarea(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await ItemareaApi.updateItemarea(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
+/**
+ * 详情 编辑页面打开
+ * @param row 
+ */
+ const detailOpenForm = (type) => {
+
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicItemarea')
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  row.status = "1";
+  detailRef.value.openDetail(row, titleName, titleValue,'itemarea')
 }
 
 /** 删除按钮操作 */
@@ -210,8 +235,10 @@ const handleDelete = async (id: number) => {
   try {
     // 删除的二次确认
     await message.delConfirm()
+    tableObject.loading = true
     // 发起删除
-    await ItemareaApi.deleteItemarea(id)
+    await ItemareaDetailApi.deleteItemareaDetail(id)
+    tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -227,23 +254,62 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ItemareaApi.exportItemarea(tableObject.params)
-    download.excel(data, '物料库区配置.xlsx')
+    download.excel(data, '发货申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
   }
 }
 
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ItemareaDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await ItemareaApi.createItemarea(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ItemareaApi.updateItemarea(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {
   importFormRef.value.open()
 }
+
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
   templateTitle: '物料库区配置导入模版.xlsx'
 })
+
 // 导入成功之后
 const importSuccess = () => {
   getList()
@@ -263,5 +329,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await ItemareaApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index c693b29fe..61b173455 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -322,13 +322,31 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     label: '出库后剩余库存自动转换为出库包装规格',
     field: 'surplusToOutpackunit',
     sort: 'custom',
-    isSearch: false,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
   },
   {
     label: '超过高储是否允许叫料',
     field: 'allowIssueRequest',
     sort: 'custom',
-    isSearch: false,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
   },
   {
     label: '优先空库位',
@@ -618,19 +636,14 @@ export const ItemareaRules = reactive({
  */
 export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'id',
-    field: 'id',
+    label: '库位组',
+    field: 'locationGroup',
     sort: 'custom',
-    isForm: false,
   },
   {
-    label: '主表ID',
-    field: 'masterId',
+    label: '库位代码',
+    field: 'locationCode',
     sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
   },
   {
     label: '备注',
@@ -663,16 +676,6 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isForm: false,
   },
-  {
-    label: '库位组',
-    field: 'locationGroup',
-    sort: 'custom',
-  },
-  {
-    label: '库位代码',
-    field: 'locationCode',
-    sort: 'custom',
-  },
   {
     label: '操作',
     field: 'action',
@@ -683,3 +686,8 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+
+// 表单校验
+export const ItemareaDetailRules = reactive({
+
+})
\ No newline at end of file

From 45aaef03719b96f77d8bd419382d75022eb1412e Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 14 Mar 2024 15:42:11 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84local?=
 =?UTF-8?q?host=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index 3b38b8cc0..78976cddd 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://192.168.0.113:12080'
+VITE_BASE_URL='http://localhost:12080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload'

From 746a7a78abdd6f9dfaccdf4e2c2d4d3d5077b0e9 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 14 Mar 2024 16:55:42 +0800
Subject: [PATCH 13/22] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=89=8D=E6=AE=B5=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itemarea/index.vue             |  9 ++
 .../itemManage/itemarea/itemarea.data.ts      | 87 ++++++++++++++++++-
 2 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 9be383b88..f932f89c5 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -113,6 +113,15 @@ const updataTableColumns = (val) => {
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
+    if (type == 'tableForm') {
+      if(formField == 'locationGroupCode') {
+        row['locationGroupCode'] = val[0]['code']
+      }else if(formField == 'locationCode') {
+        row['locationCode'] = val[0]['code']
+      }else{ 
+        row[formField] = val[0][searchField]
+      }
+    }
     const setV = {}
     setV[formField] = val[0][searchField]
     formRef.setValues(setV)
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index 61b173455..928f75071 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -1,9 +1,18 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '../itembasic/itembasic.data'
+
 import * as AreaApi from '@/api/wms/areabasic'
 import { Area } from '../../factoryModeling/areabasic/areabasic.data'
+
+import * as LocationgroupApi from '@/api/wms/locationgroup'
+import { Locationgroup } from '../../factoryModeling/locationgroup/locationgroup.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '../../factoryModeling/location/location.data'
+
 import * as PackageunitApi from '@/api/wms/packageunit'
 import { Packageunit } from '../packageunit/packageunit.data'
 
@@ -637,13 +646,83 @@ export const ItemareaRules = reactive({
 export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库位组',
-    field: 'locationGroup',
-    sort: 'custom',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位组代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位组基础信息', // 查询弹窗标题
+      searchAllSchemas: Locationgroup.allSchemas, // 查询弹窗所需类
+      searchPage: LocationgroupApi.getLocationgroupPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位组代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位组基础信息', // 查询弹窗标题
+        searchAllSchemas: Locationgroup.allSchemas, // 查询弹窗所需类
+        searchPage: LocationgroupApi.getLocationgroupPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '库位代码',
     field: 'locationCode',
     sort: 'custom',
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位基础信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'locationGroupCode',
+        value: 'locationGroupCode',
+        message: '请选择库位组！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位基础信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'locationGroupCode',
+          value: 'locationGroupCode',
+          message: '请选择库位组！',
+          isMainValue: true
+        }]
+      }
+    }
   },
   {
     label: '备注',
@@ -656,12 +735,14 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isForm: false,
+    isTableForm: false,
   },
   {
     label: '创建者Id',
     field: 'creator',
     sort: 'custom',
     isForm: false,
+    isTableForm: false,
   },
   {
     label: '最后更新时间',
@@ -669,12 +750,14 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isForm: false,
+    isTableForm: false,
   },
   {
     label: '最后更新者Id',
     field: 'updater',
     sort: 'custom',
     isForm: false,
+    isTableForm: false,
   },
   {
     label: '操作',

From 989abd1dfd7c8f04685446852ae1b13bb6438ad9 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Thu, 14 Mar 2024 17:15:44 +0800
Subject: [PATCH 14/22] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E7=8F=AD=E7=BB=84=E3=80=81=E4=BA=A7?=
 =?UTF-8?q?=E7=BA=BF=E6=90=9C=E7=B4=A2=E5=8F=8A=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workstation/workstation.data.ts           | 69 +------------------
 1 file changed, 1 insertion(+), 68 deletions(-)

diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index 9154437fa..bf6753484 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -108,74 +108,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '班组代码',
-    field: 'teamCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择班组代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '班组信息', // 查询弹窗标题
-        searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
-        searchPage: TeamApi.getTeamPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: '设备代码',
-    field: 'equipmentCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择设备代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '设备信息', // 查询弹窗标题
-        searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  // {
-  //   label: '产品代码',
-  //   field: 'productCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isSearch: true
-  // },
-  // {
-  //   label: '工序代码',
-  //   field: 'processCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isSearch: true
-  // },
+
   {
     label: '原料库位',
     field: 'rawLocationCode',

From 79035813d54d845e143b4dd845cc5fd2e9d9bcb0 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 14 Mar 2024 17:54:07 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/itembasic/index.ts                                  | 1 +
 .../wms/basicDataManage/itemManage/itemarea/itemarea.data.ts    | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts
index baa9cb66b..52a8dec1b 100644
--- a/src/api/wms/itembasic/index.ts
+++ b/src/api/wms/itembasic/index.ts
@@ -32,6 +32,7 @@ export interface ItembasicVO {
 // 查询物料基本信息列表
 export const getItembasicPage = async (params) => {
   if (params.isSearch) {
+    delete params.isSearch
     const data = {...params}
     return request.post({ url: '/wms/itembasic/senior', data })
   } else {
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index 928f75071..20732e286 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -38,8 +38,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
         }]
       }

From e53a0d92775787818b6d30828e687d7d1f6d011c Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 14 Mar 2024 18:06:17 +0800
Subject: [PATCH 16/22] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itemarea/itemarea.data.ts      | 84 ++-----------------
 1 file changed, 9 insertions(+), 75 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index 20732e286..ecb3e4260 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -63,8 +63,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
         }]
       }
@@ -90,8 +88,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
         }]
       }
@@ -117,8 +113,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
         }]
       }
@@ -209,8 +203,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
         }]
       }
@@ -646,38 +638,10 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '库位组',
     field: 'locationGroupCode',
     sort: 'custom',
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择库位组代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '库位组基础信息', // 查询弹窗标题
-      searchAllSchemas: Locationgroup.allSchemas, // 查询弹窗所需类
-      searchPage: LocationgroupApi.getLocationgroupPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择库位组代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位组基础信息', // 查询弹窗标题
-        searchAllSchemas: Locationgroup.allSchemas, // 查询弹窗所需类
-        searchPage: LocationgroupApi.getLocationgroupPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          action: '==',
-          isSearch: true,
-          isMainValue: false
-        }]
-      }
-    }
+    isForm: false,
+    isTableForm: false,
   },
+
   {
     label: '库位代码',
     field: 'locationCode',
@@ -694,9 +658,9 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
         value: 'TRUE',
         isMainValue: false
       },{
-        key: 'locationGroupCode',
-        value: 'locationGroupCode',
-        message: '请选择库位组！',
+        key: 'areaCode',
+        value: 'areaCode',
+        message: '请选择区域代码！',
         isMainValue: true
       }]
     },
@@ -714,9 +678,9 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'TRUE',
           isMainValue: false
         },{
-          key: 'locationGroupCode',
-          value: 'locationGroupCode',
-          message: '请选择库位组！',
+          key: 'areaCode',
+          value: 'areaCode',
+          message: '请选择区域代码！',
           isMainValue: true
         }]
       }
@@ -727,36 +691,6 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '创建者Id',
-    field: 'creator',
-    sort: 'custom',
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '最后更新者Id',
-    field: 'updater',
-    sort: 'custom',
-    isForm: false,
-    isTableForm: false,
-  },
   {
     label: '操作',
     field: 'action',

From d660fb9e6cd6feecb0b2a3db780875daf9e8e768 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 14 Mar 2024 19:49:16 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/putawayRecordDetail/index.ts      |   5 +
 .../putaway/putawayRecordMain/index.vue       |  57 +++-
 .../putawayRecordMain.data.ts                 | 276 +++++++++++++++++-
 3 files changed, 336 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/putawayRecordDetail/index.ts b/src/api/wms/putawayRecordDetail/index.ts
index af8a43321..2d98839a1 100644
--- a/src/api/wms/putawayRecordDetail/index.ts
+++ b/src/api/wms/putawayRecordDetail/index.ts
@@ -73,4 +73,9 @@ export const exportPutawayRecordDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/putaway-record-detail/get-import-template' })
+}
+
+// 查询上架记录子列表--子包装数据
+export const getPutawayJobDetailPageChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/putaway-record-detail/pageChildPackingNumber`, params })
 }
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
index 9c02e442d..09a9480c7 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
@@ -57,12 +57,35 @@
     :detailAllSchemas="PutawayRecordDetail.allSchemas"
     :detailAllSchemasRules="PutawayRecordDetailRules"
     :apiPage="PutawayRecordDetailApi.getPutawayRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
+
+  <!-- 子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PutawayRecordDetailChildPackingNumber.allSchemas"
+    :tableFormRules="PutawayRecordDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { PutawayRecordMain,PutawayRecordMainRules,PutawayRecordDetail,PutawayRecordDetailRules } from './putawayRecordMain.data'
+import { PutawayRecordMain,
+  PutawayRecordMainRules,
+  PutawayRecordDetail,
+  PutawayRecordDetailRules,
+  PutawayRecordDetailChildPackingNumber } from './putawayRecordMain.data'
 import * as PutawayRecordMainApi from '@/api/wms/putawayRecordMain'
 import * as PutawayRecordDetailApi from '@/api/wms/putawayRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -133,12 +156,44 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
 }
 
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PutawayRecordDetailApi.getPutawayJobDetailPageChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,'recordPutawayMain')
 }
 
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index 063429468..e13da5fc2 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -613,6 +613,17 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
 ]))
 
 //表单校验
@@ -662,4 +673,267 @@ export const PutawayRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})
+
+
+/**
+ * @returns {Array} 上架记录子表--子包装展示
+ */
+export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
\ No newline at end of file

From d3721b554bd5921313555aee2fb434a15d1ff988 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 15 Mar 2024 09:58:43 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../putawayRecordMain.data.ts                 | 229 ++++++++++++++++++
 1 file changed, 229 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index e13da5fc2..9f42208e2 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -687,6 +687,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到包装号',
@@ -695,6 +703,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从批次',
@@ -703,6 +719,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到批次',
@@ -711,6 +735,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '库存状态',
@@ -722,6 +754,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '订单号',
@@ -730,6 +770,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '订单行',
@@ -738,6 +786,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从货主代码',
@@ -746,6 +802,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从库位代码',
@@ -754,6 +818,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从库位组代码',
@@ -762,6 +834,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从库区代码',
@@ -770,6 +850,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到货主代码',
@@ -778,6 +866,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到库位代码',
@@ -786,6 +882,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到库位组代码',
@@ -794,6 +898,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到库区代码',
@@ -802,6 +914,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '单据号',
@@ -810,6 +930,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 180
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料代码',
@@ -818,6 +946,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '备注',
@@ -826,6 +962,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '创建时间',
@@ -841,11 +985,18 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled:true,
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      disabled: true,
+      type:'FormDateTime',
+      format:'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    }
   },
   {
     label: '创建者',
@@ -854,6 +1005,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料名称',
@@ -862,6 +1021,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料描述1',
@@ -870,6 +1037,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料描述2',
@@ -878,6 +1053,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '项目代码',
@@ -886,6 +1069,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '数量',
@@ -896,6 +1087,12 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
   {
@@ -908,6 +1105,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '接口类型',
@@ -919,6 +1124,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从器具号',
@@ -927,6 +1140,14 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到器具号',
@@ -935,5 +1156,13 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
 ]))
\ No newline at end of file

From bd1769d6a3274692f8131334190b32a593d4413b Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 15 Mar 2024 11:00:27 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/itemManage/itemarea/index.vue   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index f932f89c5..1369f6e85 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -216,6 +216,19 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
+  if(type == "update"){
+    Itemarea.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'areaCode') {
+              item.componentProps.isSearchList = false,
+              item.componentProps.disabled = true
+            }})
+          }else {
+              Itemarea.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'areaCode') {
+        item.componentProps.isSearchList = true
+      }
+    })  
+  }
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
 }

From 5d4f4f85775c97a0d6fe642a781bb5c7e14785e0 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 15 Mar 2024 11:27:32 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceipt/purchasereceiptJobMain/index.vue            | 2 ++
 .../purchasereceipt/purchasereceiptRequestMain/index.vue        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index ef916e124..2eb30d6e5 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -62,6 +62,8 @@
     :detailAllSchemasRules="PurchasereceiptJobDetailRules"
     :searchTableParams="searchTableParams"
     :apiPage="PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
   />
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 98b9e15a5..b41407d7e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -71,6 +71,8 @@
     fromeWhere="purchasereceipt"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
   />

From 93a10ab72e4f941df49b8ba46fa3ffe64f51dede Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 15 Mar 2024 11:28:11 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockup/stockupMainRecord/index.vue       | 119 ++---
 .../stockupMainRecord.data.ts                 | 433 +++++++++++++++---
 2 files changed, 395 insertions(+), 157 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
index 236ee8fe0..168b9c9e1 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
@@ -27,43 +27,47 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
+    ref="formRef"
+    @success="getList"
     :rules="StockupMainRecordRules"
     :formAllSchemas="StockupMainRecord.allSchemas"
-    :apiUpdate="StockupMainRecordApi.updateStockupMainRecord"
-    :apiCreate="StockupMainRecordApi.createStockupMainRecord"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
+    :tableAllSchemas="StockupDetailRecord.allSchemas"
+    :tableFormRules="StockupDetailRecordRules"
+    :isBusiness="true"
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="StockupMainRecord.allSchemas" />
-
- 
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="StockupMainRecord.allSchemas"
+    :detailAllSchemas="StockupDetailRecord.allSchemas"
+    :detailAllSchemasRules="StockupDetailRecordRules"
+    :apiPage="StockupDetailRecordApi.getStockupDetailRecordPage"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { StockupMainRecord,StockupMainRecordRules } from './stockupMainRecord.data'
+import { StockupMainRecord,StockupMainRecordRules,StockupDetailRecord,StockupDetailRecordRules } from './stockupMainRecord.data'
 import * as StockupMainRecordApi from '@/api/wms/stockupMainRecord'
+import * as StockupDetailRecordApi from '@/api/wms/stockupDetailRecord'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
 
+// 备货记录主
 defineOptions({ name: 'StockupMainRecord' })
 
 const message = useMessage() // 消息弹窗
@@ -74,15 +78,6 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(StockupMainRecord.allSchemas.tableColumns)
 
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
-  })
-}
-
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -97,8 +92,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:stockupMainRecord:create'}), // 新增
-  defaultButtons.defaultExportBtn({hasPermi:'wms:stockupMainRecord:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-record-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -114,12 +108,16 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'export') { // 导出
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -127,67 +125,18 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:stockupMainRecord:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:stockupMainRecord:delete'}), // 删除
-]
+const butttondata = (row) => {
+  return []
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
-}
-
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
-
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =StockupMainRecord.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await StockupMainRecordApi.createStockupMainRecord(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await StockupMainRecordApi.updateStockupMainRecord(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicStockupMainRecord')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await StockupMainRecordApi.deleteStockupMainRecord(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
+  detailRef.value.openDetail(row, titleName, titleValue,'recordDeliverMain')
 }
 
 /** 导出按钮操作 */
@@ -206,7 +155,6 @@ const handleExport = async () => {
   }
 }
 
-
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -220,5 +168,4 @@ const searchFormClick = (searchData) => {
 onMounted(async () => {
   getList()
 })
-
 </script>
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
index a503624dc..feaa984b8 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
@@ -5,73 +5,81 @@ import { dateFormatter } from '@/utils/formatTime'
 export const StockupMainRecordRules = reactive({
 })
 
+//主表
 export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'id',
-    field: 'id',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
-    isForm: false,
+    isSearch: true,
+    table: {
+      width: 180
+    },
   },
   {
     label: '申请单号',
     field: 'requestNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180
+    },
   },
   {
     label: '任务单号',
     field: 'jobNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180
+    },
   },
   {
     label: '发货计划单号',
     field: 'deliverPlanNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180
+    },
   },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '明细',
-    field: 'details',
-    sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '出库事务类型',
     field: 'outTransactionType',
     sort: 'custom',
-    isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                },
+    table: {
+      width: 150
+    },
   },
   {
     label: '入库事务类型',
     field: 'inTransactionType',
     sort: 'custom',
-    isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                },
+    table: {
+      width: 150
+    },
   },
   {
     label: '执行时间',
     field: 'executeTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -80,6 +88,9 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -93,46 +104,33 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'activeDate',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
     },
     form: {
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x'
       }
     },
   },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    isSearch: true,
-  },
   {
     label: '申请时间',
     field: 'requestTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
+    table: {
+      width: 180
     },
     form: {
       component: 'DatePicker',
       componentProps: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
         type: 'datetime',
         valueFormat: 'x'
       }
@@ -143,7 +141,6 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'dueTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -152,6 +149,9 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -161,46 +161,280 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '部门',
-    field: 'departmentCode',
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
-    label: '用户组',
-    field: 'userGroupCode',
+    label: '部门',
+    field: 'departmentCode',
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '接口类型',
     field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 100
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
     sort: 'custom',
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                },
   },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+//子表
+// 表单校验
+export const StockupDetailRecordRules = reactive({
+})
+
+export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180
+    },
   },
   {
-    label: '业务类型',
-    field: 'businessType',
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
     sort: 'custom',
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '创建时间',
@@ -208,6 +442,9 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: true,
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -219,46 +456,100 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '扩展属性',
-    field: 'extraProperties',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
-    label: '地点ID',
-    field: 'siteId',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
-    label: '代码',
-    field: 'code',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '操作',

From b96f23a3216e1ac21e6cd586ccd7df356c9ef3f6 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Fri, 15 Mar 2024 11:34:27 +0800
Subject: [PATCH 22/22] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E7=8F=AD=E7=BB=84=E3=80=81=E4=BA=A7?=
 =?UTF-8?q?=E7=BA=BF=E6=90=9C=E7=B4=A2=E5=8F=8A=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/index.ts                          |   0
 src/api/mes/workstation/index.ts              |  49 ++++
 src/utils/disposition/defaultButtons.ts       |  12 +
 src/views/mes/workstation/index.vue           | 248 ++++++++++++++++++
 src/views/mes/workstation/workstation.data.ts |  78 ++++++
 5 files changed, 387 insertions(+)
 delete mode 100644 src/api/mes/index.ts
 create mode 100644 src/api/mes/workstation/index.ts
 create mode 100644 src/views/mes/workstation/index.vue
 create mode 100644 src/views/mes/workstation/workstation.data.ts

diff --git a/src/api/mes/index.ts b/src/api/mes/index.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
new file mode 100644
index 000000000..f12b0a5c4
--- /dev/null
+++ b/src/api/mes/workstation/index.ts
@@ -0,0 +1,49 @@
+import request from '@/config/axios'
+
+export interface WorkstationVO {
+  code: string
+  activeTime: Date
+  expireTime: Date
+  name: string
+}
+
+// 查询工位列表
+export const getWorkstationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/workstation/senior', data })
+  } else {
+    return await request.get({ url: `/mes/workstation/page`, params })
+  }
+}
+
+// 查询工位详情
+export const getWorkstation = async (id: number) => {
+  return await request.get({ url: `/mes/workstation/get?id=` + id })
+}
+
+// 新增工位
+export const createWorkstation = async (data: WorkstationVO) => {
+  return await request.post({ url: `/mes/workstation/create`, data })
+}
+
+// 修改工位
+export const updateWorkstation = async (data: WorkstationVO) => {
+  return await request.put({ url: `/mes/workstation/update`, data })
+}
+
+// 删除工位
+export const deleteWorkstation = async (id: number) => {
+  return await request.delete({ url: `/mes/workstation/delete?id=` + id })
+}
+
+// 导出工位 Excel
+export const exportWorkstation = async (params) => {
+  return await request.download({ url: `/mes/workstation/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/workstation/get-import-template' })
+}
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index f25895502..b7f8ca791 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -735,6 +735,18 @@ export function mainThawRequesttBtn(option:any) {
     hasPermi: ''
   })
 }
+// 主列表-绑定
+export function mainListBindBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '绑定',
+    name: 'bind',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 默认按钮规则
 function __defaultBtnOption(option:any,specific:any){
   return {
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
new file mode 100644
index 000000000..c72da2656
--- /dev/null
+++ b/src/views/mes/workstation/index.vue
@@ -0,0 +1,248 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Workstation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Workstation.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="WorkstationRules"
+    :formAllSchemas="Workstation.allSchemas"
+    :apiUpdate="WorkstationApi.updateWorkstation"
+    :apiCreate="WorkstationApi.createWorkstation"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Workstation.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Workstation,WorkstationRules } from './workstation.data'
+import * as WorkstationApi from '@/api/mes/workstation'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import {mainBindBtn} from "@/utils/disposition/defaultButtons";
+
+defineOptions({ name: 'Workstation' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Workstation.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: WorkstationApi.getWorkstationPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:workstation:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:workstation:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:workstation:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除
+  defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }else if (val == 'bind') { // 绑定
+    detailRef.value.openDetail(row, row.name, "绑定", 'mesWorkstation')
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =Workstation.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await WorkstationApi.createWorkstation(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await WorkstationApi.updateWorkstation(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await WorkstationApi.deleteWorkstation(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await WorkstationApi.exportWorkstation(tableObject.params)
+    download.excel(data, '工位.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '工位导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await WorkstationApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
new file mode 100644
index 000000000..b74f05a6d
--- /dev/null
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -0,0 +1,78 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+// 表单校验
+export const WorkstationRules = reactive({
+  code: [required],
+  name: [required]
+})
+
+export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '班组代码',
+    field: 'teamCode',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))