diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index d58302118..e7c97df17 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -110,12 +110,12 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 2b4f133eb..fe5b7963d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -2,8 +2,8 @@
- - + +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index ba0238f65..16e4c64d7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -2,8 +2,8 @@
- - + +
基础信息
@@ -86,7 +86,8 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="handleSelectionChange" - row-key="id"> + row-key="id" + > + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
@@ -205,6 +299,15 @@ name: "bzjdStep3", data() { return { + plForm: { + technicalRequir: '', // 核心技术要求 + changePoint: '', // 国内标准的差异点 + complianceRequir: '1', // 符合性要求 + complianceState: '', // 合规性分析 + newData: '', // 新车型实施日期 + onlineData: '', // 在产车实施日期 + }, + modalshowflag: false, sarType: '', itemList: [], loading: false, @@ -221,7 +324,8 @@ number1: '', name1: '' }, - json: {} + json: {}, + idList: [] } }, components: { @@ -230,7 +334,43 @@ ProcessTitle }, methods: { - handleSelectionChange () {}, + saveUserInfo () { + for( let a = 0; a < this.itemList.length; a++) { + for ( let b = 0; b < this.idList.length; b++) { + if (this.itemList[a].id === this.idList[b]) { + this.itemList[a].technicalRequir = this.plForm.technicalRequir + this.itemList[a].changePoint = this.plForm.changePoint + this.itemList[a].complianceRequir = this.plForm.complianceRequir + this.itemList[a].complianceState = this.plForm.complianceState + this.itemList[a].newData = this.plForm.newData + this.itemList[a].onlineData = this.plForm.onlineData + } + } + } + this.modalshowflag = false + }, + cancleUserInfo () { + this.modalshowflag = false + }, + choiceZRR () { + if (this.idList.length > 0) { + this.plForm.technicalRequir = '' + this.plForm.changePoint = '' + this.plForm.complianceRequir = '1' + this.plForm.complianceState = '' + this.plForm.newData = '' + this.plForm.onlineData = '' + this.modalshowflag = true + } else { + this.$message.warning('请选择要编辑的数据') + } + }, + handleSelectionChange (val) { + this.idList = [] + val.forEach( item => { + this.idList.push(item.id) + }) + }, handleTabs(name) { this.active = name }, @@ -238,27 +378,53 @@ handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { - var json = this.json - json.commentText = this.commentText - var arr = this.form.zxUserId.split(',') - var newArr = [] - arr.forEach(item => { - var json1 = {} - json1.id = item - newArr.push(json1) - }) - json.zxUserId = newArr - json.zxUserIdName = this.form.zxUserIdName - 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') + let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0 + for (let a = 0; a < this.itemList.length; a++) { + if (!this.itemList[a].technicalRequir) { + num1++ } - }) + if (!this.itemList[a].changePoint) { + num2++ + } + if (!this.itemList[a].complianceRequir) { + num3++ + } + if (!this.itemList[a].newData) { + num4++ + } + if (!this.itemList[a].onlineData) { + num5++ + } + } + if (num1 > 0) { + this.$message.warning('请输入核心技术要求') + } else if (num2 > 0) { + if (this.sarType === 'INLAND') { + this.$message.warning('请输入国内标准的差异点') + } else { + this.$message.warning('请输入基于上一版本差异') + } + } else if (num3 > 0) { + this.$message.warning('请输入符合性要求') + } else if (num4 > 0) { + this.$message.warning('请输入新车型实施日期') + } else if (num5 > 0) { + this.$message.warning('请输入在产车实施日期') + } else { + var json = this.json + json.commentText = this.commentText + json.itemList = this.itemList + 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('请完善基础信息') } @@ -277,10 +443,19 @@ this.form.name1 = data.name1 this.sarType = data.standInData this.json = data - this.itemList = JSON.parse(data.itemList) - this.itemList.forEach( item => { - item.deptName = this.$store.getters.userInfo.orgName + const itemList = JSON.parse(data.itemList) + itemList.forEach(item => { + item.unitDeptName = this.$store.getters.userInfo.orgName + item.onlineData = '' + item.newData = '' + item.complianceState = '' + item.oldNumber = '' + item.complianceRequir = '1' + item.changePoint = '' + item.technicalRequir = '' + item.itemsTitle = item.itermsConditions }) + this.itemList = itemList }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 51fa5d16e..3e40ba328 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -1,13 +1,364 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index e5703d7c0..72c8cca77 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -1,13 +1,364 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 15b0a36dd..93d7edd9b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -1,13 +1,365 @@ - diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 635db2de4..81daee6cb 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -613,7 +613,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '4') { + } else if (row.taskInfo === '责任人审核') { this.$router.push({ name: 'bzjdStep4', query: { @@ -624,7 +624,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '5') { + } else if (row.taskInfo === '工程师审核') { this.$router.push({ name: 'bzjdStep5', query: { @@ -635,7 +635,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '6') { + } else if (row.taskInfo === '部长审批') { this.$router.push({ name: 'bzjdStep6', query: {