库内修改

src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue

@@ -139,7 +139,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:inventorychange-record-main:export'}), // 导出
-  defaultButtons.defaultFreshBtn({hasPermi:'wms:inventorychange-record-main:page'}), // 刷新
+  defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -108,15 +108,56 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // 明细查询页赋值
       row[formField] = val[0][searchField]
       row['fromPackingNumber'] = val[0]['packingNumber']
-      row['itemCode'] = val[0]['itemCode']
+      row['toPackingNumber'] = val[0]['packingNumber']
       row['fromBatch'] = val[0]['batch']
-      row['locationCode'] = val[0]['locationCode']
+      row['toBatch'] = val[0]['batch']
       row['fromInventoryStatus'] = val[0]['inventoryStatus']
-    }
+      row['toInventoryStatus'] = val[0]['inventoryStatus']
-    console.log(116, row)
+      row['fromContainerNumber'] = val[0]['containerNumber']
+      row['toContainerNumber'] = val[0]['containerNumber']
+      row['fromQty'] = val[0]['qty']
+      row['toQty'] = val[0]['qty']
+      row['fromOwnerCode'] = val[0]['ownerCode']
+      row['toOwnerCode'] = val[0]['ownerCode']
+      row['fromAltBatch'] = val[0]['altBatch']
+      row['toAltBatch'] = val[0]['altBatch']
+      row['fromArriveDate'] = val[0]['arriveDate']
+      row['toArriveDate'] = val[0]['arriveDate']
+      row['fromProduceDate'] = val[0]['produceDate']
+      row['toProduceDate'] = val[0]['produceDate']
+      row['fromExpireDate'] = val[0]['expireDate']
+      row['toExpireDate'] = val[0]['expireDate']
+      row['itemCode'] = val[0]['itemCode']
+      row['locationCode'] = val[0]['locationCode']
+      row['uom'] = val[0]['uom']
+    } else {
       const setV = {}
       setV[formField] = val[0][searchField]
+      setV['fromPackingNumber'] = val[0]['packingNumber']
+      setV['toPackingNumber'] = val[0]['packingNumber']
+      setV['fromBatch'] = val[0]['batch']
+      setV['toBatch'] = val[0]['batch']
+      setV['fromInventoryStatus'] = val[0]['inventoryStatus']
+      setV['toInventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromContainerNumber'] = val[0]['containerNumber']
+      setV['toContainerNumber'] = val[0]['containerNumber']
+      setV['fromQty'] = val[0]['qty']
+      setV['toQty'] = val[0]['qty']
+      setV['fromOwnerCode'] = val[0]['ownerCode']
+      setV['toOwnerCode'] = val[0]['ownerCode']
+      setV['fromAltBatch'] = val[0]['altBatch']
+      setV['toAltBatch'] = val[0]['altBatch']
+      setV['fromArriveDate'] = val[0]['arriveDate']
+      setV['toArriveDate'] = val[0]['arriveDate']
+      setV['fromProduceDate'] = val[0]['produceDate']
+      setV['toProduceDate'] = val[0]['produceDate']
+      setV['fromExpireDate'] = val[0]['expireDate']
+      setV['toExpireDate'] = val[0]['expireDate']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['locationCode'] = val[0]['locationCode']
+      setV['uom'] = val[0]['uom']
       formRef.setValues(setV)
+    }
   })
 }
 // 查询页面返回——详情
@@ -182,7 +223,7 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
     return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorychange-request-main:reAdd'}), //重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorychange-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorychange-request-main:refused'}), // 驳回

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

@@ -8,6 +8,9 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 
+import * as OwnerApi from '@/api/wms/owner'
+import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -341,6 +344,43 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择从包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePage
+      }
+    }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
   {
     label: '物品代码',
     field: 'itemCode',
@@ -350,6 +390,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     tableForm: {
       disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
@@ -391,54 +436,20 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     tableForm: {
       disabled: true
-    }
-  },
-  {
-    label: '到批次',
-    field: 'toBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '从包装号',
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
+        disabled: true
-        searchListPlaceholder: '请选择从包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
       }
     }
   },
   {
-    label: '到包装号',
+    label: '到批次',
-    field: 'toPackingNumber',
+    field: 'toBatch',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
   },
   {
     label: '从器具号',
@@ -460,28 +471,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false,
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    },
-    isTableForm: false,
-    isForm: false,
-  },
   {
     label: '从数量',
     field: 'fromQty',
@@ -492,17 +481,15 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        precision: 6,
-        precision: 6
+        disabled: true
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      precision: 6,
-      precision: 6
+      disabled: true
     },
-    isTableForm: false,
-    isForm: false,
   },
   {
     label: '到数量',
@@ -514,17 +501,13 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
       precision: 6
     },
-    isTableForm: false,
-    isForm: false,
   },
   {
     label: '计量单位',
@@ -537,9 +520,14 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     },
-    isForm: false,
   },
   {
     label: '库位代码',
@@ -550,6 +538,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     tableForm: {
       disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
@@ -566,8 +559,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select',
       disabled: true
     },
-    isTableForm: false,
+    form: {
-    isForm: false,
+      componentProps: {
+        disabled: true
+      }
+    },
   },
   {
     label: '到库存状态',
@@ -582,6 +578,10 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     tableForm: {
       type: 'Select'
     },
+    form: {
+      componentProps: {
+      }
+    },
   },
   {
     label: '库位组代码',
@@ -610,8 +610,41 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    isTableForm: false,
+    form: {
-    isForm: false,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择货主代码',
+      searchField: 'code',
+      searchTitle: '货主信息',
+      searchAllSchemas: Owner.allSchemas,
+      searchPage: OwnerApi.getOwnerPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择货主代码',
+        searchField: 'code',
+        searchTitle: '货主信息',
+        searchAllSchemas: Owner.allSchemas,
+        searchPage: OwnerApi.getOwnerPage
+      }
+    }
   },
   {
     label: '从替代批次',
@@ -687,34 +720,19 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
+        disabled: true
       }
     },
-    isTableForm: false,
+    tableForm: {
-    isForm: false,
+      type: 'FormDateTime',
-  },
+      format: 'YYYY-MM-DD HH:mm:ss',
-  {
+      valueFormat: 'x',
-    label: '到货主代码',
+      disabled: true
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '到替代批次',
-    field: 'toAltBatch',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    isTableForm: false,
-    isForm: false,
   },
   {
-    label: '到到货日期',
+    label: '到过期日期',
-    field: 'toArrivdAte',
+    field: 'toExpireDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -732,12 +750,25 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      type: 'FormDateTime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '到替代批次',
+    field: 'toAltBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
     isTableForm: false,
     isForm: false,
   },
   {
-    label: '到生产日期',
+    label: '到到货日期',
-    field: 'toProduceDate',
+    field: 'toArrivdAte',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -759,8 +790,8 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false,
   },
   {
-    label: '到过期日期',
+    label: '到生产日期',
-    field: 'toExpireDate',
+    field: 'toProduceDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'