From 1000609158659d044623c920f7d911ebc3e680e0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 13 Nov 2024 13:14:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=95=B4=E4=BD=93=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE=E5=92=8C=E5=88=A4=E6=96=AD=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrivalInspectionStrategy/AddForm.vue | 16 +++--- .../arrivalInspectionStrategy/index.vue | 4 +- .../strategy/batchStrategy/AddForm.vue | 28 +++++----- .../strategy/batchStrategy/index.vue | 4 +- .../strategy/downShelfStrategy/AddForm.vue | 46 ++++++++-------- .../strategy/downShelfStrategy/index.vue | 4 +- .../strategy/inspectStrategy/AddForm.vue | 20 +++---- .../strategy/inspectStrategy/index.vue | 4 +- .../manageAccuracyStrategy/AddForm.vue | 23 +++++++- .../strategy/manageAccuracyStrategy/index.vue | 4 +- .../purchaseReceiptStrategy/AddForm.vue | 2 +- .../purchaseReceiptStrategy/index.vue | 4 +- .../repairMaterialStrategy/AddForm.vue | 16 +++++- .../strategy/repairMaterialStrategy/index.vue | 4 +- .../storageCapacityStrategy/AddForm.vue | 28 +++++----- .../storageCapacityStrategy/index.vue | 4 +- .../supplieDeliveryStrategy/AddForm.vue | 18 +++--- .../supplieDeliveryStrategy/index.vue | 4 +- .../strategy/upShelfStrategy/AddForm.vue | 55 ++++++++++--------- .../strategy/upShelfStrategy/index.vue | 4 +- .../utensilCapacityStrategy/AddForm.vue | 2 +- .../utensilCapacityStrategy/index.vue | 4 +- .../warehouseStorageStrategy/AddForm.vue | 14 ++--- .../warehouseStorageStrategy/index.vue | 4 +- 24 files changed, 172 insertions(+), 144 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index 34ed4b862..1b9035c0a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -60,7 +60,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index f2bb3979e..743fc5996 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -58,7 +58,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue index 7942a9f07..0158f9739 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue @@ -144,8 +144,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index f638c1143..35f193ba3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -26,22 +26,22 @@ - + - + - + - + @@ -60,7 +60,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > @@ -212,7 +212,7 @@ placeholder="" @change="changeCalculation" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > @@ -250,7 +250,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > --> diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue index 9bcc87580..93abbd89f 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue @@ -148,8 +148,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue index f77dfc73c..0ffb8fa97 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue @@ -26,22 +26,22 @@ - + - + - + - + @@ -57,7 +57,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue index 8c438ce6b..f682d1037 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue @@ -142,8 +142,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue index 2fab0b936..36f91fdf6 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue @@ -25,17 +25,17 @@ - + - + - + @@ -58,6 +58,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" + :disabled="formData.priority==0&&formType=='update'" > @@ -182,6 +192,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeWarehouse" + :disabled="formData.priority==0&&formType=='update'" > @@ -257,6 +272,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" + :disabled="formData.priority==0&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue index 19298f953..68b336052 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue @@ -150,8 +150,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue index 7e869a6bd..19381acca 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 a68e7d65a..2030179d0 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue @@ -145,8 +145,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index 99c769ab7..9390c60b5 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -25,17 +25,17 @@ - + - + - + @@ -57,6 +57,7 @@ v-model="item.ParamCode" placeholder="" @change="changeItemsType" + :disabled="formData.priority==0&&formType=='update'" style="width: 110px; margin-right: 10px" > @@ -85,6 +87,7 @@ clearable multiple collapse-tags + :disabled="formData.priority==0&&formType=='update'" v-if="item.ParamCode == 'ItemType'" > @@ -139,6 +146,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeWarehouse" + :disabled="formData.priority==0&&formType=='update'" > { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue index 058b73c13..c47e39274 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -58,7 +58,7 @@ placeholder="" @change="changeItemsType" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > @@ -146,7 +146,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeWarehouse" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index 0fae5ae31..e3f868382 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -37,7 +37,7 @@ - + @@ -58,8 +58,8 @@ v-model="item.ParamCode" placeholder="" style="width: 110px; margin-right: 10px" + :disabled="formData.priority==0&&formType=='update'" @change="changeWarehouseArea" - :disabled="formData.name=='默认规则'&&formType=='update'" > - - + + @@ -97,7 +97,7 @@ v-model="item.Operator" :placeholder="t('ts.请选择范围').replace('ts.','')" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" @change="OperatorChange($event,item)" > - - + + @@ -146,7 +146,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue index c07e8e033..e1a3268ee 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue @@ -173,8 +173,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:strategy:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:strategy:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 7c2e56220..3b751646a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -57,6 +57,7 @@ v-model="item.ParamCode" placeholder="" style="width: 110px; margin-right: 10px" + :disabled="formData.priority==0&&formType=='update'" > - +