From 5d85f998042ce0bc5ba3c3658f380a6f72e32818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Tue, 30 Dec 2025 15:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=8C=89=E9=92=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/approve/Appro/components/config.ts | 14 +-- .../approve/Appro/components/createForm.vue | 6 +- src/views/approve/Appro/index.vue | 15 +-- .../ContractFact/components/config.ts | 2 +- src/views/contract/ContractFact/index.vue | 13 +-- .../sales/Customer/components/createForm.vue | 9 +- src/views/sales/Customer/index.vue | 12 +-- src/views/sales/ScoreCustomer/index.vue | 2 +- src/views/secondDev/createFlow.vue | 6 ++ .../ScoreSupplier/components/config.ts | 9 -- src/views/supplier/ScoreSupplier/index.vue | 2 +- .../supplier/Supplier/components/config.ts | 2 +- .../Supplier/components/createForm.vue | 100 +++++++++--------- src/views/supplier/Supplier/index.vue | 12 ++- 14 files changed, 103 insertions(+), 101 deletions(-) diff --git a/src/views/approve/Appro/components/config.ts b/src/views/approve/Appro/components/config.ts index f7b22ff..6467101 100644 --- a/src/views/approve/Appro/components/config.ts +++ b/src/views/approve/Appro/components/config.ts @@ -76,14 +76,14 @@ export const columns: BasicColumn[] = [ sorter: true, }, - { - dataIndex: 'securityName', - title: '密级', - componentType: 'select', - align: 'left', + // { + // dataIndex: 'securityName', + // title: '密级', + // componentType: 'select', + // align: 'left', - sorter: true, - }, + // sorter: true, + // }, { dataIndex: 'urgencyName', diff --git a/src/views/approve/Appro/components/createForm.vue b/src/views/approve/Appro/components/createForm.vue index 03a3195..c2aab68 100644 --- a/src/views/approve/Appro/components/createForm.vue +++ b/src/views/approve/Appro/components/createForm.vue @@ -23,7 +23,7 @@ - + @@ -157,7 +157,7 @@ urgencyCode: [{ required: true, message: "该项为必填项", trigger: 'change' }], empName: [{ required: true, message: "该项为必填项", trigger: 'change' }], bDeptName: [{ required: true, message: "该项为必填项", trigger: 'change' }], - comName: [{ required: true, message: "该项为必填项", trigger: 'change' }], + comName: [{ required: false, message: "该项为必填项", trigger: 'change' }], dateAppro: [{ required: true, message: "该项为必填项", trigger: 'change' }], content: [{ required: true, message: "该项为必填项", trigger: 'change' }], diff --git a/src/views/approve/Appro/index.vue b/src/views/approve/Appro/index.vue index 0308301..7f39ee8 100644 --- a/src/views/approve/Appro/index.vue +++ b/src/views/approve/Appro/index.vue @@ -172,7 +172,6 @@ formName: formName, formId:currentRoute.value.meta.formId, id: record.id, - status } }); } else { @@ -333,7 +332,7 @@ onClick: btnEvent[button.code].bind(null, record), }); } - if (['edit', 'delete','update'].includes(button.code)) { + if (['edit', 'delete'].includes(button.code)) { editAndDelBtn.push({ icon: button?.icon, tooltip: button?.name, @@ -342,11 +341,17 @@ }); } if (button.code === 'flowRecord') hasFlowRecord = true; + if (record.approCode == 'YSP' && button.code== 'update') { + let idx = actionsList.findIndex(v =>v.tooltip == '变更') + idx<0 && actionsList.push({icon: button?.icon, + tooltip: button?.name, + onClick: btnEvent[button.code].bind(null, record),}) + } }); if (record.workflowData?.enabled) { //与工作流有关联的表单 if (record.workflowData.status) { - actionsList.unshift(setIndexFlowStatus(record.workflowData)) + // actionsList.unshift(setIndexFlowStatus(record.workflowData)) } else { actionsList = actionsList.concat(editAndDelBtn); } @@ -356,10 +361,6 @@ actionsList = actionsList.concat(editAndDelBtn); } } - if (record.approCode !== 'YSP') { - let idx = actionsList.findIndex(v =>v.tooltip == '变更') - idx>-1 && actionsList.splice(idx, 1) - } return actionsList; } function handleStartwork(record: Recordable) { diff --git a/src/views/contract/ContractFact/components/config.ts b/src/views/contract/ContractFact/components/config.ts index ab15323..2345fad 100644 --- a/src/views/contract/ContractFact/components/config.ts +++ b/src/views/contract/ContractFact/components/config.ts @@ -7,7 +7,7 @@ export const formConfig = { export const searchFormSchema: FormSchema[] = [ { - field: 'kNo', + field: 'kName', label: '合同号', component: 'Input', }, diff --git a/src/views/contract/ContractFact/index.vue b/src/views/contract/ContractFact/index.vue index 5f2501e..4262165 100644 --- a/src/views/contract/ContractFact/index.vue +++ b/src/views/contract/ContractFact/index.vue @@ -172,7 +172,6 @@ formName: formName, formId:currentRoute.value.meta.formId, id: record.id, - status } }); } else { @@ -341,11 +340,17 @@ }); } if (button.code === 'flowRecord') hasFlowRecord = true; + if (record.approCode == 'YSP' && button.code== 'update') { + let idx = actionsList.findIndex(v =>v.tooltip == '变更') + idx<0 && actionsList.push({icon: button?.icon, + tooltip: button?.name, + onClick: btnEvent[button.code].bind(null, record),}) + } }); if (record.workflowData?.enabled) { //与工作流有关联的表单 if (record.workflowData.status) { - actionsList.unshift(setIndexFlowStatus(record.workflowData)) + // actionsList.unshift(setIndexFlowStatus(record.workflowData)) } else { actionsList = actionsList.concat(editAndDelBtn); } @@ -355,10 +360,6 @@ actionsList = actionsList.concat(editAndDelBtn); } } - if (record.approCode !== 'YSP') { - let idx = actionsList.findIndex(v =>v.tooltip == '变更') - idx>-1 && actionsList.splice(idx, 1) - } return actionsList; } function handleStartwork(record: Recordable) { diff --git a/src/views/sales/Customer/components/createForm.vue b/src/views/sales/Customer/components/createForm.vue index 7233a94..92a1188 100644 --- a/src/views/sales/Customer/components/createForm.vue +++ b/src/views/sales/Customer/components/createForm.vue @@ -163,7 +163,7 @@ - + @@ -188,6 +188,13 @@ + + + + {{ item.name }} + + +

电厂业务信息

diff --git a/src/views/sales/Customer/index.vue b/src/views/sales/Customer/index.vue index d09dc21..3f3f2ea 100644 --- a/src/views/sales/Customer/index.vue +++ b/src/views/sales/Customer/index.vue @@ -15,9 +15,6 @@