From a95aca9f905bf3736fa79306d8fbd1ce32afd779 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 8 Jan 2024 10:59:09 +0800 Subject: [PATCH 01/44] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80048?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlanApprovalChangeFlow.vue | 7 ++++++- .../modules/ApprovalBaseInfo.vue | 10 ++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index 20582056..1ecefd95 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -91,6 +91,7 @@ {{ $t('workCenter.enterpriseInitChangePlan.formulate') }} {{ $t('workCenter.enterpriseInitChangePlan.revise') }} @@ -637,11 +638,13 @@ export default { if (this.formInline.projectType) { this.formInline.projectType = undefined } + // 清空流程名称 + this.processInfoForm.resetFields(['prcName']) }, // 项目类别改变 projectTypeChange (value) { console.log(value, this.formInline.applicationCategory) - if (value) { + if (value && this.formInline.applicationCategory === ApplicationCategory.CHANGE.value) { if (value === ProjectType.RESPONSIBLE_DEPT_CHANGE.value) { // 是责任部门变更 this.resetPersonInfoStructure('3') @@ -650,6 +653,8 @@ export default { this.resetPersonInfoStructure('2') } } + // 清空流程名称 + this.processInfoForm.resetFields(['prcName']) }, // 选择用户得到用户名 userSelectNameChange (value, fieldName) { diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue index b95fce9d..a8c34c7b 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue @@ -44,6 +44,7 @@ v-model="formInline.newEnStandardName" :disabled="disabled" :maxLength="200" + @blur="newEnStandardNameBlur" @change="event => event.target.value = event.target.value.trim()" :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" /> @@ -169,6 +170,7 @@ :disabled="disabled" v-model="formInline.newEnStandardName" :maxLength="200" + @blur="newEnStandardNameBlur" @change="event => event.target.value = event.target.value.trim()" :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardName')" /> @@ -660,10 +662,6 @@ export default { // 原企标编号改变，新企标编号随之改变 'formInline.originEnStandardNo' (value) { this.getEnStandardNo() - }, - // 企标名称，企标名称修改流程名称需要自动更改 - 'formInline.newEnStandardName' (value) { - this.returnProcessName() } }, computed: { @@ -873,6 +871,10 @@ export default { decadeCodeChange (value) { this.getEnStandardNo() }, + newEnStandardNameBlur (value) { + // 企标名称，企标名称修改流程名称需要自动更改 + this.returnProcessName() + }, // 返回流程名称 returnProcessName () { const processName = (this.formInline.newEnStandardNo || '') + '-' + (this.formInline.newEnStandardName || '') + '-' + '立项' From 9e37c2c2082d22cb9d3e46e3368124663d9a6deb Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 8 Jan 2024 11:23:38 +0800 Subject: [PATCH 02/44] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80075?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ProcessDetailList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue index b656c626..739a33e2 100644 --- a/src/components/ProcessDetailList.vue +++ b/src/components/ProcessDetailList.vue @@ -177,6 +177,7 @@ export default { { title: this.$t('workCenter.processDetail.timeConsuming'), width: 150, + dataIndex: 'timeConsuming', scopedSlots: { customRender: 'timeConsuming' } }, // 审批意见 From eb40c64efd597711d5658df9ff639a2005ae9049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Mon, 8 Jan 2024 11:50:25 +0800 Subject: [PATCH 03/44] fix 80074 --- src/components/FlowChart.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/FlowChart.vue b/src/components/FlowChart.vue index 1bd3217e..f6259292 100644 --- a/src/components/FlowChart.vue +++ b/src/components/FlowChart.vue @@ -98,7 +98,6 @@ export default { this.isLoadEnd = true const dom = document.getElementById(this.domId) this.observer = new ResizeObserver(this.handleResize) - console.log(this.observer) this.observer.observe(dom, { box: 'border-box' }) }) }, @@ -337,6 +336,7 @@ export default { return } this.graph.changeSize(document.getElementById(this.domId).clientWidth, document.getElementById(this.domId).clientHeight) + this.graph.fitCenter() } }, beforeDestroy () { From 1475fdfbc8bce2efe2ab536f78de0331d95ce94a Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 8 Jan 2024 12:03:21 +0800 Subject: [PATCH 04/44] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80303?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/OnlyTableForm.vue | 18 ++++++++++++++---- .../modules/EngineerInitBaseInfo.vue | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue index 7d3e5c0c..5c891828 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue @@ -460,11 +460,21 @@ export default { }, // 批量删除 batchDel () { - for (let i = 0; i < this.selectedRowKeys.length; i++) { - this.dataSource.splice(this.selectedRowKeys[i], 1, false) + if (this.selectedRowKeys.length <= 0) { + this.$message.warning(this.$t('selectARecord')) + return } - this.dataSource = this.dataSource.filter(item => !!item) - this.selectedRowKeys = [] + this.$confirm({ + title: this.$t('confirmBatchDeletion'), + content: this.$t('deleteAData'), + onOk: () => { + for (let i = 0; i < this.selectedRowKeys.length; i++) { + this.dataSource.splice(this.selectedRowKeys[i], 1, false) + } + this.dataSource = this.dataSource.filter(item => !!item) + this.selectedRowKeys = [] + } + }) }, /** * 对数组形式后端错误信息进行处理 diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue index 33a2a347..b4af3aaf 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue @@ -469,11 +469,21 @@ export default { }, // 批量删除 batchDel () { - for (let i = 0; i < this.selectedRowKeys.length; i++) { - this.dataSource.splice(this.selectedRowKeys[i], 1, false) + if (this.selectedRowKeys.length <= 0) { + this.$message.warning(this.$t('selectARecord')) + return } - this.dataSource = this.dataSource.filter(item => !!item) - this.selectedRowKeys = [] + this.$confirm({ + title: this.$t('confirmBatchDeletion'), + content: this.$t('deleteAData'), + onOk: () => { + for (let i = 0; i < this.selectedRowKeys.length; i++) { + this.dataSource.splice(this.selectedRowKeys[i], 1, false) + } + this.dataSource = this.dataSource.filter(item => !!item) + this.selectedRowKeys = [] + } + }) }, // 批量设置联络人 batchSetContact () { From 140a2796ebabaf3fcd3e7ac7b6c326d8f68eceab Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 8 Jan 2024 14:39:57 +0800 Subject: [PATCH 05/44] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E9=9C=80=E8=A6=81=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/workCenter/zh.js | 13 +- .../modules/MainDrafterInitBaseInfo.vue | 346 +++++++++++++++++- 2 files changed, 346 insertions(+), 13 deletions(-) diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index bf756f62..553ad286 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -174,7 +174,18 @@ module.exports = { updateReason: '修改理由', lookUpdateBeforeContent: '查看修改前内容', proposingDepartment: '提出部门', - introducer: '提出人' + introducer: '提出人', + levelCode: '更改级别代号', + isHasGraph: '有无二维或三维图', + customerConfirmation: '顾客确认(适用军品)', + refreshFileNumber: '刷新文件号(三维)', + inventory: '库存', + workInProgress: '在制品', + spareParts: '备件', + relatedChanges: '关联更改项', + changeTag: '更改标记', + treatmentCount: '处数', + effectiveDate: '生效日期' }, // 企标复审流程 enStandardRecheck: { diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index 0dc6aae7..9c43ee97 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -51,6 +51,199 @@ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.levelCode') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.isHasGraph') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.customerConfirmation') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.refreshFileNumber') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.inventory') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.workInProgress') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.spareParts') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.relatedChanges') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.changeTag') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.treatmentCount') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.effectiveDate') }} + +
+ + + + +
+
+ + @@ -134,7 +327,98 @@ export default { } ], dataSource: [], - loading: false + loading: false, + formInline: {}, + rules: { + // 更改级别代号 + levelCode: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.levelCode') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 有无二维或三维图 + has2d3dGraph: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.isHasGraph') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 顾客确认(适用军品) + customerConfirmation: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.customerConfirmation') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 刷新文件号(三维) + refreshFileNumber: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.refreshFileNumber') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 库存 + inventory: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.inventory') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 在制品 + workInProgress: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.workInProgress') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 备件 + spareParts: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.spareParts') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 关联更改项 + relatedChanges: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.relatedChanges') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 更改标记 + changeTag: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.changeTag') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 处数 + treatmentCount: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.treatmentCount') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 生效日期 + effectiveDate: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.effectiveDate') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + } } }, methods: { @@ -142,6 +426,30 @@ export default { initData (data) { // 给表格赋值，在线编辑不知道要怎么赋值？ this.dataSource = data.list + const formInline = {} + // 更改级别代号 + formInline.levelCode = data.levelCode + // 有无二维或三维图 + formInline.has2d3dGraph = data.has2d3dGraph + // 顾客确认(适用军品) + formInline.customerConfirmation = data.customerConfirmation + // 刷新文件号(三维) + formInline.refreshFileNumber = data.refreshFileNumber + // 库存 + formInline.inventory = data.inventory + // 在制品 + formInline.workInProgress = data.workInProgress + // 备件 + formInline.spareParts = data.spareParts + // 关联更改项 + formInline.relatedChanges = data.relatedChanges + // 更改标记 + formInline.changeTag = data.changeTag + // 处数 + formInline.treatmentCount = data.treatmentCount + // 生效日期 + formInline.effectiveDate = data.effectiveDate + this.formInline = Object.assign({}, formInline) // 给表单赋值 this.$nextTick(() => { this.$refs.baseInfoForm.initData(data) @@ -151,23 +459,30 @@ export default { getData () { // 把数据抛出，在线编辑不知道要不要抛 const data = {} - data.formInline = this.$refs.baseInfoForm.getData() + data.formInline = { + ...this.$refs.baseInfoForm.getData(), + ...this.formInline + } data.dataSource = this.dataSource return data }, // 外层获取数据要过校验,返回false表示没有通过校验 async getDataValidate () { let data = {} - const formInline = await this.$refs.baseInfoForm.getDataValidate() - if (formInline && this.dataSource.length > 0) { - data.formInline = formInline - data.dataSource = this.dataSource - } else if (this.dataSource.length <= 0) { - this.$message.warning(this.$t('addAtLeastOneRowOfData')) - data = false - } else { - data = false - } + await this.$refs.ruleForm.validate(async valid => { + if (valid) { + const formInline = await this.$refs.baseInfoForm.getDataValidate() + if (formInline && this.dataSource.length > 0) { + data.formInline = { ...formInline, ...this.formInline } + data.dataSource = this.dataSource + } else if (this.dataSource.length <= 0) { + this.$message.warning(this.$t('addAtLeastOneRowOfData')) + data = false + } else { + data = false + } + } + }) return data }, // 企标编号和名称修改触发流程名称的修改 @@ -227,4 +542,11 @@ export default { margin-right: 20px; } } +/deep/ .ant-form-item-children > * { + width: 100% !important; +} + +.update-list-form { + margin-top: 20px; +} From 60deea975e875db0a67a3356bb72d1a99068e99b Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 8 Jan 2024 14:43:21 +0800 Subject: [PATCH 06/44] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/MainDrafterInitBaseInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index 9c43ee97..5e1652a3 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -469,9 +469,9 @@ export default { // 外层获取数据要过校验,返回false表示没有通过校验 async getDataValidate () { let data = {} + const formInline = await this.$refs.baseInfoForm.getDataValidate() await this.$refs.ruleForm.validate(async valid => { if (valid) { - const formInline = await this.$refs.baseInfoForm.getDataValidate() if (formInline && this.dataSource.length > 0) { data.formInline = { ...formInline, ...this.formInline } data.dataSource = this.dataSource From 83e71f1a69e2e5bf2a26d5e45a8891e6d4f9b1dd Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 8 Jan 2024 14:58:32 +0800 Subject: [PATCH 07/44] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80344?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard/modules/TemporaryPermissionRecord.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue b/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue index c40da8b8..bc73534c 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue +++ b/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue @@ -79,7 +79,7 @@ @@ -186,6 +186,12 @@ export default { } }) }, + // 解除授权按钮是否不可点击 + isDisabled (record) { + const authExpireDate = new Date(Date.parse(record.authExpireDate)) + const currentDate = new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() + return new Date(Date.parse(authExpireDate)) < new Date(Date.parse(currentDate)) + }, loadData (arg) { if (!this.url.list) { this.$message.warning('请设置url.list属性!') From e82a6dd4bb51dad7d3ca97358302f3a3401ec50c Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 8 Jan 2024 15:18:32 +0800 Subject: [PATCH 08/44] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80348?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard/modules/TemporaryPermissionRecord.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue b/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue index bc73534c..291123a3 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue +++ b/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue @@ -260,6 +260,17 @@ export default { close () { this.queryParam = {} this.visible = false + this.ipagination = { + current: 1, + pageSize: 10, + pageSizeOptions: ['10', '30', '50', '100', '150', '200'], + showTotal: (total, range) => { + return range[0] + '-' + range[1] + ' ' + this.$t('total') + total + this.$t('strip') + }, + showQuickJumper: true, + showSizeChanger: true, + total: 0 + } } } } From 8160f5e1c3031562a489eff2973fbe3efc0e52d8 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 8 Jan 2024 15:29:36 +0800 Subject: [PATCH 09/44] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80350?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue | 2 +- src/views/personalCenter/taskCareOf/table/ProcessInfo.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue b/src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue index 579577de..adad6b78 100644 --- a/src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue +++ b/src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue @@ -206,7 +206,7 @@ export default { // 批量转交 handleTransfer () { if (this.selectedRowKeys.length <= 0) { - this.$message.warning(this.$t('selectARecord')) + this.$message.warning(this.$t('selectLeastOne')) } else { this.$refs.userSelectModal.open() } diff --git a/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue b/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue index 4e6def57..452ca38d 100644 --- a/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue +++ b/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue @@ -192,7 +192,7 @@ export default { // 批量转交 handleTransfer () { if (this.selectedRowKeys.length <= 0) { - this.$message.warning(this.$t('selectARecord')) + this.$message.warning(this.$t('selectLeastOne')) } else { this.$refs.userSelectModal.open() } From 42eb43c4ffd79b0599a5b134df019a2795358f34 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 8 Jan 2024 15:49:32 +0800 Subject: [PATCH 10/44] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80375?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/CommentObjectEnterBaseInfo.vue | 8 +++++++- .../modules/DepartLiaisonCollectBaseInfo.vue | 8 +++++++- .../modules/DepartLiaisonLeaderApproveBaseInfo.vue | 8 +++++++- .../modules/MainDrafterCollectBaseInfo.vue | 8 +++++++- .../modules/MainDrafterCollectUploadMinuteBaseInfo.vue | 8 +++++++- .../modules/MainDrafterSentBaseInfo.vue | 8 +++++++- 6 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue index 10c170a5..5e8bba6e 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue @@ -153,7 +153,13 @@ export default { }, // 征求意见的删除 handleDelete (index) { - this.dataSource.splice(index, 1) + this.$confirm({ + title: this.$t('confirmDeletion'), + content: this.$t('areYouSure'), + onOk: () => { + this.dataSource.splice(index, 1) + } + }) }, // 征求意见新增编辑完成 modalFormOk (value, index) { diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue index 5d2b24d8..cb10b078 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue @@ -189,7 +189,13 @@ export default { }, // 征求意见的删除 handleDelete (index) { - this.dataSource.splice(index, 1) + this.$confirm({ + title: this.$t('confirmDeletion'), + content: this.$t('areYouSure'), + onOk: () => { + this.dataSource.splice(index, 1) + } + }) }, // 征求意见新增编辑完成 modalFormOk (value, index) { diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue index 65c95c1b..f27ba085 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue @@ -160,7 +160,13 @@ export default { }, // 征求意见的删除 handleDelete (index) { - this.dataSource.splice(index, 1) + this.$confirm({ + title: this.$t('confirmDeletion'), + content: this.$t('areYouSure'), + onOk: () => { + this.dataSource.splice(index, 1) + } + }) }, // 征求意见新增编辑完成 modalFormOk (value, index) { diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue index 69c4e1df..70a53b57 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue @@ -203,7 +203,13 @@ export default { }, // 征求意见的删除 handleDelete (index) { - this.dataSource.splice(index, 1) + this.$confirm({ + title: this.$t('confirmDeletion'), + content: this.$t('areYouSure'), + onOk: () => { + this.dataSource.splice(index, 1) + } + }) }, // 征求意见新增编辑完成 modalFormOk (value, index) { diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue index 0ecfb3eb..fb8580a8 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue @@ -408,7 +408,13 @@ export default { }, // 稽查内容的删除 handleDelete (index) { - this.dataSource.splice(index, 1) + this.$confirm({ + title: this.$t('confirmDeletion'), + content: this.$t('areYouSure'), + onOk: () => { + this.dataSource.splice(index, 1) + } + }) }, // 稽查内容新增编辑完成 checkContentOk (value, index) { diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue index 0c4bfceb..fd82f76d 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue @@ -157,7 +157,13 @@ export default { }, // 删除 handleDelete (id, index) { - this.dataSource.splice(index, 1) + this.$confirm({ + title: this.$t('confirmDeletion'), + content: this.$t('areYouSure'), + onOk: () => { + this.dataSource.splice(index, 1) + } + }) }, // 新增或编辑完成 modalFormOk (value) { From cbfccde748f78bb5b19fd3274b7188b68aea1724 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 8 Jan 2024 16:09:20 +0800 Subject: [PATCH 11/44] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80389?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/MainDrafterCollectUploadMinuteBaseInfo.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue index fb8580a8..68c4e7a2 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue @@ -79,6 +79,8 @@ + +

{{ $t('enterpriseStandardLibrary.standard.auditContent') }}

@@ -102,9 +104,6 @@