From 390a59be19053b9391eec67f2fc430938db93e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 25 Dec 2023 16:04:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=86=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorychangeRecordMain/index.vue | 2 +- .../inventorychangeRequestMain/index.vue | 55 +++- .../inventorychangeRequestMain.data.ts | 235 ++++++++++-------- 3 files changed, 182 insertions(+), 110 deletions(-) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue index b9d7286d0..ad3c7e2c7 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue +++ b/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), // 设置 // { diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 52f69be97..577452352 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/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'] + 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) } - console.log(116, row) - const setV = {} - setV[formField] = val[0][searchField] - 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'}), // 驳回 diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 3db76d9cf..9fb835b57 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/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