物料变更前段页面展示字段修改

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@@ -192,6 +192,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           newRow['toBatch'] = item['batch']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['inventoryStatus'] = item['inventoryStatus']
+          newRow['packUnit'] = item['packUnit']
+          newRow['packQty'] = item['packQty']
           tableData.value.push(newRow)
         })
         let itemCodes = []
@@ -229,10 +231,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         // console.log(row['itemCode']);
         // ItembasicApi.getItemListByCodes(row['itemCode'])
         row['downItemCode'] = val[0]['code']
-      } else if(formField == 'packUnit'){
+      } else if (formField == 'toLocationCode') {
-        row['packUnit'] = val[0]['packUnit']
-        row['packQty'] = val[0]['packQty']
-      }else if (formField == 'toLocationCode') {
         row['toLocationCode'] = val[0]['code']
       } else {
         row[formField] = val[0][searchField]
@@ -400,16 +399,17 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过
     defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:update'}), // 编辑
-    {
+    // {
-      label: '创建标签',
+    //   label: '创建标签',
-      name: 'cjbq',
+    //   name: 'cjbq',
-      hide: isShowMainButton(row,['3']),
+    //   hide: isShowMainButton(row,['3']),
-      type: 'primary',
+    //   type: 'primary',
-      icon: '',
+    //   icon: '',
-      color: '',
+    //   color: '',
-      hasPermi: '',
+    //   hasPermi: '',
-      link: true, // 文本展现按钮
+    //   link: true, // 文本展现按钮
-    },defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+    // },
+    defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-request-main:delete'}), // 删除
     ]
 }

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@@ -410,59 +410,35 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '计量单位',
+    label: '包装号',
-    field: 'uom',
+    field: 'fromPackingNumber',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 80
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '数量',
-    field: 'qty',
     sort: 'custom',
     form: {
       componentProps: {
-        disabled: true
+        disabled: true,
       }
     },
     tableForm: {
       disabled: true
     },
     table: {
-      width: 80
+      width: 120
     },
   },
   {
-    label: '从批次',
+    label: '包装规格',
-    field: 'fromBatch',
+    field: 'packUnit',
     sort: 'custom',
-    form: {
+    table: {
-      componentProps: {
+      width: 120
-        disabled: true,
-      }
     },
     tableForm: {
       disabled: true
     },
-    table: {
-      width: 120
-    },
   },
   {
-    label: '从包装号',
+    label: '批次',
-    field: 'fromPackingNumber',
+    field: 'fromBatch',
     sort: 'custom',
     form: {
       componentProps: {
@@ -477,65 +453,42 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到包装号',
+    label: '数量',
-    field: 'toPackingNumber',
+    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 120
-    },
-    tableForm: {
-      disabled: true
-    },
-  },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
     sort: 'custom',
     form: {
       componentProps: {
-        disabled: true,
+        disabled: true
       }
     },
     tableForm: {
       disabled: true
     },
     table: {
-      width: 120
+      width: 80
     },
   },
   {
-    label: '从库区类型',
+    label: '计量单位',
-    field: 'fromAreaTypes',
+    field: 'uom',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isTable: false,
-    isForm: false,
-    isTableForm: false,
-    sort: 'custom',
-  },
-  {
-    label: '从库区代码',
-    field: 'fromAreaCodes',
     sort: 'custom',
-    isForm:false,
-    isTableForm: false,
     table: {
-      width: 150
+      width: 100
-    },
     },
-  {
-    label: '到批次',
-    field: 'toBatch',
-    sort: 'custom',
     tableForm: {
+      type: 'Select',
       disabled: true
     },
-    table: {
+    form: {
-      width: 120
+      componentProps: {
-    },
+        disabled: true
+      }
+    }
   },
   {
-    label: '到库位代码',
+    label: '库位代码',
     field: 'toLocationCode',
     sort: 'custom',
     tableForm:{
@@ -562,47 +515,46 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '包装规格',
+    label: '到包装号',
-    field: 'packUnit',
+    field: 'toPackingNumber',
     sort: 'custom',
-    tableForm:{
+    isTable: false,
-      isInpuFocusShow: true, // 开启查询弹窗
+    isForm: false,
-      searchListPlaceholder: '请选择包装规格',
+    isTableForm: false,
-      searchField: 'packUnit',
+  },
-      searchTitle: '包装规格',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItempackageApi.getItempackagingPage,
-      searchCondition:[
   {
-          key: 'itemCode',
+    label: '从库位代码',
-          value: 'downItemCode',
+    field: 'fromLocationCode',
-          message: "请选择物料变更代码",
+    sort: 'custom',
-          isMainValue: true
+    isTable: false,
-        }
+    isTableForm: false,
-      ]
+    isForm: false,
   },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装规格',
-        searchField: 'packUnit',
-        searchTitle: '包装规格',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItempackageApi.getItempackagingPage,
-        searchCondition:[
   {
-            key: 'itemCode',
+    label: '从库区类型',
-            value: 'downItemCode',
+    field: 'fromAreaTypes',
-            message: "请选择降级物料代码",
+    dictType: DICT_TYPE.AREA_TYPE,
-            isMainValue: true
+    dictClass: 'string',
-          }
+    isTable: false,
-        ]
+    isForm: false,
-      }
+    isTableForm: false,
+    sort: 'custom',
   },
-    table: {
+  {
-      width: 120
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isForm:false,
+    isTableForm: false,
+    isTable: false,
   },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    isTable: false,
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '到库区类型',
@@ -617,21 +569,17 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到库区代码',
     field: 'toAreaCodes',
     sort: 'custom',
-    isForm:false,
     isTableForm: false,
-    table: {
+    isTable: false,
-      width: 150
+    isForm: false,
-    },
   },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
-    isForm:false,
     isTableForm: false,
-    table: {
+    isTable: false,
-      width: 150
+    isForm: false,
-    },
   },
   {
     label: '是否可用',