diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index 9504629bc..c99d5509d 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -216,7 +216,7 @@ :loading="isSubmit" >{{ btnName }} - + 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/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index dab32ce04..45ccf0b85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -45,18 +45,23 @@ v-model="form.modelName" clearable > -
- {{ form.modelName }} -
-
- - 点击上传 + + + + + + + + + + + + + + + {{isFileUploadStr}} -
+ @@ -179,7 +184,7 @@ :before-upload="beginImportFile" :on-success="importFileSuccess" :on-progress="progressFile" - :show-file-list="false" + :show-file-list="true" >
@@ -201,6 +206,7 @@ export default { name: "bzdyStep1", data() { return { + isFileUploadStr:'点击上传', progressType: false, loadProgress: 0, commentText: '', @@ -350,7 +356,8 @@ export default { // 导入标准数据成功后执行 importFileSuccess (response, file) { if (response.ok) { - this.fileMadel = false + this.isFileUploadStr='点击查看已上传文件'; + this.fileMadel = true; this.loadProgress = 0 this.progressType = false this.form.model = response.data.id diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 0aaef349e..f307e3bb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -155,6 +155,21 @@
+
+ + +
+ + +
+
+
+
@@ -735,6 +750,7 @@ export default { pageSizeNo: this.$store.getters.userInfo.configContent }, standList: [], //新添加的标准 + commentText: '', modalshowflag: false, // drawer开关 modalshowflag2: false, nodeList2: [], @@ -1052,6 +1068,7 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { + this.listForm.commentText = this.commentText var json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index ade22d84d..1060f42c4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -134,6 +134,21 @@
+
+ + +
+ + +
+
+
+
@@ -421,6 +436,7 @@ export default { totalNo: 0, prcNum: '', pageSizeNo: this.$store.getters.userInfo.configContent, + commentText:'', listForm: { listName: "", //清单名称 // applyRegion: "", //适用区域 @@ -677,6 +693,7 @@ export default { }, //提交事件 handleSubmit() { + this.listForm.commentText = this.commentText const json = JSON.stringify(this.listForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue index 358b5f851..bb2722e67 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -384,14 +384,15 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.approvalOpinion = "1"; - this.handleSubmit(); - }, - //提交事件 - handleSubmit() { if (this.commentText === null || this.commentText === undefined || this.commentText === "") { this.$message.warning("请填写审批意见"); } else { + this.listForm.approvalOpinion = "1"; + this.handleSubmit(); + } + }, + //提交事件 + handleSubmit() { this.isSubmit = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); @@ -408,7 +409,6 @@ export default { } this.isSubmit = false }); - } }, //选择标准取消事件 closeDrawer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 24ecd52e3..1ab67aba8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -158,6 +158,21 @@
+
+ + +
+ + +
+
+
+
@@ -712,6 +727,7 @@ export default { pageSizeNo: this.$store.getters.userInfo.configContent }, standList: [], //新添加的标准 + commentText: '', modalshowflag: false, // drawer开关 modalshowflag2: false, nodeList2: [], @@ -1024,6 +1040,7 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { + this.listForm.commentText = this.commentText var json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index f651fe48e..0fea2918a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -387,9 +387,6 @@ export default { }, //提交事件 handleSubmit() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { - this.$message.warning("请填写会签意见"); - }else{ this.isSubmit = true this.listForm.commentText = this.commentText; this.listForm.approvalOpinion = ""; @@ -410,7 +407,6 @@ export default { }, e => { }); - } }, //选择标准取消事件 closeDrawer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 8c29d742e..3761e3f62 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -149,6 +149,21 @@
+
+ + +
+ + +
+
+
+
@@ -392,6 +407,7 @@ export default { // 当前流程类型(1待办/2已办) processType: 1, searching: false, + commentText:'', standardTypeOptions: [ { value: "INLAND", @@ -711,6 +727,7 @@ export default { }, //提交事件 handleSubmit() { + this.listForm.commentText = this.commentText const json = JSON.stringify(this.listForm); this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 0d8cf9310..cec4dac2b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -401,9 +401,6 @@ export default { }, //提交事件 handleSubmit() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { - this.$message.warning("请填写审批意见"); - } else { this.isSubmit = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); @@ -420,7 +417,6 @@ export default { } this.isSubmit = false }); - } }, //选择标准取消事件 closeDrawer() { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index dd5c530aa..bdbc16be0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -862,8 +862,13 @@ }, methods: { downloadFile (fileType) { + //文件id中出现了','字符,去除掉 if(fileType === 'fbgbjbd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId }else if(fileType === 'bpg'){ @@ -885,11 +890,12 @@ } }, getRule(){ + if (this.formTongGuo.approvalOpinion === '0') { - this.rules.commentText.required = false + this.rules.commentText[0].required = false; this.$refs.formTongGuo.clearValidate('commentText') - } else { - this.rules.commentText.required = true + }else { + this.rules.commentText[0].required = true; } }, popoverHide (checkedIds, checkedData) { @@ -964,6 +970,7 @@ this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) + console.log(processForm); } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index e0b897644..26187ebbd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -836,6 +836,10 @@ export default { methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 2d414fb44..840e35e6e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -815,6 +815,10 @@ methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId 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/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 2e84bd32f..e01298782 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -114,6 +114,21 @@
+
+ + +
+ + +
+
+
+
@@ -390,6 +405,7 @@ export default { drawerTitle: "", //drawer标题 // 查询相关参数 searching: false, + commentText:'', standardSearch: { standType: "", standName: "" diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 58f52cd16..93b96686c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -101,6 +101,21 @@
+
+ + +
+ + +
+
+
+
@@ -374,6 +389,7 @@ export default { productData: [], //添加抽屉的数据 standList: [], //新添加的标准 modalshowflag: false, // drawer开关 + commentText: '', drawerTitle: "", //drawer标题 // 查询相关参数 searching: false, @@ -658,6 +674,7 @@ export default { this.$message.warning("请选择分发责任人"); } else { this.isSubmit = true + this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); this.$refs["listForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 696a2f8e8..91cc0a018 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -336,9 +336,6 @@ export default { }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - }else{ this.listForm.commentText = this.commentText const json = JSON.stringify(this.listForm); this.isSubmit = true @@ -356,7 +353,7 @@ export default { this.isSubmit = false }, e => { }); - } + }, //标准表格选择框改变 selectStandChange(data) { @@ -464,4 +461,3 @@ export default { } } - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 29c37d98e..aafe0469e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -126,6 +126,7 @@ +
- - - - - - - - - - - - - - - +
+ + +
+ + +
+
+
+
@@ -616,5 +616,3 @@ export default { } } - - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index b350287cb..9bf3d7814 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -447,9 +447,6 @@ export default { }, //驳回事件 beforeBack () { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList @@ -468,17 +465,13 @@ export default { } }, e => { }); - } }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - }else { this.listForm.applyUpdUserId = this.dataList[0].distributePersonId - this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList this.listForm.fenFlag = '2' + this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { @@ -495,7 +488,7 @@ export default { this.isSubmit = false }, e => { }); - } + }, //标准表格选择框改变 selectStandChange(data) { @@ -602,6 +595,4 @@ export default { margin-top: 10px; } } - - - +> diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index e74199aa4..da7a853ea 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -452,9 +452,6 @@ export default { }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { this.isSubmit = true this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; @@ -480,7 +477,7 @@ export default { }, e => { }); - } + }, //标准表格选择框改变 selectStandChange(data) { @@ -588,5 +585,3 @@ export default { } } - - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 40b79891e..d12fc2bc4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -451,9 +451,6 @@ export default { }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; @@ -479,7 +476,6 @@ export default { }, e => { }); - } }, //标准表格选择框改变 selectStandChange(data) { @@ -514,7 +510,6 @@ export default {