From 8bb44b8e5a8ae1a1a86df62116edaa76bc311fb3 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 31 Mar 2022 16:01:48 +0800 Subject: [PATCH 001/168] feat: There is no way the, --- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 927d8ad27..0d9e0a3b8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2537,7 +2537,12 @@ }, // 文件预览及下载 handleFilePreview(file) { - const attId = file.response.data.id + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } if (this.preview) { if (attId) { window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId From 8fa40add27a1a0813661c4eb815b790093306b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 31 Mar 2022 17:19:45 +0800 Subject: [PATCH 002/168] =?UTF-8?q?52297=20=E6=94=BF=E7=AD=96=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=EF=BC=9A=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E4=BA=BA=E4=BB=BB=E5=8A=A1=E5=88=86=E5=8F=91=E8=8A=82?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E7=BC=BA=E5=B0=91=E4=BF=9D=E5=AD=98=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/zczqyj/step1.vue | 49 ++++++++++++------- .../pages/creatProcess/zczqyj/step2.vue | 30 ++++++++---- .../tabComponents/taskDraft/index.vue | 4 +- 3 files changed, 53 insertions(+), 30 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue index 46d713d54..0d700ec36 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue @@ -328,7 +328,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { queryTaskFirst, saveTaskFirst } from "api/process"; +import { queryTaskFirst, saveTaskFirst, taskDel } from "api/process"; export default { name: "zczqyjStep1", @@ -620,13 +620,15 @@ export default { handleSave() { this.saveLoading = true; let _formData = new FormData(); - this.form.commentText = this.commentText - this.form.filesId = this.addFjList + let json = this.form + json.commentText = this.commentText + json.filesId = this.addFjList + json.filesName = this.form.fjListName _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.userName); - _formData.append("prcType", "12"); + _formData.append("prcType", "laws2"); _formData.append("json", JSON.stringify({ - form: this.form, + form: json, roleForm: this.roleForm, commentText: this.commentText })); @@ -643,29 +645,40 @@ export default { if (valid) { this.$refs['Form'].validate((valid) => { if (valid) { + var json = Object.assign(this.form, this.roleForm) + json.commentText = this.commentText + json.filesId = this.addFjList + json.filesName = this.form.fjListName this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: 'laws2' + this.$http.post('lawss/activiti/startProcessRollBack', { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: 'laws2', + json: JSON.stringify({ + form: json, + roleForm: this.roleForm, + commentText: this.commentText + }) }, {_this: this}, res => { if (res.ok) { - var json = Object.assign(this.form, this.roleForm) - console.log('644',json) - json.commentText = this.commentText - json.filesId = this.addFjList - json.filesName = this.form.fjListName this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: res.data, userId: this.$store.getters.userInfo.userId }, {_this: this}, res => { if (res.success) { - this.$message.success('流程发起成功') - this.$router.push('/processCenter') - this.isSubmit = false - } else { - this.$message.warning('流程启动失败') - this.isSubmit = false + this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + this.$router.push("/processCenter"); } + this.isSubmit = false; }) } else { this.$message.warning('流程启动失败') diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue index cc612e5ec..60f6d66ab 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue @@ -124,6 +124,7 @@ { @@ -329,14 +336,17 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log('335',data) - this.form.lawsNumber = data.lawsNumber - this.form.lawsName = data.lawsName - this.form.endTime = data.endTime - this.form.cname = data.cname - this.form.fjList = data.fjList - this.form.fjListId = data.fjListId - this.json = data + console.log(data); + this.form.lawsNumber = data.form ? data.form.lawsNumber : data.lawsNumber + this.form.responUserAndInstitutionNameMap = data.form ? data.form.responUserAndInstitutionNameMap : '' + this.form.lawsName = data.form ? data.form.lawsName : data.lawsName + this.form.responUserList = data.form ? data.form.responUserList: '' + this.form.responUserListName = data.form ? data.form.responUserListName : '' + this.form.endTime = data.form ? data.form.endTime : data.endTime + this.form.cname = data.form ? data.form.cname : data.cname + this.form.fjList = data.form ? data.form.fjList : data.fjList + this.form.fjListId = data.form ? data.form.fjListId : data.fjListId + this.json = data.form ? data.form : data }).catch(e => { }); }); diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 522e7161c..ff3bb2a95 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -724,11 +724,11 @@ export default { } }) break - case '12': + case 'laws2': this.$router.push({ name: 'zczqyjStep1', query: { - type: '12', + type: 'laws2', processName: '政策征求意见流程', bpnId: id } From f302bda2ffb08f62a71eae1615ebcd102c629d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 31 Mar 2022 17:36:35 +0800 Subject: [PATCH 003/168] =?UTF-8?q?=E9=98=BB=E6=96=AD=E3=80=91=E6=94=BF?= =?UTF-8?q?=E7=AD=96=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=9A=E8=B4=A3=E4=BB=BB=E4=BA=BA(=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88)=E5=A1=AB=E5=86=99=E6=84=8F?= =?UTF-8?q?=E8=A7=81=EF=BC=8C=E5=A1=AB=E5=86=99=E5=9B=9E=E6=89=A7=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E5=90=8E=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=EF=BC=8C?= =?UTF-8?q?=E7=84=B6=E5=90=8E=E8=BD=AC=E5=8A=9E=E7=BB=99=E8=83=A1=E5=9B=BD?= =?UTF-8?q?=E9=94=90=EF=BC=8C=E8=83=A1=E5=9B=BD=E9=94=90=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0?= =?UTF-8?q?=E6=8A=A5500=2052301?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/zczqyj/step2.vue | 2 +- .../pages/creatProcess/zczqyj/step3.vue | 49 +++++++++++-------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue index 60f6d66ab..df87b96d6 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue @@ -287,7 +287,7 @@ export default { json.responUserAndInstitutionNameMap = this.form.responUserAndInstitutionNameMap; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); - _formData.append("prcType", "12"); + _formData.append("prcType", "laws2"); _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ form: json, diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue index fec7ffee5..23655e4b9 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue @@ -384,26 +384,7 @@ export default { handleTabs(name) { this.active = name }, - handleSave() { - this.saveLoading = true; - let _formData = new FormData(); - let json = this.form - json.data = this.data - _formData.append("id", this.bpnId || ""); - _formData.append("prcType", "3"); - _formData.append("taskIds", this.taskIds); - _formData.append("json", JSON.stringify({ - form: json, - commentText: this.commentText - })); - saveTaskForPub(_formData).then(res => { - this.saveLoading = false; - this.$message.success("保存成功"); - this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); - }, + handleAccept() { this.isSubmit = true execTask({ @@ -416,6 +397,29 @@ export default { this.isSubmit = false }) }, + handleSave() { + this.saveLoading = true; + let json = this.json + json.commentText = this.commentText + json.info = this.data + json.form = this.form + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "laws2"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: json, + dataList: this.data, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); + }, handleSubmit() { if (this.data.length < 1) { this.$message.warning('请输入征求意见') @@ -505,8 +509,11 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { + console.log(item); this.$nextTick(() => { - this.form = JSON.parse(JSON.stringify(item)); + this.form = item.form ? JSON.parse(JSON.stringify(item.form.form)) : JSON.parse(JSON.stringify(item)); + this.data = item.form ? item.dataList : [] + this.commentText = item.form ? item.commentText : '' }); }, }, From 5315bc1c8e11f9d675ad84b61f4c5736b01d775d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 31 Mar 2022 17:36:54 +0800 Subject: [PATCH 004/168] feat: There is no way the, bug #52329 --- .../pages/creatProcess/zcrk/step1.vue | 71 ++--- .../pages/creatProcess/zcrk/step2.vue | 6 +- .../pages/creatProcess/zcrk/step3.vue | 248 ++++++++++-------- 3 files changed, 183 insertions(+), 142 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue index 65862a3d8..70541b6bd 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue @@ -1426,6 +1426,12 @@ let mes = JSON.parse(res.mes) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form + this.form['lawsSyqy'] = this.filterObj(this.form['lawsSyqy']) + this.form['lawsSycx'] = this.filterObj(this.form['lawsSycx']) + this.form['lawsLabel'] = this.filterObj(this.form['lawsLabel']) + this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS']) + this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS']) + this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS']) this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -1537,8 +1543,6 @@ this.form['id'] = bringData.id this.standardDrawer = false this.verifySarStandard = true - this.busVsFunc() - this.modelFunc() this.$forceUpdate() } // 遍历对象初始化文件信息 @@ -1974,23 +1978,29 @@ // this.fileList = fileList.splice(0, 1) // } if (response.ok) { - - switch (this.fileType){ - case 'ZCWBLAWS': - this.ZCWBLAWSFileList = fileList - break; - case 'GCWBLAWS' : - this.GCWBLAWSFileList = fileList - break; - case 'JDWJLAWS': - this.JDWJLAWSFileList = fileList - break; - case 'GLWJLAWS': - this.GLWJLAWSFileList = fileList - break; - default : ; - } - this.$message({ + const fileObj = {} + fileObj.id = file.response.data.id + fileObj.name = file.response.data.name + switch (this.fileType){ + case 'ZCWBLAWS': + this.ZCWBLAWSFileList = this.ZCWBLAWSFileList.filter ( item => item.response === undefined); + this.ZCWBLAWSFileList.push(fileObj) + break; + case 'GCWBLAWS' : + this.GCWBLAWSFileList = this.GCWBLAWSFileList.filter ( item => item.response === undefined); + this.GCWBLAWSFileList.push(fileObj) + break; + case 'JDWJLAWS': + this.JDWJLAWSFileList = this.JDWJLAWSFileList.filter ( item => item.response === undefined); + this.JDWJLAWSFileList.push(fileObj) + break; + case 'GLWJLAWS': + this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined); + this.GLWJLAWSFileList.push(fileObj) + break; + default : ; + } + this.$message({ showClose: true, message: response.message, type: 'success' @@ -2154,6 +2164,7 @@ // } this.saveLoading = true + this.fileInfoHandle() let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2181,19 +2192,18 @@ }) }, fileInfoHandle(){ + //拼接文件名和id 提交到流程Activity + this.form.ZCWBLAWS=this.ZCWBLAWSFileList.map(item => item.id).join(",") + this.form.ZCWBLAWSName=this.ZCWBLAWSFileList.map(item => item.name).join(",") - //拼接文件名和id 提交到流程Activity - this.form.ZCWBLAWS=this.ZCWBLAWSFileList.map(item => item.response.data.id).join(",") - this.form.ZCWBLAWSName=this.ZCWBLAWSFileList.map(item => item.name).join(",") + this.form.GCWBLAWS=this.GCWBLAWSFileList.map(item => item.id).join(",") + this.form.GCWBLAWSName=this.GCWBLAWSFileList.map(item => item.name).join(",") - this.form.GCWBLAWS=this.GCWBLAWSFileList.map(item => item.response.data.id).join(",") - this.form.GCWBLAWSName=this.GCWBLAWSFileList.map(item => item.name).join(",") + this.form.JDWJLAWS=this.JDWJLAWSFileList.map(item => item.id).join(",") + this.form.JDWJLAWSName=this.JDWJLAWSFileList.map(item => item.name).join(",") - this.form.JDWJLAWS=this.JDWJLAWSFileList.map(item => item.response.data.id).join(",") - this.form.JDWJLAWSName=this.JDWJLAWSFileList.map(item => item.name).join(",") - - this.form.GLWJLAWS=this.GLWJLAWSFileList.map(item => item.response.data.id).join(",") - this.form.GLWJLAWSName=this.GLWJLAWSFileList.map(item => item.name).join(",") + this.form.GLWJLAWS=this.GLWJLAWSFileList.map(item => item.id).join(",") + this.form.GLWJLAWSName=this.GLWJLAWSFileList.map(item => item.name).join(",") }, handleSubmit() { @@ -2302,10 +2312,7 @@ this.YYRZLAWSOptions = res.data.YYRZLAWS this.ZRBMLAWSOptions = res.data.ZRBMLAWS this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS - this.setMap(this.standStateOptions) }) - this.busVsFunc() - this.modelFunc() } } diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue index ed526ee4f..87b86986c 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue @@ -260,7 +260,7 @@
- +
{{value.name}} @@ -279,7 +279,7 @@ - +
{{value.name}}
@@ -1089,7 +1089,7 @@ _this: this }, res => { if (res.success) { - if(this.formTongGuo.approvalOpinion === '1'){ + if(this.formTongGuo.approvalOpinion === 1){ this.$message.warning("驳回成功") this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue index 78f953844..6cd9109c4 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue @@ -130,14 +130,14 @@ clearable > - - - 根据编号、名称、文本状态查询 - - + + + + + + + + -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
-
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
@@ -328,27 +314,20 @@ v-model="form.GCWBLAWSName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -505,27 +484,20 @@ v-model="form.GLWJLAWSName" clearable > -
- - - - 查看已上传文件 - - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -635,6 +607,7 @@ accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx" :before-upload="beginImportFile" :on-success="importFileSuccess" + :on-preview="handleFilePreview" :on-remove="removeOneFile" :show-file-list="true" > @@ -1445,8 +1418,24 @@ this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id + this.form['lawsSyqy'] = this.filterObj(this.form['lawsSyqy']) + this.form['lawsSycx'] = this.filterObj(this.form['lawsSycx']) + this.form['lawsLabel'] = this.filterObj(this.form['lawsLabel']) + this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS']) + this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS']) + this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS']) }) }, + filterObj(obj){ + if(obj && obj !== ''){ + if(obj instanceof Array){ + return obj; + }else { + return obj.split(",") + } + } + return ""; + }, getData() { if(this.taskIds && this.pId){ return new Promise((resolve, reject) => { @@ -1475,6 +1464,17 @@ }) } }, + assemble(ids,names){ + let list= new Array(); + if(ids && ids !== '' && names && names !== ''){ + let idArray=ids.split(','); + let nameArray=names.split(','); + for(let i=0; i { Promise.all([this.getTaskId()]).then((value) => { @@ -1482,6 +1482,12 @@ let mes = JSON.parse(value[0].mes) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form + this.form['lawsSyqy'] = this.filterObj(this.form['lawsSyqy']) + this.form['lawsSycx'] = this.filterObj(this.form['lawsSycx']) + this.form['lawsLabel'] = this.filterObj(this.form['lawsLabel']) + this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS']) + this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS']) + this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS']) this.taskIds = mes.taskIds; this.pId = mes.pId; this.userId = mes.userId; @@ -2102,19 +2108,25 @@ // this.fileList = fileList.splice(0, 1) // } if (response.ok) { - + const fileObj = {} + fileObj.id = file.response.data.id + fileObj.name = file.response.data.name switch (this.fileType){ case 'ZCWBLAWS': - this.ZCWBLAWSFileList = fileList + this.ZCWBLAWSFileList = this.ZCWBLAWSFileList.filter ( item => item.response === undefined); + this.ZCWBLAWSFileList.push(fileObj) break; case 'GCWBLAWS' : - this.GCWBLAWSFileList = fileList + this.GCWBLAWSFileList = this.GCWBLAWSFileList.filter ( item => item.response === undefined); + this.GCWBLAWSFileList.push(fileObj) break; case 'JDWJLAWS': - this.JDWJLAWSFileList = fileList + this.JDWJLAWSFileList = this.JDWJLAWSFileList.filter ( item => item.response === undefined); + this.JDWJLAWSFileList.push(fileObj) break; case 'GLWJLAWS': - this.GLWJLAWSFileList = fileList + this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined); + this.GLWJLAWSFileList.push(fileObj) break; default : ; } @@ -2125,6 +2137,25 @@ }) } }, + // 文件预览及下载 + handleFilePreview(file) { + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } + + if (this.preview) { + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + } else { + this.$preview(attId) + } + }, fileUpload (type) { this.fileType = ''; // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表 @@ -2254,6 +2285,8 @@ // } this.saveLoading = true + this.isSubmit = true + this.fileInfoHandle() let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2278,27 +2311,29 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { + this.isSubmit = false this.saveLoading = false this.$message.success('保存成功') this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // this.bpnId = res.result }).catch(e => { + this.isSubmit = false this.saveLoading = false - }) + }) }, fileInfoHandle(){ //拼接文件名和id 提交到流程Activity - this.form.ZCWBLAWS=this.ZCWBLAWSFileList.map(item => item.response.data.id).join(",") + this.form.ZCWBLAWS=this.ZCWBLAWSFileList.map(item => item.id).join(",") this.form.ZCWBLAWSName=this.ZCWBLAWSFileList.map(item => item.name).join(",") - this.form.GCWBLAWS=this.GCWBLAWSFileList.map(item => item.response.data.id).join(",") + this.form.GCWBLAWS=this.GCWBLAWSFileList.map(item => item.id).join(",") this.form.GCWBLAWSName=this.GCWBLAWSFileList.map(item => item.name).join(",") - this.form.JDWJLAWS=this.JDWJLAWSFileList.map(item => item.response.data.id).join(",") + this.form.JDWJLAWS=this.JDWJLAWSFileList.map(item => item.id).join(",") this.form.JDWJLAWSName=this.JDWJLAWSFileList.map(item => item.name).join(",") - this.form.GLWJLAWS=this.GLWJLAWSFileList.map(item => item.response.data.id).join(",") + this.form.GLWJLAWS=this.GLWJLAWSFileList.map(item => item.id).join(",") this.form.GLWJLAWSName=this.GLWJLAWSFileList.map(item => item.name).join(",") }, @@ -2308,6 +2343,7 @@ if (valid) { this.fileInfoHandle() this.isSubmit = true + this.saveLoading = true this.form.country=this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId @@ -2327,6 +2363,7 @@ if (res.success) { this.$message.success(res.message) this.isSubmit = false + this.saveLoading = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } @@ -2398,10 +2435,7 @@ this.YYRZLAWSOptions = res.data.YYRZLAWS this.ZRBMLAWSOptions = res.data.ZRBMLAWS this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS - this.setMap(this.standStateOptions) }) - this.busVsFunc() - this.modelFunc() } } From c0adb1d338c025ae3306ae8c382c779f37baef20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 31 Mar 2022 17:47:58 +0800 Subject: [PATCH 005/168] commit --- src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 597c94aa6..dca7aaf9d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -538,7 +538,6 @@
Date: Thu, 31 Mar 2022 18:06:53 +0800 Subject: [PATCH 006/168] feat: There is no way the, min-height --- .../creatProcess/qbrk-product/step10.vue | 39 ++++++------------- .../creatProcess/qbrk-product/step11.vue | 39 ++++++------------- .../creatProcess/qbrk-product/step12.vue | 39 ++++++------------- .../creatProcess/qbrk-product/step13.vue | 2 +- .../pages/creatProcess/qbrk-product/step2.vue | 39 ++++++------------- .../pages/creatProcess/qbrk-product/step3.vue | 2 +- .../pages/creatProcess/qbrk-product/step4.vue | 39 ++++++------------- .../pages/creatProcess/qbrk-product/step5.vue | 2 +- .../pages/creatProcess/qbrk-product/step6.vue | 2 +- .../pages/creatProcess/qbrk-product/step7.vue | 39 ++++++------------- .../pages/creatProcess/qbrk-product/step8.vue | 39 ++++++------------- .../pages/creatProcess/qbrk-product/step9.vue | 39 ++++++------------- .../creatProcess/qbrk-product/stepC3.vue | 2 +- .../creatProcess/qbrk-product/stepC6.vue | 2 +- .../creatProcess/qbrk-product/stepDetail.vue | 39 ++++++------------- .../pages/creatProcess/qbrk/step10.vue | 2 +- .../pages/creatProcess/qbrk/step11.vue | 2 +- .../pages/creatProcess/qbrk/step12.vue | 2 +- .../pages/creatProcess/qbrk/step13.vue | 2 +- .../pages/creatProcess/qbrk/step2.vue | 2 +- .../pages/creatProcess/qbrk/step3.vue | 2 +- .../pages/creatProcess/qbrk/step4.vue | 2 +- .../pages/creatProcess/qbrk/step5.vue | 2 +- .../pages/creatProcess/qbrk/step6.vue | 2 +- .../pages/creatProcess/qbrk/step7.vue | 2 +- .../pages/creatProcess/qbrk/step8.vue | 2 +- .../pages/creatProcess/qbrk/step9.vue | 2 +- .../pages/creatProcess/qbrk/stepC1.vue | 2 +- .../pages/creatProcess/qbrk/stepC3.vue | 2 +- .../pages/creatProcess/qbrk/stepC6.vue | 2 +- .../pages/creatProcess/qbrk/stepDetail.vue | 2 +- 31 files changed, 121 insertions(+), 274 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue index c408a7e5e..7c9e2d640 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -142,7 +142,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" @@ -2346,33 +2346,16 @@ } }, processTable () { - this.$nextTick(() => { - Promise.all([this.getTaskId()]).then((value) => { - if(value[0] &&value.length > 0){ - let mes = JSON.parse(value[0].mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.form = mes.form - this.taskIds = mes.taskIds; - this.pId = mes.pId; - this.userId = mes.userId; - this.prcNum = mes.prcNum; - this.prcName = mes.prcName; - this.roleForm = mes.roleForm - this.commentText = mes.commentText - } - this.loading = true - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu - }, { - loading: 'loading', - _this: this - }, res => { - this.detailData = res - this.loading = false - }, e => {}) - }) + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res + }, e => { }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue index 6ef2c8614..df3758e0b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue @@ -142,7 +142,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" @@ -2346,33 +2346,16 @@ } }, processTable () { - this.$nextTick(() => { - Promise.all([this.getTaskId()]).then((value) => { - if(value[0] &&value.length > 0){ - let mes = JSON.parse(value[0].mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.form = mes.form - this.taskIds = mes.taskIds; - this.pId = mes.pId; - this.userId = mes.userId; - this.prcNum = mes.prcNum; - this.prcName = mes.prcName; - this.roleForm = mes.roleForm - this.commentText = mes.commentText - } - this.loading = true - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu - }, { - loading: 'loading', - _this: this - }, res => { - this.detailData = res - this.loading = false - }, e => {}) - }) + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res + }, e => { }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue index 278e260dd..bd7df16c4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -142,7 +142,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" @@ -2346,33 +2346,16 @@ } }, processTable () { - this.$nextTick(() => { - Promise.all([this.getTaskId()]).then((value) => { - if(value[0] &&value.length > 0){ - let mes = JSON.parse(value[0].mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.form = mes.form - this.taskIds = mes.taskIds; - this.pId = mes.pId; - this.userId = mes.userId; - this.prcNum = mes.prcNum; - this.prcName = mes.prcName; - this.roleForm = mes.roleForm - this.commentText = mes.commentText - } - this.loading = true - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu - }, { - loading: 'loading', - _this: this - }, res => { - this.detailData = res - this.loading = false - }, e => {}) - }) + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res + }, e => { }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 150c5968a..865d4d4d8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -162,7 +162,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index addb56e40..4af9879d1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -148,7 +148,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" @@ -2454,33 +2454,16 @@ } }, processTable () { - this.$nextTick(() => { - Promise.all([this.getTaskId()]).then((value) => { - if(value[0] &&value.length > 0){ - let mes = JSON.parse(value[0].mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.form = mes.form - this.taskIds = mes.taskIds; - this.pId = mes.pId; - this.userId = mes.userId; - this.prcNum = mes.prcNum; - this.prcName = mes.prcName; - this.roleForm = mes.roleForm - this.commentText = mes.commentText - } - this.loading = true - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu - }, { - loading: 'loading', - _this: this - }, res => { - this.detailData = res - this.loading = false - }, e => {}) - }) + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res + }, e => { }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index bb7342dab..d846ee3eb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -204,7 +204,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index 5c26a6b2c..86c3efe32 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -140,7 +140,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" @@ -2345,33 +2345,16 @@ } }, processTable () { - this.$nextTick(() => { - Promise.all([this.getTaskId()]).then((value) => { - if(value[0] &&value.length > 0){ - let mes = JSON.parse(value[0].mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.form = mes.form - this.taskIds = mes.taskIds; - this.pId = mes.pId; - this.userId = mes.userId; - this.prcNum = mes.prcNum; - this.prcName = mes.prcName; - this.roleForm = mes.roleForm - this.commentText = mes.commentText - } - this.loading = true - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu - }, { - loading: 'loading', - _this: this - }, res => { - this.detailData = res - this.loading = false - }, e => {}) - }) + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res + }, e => { }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 5ee012749..6d0fc6c03 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -225,7 +225,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index d3a0cc9ef..dc054b6a0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -274,7 +274,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index 69efa7c82..7b69ce274 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -143,7 +143,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" @@ -2471,33 +2471,16 @@ return ""; }, processTable () { - this.$nextTick(() => { - Promise.all([this.getTaskId()]).then((value) => { - if(value[0] &&value.length > 0){ - let mes = JSON.parse(value[0].mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.form = mes.form - this.taskIds = mes.taskIds; - this.pId = mes.pId; - this.userId = mes.userId; - this.prcNum = mes.prcNum; - this.prcName = mes.prcName; - this.roleForm = mes.roleForm - this.commentText = mes.commentText - } - this.loading = true - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu - }, { - loading: 'loading', - _this: this - }, res => { - this.detailData = res - this.loading = false - }, e => {}) - }) + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res + }, e => { }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue index 45b9fcc4f..5b6287a77 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -142,7 +142,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" @@ -2345,33 +2345,16 @@ } }, processTable () { - this.$nextTick(() => { - Promise.all([this.getTaskId()]).then((value) => { - if(value[0] &&value.length > 0){ - let mes = JSON.parse(value[0].mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.form = mes.form - this.taskIds = mes.taskIds; - this.pId = mes.pId; - this.userId = mes.userId; - this.prcNum = mes.prcNum; - this.prcName = mes.prcName; - this.roleForm = mes.roleForm - this.commentText = mes.commentText - } - this.loading = true - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu - }, { - loading: 'loading', - _this: this - }, res => { - this.detailData = res - this.loading = false - }, e => {}) - }) + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res + }, e => { }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue index e2068c02a..24a376a2b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -142,7 +142,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" @@ -2346,33 +2346,16 @@ } }, processTable () { - this.$nextTick(() => { - Promise.all([this.getTaskId()]).then((value) => { - if(value[0] &&value.length > 0){ - let mes = JSON.parse(value[0].mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.form = mes.form - this.taskIds = mes.taskIds; - this.pId = mes.pId; - this.userId = mes.userId; - this.prcNum = mes.prcNum; - this.prcName = mes.prcName; - this.roleForm = mes.roleForm - this.commentText = mes.commentText - } - this.loading = true - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu - }, { - loading: 'loading', - _this: this - }, res => { - this.detailData = res - this.loading = false - }, e => {}) - }) + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res + }, e => { }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 5c31f402a..152bade46 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -204,7 +204,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index b53ebcf1a..29596a7da 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -274,7 +274,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue index 8e6a363a2..d0c851e38 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue @@ -150,7 +150,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" @@ -2276,33 +2276,16 @@ } }, processTable () { - this.$nextTick(() => { - Promise.all([this.getTaskId()]).then((value) => { - if(value[0] &&value.length > 0){ - let mes = JSON.parse(value[0].mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) - this.form = mes.form - this.taskIds = mes.taskIds; - this.pId = mes.pId; - this.userId = mes.userId; - this.prcNum = mes.prcNum; - this.prcName = mes.prcName; - this.roleForm = mes.roleForm - this.commentText = mes.commentText - } - this.loading = true - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu - }, { - loading: 'loading', - _this: this - }, res => { - this.detailData = res - this.loading = false - }, e => {}) - }) + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res + }, e => { }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index 3155026a0..cd6b29cc8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -150,7 +150,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 19e59fe0e..391732e0f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -150,7 +150,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 8c3f53234..f09f575e7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -163,7 +163,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 1c8fd95ae..a5ab5152b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -164,7 +164,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index b53741a05..54cfad437 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -273,7 +273,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index e8f81f873..5fdd64e5e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -208,7 +208,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 6e6c494bf..630fc995f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -148,7 +148,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index d8beb83fb..e8a8035da 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -399,7 +399,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 2188cf658..236387716 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -411,7 +411,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index 7a3188f63..a576221df 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -247,7 +247,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index d058dbc22..1fb674bde 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -71,7 +71,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index b00747f81..5583129d7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -256,7 +256,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index c4f2c1f6b..a9d0419b0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -285,7 +285,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 3e716dd4d..00a7bcc42 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -208,7 +208,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 28b07c9a5..568ef2b24 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -411,7 +411,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue index fece31eb3..8226b7f8d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue @@ -149,7 +149,7 @@ ref="selection" :data="detailData" tooltip-effect="dark" - style="width: 100%" + style="width: 100%;min-height: 535px" border row-key="id" :no-data-text="listNoDataText" From 636ccb323e53d195965c6f056141dfa3c215b883 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Fri, 1 Apr 2022 09:42:59 +0800 Subject: [PATCH 007/168] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052347=20?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E5=BA=93=20=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=95=8C=E9=9D=A2=20UI=E9=9C=80=E8=A6=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E4=B8=AD=E6=96=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherBussStandardDetails/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index d5f3667c4..0f80ed8ac 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -352,7 +352,7 @@

{{ sarStandardsInfoEO.standCode }}

-