diff --git a/src/components/XButton/src/ButtonBase.vue b/src/components/XButton/src/ButtonBase.vue index 490bae618..15f997966 100644 --- a/src/components/XButton/src/ButtonBase.vue +++ b/src/components/XButton/src/ButtonBase.vue @@ -5,6 +5,7 @@ :type="item.type" :color="item.color" :link="item.link ? item.link : false" + :disabled="item.disabled" v-hasPermi="[item.hasPermi] || []" v-if="item.name != 'set'" @click="buttonBaseClick(item.name, item, $event)" @@ -32,6 +33,7 @@ v-show="!item.hide" :type="item.type" :color="item.color" + :disabled="item.disabled" :link="item.link ? item.link : false" v-hasPermi="[item.hasPermi] || []" @click="buttonBaseClick(item.name, item, $event)" diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 22ffb4b48..2930263de 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -703,6 +703,7 @@ export function mainCountAdjustRequesttBtn(option:any) { function __defaultBtnOption(option:any,specific:any){ return { type:option && option.type ? option.type : specific.type, + disabled:option && option.disabled ? option.disabled : specific.disabled, plain:option && option.plain ? option.plain : specific.plain, icon:option && option.icon ? option.icon : specific.icon, label:option && option.label ? option.label : specific.label, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index 3387408a9..0aefc1529 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -283,6 +283,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] } else { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index d7eaa80c4..b21d506b1 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -287,6 +287,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] } else { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 270e8da84..edd0b931d 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -510,6 +510,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] } else { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue index 877fdc8ac..9b4bb0bf6 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue @@ -404,6 +404,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] } else { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue index 1ffb679db..e7afafe61 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue @@ -332,6 +332,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] } else { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue index 31612c98a..22ca2a53a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue @@ -295,6 +295,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] console.log(Butttondata) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index 20adda136..27ef5c960 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -312,6 +312,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] } else { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue index ba472348e..017944417 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue @@ -450,6 +450,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] } else { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index a9c2a63ac..bf3fc14c6 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -420,6 +420,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] } else { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index de2707ec3..69523dbcd 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -725,6 +725,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] console.log(Butttondata) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue index b0df86aa9..b2b6a754f 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue @@ -224,6 +224,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] } else { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue index faa15a1f8..4758eb542 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue @@ -400,6 +400,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.status = data.status == 0 ? true : false if (formData.value.priority == 0) { Butttondata.value = [ + defaultButtons.formSaveBtn({disabled:true}), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] } else {