From 7657b7ed6af90e6c6a89bc7493e1938e83dffa7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 27 Jul 2021 14:53:01 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 2855 ++++++++--------- .../pages/creatProcess/bzqdfb/step1.vue | 70 +- .../pages/creatProcess/bzqdfb/step2.vue | 20 +- .../pages/creatProcess/xmpg2/step5.vue | 2 +- .../tabComponents/processCenter/index.vue | 66 + 5 files changed, 1530 insertions(+), 1483 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index bc2aba78e..6d6626e98 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1,1456 +1,1431 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index c274edff0..302272626 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -49,26 +49,25 @@ > -
-

{{listForm.fileName}} +

+

+ {{ listForm.fileName }} + + + 点击上传 + +

-
- - - 点击上传 - - -
@@ -741,17 +740,13 @@ export default { }, roleForm: { startUserName: this.$store.getters.userInfo.userName, - startUser: this.$store.getters.userInfo.id, + startUser: this.$store.getters.userInfo.userId, dockUser: "", - responUserList: "", ministerUser: "", directorUser: "", - presidentUser: "", dockUserName: "", - responUserListName: "", ministerUserName: "", directorUserName: "", - presidentUserName: "" }, formRules: { listType: [ @@ -806,7 +801,7 @@ export default { modelName: "", standId: "", //选择的清单的id signFlag: "1", //是否会签 1为会签 2为不会签 - inforlist: "", //用来存放标准列表的标准id + inforlist: " ", //用来存放标准列表的标准id dataList: [{ code: "", //标准号 standName: "", //标准名称 @@ -850,9 +845,6 @@ export default { } else if (this.type === "directorUser") { this.roleForm.directorUser = data[0].id; this.roleForm.directorUserName = data[0].name; - } else if (this.type === "presidentUser") { - this.roleForm.presidentUser = data[0].id; - this.roleForm.presidentUserName = data[0].name; } this.modalshowflag = false; }, @@ -1032,19 +1024,8 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { - let json = this.listForm; - this.listForm.fileId = this.fileIds.join(","); - this.listForm.fileName = this.fileListName.join(","); - this.listForm.model = this.listForm.fileId; - this.listForm.modelName = this.listForm.fileName; - json.zrUserId = this.roleForm.dockUser; //会签人 - json.jlUserId = this.roleForm.directorUser; //业务经理 - json.applyUpdUserId = this.roleForm.ministerUser; // 修订人 - json.approvalOpinion = ""; - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; - json.standName = this.listForm.listName; - json.standId = this.listForm.standId; + var json = Object.assign(this.listForm, this.roleForm) + console.log(json); this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { @@ -1100,6 +1081,12 @@ export default { }); this.fileListName = middle; this.fileIds.push(file.response.data.id); + if(this.listForm.fileName === null ){ + this.listForm.fileName = this.fileListName.join(',') + }else { + this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(','); + } + this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',') this.$message.success("上传成功"); } else { this.$message.error(res.message); @@ -1202,6 +1189,7 @@ export default { if (this.standList.length < 1) { this.$message.warning("请选择需要添加进清单的数据"); } else { + let exits = [] this.standList.map(item => { let newStand = false; for (let itemKey of this.dataList) { @@ -1214,8 +1202,10 @@ export default { this.$message.warning("请勿重复添加数据"); } else { this.dataList.push(item); + exits.push(item.id) } }); + this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',') this.standardData = []; this.standModel = false; } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 976a14cda..617b6018c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -78,8 +78,13 @@ width="180px" label="标准号"> diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 64152b927..c6302ea23 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -600,6 +600,72 @@ export default { prcType: row.prcType } }) + } else if(row.taskInfo === '分发负责人审批') { + this.$router.push({ + name: 'xmpg2Step7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '架构经理审批') { + this.$router.push({ + name: 'xmpg2Step8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '工程经理审批') { + this.$router.push({ + name: 'xmpg2Step9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部经理审批') { + this.$router.push({ + name: 'xmpg2Step10', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '汇总审批') { + this.$router.push({ + name: 'xmpg2Step11', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部部长审批') { + this.$router.push({ + name: 'xmpg2Step12', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //未符合项整改流程 From 9c27738b08abfca968525b5a1f37fb0654751c50 Mon Sep 17 00:00:00 2001 From: zqx0221 <2119066161@qq.com> Date: Tue, 27 Jul 2021 15:37:40 +0800 Subject: [PATCH 02/16] =?UTF-8?q?fix:=E9=93=BE=E6=8E=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E9=93=BE=E6=8E=A5=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 106 ++++++++++++-------- 1 file changed, 65 insertions(+), 41 deletions(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 783a6a8dc..6f7caa83e 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -163,33 +163,46 @@ }, //表格中操作列删除操作弹窗 deleteLink (row) { + this.$confirm('此操作将删除该链接, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$http.delete('sarUrl/tsUrl/delete', { - id: row.id + id: row.id }, { - _this: this, - loading: 'Loading' + _this: this, + loading: 'Loading' }, res => { - if (res.ok) { - this.$message.success('删除成功') - let arr = [] - for (let a = 0; a < this.linkList.length; a++) { - if (this.linkList[a].id === row.id) { - this.linkList.splice(a, 1) - } - } - this.linkList.forEach((item, index) => { - let json = {} - json.id = item.id - json.orderBy = index + 1 - arr.push(json) - }) - this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { - this.getLink() - }) - }else { - this.$message.warning(res.message) + if (res.ok) { + this.$message.success('删除成功') + let arr = [] + for (let a = 0; a < this.linkList.length; a++) { + if (this.linkList[a].id === row.id) { + this.linkList.splice(a, 1) + } } + this.linkList.forEach((item, index) => { + let json = {} + json.id = item.id + json.orderBy = index + 1 + arr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { + this.getLink() + }) + }else { + this.$message.warning(res.message) + } }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + }, //头部删除按钮 deleteAllLink() { @@ -202,28 +215,39 @@ this.$message.warning('请选择要删除的链接') } else { this.modalRole = true + this.$confirm('此操作将删除链接, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { this.$http.delete('sarUrl/tsUrl/deleteBatch', { - ids: this.ids + ids: this.ids }, {}, res => { - if (res.ok) { - this.$message.success('删除成功') - let arr = this.linkList.filter(items => { - if (!this.ids.includes(items.id)) return items; - }) - let newArr = [] - arr.forEach((item, index) => { - let json = {} - json.id = item.id - json.orderBy = index + 1 - newArr.push(json) - }) - this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { - this.getLink() - }) - }else { - this.$message.warning(res.message) - } + if (res.ok) { + this.$message.success('删除成功') + let arr = this.linkList.filter(items => { + if (!this.ids.includes(items.id)) return items; + }) + let newArr = [] + arr.forEach((item, index) => { + let json = {} + json.id = item.id + json.orderBy = index + 1 + newArr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { + this.getLink() + }) + }else { + this.$message.warning(res.message) + } }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); } }, //弹窗关闭操作 From 9baf7dc117d27eaa88ecfc6c80d6c8bb7176b9cf Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 15:38:37 +0800 Subject: [PATCH 03/16] =?UTF-8?q?bug=EF=BC=9A=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=B5=81=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E5=BF=83---=E5=B7=B2=E5=8F=91=E6=B5=81=E7=A8=8B=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=E7=9A=84=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=96=87=E4=BB=B6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B9=B1=E7=A0=81=EF=BC=8C=E5=8E=BB=E6=8E=89=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=B5=81=E7=A8=8B=E3=80=81=E8=A2=AB=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E6=A0=87=E5=87=86=E3=80=81=E5=8F=82=E4=BC=9A=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=9C=88=E4=BD=8F=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B2=A1=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step4.vue | 4 +- .../pages/creatProcess/bzrk/step5.vue | 130 ++++++++++-------- 2 files changed, 77 insertions(+), 57 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 74c328123..6c3ddd005 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -709,7 +709,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('dtbjh'),config.attrName = '代替标准号'" + @click="selectLaws('yybj'),config.attrName = '引用标准'" >{{'手动查找'}} @@ -737,7 +737,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('byybj'),config.attrName = '代替标准号'" + @click="selectLaws('byybj'),config.attrName = '被引用标准'" >{{'手动查找'}} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index e62214175..b062aa82e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -42,13 +42,11 @@ - - + - + + + + + - - - - + - - - - + - - - - + - - - + + + + + - - - + + + + + + + +
{{ form.glwjName }} @@ -492,22 +505,22 @@ clearable > - - - - - - + + + + + + + + + + + + + + + +
@@ -777,6 +790,7 @@ zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 txlbOptions: [], // 体系类别 + qcdwOption: [], // 起草单位 data: [], // 标准列表数据 ListForm: {}, // 新增数据 user1: '', @@ -860,6 +874,11 @@ this.glwjFileId = processForm.glwj this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd + this.form.standYear = processForm.standYear + this.form.standSystem = processForm.standSystem + this.form.kccvppsbm = processForm.kccvppsbm + this.form.cycvppsbm = processForm.cycvppsbm + this.form.dybxh = processForm.dybxh this.getFormFieldList(processForm) } }).catch(e => { @@ -958,6 +977,7 @@ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOption = res.data.QCDW // 体系类别 }) } } From 2eca268fd0f12dd8d3747252f27bd057410a4f2a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 27 Jul 2021 15:49:45 +0800 Subject: [PATCH 04/16] commit --- src/components/navMenu/index.vue | 2 +- .../pages/creatProcess/bzdy/step1-1.vue | 4 +- .../pages/creatProcess/bzdy/step1.vue | 4 +- .../pages/creatProcess/bzdy/step3.vue | 4 +- .../pages/creatProcess/bzdy/step5.vue | 4 +- .../pages/creatProcess/bzdy/step6.vue | 4 +- .../pages/creatProcess/bzdy/step7.vue | 4 +- .../pages/creatProcess/bzdy/step8.vue | 4 +- .../pages/creatProcess/bzdy/step9.vue | 4 +- .../pages/creatProcess/bzjd/step1.vue | 217 ++++++++---------- .../tabComponents/alreadyProcess/index.vue | 2 +- .../tabComponents/alreadySend/index.vue | 2 +- .../tabComponents/processCenter/index.vue | 2 +- .../tabComponents/taskDraft/index.vue | 2 +- .../pags/consultationDetails.vue | 26 ++- 15 files changed, 129 insertions(+), 156 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 2e85d241d..f9cb687af 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -458,7 +458,7 @@ export default { overflow-y: auto; user-select: none; box-sizing: border-box; - background: url("~assets/images/shangqi/sideBar/side-bar-isCollapse-bg.png") no-repeat; + background: url("~assets/images/shangqi/sideBar/newside-bar-bg1.png") no-repeat; background-size: 100% 100%; &:not(.is-collapse) { width: 212px; diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 6f7638f37..bb093c810 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -327,11 +327,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index db34d6fd9..4bed4251c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -318,11 +318,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 94122ef61..2166ae91f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -236,11 +236,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 47f247302..fd03d1776 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -260,11 +260,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index d9e652faa..307627111 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -259,11 +259,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 699657b95..caf5acd2d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -259,11 +259,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 220de8e65..df88eaaca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -259,11 +259,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 91fa08324..16c896fdb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -259,11 +259,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 1ac24ea1b..d240a7ac1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -165,7 +165,7 @@
@@ -313,58 +313,63 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -392,6 +397,7 @@ saveLoading: false, // 基础信息form表单 form: { + id: '', itemsNum: '', itemsName: '', standId: '', @@ -570,7 +576,7 @@ this.listModel = false; this.listModel2 = true this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { - infoId: this.form.id, + infoId: this.form.standId, page: 1, pageSize: 9999 }, { @@ -621,46 +627,25 @@ }, /*** **********************************************/ /** 流程节点负责人的选择 *****************************/ - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, - saveUserInfo () { - if (this.type === 'deptUserId') { - this.roleForm.deptUserId = this.roleRow.id - this.roleForm.deptUserIdName = this.roleRow.name + saveUserInfo (data) { + if (this.type === 0) { + this.roleForm.deptUserId = data[0].id + this.roleForm.deptUserIdName = data[0].name + } else if (this.type === 1) { + this.itemList[this.zrIndex].zrUserId = data[0].id + this.itemList[this.zrIndex].zrUserIdName = data[0].name + } else { + this.itemList.forEach( item => { + this.zrIdList.forEach( items => { + if (item.id === items) { + item.zrUserId = data[0].id + item.zrUserIdName = data[0].name + } + }) + }) } this.modalshowflag = false }, - cancleUserInfo () { - this.modalshowflag = false - }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - drawerCheck2 (data) { - var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree2.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree2.getCheckedNodes()[0] - } - }, handleSelectionChange (val) { this.zrIdList = [] val.forEach( item => { @@ -668,51 +653,30 @@ }) }, choiceZRRS (row, type, index) { + this.type = type if (type === 1) { - this.nodeList2 = [] - this.zrIndex= index + this.drawerTitle = '选择责任人' + this.nodeList = [] + this.zrIndex = index this.zrType = type - this.nodeList2.push(row) - this.modalshowflag2 = true - } else { + this.nodeList.push(row) + this.modalshowflag = true + } else if (type === 2) { // 批量 if (this.zrIdList.length > 0) { this.zrType = type - this.nodeList2 = [] - this.modalshowflag2 = true + this.nodeList = [] + this.modalshowflag = true + this.drawerTitle = '批量选择责任人' } else { this.$message.warning('请选择要编辑的数据') } - } - }, - saveUserInfo2 () { - var idList = '' - var nameList = '' - this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { - if (nameList.length > 0) { - nameList += ',' - idList += ',' - } - idList += item.id - nameList += item.name - }) - if (this.zrType == 1) { - this.itemList[this.zrIndex].zrUserId = idList - this.itemList[this.zrIndex].zrUserIdName = nameList } else { - this.itemList.forEach( item => { - this.zrIdList.forEach( items => { - if (item.id === items) { - item.zrUserId = idList - item.zrUserIdName = nameList - } - }) - }) + this.nodeList = [] + this.nodeList.push(row) + this.drawerTitle = '选择标准法规部部长' + this.modalshowflag = true } - this.modalshowflag2 = false - }, - cancleUserInfo2 () { - this.modalshowflag2 = false }, handleTabs(name) { this.active = name @@ -766,7 +730,6 @@ } }, mounted () { - this.getTree() this.sarStandCompareHis() this.sarStandCompareHis2() this.tableHeight = $('.content').height() - 44 diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index 2e9643307..a68ddea6e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -127,7 +127,7 @@ - 查看 + 查看 diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 647a5fd38..d1bdadf80 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -127,7 +127,7 @@ - 查看 + 查看 diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 64152b927..4075151f6 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -124,7 +124,7 @@