From 1a4815ef21310607df5efc2d262837deb457ebfa Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 24 Oct 2024 11:50:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E3=80=82=E5=92=8C=E8=A6=81?= =?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=E8=8E=B7=E5=8F=96=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasePlanMain/index.ts | 6 ++++-- .../strategy/arrivalInspectionStrategy/AddForm.vue | 2 +- .../strategy/arrivalInspectionStrategy/index.vue | 4 ++-- .../strategySetting/strategy/batchStrategy/AddForm.vue | 2 +- .../strategySetting/strategy/batchStrategy/index.vue | 4 ++-- .../strategySetting/strategy/downShelfStrategy/AddForm.vue | 2 +- .../strategySetting/strategy/downShelfStrategy/index.vue | 4 ++-- .../strategySetting/strategy/inspectStrategy/AddForm.vue | 2 +- .../strategySetting/strategy/inspectStrategy/index.vue | 4 ++-- .../strategy/manageAccuracyStrategy/AddForm.vue | 2 +- .../strategy/manageAccuracyStrategy/index.vue | 4 ++-- .../strategy/purchaseReceiptStrategy/AddForm.vue | 2 +- .../strategy/purchaseReceiptStrategy/index.vue | 4 ++-- .../strategy/repairMaterialStrategy/AddForm.vue | 2 +- .../strategy/repairMaterialStrategy/index.vue | 4 ++-- 15 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/api/wms/purchasePlanMain/index.ts b/src/api/wms/purchasePlanMain/index.ts index 9d5e42230..4f37cd824 100644 --- a/src/api/wms/purchasePlanMain/index.ts +++ b/src/api/wms/purchasePlanMain/index.ts @@ -109,6 +109,8 @@ export const importTemplate = () => { } // 查询要货计划策略根据供应商 -export const queryPurchasePlan = async (supplierCode: string) => { - return await request.get({ url: `/wms/purchase-plan-main/queryPurchasePlan?supplierCode=` + supplierCode }) +export const queryPurchasePlan = async (supplierCode: string, itemCode: string) => { + return await request.get({ + url: `/wms/purchase-plan-main/queryPurchasePlan?supplierCode=` + supplierCode + `&itemCode=` + itemCode +}) } \ No newline at end of file diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index 09130a81b..34ed4b862 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -35,7 +35,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue index d025c2b9d..63821afa2 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue @@ -134,7 +134,7 @@ const buttonBaseClick = (val, item) => { // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { - if (val == row.name) { + if (val == row.priority) { return true } else { return false @@ -145,7 +145,7 @@ const isShowMainButton = (row,val) => { const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index 4ab25e524..f2bb3979e 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -35,7 +35,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue index f0bb71880..7942a9f07 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue @@ -134,7 +134,7 @@ const buttonBaseClick = (val, item) => { // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { - if (val == row.name) { + if (val == row.priority) { return true } else { return false @@ -145,7 +145,7 @@ const isShowMainButton = (row,val) => { const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 8f32d6a8b..f638c1143 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -36,7 +36,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue index e870c8b94..9bcc87580 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue @@ -138,7 +138,7 @@ const buttonBaseClick = (val, item) => { // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { - if (val == row.name) { + if (val == row.priority) { return true } else { return false @@ -149,7 +149,7 @@ const isShowMainButton = (row,val) => { const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue index 9bb1b7f21..f77dfc73c 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue @@ -36,7 +36,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue index 67da993da..8c438ce6b 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue @@ -132,7 +132,7 @@ const buttonBaseClick = (val, item) => { // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { - if (val == row.name) { + if (val == row.priority) { return true } else { return false @@ -143,7 +143,7 @@ const isShowMainButton = (row,val) => { const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue index 23d8aed20..2fab0b936 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue @@ -35,7 +35,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue index e250778fc..19298f953 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue @@ -140,7 +140,7 @@ const buttonBaseClick = (val, item) => { // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { - if (val == row.name) { + if (val == row.priority) { return true } else { return false @@ -151,7 +151,7 @@ const isShowMainButton = (row,val) => { const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue index 4d0d16171..7e869a6bd 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue @@ -36,7 +36,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue index a149f214f..a68e7d65a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue @@ -135,7 +135,7 @@ const buttonBaseClick = (val, item) => { // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { - if (val == row.name) { + if (val == row.priority) { return true } else { return false @@ -146,7 +146,7 @@ const isShowMainButton = (row,val) => { const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index fe388bd81..99c769ab7 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -35,7 +35,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue index bdf874b67..7f325c260 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue @@ -140,7 +140,7 @@ const buttonBaseClick = (val, item) => { // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { - if (val == row.name) { + if (val == row.priority) { return true } else { return false @@ -151,7 +151,7 @@ const isShowMainButton = (row,val) => { const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 ] }