diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 7afe67ada..266344463 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -53,7 +53,7 @@ size="small" class="common-button-danger" @click="beforeBack" - :loading="isSubmit" + :loading="isSubmitBack" v-if="showBack"> {{ backBTNText }} @@ -151,6 +151,11 @@ export default { type: Boolean, default: false }, + // 保存按钮loading + isSubmitBack: { + type: Boolean, + default: false + }, // 是否默认委托事件 defaultEntrust: { type: Boolean, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index b15859b09..de2138c64 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -31,7 +31,7 @@ @@ -102,7 +102,7 @@

确认+选择责任人

- +
@@ -114,7 +114,7 @@

负责人

- +
@@ -126,7 +126,7 @@

分发负责人

- +
@@ -148,7 +148,7 @@ @@ -210,9 +210,9 @@ @selection-change="selectedChange" > - + @@ -291,6 +291,7 @@ export default { pageSize: 10, total: 0, closeState: '1', + standId: '', standSerialNumber: '', // 标准号/名称 productName: '', // 项目名称 responsibleUnit: '' // 责任部门 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 34d9c9a60..b52339f31 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -97,9 +97,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index e8a67fc9b..5716eb580 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -99,9 +99,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index a684c38a4..71d89ca6a 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -87,9 +87,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + @@ -118,6 +118,7 @@ accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" + :on-remove="handleONRemove" :on-success="handleOnsuccess" > { if (item.fileText.length !== 0) { - item.fileText.forEach(item1 => { - this.fileTextList.push({ - id: item1.id, - name: item1.name - }) - }) + this.fileTextList = item.fileText } }) }) @@ -335,10 +331,18 @@ export default { // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { - this.newDataList.push({ - id: res.data.attId, - name: res.data.standName - }) + if (this.fileTextList !== null) { + this.newDataList = this.fileTextList + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + } else { + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + } this.fileListData.fileText = this.newDataList this.$message({ showClose: true, @@ -377,14 +381,17 @@ export default { }, // 移除上传的文件 handleBeforeRemove(file, fileList) { + this.fileListData.fileText = fileList this.fileTextList = fileList - this.newDataList.forEach((item, index) => { +/* this.newDataList.forEach((item, index) => { if (file.name === item.name || file.id === item.id) { this.newDataList.splice(index, 1) - } - }) - }, + console.log(this.dataList) + } + })*/ + }, + handleONRemove() {}, /************ ********* *****************/ // 点击查看 handlePreview (item) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index ab8c6df90..865a6a96e 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -87,9 +87,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + @@ -201,7 +201,7 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="backLoading" @submit="handleSubmit" submitBTNText="同意" > @@ -357,6 +357,7 @@ export default { }) }, handleSubmitNo() { + this.backLoading = true if (this.commentText) { var json = { responUserInfo: { @@ -372,12 +373,13 @@ export default { }, {}, res => { if (res.success) { this.$message.success('驳回成功') - this.fileTextList = [] this.$router.push('/processCenter') + this.backLoading = false } }) } else { this.$message.warning('请输入反馈意见') + this.backLoading = false } }, //未整改项抽屉中的查询按钮 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 4a89f62c4..883ef6927 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -185,6 +185,9 @@ prop="standName" label="标准名称" > + + + + + + + + +