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

src/api/wms/supplierdeliverRequestDetail/index.ts

@@ -43,6 +43,10 @@ export const getSupplierdeliverRequestDetailPage = async (params) => {
     return await request.get({ url: `/wms/supplierdeliver-request-detail/page`, params })
   }
 }
+// 查询供应商发货申请子列表
+export const getGenerateLabelList = async (params) => {
+  return await request.get({ url: `/wms/supplierdeliver-request-detail/generateLabelParentList`, params })
+}
 
 // 查询供应商发货申请子详情
 export const getSupplierdeliverRequestDetail = async (id: number) => {

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -835,7 +835,7 @@ const handleExport = async () => {
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
-  getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage
+  getListApi: SupplierdeliverRequestDetailApi.getGenerateLabelList
 })
 detatableData.pageSize = 500
 const { getList:getDetailList } = detatableMethods

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue

@@ -5,13 +5,11 @@
       border
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
-      v-if="tableData.length > 0"
     >
       <el-table-column type="expand" width="50">
         <template #default="scope">
           <div
             style="margin-left: 400px; margin-top: -8px; margin-bottom: -8px"
-            v-if="scope.row.packUnit && scope.row.packQty"
           >
             <el-table
               :data="scope.row.children"
@@ -89,7 +87,7 @@
               </el-table-column>
             </el-table>
           </div>
-          <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
+          <!-- <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
             <el-table :data="scope.row.children" border style="width: 300px" row-key="id">
               <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center" />
               <el-table-column label="数量" width="100" prop="qtyOne" align="center">
@@ -113,7 +111,7 @@
                 </template>
               </el-table-column>
             </el-table>
-          </div>
+          </div> -->
         </template>
       </el-table-column>
       <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />

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

@@ -1599,174 +1599,24 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '包装规格1',
+    label: '箱规格',
     field: 'packUnit',
     isTable: true,
     sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-
-      }
-    },
-    tableForm: {
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'itemCode',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isTableRowValue: true, 
-          isMainValue:false
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
-  {
-    label: '包装名称1',
-    field: 'packName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
     form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '物料数量1',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-      }
-    },
-    tableForm: {
-    }
-  },
-  {
-    label: '包装规格2',
-    field: 'secondPackUnit',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150,
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
       componentProps: {
         disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-
-      }
-    },
-    tableForm: {
-      clearable: true,
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isTableRowValue: true, 
-          isMainValue:false
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
-  {
-    label: '包装名称2',
-    field: 'secondPackName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
       }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '物料数量2',
-    field: 'secondPackQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-      }
-    },
-    tableForm: {
     }
   },
+ 
   {
     label: '物料名称',
     field: 'itemName',