From 1e361796d4b1f43072a6cfc962009741b23f27d4 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Fri, 8 Dec 2023 13:54:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 6 +++--- .../supplierdeliver/supplierdeliverRecordMain/index.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 000c0b82a..04a3dba55 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -172,9 +172,9 @@ defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开 defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭 defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布 - defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['6']) }), // 接受 - defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['6']) }), // 不接受 - defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['6']) }), // 下架 + defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受 + defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受 + defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架 defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除 ] diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index 45e1da0a7..2c86695d9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -121,7 +121,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListGenerateApplicationBtn(null), // 生成采购申请 + // defaultButtons.mainListGenerateApplicationBtn(null), // 生成采购申请 ] } From 79398d9fa5ea999ddb7aaf62c587e42dbd34cedf Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 8 Dec 2023 15:05:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/inspectJobMain/inspectJobMain.data.ts | 8 ++++---- .../purchasereturnJobMain/purchasereturnJobMain.data.ts | 4 ++-- .../putaway/putawayJobMain/putawayJobMain.data.ts | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts index 7695749f7..2350037b7 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts @@ -177,8 +177,8 @@ export const InspectJobMain = useCrudSchemas(reactive([ }, }, { - label: '承接人用户名', - field: 'acceptUserId', + label: '承接人', + field: 'acceptUserName', sort: 'custom', table: { width: 150 @@ -205,8 +205,8 @@ export const InspectJobMain = useCrudSchemas(reactive([ }, }, { - label: '完成人用户名', - field: 'completeUserId', + label: '完成人', + field: 'completeUserName', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index bdeef4790..2873515a4 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -271,7 +271,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive([ }, { label: '承接人', - field: 'acceptUserId', + field: 'acceptUserName', sort: 'custom', table: { width: 150 @@ -299,7 +299,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive([ }, { label: '完成人', - field: 'completeUserId', + field: 'completeUserName', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts index bbccf831d..b0266e1f2 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts @@ -170,8 +170,8 @@ export const PutawayJobMain = useCrudSchemas(reactive([ }, }, { - label: '承接人用户名', - field: 'acceptUserId', + label: '承接人', + field: 'acceptUserName', sort: 'custom', table: { width: 150 @@ -198,8 +198,8 @@ export const PutawayJobMain = useCrudSchemas(reactive([ }, }, { - label: '完成人用户名', - field: 'completeUserId', + label: '完成人', + field: 'completeUserName', sort: 'custom', table: { width: 150 From 7219dab1e93d1abfa2ddfd0e1c56f271c9f2fcb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 8 Dec 2023 16:21:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=89=A9=E5=B1=95=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ImportForm/src/ImportForm.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue index d911a51be..b71ee0cb2 100644 --- a/src/components/ImportForm/src/ImportForm.vue +++ b/src/components/ImportForm/src/ImportForm.vue @@ -13,7 +13,9 @@ '&updatePart=' + updatePart + '&outFile=' + - outFile + outFile + + '&fromInventoryStatus=' + fromInventoryStatus + + '&toInventoryStatus=' + toInventoryStatus " :auto-upload="false" :disabled="formLoading" @@ -167,6 +169,18 @@ const props = defineProps({ type: Boolean, required: false, default: false + }, + // 库存修改 扩展额外属性 + fromInventoryStatus: { + type: String, + required: false, + default: '' + }, + // 库存修改 扩展额外属性 + toInventoryStatus: { + type: String, + required: false, + default: '' } }) const importTemplateData = ref(props.importTemplateData) From dc9acb2085ec5ab8983d5309b0dc57f5ce1779a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 8 Dec 2023 17:02:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=BD=AC=E9=9A=94?= =?UTF-8?q?=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorychangeRequestMain/index.vue | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 7ada0b923..02f7dacd5 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -67,13 +67,12 @@ :apiUpdate="InventorychangeRequestDetailApi.updateInventorychangeRequestDetail" :apiPage="InventorychangeRequestDetailApi.getInventorychangeRequestDetailPage" :apiDelete="InventorychangeRequestDetailApi.deleteInventorychangeRequestDetail" - :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" /> + @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />