From 7f69ee42ecb75867666815f0c6f1f3b9884b8d72 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 3 Aug 2021 11:24:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 126 ++++++++++++++---- .../pages/creatProcess/wfhxzg/step2.vue | 35 ++++- .../pages/creatProcess/wfhxzg/step3.vue | 53 ++++++-- 3 files changed, 176 insertions(+), 38 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index ebb110b56..49068ff27 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -29,7 +29,16 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + + + + + + @@ -87,6 +96,42 @@ + + + +

确认+选择责任人

+
+ + + +
+ + + + + + +

负责人

+
+ + + +
+ + + + + + +

分发负责人

+
+ + + +
+ + + @@ -103,7 +148,7 @@ @@ -154,25 +199,44 @@ + @selection-change="selectedChange" + > - - - - - - - + + + + + + + + + + + + + + +
取消 带入 @@ -217,13 +281,17 @@ export default { // 责任部门 zrbmOptions: [], standModel: false, + // 总数 + total: 0, + // 当前页数 + pageNo: 1, // 查询未符合项整改数据库数据 queryUnqualidiedData: { pageNo: 1, pageSize: 10, total: 0, closeState: '1', - standId: '', // 标准号/名称 + standSerialNumber: '', // 标准号/名称 productName: '', // 项目名称 responsibleUnit: '' // 责任部门 }, @@ -269,9 +337,9 @@ export default { this.$set(item,'dutyPeople','') this.$set(item,'dutyPeopleInfoId','') this.$set(item,'dutyPeopleId','') - this.$set(item,'fileText','') - this.$set(item,'fileTextId','') - this.$set(item,'fileTextPath','') + this.$set(item,'fileText',[]) + this.$set(item,'fileTextId',[]) + this.$set(item,'fileTextPath',[]) }) this.total = res.data.total }) @@ -308,6 +376,18 @@ export default { }); } }, + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, //选择标准取消事件 closeDrawer() { this.standModel = false @@ -432,7 +512,7 @@ export default { // 清空 查询条件 clearAllSearch (search = true) { this.queryUnqualidiedData = { - 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 d0c774c8a..4a203c4e7 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -13,7 +13,7 @@ - +
- + + + + + + @@ -119,7 +128,6 @@ -
@@ -316,9 +324,9 @@ export default { const params = { taskIds: this.taskIds, pId: this.pId, - standId: '', // 标准号/名称 - productName: '', // 项目名称 - responsibleUnit: '' // 责任部门 + // standId: '', // 标准号/名称 + // productName: '', // 项目名称 + // responsibleUnit: '' // 责任部门 } inboundLiaisonDetail(params).then(res => { const processForm = JSON.parse(res.mesg) @@ -328,6 +336,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList + this.textarea = JSON.parse(JSON.stringify(item)).commentText }) }, // 批量选择分发责任人 @@ -455,6 +464,18 @@ export default { }) this.dataList = this.realList }, + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, // 清空 查询条件 clearAllSearch () { this.nonSearch = { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index e7b4bc4e9..ba1775e1f 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -13,7 +13,7 @@ - +
- + + + + + + @@ -125,7 +134,6 @@ -
@@ -316,6 +324,7 @@ export default { for (let i = 0; i { + if (res.success) { + this.$message.success('驳回成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) + } else { + this.$message.warning('请输入反馈意见') + } +/* this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, userId: this.$store.getters.userInfo.userId @@ -365,7 +390,19 @@ export default { }) } else { this.$message.warning('请输入反馈意见') - } + }*/ + }, + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') }, // 保存按钮 handleSave() {}, From 1ab9e81ded617772565053887d91b9b2fb736d08 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 13:37:05 +0800 Subject: [PATCH 2/4] commit --- .../pages/creatProcess/bzjd/step1.vue | 14 +- .../pages/creatProcess/bzjd/step2.vue | 149 ++++++------------ .../pages/creatProcess/bzjd/step3.vue | 61 ++++--- .../pages/creatProcess/bzjd/step4.vue | 38 +++-- .../pages/creatProcess/bzjd/step5.vue | 38 +++-- .../pages/creatProcess/bzjd/step6.vue | 40 ++--- 6 files changed, 166 insertions(+), 174 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 4ab746639..f274448db 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -600,12 +600,6 @@ } this.modalshowflag = false }, - handleSelectionChange (val) { - this.zrIdList = [] - val.forEach( item => { - this.zrIdList.push(item.id) - }) - }, choiceZRRS (row, type, index) { this.type = type if (type === 1) { @@ -632,6 +626,12 @@ this.modalshowflag = true } }, + handleSelectionChange (val) { + this.zrIdList = [] + val.forEach( item => { + this.zrIdList.push(item.id) + }) + }, handleTabs(name) { this.active = name }, @@ -650,6 +650,7 @@ if (b > 0) { this.$message.warning('请选择责任人') } else { + this.isSubmit = true this.$http.get('lawss/activiti/startProcess', { type: '9' }, {}, res => { @@ -672,6 +673,7 @@ this.$message.warning('流程启动失败') } }) + this.isSubmit = false } } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index ebf12321b..77c7bec18 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -198,7 +198,6 @@
- - - - - + + 加载中... @@ -245,33 +226,30 @@ name: "bzjdStep2", data() { return { + type: '', + drawerTitle: '', histortData: [], sarType: '', zxIndex: '', zxType: '', zxIdList: [], modalshowflag2: false, - treeData: [], nodeList2: [], - defaultProps: { - children: 'children', - label: 'name' - }, - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, roleRow: {}, - type: '', - drawerTitle: '', //drawer标题 textarea: '', // 意见 ListModel: false, // 新增编辑抽屉开关 active: '1', // 默认显示 isSubmit: false, saveLoading: false, form: { - number: '', - name: '', + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, itemList: [] @@ -290,26 +268,18 @@ this.histortData = res }, e => {}) }, - 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] - } - }, choiceZRRS (row, type, index) { + this.type = type if (type === 1) { + this.drawerTitle = '选择责任部门对接人' this.nodeList2 = [] this.zxIndex= index - this.zxType = type this.nodeList2.push(row) this.modalshowflag2 = true } else { // 批量 + this.drawerTitle = '批量选择责任部门对接人' if (this.zxIdList.length > 0) { - this.zxType = type this.nodeList2 = [] this.modalshowflag2 = true } else { @@ -317,39 +287,21 @@ } } }, - 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.zxType == 1) { - this.itemList[this.zxIndex].zxUserId = idList - this.itemList[this.zxIndex].zxUserIdName = nameList + saveUserInfo (data) { + if (this.type === 1) { + this.itemList[this.zxIndex].zxUserId = data[0].id + this.itemList[this.zxIndex].zxUserIdName = data[0].name } else { this.itemList.forEach( item => { this.zxIdList.forEach( items => { if (item.id === items) { - item.zxUserId = idList - item.zxUserIdName = nameList + item.zxUserId = data[0].id + item.zxUserIdName = data[0].name } }) }) } - this.modalshowflag2 = false - }, - cancleUserInfo2 () { - this.modalshowflag2 = false - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) + this.modalshowflag = false }, handleTabs(name) { this.active = name @@ -366,20 +318,23 @@ } if (b > 0) { this.$message.warning('请选择执行人') + } else { + this.isSubmit = true + var json = this.json + json.itemList = this.itemList + json.commentText = this.commentText + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + }) + this.isSubmit = false } - var json = this.json - json.itemList = this.itemList - json.commentText = this.commentText - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - }) } else { return this.$message.warning('请完善基础信息') } @@ -398,10 +353,10 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data var arr = [] @@ -411,6 +366,7 @@ item.zxUserIdName = '' }) this.itemList = arr + this.loading = false }).catch(e => { }) }) @@ -418,7 +374,6 @@ }, mounted () { this.getHistoryData() - this.getTree() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index ec3179f4c..5a7bfc5ef 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -189,6 +189,11 @@ width="150" label="适用车型" align="center"> + - 数据获取中
@@ -278,7 +282,6 @@
+ + + + + + 加载中... @@ -359,6 +368,7 @@ name: "bzjdStep3", data() { return { + cxList: [], histortData: [], plForm: { technicalRequir: '', // 核心技术要求 @@ -367,11 +377,12 @@ complianceState: '', // 合规性分析 newData: '', // 新车型实施日期 onlineData: '', // 在产车实施日期 + applyArctic: '', // 适用车型 }, modalshowflag: false, sarType: '', itemList: [], - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -380,10 +391,10 @@ isSubmit: false, saveLoading: false, form: { - number: '', - name: '', - number1: '', - name1: '' + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, idList: [] @@ -412,6 +423,7 @@ this.itemList[a].complianceState = this.plForm.complianceState this.itemList[a].newData = this.plForm.newData this.itemList[a].onlineData = this.plForm.onlineData + this.itemList[a].applyArctic = this.plForm.applyArctic } } } @@ -446,7 +458,7 @@ handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { - let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0 + let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0, num6 = 0 for (let a = 0; a < this.itemList.length; a++) { if (!this.itemList[a].technicalRequir) { num1++ @@ -463,6 +475,9 @@ if (!this.itemList[a].onlineData) { num5++ } + if (!this.itemList[a].applyArctic) { + num6++ + } } if (num1 > 0) { this.$message.warning('请输入核心技术要求') @@ -478,7 +493,10 @@ this.$message.warning('请输入新车型实施日期') } else if (num5 > 0) { this.$message.warning('请输入在产车实施日期') + } else if (num6 > 0) { + this.$message.warning('请选择适用车型') } else { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.itemList = this.itemList @@ -492,6 +510,7 @@ this.$router.push('/processCenter') } }) + this.isSubmit = false } } else { return this.$message.warning('请完善基础信息') @@ -505,10 +524,10 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data const itemList = JSON.parse(data.itemList) @@ -524,6 +543,7 @@ item.itemsTitle = item.itermsConditions }) this.itemList = itemList + this.loading = false }).catch(e => { }) }) @@ -532,6 +552,11 @@ mounted () { this.getHistoryData() this.getData() + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.cxList = res.data.ENERGYTYPES // 适用车型 + }) } } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 4d68f687d..ff4b8c6aa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -176,7 +176,6 @@ align="center"> - 数据获取中
@@ -250,8 +249,8 @@
+ 加载中... { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data this.itemList = data.itemList + this.loading = false }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index d8fbe2523..8030287a6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -176,7 +176,6 @@ align="center"> - 数据获取中
@@ -251,7 +250,6 @@
+ 加载中... @@ -278,7 +277,7 @@ histortData: [], sarType: '', itemList: [], - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -287,10 +286,10 @@ isSubmit: false, saveLoading: false, form: { - number: '', - name: '', - number1: '', - name1: '' + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, } @@ -313,6 +312,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.zrApplyFlag = 1 json.commentText = this.commentText @@ -325,10 +325,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo () { if (this.commentText) { + this.isSubmit = true var json = this.json json.zrApplyFlag = 2 json.commentText = this.commentText @@ -341,6 +343,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') @@ -353,13 +356,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data this.itemList = data.itemList + this.loading = true }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index c29c8e39e..9c0039f5d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -177,7 +177,6 @@ align="center"> - 数据获取中
@@ -252,17 +251,15 @@
+ 加载中... @@ -279,7 +276,7 @@ histortData: [], sarType: '', itemList: [], - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -288,10 +285,10 @@ isSubmit: false, saveLoading: false, form: { - number: '', - name: '', - number1: '', - name1: '' + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, } @@ -314,6 +311,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.gcApplyFlag = 1 json.commentText = this.commentText @@ -326,10 +324,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo () { if (this.commentText) { + this.isSubmit = true var json = this.json json.gcApplyFlag = 2 json.commentText = this.commentText @@ -342,6 +342,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') @@ -354,13 +355,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data this.itemList = data.itemList + this.loading = false }).catch(e => { }) }) From fdcc5a86923d55c1096b2abddd483c4fdfdcff2f Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 13:40:38 +0800 Subject: [PATCH 3/4] commit --- .../processCenter/pages/creatProcess/bzjd/step1.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index f274448db..55c6529cd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -248,6 +248,17 @@ + + + + From af7a7493699aba09e0b357469d44a795c8d8c72f Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 13:57:13 +0800 Subject: [PATCH 4/4] commit --- .../pags/consultationDetails.vue | 738 +++++++++--------- 1 file changed, 375 insertions(+), 363 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 684ffedb8..578bec260 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -1,92 +1,92 @@