From 8a7a9615b40f788204866dc19e3ffe56d39383f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Tue, 23 Jul 2024 18:56:54 +0800 Subject: [PATCH] =?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 --- src/views/qms/aql/index.vue | 7 +++++-- src/views/qms/counter/index.vue | 2 +- src/views/qms/dynamicRule/index.vue | 3 ++- src/views/qms/inspectionMethod/index.vue | 3 ++- src/views/qms/inspectionScheme/index.vue | 3 ++- src/views/qms/inspectionScheme/inspectionScheme.data.ts | 2 +- src/views/qms/inspectionTemplate/index.vue | 3 ++- .../qms/inspectionTemplate/inspectionTemplate.data.ts | 2 +- src/views/qms/sampleCode/index.vue | 3 ++- src/views/qms/samplingProcess/index.vue | 3 ++- src/views/qms/samplingScheme/index.vue | 5 ++++- src/views/qms/selectedSet/index.vue | 3 ++- 12 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue index e04873b03..c74fe3459 100644 --- a/src/views/qms/aql/index.vue +++ b/src/views/qms/aql/index.vue @@ -144,7 +144,8 @@ const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'qms:aql:update'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:aql:enable'}), - defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:aql:disable'}), + defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:aql:disable' }), + defaultButtons.mainListDeleteBtn({hasPermi:'qms:aql:delete'}), // 删除 ] } // 列表-操作按钮事件 @@ -155,7 +156,9 @@ const buttonTableClick = async (val, row) => { handleEnable(row.id) }else if (val == 'disable') { handleDisable(row.id) - } + }else if (val == 'delete') { // 删除 +    handleDelete(row.id) +  } } /** 添加/修改操作 */ diff --git a/src/views/qms/counter/index.vue b/src/views/qms/counter/index.vue index cd789a436..d1e5edc9f 100644 --- a/src/views/qms/counter/index.vue +++ b/src/views/qms/counter/index.vue @@ -135,7 +135,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ defaultButtons.mainListEditBtn({hasPermi:'qms:counter:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'qms:counter:delete'}), // 删除 + defaultButtons.mainListDeleteBtn({hasPermi:'qms:counter:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue index 58c82c277..951326cc8 100644 --- a/src/views/qms/dynamicRule/index.vue +++ b/src/views/qms/dynamicRule/index.vue @@ -185,7 +185,8 @@ const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'qms:dynamic-rule:update'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:dynamic-rule:enable'}), - defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:dynamic-rule:disable'}), + defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:dynamic-rule:disable' }), + defaultButtons.mainListDeleteBtn({hasPermi:'qms:dynamic-rule:delete'}), // 删除 ] } diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue index d0d67276d..efb81ded1 100644 --- a/src/views/qms/inspectionMethod/index.vue +++ b/src/views/qms/inspectionMethod/index.vue @@ -157,7 +157,8 @@ const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'qms:inspection-method:update'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspection-method:enable'}), - defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspection-method:disable'}), + defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:inspection-method:disable' }), + defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspection-method:delete'}), // 删除 ] } diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue index 1bd6b50e3..1241fda5d 100644 --- a/src/views/qms/inspectionScheme/index.vue +++ b/src/views/qms/inspectionScheme/index.vue @@ -139,7 +139,8 @@ const butttondata = (row) => { defaultButtons.mainListEditBtn({hasPermi: 'qms:inspection-scheme:update'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspection-scheme:enable'}), defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspection-scheme:disable'}), - defaultButtons.mainCopyBtn({hasPermi:'qms:programme-template:copy'}), + defaultButtons.mainCopyBtn({ hasPermi: 'qms:programme-template:copy' }), + defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspection-scheme:delete'}), // 删除 ] } diff --git a/src/views/qms/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts index fce02545b..65bd50c43 100644 --- a/src/views/qms/inspectionScheme/inspectionScheme.data.ts +++ b/src/views/qms/inspectionScheme/inspectionScheme.data.ts @@ -272,7 +272,7 @@ export const InspectionSchemeMain = useCrudSchemas( isForm: false, isDetail: false, table: { - width: 150, + width: 180, fixed: 'right' } } diff --git a/src/views/qms/inspectionTemplate/index.vue b/src/views/qms/inspectionTemplate/index.vue index 578a526c1..cb0f97e8d 100644 --- a/src/views/qms/inspectionTemplate/index.vue +++ b/src/views/qms/inspectionTemplate/index.vue @@ -146,7 +146,8 @@ const butttondata = (row) => { defaultButtons.mainListEditBtn({hasPermi: 'qms:programme-template:update'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:programme-template:enable'}), defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:programme-template:disable'}), - defaultButtons.mainCopyBtn({hasPermi:'qms:programme-template:copy'}), + defaultButtons.mainCopyBtn({ hasPermi: 'qms:programme-template:copy' }), + defaultButtons.mainListDeleteBtn({hasPermi:'qms:programme-template:delete'}), // 删除 ] } diff --git a/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts index 631e9a887..4795f8a1f 100644 --- a/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts +++ b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts @@ -147,7 +147,7 @@ export const InspectionTemplateMain = useCrudSchemas( isForm: false, isDetail: false, table: { - width: 150, + width: 180, fixed: 'right' } } diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue index 5c1b55904..38ed151c0 100644 --- a/src/views/qms/sampleCode/index.vue +++ b/src/views/qms/sampleCode/index.vue @@ -150,7 +150,8 @@ const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'qms:sample-code:update'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sample-code:enable'}), - defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sample-code:disable'}), + defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:sample-code:disable' }), + defaultButtons.mainListDeleteBtn({hasPermi:'qms:sample-code:delete'}), // 删除 ] } diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue index 1045a90b2..7733e50c5 100644 --- a/src/views/qms/samplingProcess/index.vue +++ b/src/views/qms/samplingProcess/index.vue @@ -153,7 +153,8 @@ const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'qms:sampling-process:update'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampling-process:enable'}), - defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampling-process:disable'}), + defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:sampling-process:disable' }), + defaultButtons.mainListDeleteBtn({hasPermi:'qms:sampling-process:delete'}), // 删除 ] } diff --git a/src/views/qms/samplingScheme/index.vue b/src/views/qms/samplingScheme/index.vue index 25ff8c6b5..01c52c11a 100644 --- a/src/views/qms/samplingScheme/index.vue +++ b/src/views/qms/samplingScheme/index.vue @@ -143,7 +143,8 @@ const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'qms:sampling-scheme:update'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampling-scheme:enable'}), - defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampling-scheme:disable'}), + defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:sampling-scheme:disable' }), + defaultButtons.mainListDeleteBtn({hasPermi:'qms:sampling-scheme:delete'}), // 删除 ] } @@ -155,6 +156,8 @@ const buttonTableClick = async (val, row) => { handleEnable(row.id) }else if (val == 'disable') { handleDisable(row.id) + } else if (val == 'delete') { // 删除 + handleDelete(row.id) } } diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue index ffecc38ef..70d99f702 100644 --- a/src/views/qms/selectedSet/index.vue +++ b/src/views/qms/selectedSet/index.vue @@ -189,7 +189,8 @@ const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi: 'qms:selected-set:update'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:selected-set:enable'}), - defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:selected-set:disable'}), + defaultButtons.mainListDisableBtn({ hide: isShowMainButton(row, ['TRUE']), hasPermi: 'qms:selected-set:disable' }), + defaultButtons.mainListDeleteBtn({hasPermi:'qms:selected-set:delete'}), // 删除 ] }