备货展示字段顺序调整

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
         }]
       }
     }

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -324,19 +324,19 @@ const openForm = (type: string, row?: number) => {
 }
 
 // 获取部门 用于详情 部门回显
-// const { wsCache } = useCache()
+const { wsCache } = useCache()
-// /** 详情操作 */
+/** 详情操作 */
-// const detailRef = ref()
+const detailRef = ref()
-// const openDetail = (row: any, titleName: any, titleValue: any) => {
+const openDetail = (row: any, titleName: any, titleValue: any) => {
-//   if(row.deliverPlanNumber != null){
+  if(row.deliverPlanNumber != null){
-//         trueFalse.value = false
+        trueFalse.value = false
-//     }else {
+    }else {
-//       trueFalse.value = true
+      trueFalse.value = true
-//     }
+    }
-//   const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-//   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-//   detailRef.value.openDetail(row, titleName, titleValue,'requestDeliverMain')
+  detailRef.value.openDetail(row, titleName, titleValue,'stockupMainRequest')
-// }
+}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {

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: '从货主代码',
+    label: '创建时间',
-    field: 'fromOwnerCode',
+    field: 'createTime',
     sort: 'custom',
+    formatter: dateFormatter,
     isSearch: true,
-    isTableForm: false,
+    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,
+  },
 ]))