diff --git a/src/components/treeSelect/treeSelect.vue b/src/components/treeSelect/treeSelect.vue index f980c43f9..1fd56f2f2 100644 --- a/src/components/treeSelect/treeSelect.vue +++ b/src/components/treeSelect/treeSelect.vue @@ -17,12 +17,11 @@ - - - - - + @@ -931,7 +932,7 @@ export default { _this: this }, res => { this.addSpiltStandList = res.data.list - this.addFileStandtotal = res.data.count + this.addFileStandtotal = res.data.list.length this.loadData = false }, e => { this.loadData = false @@ -1359,10 +1360,7 @@ export default { name: 'ItemSplitInfo', query: { infoId: row.id, - // standNumSplit: row.standNumSplit === null ? row.showNumber : row.standNumSplit, - // standNameSplit: row.standNameSplit === null ? row.standName : row.standNameSplit, result: row.result, - // fileType: row.fileType } }) }, 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/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 761ad3913..3a9d1d190 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -28,18 +28,18 @@ 带入 - + - + @@ -47,14 +47,14 @@ @@ -392,18 +392,18 @@ saveLoading: false, // 基础信息form表单 form: { - number: '', - name: '', - id: '', - number1: '', - name1: '', - id1: '' + itemsNum: '', + itemsName: '', + standId: '', + itemsNum1: '', + itemsName1: '', + oldNumber: '' }, formRules: { - number: [ + itemsNum: [ { required: true, message: '请输入标准号/政策号', trigger: 'change' }, ], - name: [ + itemsName: [ { required: true, message: '请输入标准名称/政策名称', trigger: 'change' }, ], }, @@ -558,13 +558,13 @@ bringData.push(deposit.get(this.selectedList[i])); } if (bringData[0].splitStatus === '0') { - this.form.number = bringData[0].standNumSplit - this.form.name = bringData[0].standNameSplit + this.form.itemsNum = bringData[0].standNumSplit + this.form.itemsName = bringData[0].standNameSplit } else { - this.form.number = bringData[0].showNumber - this.form.name = bringData[0].standName + this.form.itemsNum = bringData[0].showNumber + this.form.itemsName = bringData[0].standName } - this.form.id = bringData[0].id + this.form.standId = bringData[0].id this.sarType = bringData[0].sarType this.standId = bringData[0].standId this.listModel = false; @@ -605,13 +605,13 @@ bringData.push(deposit.get(this.selectedList2[i])); } if (bringData[0].splitStatus === '0') { - this.form.number1 = bringData[0].standNumSplit - this.form.name1 = bringData[0].standNameSplit + this.form.itemsNum1 = bringData[0].standNumSplit + this.form.itemsName1 = bringData[0].standNameSplit } else { - this.form.number1 = bringData[0].showNumber - this.form.name1 = bringData[0].standName + this.form.itemsNum1 = bringData[0].showNumber + this.form.itemsName1 = bringData[0].standName } - this.form.id1 = bringData[0].id + this.form.oldNumber = bringData[0].id this.listModel2 = false } else if (this.selectedList2.length > 1) { this.$message.warning("只能选择一条数据进行带入"); 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/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 852fb8bf4..72064daeb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -123,6 +123,7 @@ - + + :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" + :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"> + :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" + :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> - + - +

会签责任人

@@ -951,7 +955,7 @@
- + @@ -959,7 +963,7 @@ - + - + - + - + 1) { this.$message.warning('最多可以带入一条标准信息') } else { @@ -1836,6 +1859,9 @@ }else if(this.fileType === 'ca'){ this.form.ca = response.data.id; this.form.caName = response.data.name; + }else if(this.fileType === 'zbjbd'){ + this.form.zbjbd = response.data.id; + this.form.zbjbdName = response.data.name; } this.$message({ showClose: true, @@ -1850,32 +1876,28 @@ this.fileType = type; }, popoverHide (checkedIds, checkedData) { - console.log(checkedIds); - console.log(checkedData); - this.form.standSystem = checkedData.id - this.form.standSystemName = checkedData.menuName - console.log(this.sarStandardsInfoEO.standSystem); + if(checkedData) { + this.form.standSystem = checkedData.id + this.form.standSystemName = checkedData.menuName + } }, popoverHideBusVs (checkedIds, checkedData) { - console.log(checkedIds); - console.log(checkedData); - this.form.cycvppsbm = checkedData.code - this.form.cycvppscn = checkedData.chineseName - console.log(this.sarStandardsInfoEO.standSystem); + if(checkedData){ + this.form.cycvppsbm = checkedData.code + this.form.cycvppscn = checkedData.chineseName + } }, popoverHideCarVs (checkedIds, checkedData) { - console.log(checkedIds); - console.log(checkedData); - this.form.kccvppsbm = checkedData.code - this.form.kccvppscn = checkedData.chineseName - console.log(this.sarStandardsInfoEO.standSystem); + if(checkedData){ + this.form.kccvppsbm = checkedData.code + this.form.kccvppscn = checkedData.chineseName + } }, popoverHideModel (checkedIds, checkedData) { - console.log(checkedIds); - console.log(checkedData); - this.form.dybxh = checkedData.model - this.form.dymc = checkedData.name - console.log(this.sarStandardsInfoEO.standSystem); + if(checkedData){ + this.form.dybxh = checkedData.model + this.form.dymc = checkedData.name + } }, closeDrawer() { this.ListModel = false @@ -1924,6 +1946,7 @@ if (valid) { this.$refs['userForm'].validate((valid) => { if (valid) { + this.isSubmit = true var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId @@ -1944,6 +1967,7 @@ }, res => { if (res.success) { this.$message.success(res.message) + this.isSubmit = false } }) } @@ -1961,6 +1985,7 @@ this.$http.get('sarVppsTree/list', '', { _this: this }, res => { + this.busVppsOptions = [] this.busVppsOptions = res.data }) }, @@ -1968,6 +1993,7 @@ this.$http.get('sarModelTree/list', '', { _this: this }, res => { + this.modelOptions = [] this.modelOptions = res.data }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index a2db959df..78391027b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -42,13 +42,12 @@ - - + v-model.number="form.standYear" + placeholder="请输入标准标准年份" + clearable + > - + - + - - - - + - - - - + - - - - + - + { + this.busVppsOptions = res.data + this.key1++ + this.key2++ + }) + }, + modelFunc(){ + this.$http.get('sarModelTree/list', '', { + _this: this + }, res => { + this.modelOptions = res.data + this.key3++ + }) }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { @@ -848,8 +912,13 @@ getFormFieldList (item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) - this.defaultCheckedKeys = [this.form.standSystem]; + this.defaultCheckedKeys = [this.form.standSystem] + console.log(this.defaultCheckedKeys) + this.defaultCheckedKeys1 = [this.form.cycvppsbm] + this.defaultCheckedKeys2 = [this.form.kccvppsbm] + this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id @@ -874,6 +943,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); @@ -886,7 +956,12 @@ }, res => { console.log(res); if (res.success) { - this.processCreateStand(json) + if(this.approvalOpinion === '1'){ + this.$message.warning("驳回成功") + this.isSubmit = false + }else{ + this.processCreateStand(json) + } } }) }, @@ -907,12 +982,16 @@ name: 'ProcessCenter' }) }, 100) + this.isSubmit = false } else { this.$message.warning(res.message) + this.isSubmit = false } }) }, }, + created(){ + }, mounted () { this.getData() this.processTable() @@ -931,7 +1010,10 @@ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.key++ }) + this.busVsFunc() + this.modelFunc() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 5641ccae3..6c87cb661 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -42,13 +42,12 @@ - - + - + - + - - - - + - - - - + - - - - + - + { + this.busVppsOptions = res.data + this.key1++ + this.key2++ + }) + }, + modelFunc(){ + this.$http.get('sarModelTree/list', '', { + _this: this + }, res => { + this.modelOptions = res.data + this.key3++ + }) }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { @@ -837,8 +904,12 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) - this.defaultCheckedKeys = [this.form.standSystem]; + this.defaultCheckedKeys = [this.form.standSystem] + this.defaultCheckedKeys1 = [this.form.cycvppsbm] + this.defaultCheckedKeys2 = [this.form.kccvppsbm] + this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id @@ -864,10 +935,10 @@ export default { }, handleSave() {}, handleSubmit() { + this.isSubmit = false this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); - console.log(json) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, @@ -880,6 +951,7 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false }) }, @@ -905,7 +977,11 @@ export default { }) }, }, + created(){ + this.getData() + }, mounted () { + this.getData() this.processTable() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this @@ -914,7 +990,6 @@ export default { this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 this.standSystemOptions = res.data.BZTXCLASS // 标准体系 - console.log(this.standSystemOptions) this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 @@ -923,9 +998,10 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.getData() + this.key++ }) - this.$forceUpdate() + this.busVsFunc() + this.modelFunc() }, } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index daf0be040..7dd189237 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -43,12 +43,11 @@ - - + @@ -476,7 +477,7 @@ - + - - - - + - - - - + - - - - + - + @@ -996,8 +1006,25 @@ export default { children: 'children', label: 'menuName' }, + defaultCodeProps: { + children: 'children', + label: 'code' + }, + defaultModelProps: { + children: 'children', + label: 'model' + }, nodeKey: 'id', defaultCheckedKeys: [], + nodeKeyCode: 'code', + nodeKeyModel: 'model', + key:1, + key1:2, + key2:3, + key3:4, + defaultCheckedKeys1: [], + defaultCheckedKeys2: [], + defaultCheckedKeys3: [], treeStatus:false, fileUrl: 'api/att/attFile/upload', fileMadel: false, @@ -1140,6 +1167,8 @@ export default { standNatureOptions: [], // 标准性质 standStateOptions: [], // 文本状态 standSystemOptions: [], // 标准体系 + busVppsOptions: [], // 车系体系架构 + modelOptions: [], // 模块体系架构 applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 @@ -1172,6 +1201,23 @@ export default { }, }, methods: { + busVsFunc(){ + this.$http.get('sarVppsTree/list', '', { + _this: this + }, res => { + this.busVppsOptions = res.data + this.key1++ + this.key2++ + }) + }, + modelFunc(){ + this.$http.get('sarModelTree/list', '', { + _this: this + }, res => { + this.modelOptions = res.data + this.key3++ + }) + }, // 代替政策号 请求数据 getReplaceLawsNumRowFirst () { if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') { @@ -1408,10 +1454,28 @@ export default { this.fileType = type; }, popoverHide (checkedIds, checkedData) { - console.log(checkedIds); - console.log(checkedData); - this.form.standSystem = checkedData.id - this.form.standSystemName = checkedData.menuName + if(checkedData) { + this.form.standSystem = checkedData.id + this.form.standSystemName = checkedData.menuName + } + }, + popoverHideBusVs (checkedIds, checkedData) { + if(checkedData){ + this.form.cycvppsbm = checkedData.code + this.form.cycvppscn = checkedData.chineseName + } + }, + popoverHideCarVs (checkedIds, checkedData) { + if(checkedData){ + this.form.kccvppsbm = checkedData.code + this.form.kccvppscn = checkedData.chineseName + } + }, + popoverHideModel (checkedIds, checkedData) { + if(checkedData){ + this.form.dybxh = checkedData.model + this.form.dymc = checkedData.name + } }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { @@ -1446,7 +1510,11 @@ export default { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.form.standSystem]; + this.defaultCheckedKeys1 = [this.form.cycvppsbm]; + this.defaultCheckedKeys2 = [this.form.kccvppsbm]; + this.defaultCheckedKeys3 = [this.form.dybxh]; this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id @@ -1474,6 +1542,7 @@ export default { handleSubmit() { this.$refs['form'].validate((valid) => { if (valid) { + this.isSubmit = true this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); @@ -1489,6 +1558,7 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false }) } }) @@ -1521,7 +1591,6 @@ export default { }, mounted () { this.processTable() - this.getData() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { @@ -1538,7 +1607,10 @@ export default { this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.treeStatus = true + this.key++ }) + this.busVsFunc() + this.modelFunc() }, watch:{ form(val){ diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 8e443909d..9c9831194 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -340,7 +340,7 @@ export default { // 点击批量删除事件 deleteList() { - if (this.selectList.length < 1) { + if (this.selectedList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { this.$confirm("您确认删除这些数据?", "提示", { @@ -350,7 +350,7 @@ export default { type: "warning" }).then(() => { let exits = []; - this.selectList.map(item => { + this.selectedList.map(item => { let index; index = this.dataList.findIndex(items => { return items.id = item; @@ -360,7 +360,7 @@ export default { } exits.push(item); }); - this.selectList = []; + this.selectedList = []; }).catch(() => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 9407ee22c..2fbc81167 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -92,8 +92,10 @@ - -
{{ 11 || '暂无数据' }}
+ + @@ -263,6 +265,16 @@ export default { } this.getData() }, + download(row) { + // window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath) + var name = row.fileText; + var url = row.fileTextPath; + const a = document.createElement('a') + a.setAttribute('download', name) + a.setAttribute('target', '_blank') + a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url) + a.click() + }, // 分页事件 pageChange (page) { this.pageNo = page 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: { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 68f4be520..16f7f8735 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -307,7 +307,7 @@
提交 - - - - - - -
- -
- - - - - - - - - - - - - - - - - {{ opt.label}} - - - - - - - - - - {{ opt.label}} - - - - - - {{ opt.label}} - - - - - - {{ opt.label}} - - - - -
- - 查询 - - - 清空 - -
-
- -
- - - - - - - - - - - - { let addList; - addList = this.stahndinfoList.findIndex(items => { + addList = this.sarAccessInfoList.findIndex(items => { return items.id == item.id }) if(addList > -1){ @@ -1184,7 +1022,7 @@ export default { this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() } else{ - this.stahndinfoList.push(item) + this.sarAccessInfoList.push(item) this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1202,21 +1040,21 @@ export default { type: 'warning' }) } else { - let temp = this.stahndinfoList[index - 1] - this.$set(this.stahndinfoList, index - 1, this.stahndinfoList[index]) - this.$set(this.stahndinfoList, index, temp) + let temp = this.sarAccessInfoList[index - 1] + this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index]) + this.$set(this.sarAccessInfoList, index, temp) } }, moveDown (index) { - if (index === (this.stahndinfoList.length - 1)) { + if (index === (this.sarAccessInfoList.length - 1)) { this.$message({ message: '已经是列表中最后一个素材！', type: 'warning' }) } else { - let i = this.stahndinfoList[index + 1] - this.$set(this.stahndinfoList, index + 1, this.stahndinfoList[index]) - this.$set(this.stahndinfoList, index, i) + let i = this.sarAccessInfoList[index + 1] + this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index]) + this.$set(this.sarAccessInfoList, index, i) } }, // 点击清单条目导入按钮事件 @@ -1235,7 +1073,7 @@ export default { * 删除不想添加的AccessInfo信息 */ deleteSelectSarAccessInfo () { - if (this.stahndinfoListArry.length > 0) { + if (this.sarAccessInfoListArry.length > 0) { this.$confirm('确认删除选中数据？', '确认删除', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1245,14 +1083,14 @@ export default { }).then(() => { // i 全部对象数组的下标 // s 选中对象数组的下标 - for (var s in this.stahndinfoListArry) { - for (var i in this.stahndinfoList) { - if (this.stahndinfoListArry[s].uuid === this.stahndinfoList[i].uuid) { - this.stahndinfoList.splice(i, 1) + for (var s in this.sarAccessInfoListArry) { + for (var i in this.sarAccessInfoList) { + if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) { + this.sarAccessInfoList.splice(i, 1) } } } - this.stahndinfoListArry = [] + this.sarAccessInfoListArry = [] this.$refs.entryTable.clearSelection() }).catch(() => {}) } else { @@ -1261,8 +1099,8 @@ export default { }, // 清单条目 table select事件 sarAccessInfoSelect (selectData) { - this.stahndinfoListArry = selectData - let stahndinfoListArryId = [] + this.sarAccessInfoListArry = selectData + let sarAccessInfoListArryId = [] for(let i=0; i { if (valid) { let rowlist = [] - for (let i = 0; i < this.stahndinfoList.length; i++) { - rowlist.push(this.stahndinfoList[i].id) + for (let i = 0; i < this.sarAccessInfoList.length; i++) { + rowlist.push(this.sarAccessInfoList[i].id) } rowlist = rowlist.join(',') let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) @@ -1331,10 +1169,7 @@ export default { }, // 查询数据搜索 table 数据 selectLawsStands () { - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', { - ...this.sarAccessInfoSearch, - ...this.sarStandardsSearch - }, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { _this: this }, res =>{ this.sarAccessInfoSearchList = res.data.list @@ -1348,6 +1183,7 @@ export default { // 数据搜索 table select事件 sarAccessInfoSearchSelect (val) { this.selectedAccInfoSearchList = val + console.log(val) }, // 数据搜索 清单类型 table select事件 accessSarTypeSelect (selectData) { @@ -1373,10 +1209,10 @@ export default { exportTestItem () { let exportNames = this.exportName let exportList = [] - if (this.stahndinfoListArry.length > 0) { - exportList = this.stahndinfoListArry + if (this.sarAccessInfoListArry.length > 0) { + exportList = this.sarAccessInfoListArry } else { - exportList = this.stahndinfoList + exportList = this.sarAccessInfoList } if (exportList != null && exportList.length > 0) { let accIdAndrestype = [] @@ -1417,9 +1253,9 @@ export default { var a var b = '' if (response.data) { - for (var sADMIN in this.stahndinfoListADMIN) { + for (var sADMIN in this.sarAccessInfoListADMIN) { for (var iADMIN in response.data) { - if (this.stahndinfoListADMIN[sADMIN].code === response.data[iADMIN].code) { + if (this.sarAccessInfoListADMIN[sADMIN].code === response.data[iADMIN].code) { // ('在全部对象中的位置' + i) response.data.splice(i, 1) b = '数据重复添加,现已自动清除! ' @@ -1428,7 +1264,7 @@ export default { } if (response.data.length > 0) { for (let i = 0; i < response.data.length; i++) { - this.stahndinfoList.push(response.data[i]) + this.sarAccessInfoList.push(response.data[i]) } } a = response.data.length @@ -1537,16 +1373,16 @@ export default { nowstandinfo.askNature = nowstandinfo.askNature.join(',') // 判断新增还是编辑 if (this.editAddType === 1) { - this.stahndinfoList.push(nowstandinfo) - this.stahndinfoList[this.stahndinfoList.length - 1].uuid = this.number + this.sarAccessInfoList.push(nowstandinfo) + this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number this.number++ this.isSubmit = false this.$message.success('添加成功') } else { - this.stahndinfoList.map((item, index) => { + this.sarAccessInfoList.map((item, index) => { if (item.uuid === nowstandinfo.uuid) { - // this.stahndinfoList[index] = nowstandinfo - this.$set(this.stahndinfoList, index, nowstandinfo) + // this.sarAccessInfoList[index] = nowstandinfo + this.$set(this.sarAccessInfoList, index, nowstandinfo) } }) this.isSubmit = false @@ -1742,7 +1578,7 @@ export default { // 新增、编辑标准时验证标准编号是否重复 validCode (rule, value, callback) { let find = 0 - this.stahndinfoList.map(item => { + this.sarAccessInfoList.map(item => { if (item.code === value) { find++ } @@ -1793,176 +1629,10 @@ export default { this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, { _this: this }, res => { - this.stahndinfoList = res.data + this.sarAccessInfoList = res.data }, e => { }) - }, - treeClick (treeNode) { - this.selectSarMenu = treeNode - this.standCommonlySearch.menuId = treeNode.id - this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询 - this.sarStandardsSearch.page = 1 - this.standCommonlySearch.page = 1 - this.getDomesticStandardTable(this.tableFlag) - }, - // 分页查询国内标准 - getDomesticStandardTable (item) { - if (item !== '' && item !== null && item !== undefined) { - item.pageSize = this.$store.getters.userInfo.configContent - } - this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent - const data = item || this.sarStandardsSearch - if (item) { - this.sarStandardsSearch.advanceSearchVOStr = item.advanceSearchVOStr - } - // this.sarStandardsSearch.menuId = this.selectSarMenu.id - const formData = {...data} - if (!item) { - formData.menuId = this.sarStandardsSearch.menuId - } else { - formData.menuId = this.selectSarMenu.id - } - - // 排序 - formData.orderBy = this.orderBy - // 处理我的收藏和个性化标签传参 - if (this.selectSarMenu.id === 'wdsc') { - formData.menuId = undefined - formData.labelMenuId = undefined - formData.collectMenuId = 'wdsc' - } else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') { - formData.menuId = undefined - formData.labelMenuId = this.selectSarMenu.id - formData.collectMenuId = undefined - } else { - formData.labelMenuId = undefined - formData.collectMenuId = undefined - } - formData.standType = 'INLAND' - this.SarExportSearchEo = formData - this.loading = true - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { - _this: this, loading: 'loading' - }, res => { - this.isAdvancedSearch = false - this.loading = false - if (res.ok) { - for (let i = 0; i < res.data.list.length; i++) { - res.data.list[i].checked = false - if (res.data.list[i].collectId != null && res.data.list[i].collectId !== '') { - res.data.list[i].collectBtn = false - res.data.list[i].cancelCollectBtn = true - } else { - res.data.list[i].collectBtn = true - res.data.list[i].cancelCollectBtn = false - } - res.data.list[i].isSubmit = false - if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.XCXSSRQ) { - res.data.list[i].XCXSSRQ = res.data.list[i].attrInfoMap.XCXSSRQ - } - if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) { - res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ - } - } - this.stahndinfoList = res.data.list - this.total = res.data.count - if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) { - this.pageChange(1) - } - } else { - this.$message.error(res.message) - } - }, e => { - this.loading = false - this.stahndinfoList = [] - this.total = 0 - }) - }, - // 点击搜索按钮 - searchBtnClick (standCommonlySearch) { - let item = this.standCommonlySearch - this.getDomesticStandardTable(item) - this.isAdvancedSearch = false - this.selectLawsStands() - }, - // 搜索 - getDomesticStandardTableBtn (item) { - this.tableFlag = item - item.page = 1 - item.sarStandardsSearch = '' - this.getDomesticStandardTable(item) - }, - // 提交配置搜索项 - saveConfigStand () { - let search = {} - search.menuId = this.selectSarMenu.id - if (this.selectConfigStand.length === 0) { - this.$message({ - showClose: true, - message: '请至少选择一条标准', - type: 'warning' - }) - } else { - search.idlist = this.selectConfigStand - this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, { - _this: this, - loading: 'isSubmit' - }, res => { - if (res.ok) { - this.configStandFlag = false - // this.$message({ - // showClose: true, - // message: '配置标准成功!', - // type: 'success' - // }) - this.getDomesticStandardTable(this.tableFlag) - } - }, e => { - }) - } - }, - // 清空搜索框 - clearAllSearch (flag) { - this.isAdvancedSearch = false - if (flag === 'sarStandardsSearch') { - // 标准搜索 - this.sarStandardsSearch.country = '' - this.sarStandardsSearch.standSort = '' - this.sarStandardsSearch.standNumber = '' - this.sarStandardsSearch.standName = '' - this.sarStandardsSearch.standState = '' - this.sarStandardsSearch.standNature = '' - this.sarStandardsSearch.issueTime = '' - this.sarStandardsSearch.applyArctic = '' - this.sarStandardsSearch.replaceStandNum = '' - this.sarStandardsSearch.replacedStandNum = '' - this.sarStandardsSearch.synopsis = '' - this.sarStandardsSearch.category = '' - this.pageChange(1) - this.getDomesticStandardTable(this.sarStandardsSearch) - } else if (flag === 'standCommonlySearch') { - this.standCommonlySearch.standSort = '' - this.standCommonlySearch.standNumber = '' - this.pageChange(1) - this.getDomesticStandardTable(this.standCommonlySearch) - } else if (flag === 2) { - // 标准条目搜索 - this.standItemSearch.responsibleUnit = '' - this.standItemSearch.orgName = '' - } else { - this.configPage = 1 - // 游离标准搜索清空 - this.sarConfigStandSearch.standSort = '' - this.sarConfigStandSearch.standNumber = '' - this.sarConfigStandSearch.standName = '' - this.sarConfigStandSearch.category = '' - this.sarConfigStandSearch.standNature = '' - this.sarConfigStandSearch.synopsis = '' - this.sarConfigStandSearch.applyArctic = '' - this.sarConfigStandSearch.replaceStandNum = '' - this.selectConfiguraStand() - } - }, + } }, watch: { // 监听 清单类型 @@ -1976,59 +1646,6 @@ export default { }, computed: { ...mapGetters(['getAccessStandardRegRow']), - created(){ - }, - async mounted () { - // 进入页面后查询树形结构目录 - await this.selectMenu() - // 进入页面后查询标准体系树形结构目录 - await this.selectStandardMenu() - this.treeReload = true - // 从数据库中查询各下拉框数据 - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.allSelectOptions = res.data || {} - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.WBZTCLASS // 文本状态 - this.standSystemOptions = res.data.BZTXCLASS // 标准体系 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.getGzzOption() - }, e => { - }) - this.getDomesticStandardTable(this.tableFlag) - // 加载所有的部门 - this.getOrgTreeSource() - // 加载动态表单数据 - this.getAddFormFieldList() - this.getDept() - }, - destroyed () { - this.allSelectOptions = {} - this.countryOptions = [] - this.regionOptions = [] - this.standSortOptions = [] - this.applyArcticOptions = [] - this.standStateOptions = [] - this.standNatureOptions = [] - this.adoptExtentOptions = [] - this.emergyKindOptions = [] - this.applyAuthOptions = [] - this.categoryOptions = [] - this.assemClassOptions = [] - this.categoryConfigOptions = [] - this.standAttributeList = [] - this.zNodesS = [] - this.zNodesSItem = [] - this.searchInlandNodes = [] - this.orgData = [] - } }, mounted () { this.zqaId =this.$route.query.id; @@ -2040,8 +1657,7 @@ export default { }, res => { this.allSelectOptions = res.data || {} this.regionOptions = res.data.REGION // 基础信息 区域list - this.applyArcticOptions = res.data.ENERGYTYPES || [] // 基础车型 适用车型list - this.sycpxOptions = res.data.SYCPXCLASS || []// 适用产品线 + this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list this.applyOptions = res.data.COUNTRY //适用区域list @@ -2152,23 +1768,4 @@ export default { margin: 2px; } } -.label-input-form { - &.table-lattice{ - /deep/.el-form-item__label { - width:100px; - height:30px; - border: 1px solid #DCDFE6; - border-right: none; - line-height:30px; - text-align: center; - margin-top: 7px; - background: #F9F9F9; - } - /deep/.el-input__inner { - height: 30px; - line-height: 30px; - border-radius: 0 !important; - } - } -} \ No newline at end of file diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 1356728b8..aece23601 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -462,7 +462,7 @@ export default { // 新增、编辑 基础信息字段 sarAccessEO: { id: '', - sortKey: 1, + sortKey: 4, detailedList: '', detailedListName: '', energyKind: '', diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 96ac0b5fe..7b9220a28 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -10,8 +10,8 @@ - - + + { if (valid) { let rowlist = [] diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 9d5fd2bf0..9b46f8ae4 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -304,7 +304,7 @@
{{ displayLocation.label }}
 - - @@ -1089,6 +1113,8 @@ export default { label: 'menuName' }, nodeKey: 'id', + nodeKeyCode: 'code', + nodeKeyModel: 'model', defaultCheckedKeys: [], exportLoading : false, visibleOrgTable: false, @@ -1183,6 +1209,19 @@ export default { standSort: '', standNumber: '' }, + defaultCheckedKeys1: [], + defaultCheckedKeys2: [], + defaultCheckedKeys3: [], + defaultCodeProps: { + children: 'children', + label: 'code' + }, + defaultModelProps: { + children: 'children', + label: 'model' + }, + busVppsOptions: [], // 车系体系架构 + modelOptions: [], // 模块体系架构 searching: false, stahndinfoList: [], tableFlag: '', @@ -1286,7 +1325,21 @@ export default { upReplaceNumFlag: 0, // 记录是否修改了代替政策编号 upNumFlag: 0, orgName: '', // 部门名称 - registerPutTime: '' // 注册登记车实施日期 + registerPutTime: '', // 注册登记车实施日期 + CYCVPPSBM: '', + CYCVPPSCN: '', + KCCVPPSBM: '', + KCCVPPSCN: '', + DYBXH: '', + DYMC: '', + CYSD:'', + CLLX:'', + NYLX:'', + SYCPX:'', + SYRZ:'', + ZRBM:'', + ZRGCS:'', + WSSMR:'', }, // 标准新增过程中用到的对象 standClass: [], // 标准类别 sarStandardsInfoEO: { @@ -1405,7 +1458,21 @@ export default { sentScreenFileFeedback: '', approvalFileTime: '', approvalFileFeedback: '', - certPutTimeList: [] + certPutTimeList: [], + CYCVPPSBM: '', + CYCVPPSCN: '', + KCCVPPSBM: '', + KCCVPPSCN: '', + DYBXH: '', + DYMC: '', + CYSD:'', + CLLX:'', + NYLX:'', + SYCPX:'', + SYRZ:'', + ZRBM:'', + ZRGCS:'', + WSSMR:'', }, // 标准新增过程中用到的对象 currentFileList: '', // 当前操作的是哪个FormItem的上传 isList: [ @@ -1654,8 +1721,46 @@ export default { } }, methods: { + popoverHideBusVs (checkedIds, checkedData) { + if(checkedData){ + this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code + this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName + this.$forceUpdate() + } + }, + popoverHideCarVs (checkedIds, checkedData) { + if(checkedData){ + this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code + this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName + this.$forceUpdate() + } + + }, + popoverHideModel (checkedIds, checkedData) { + if(checkedData){ + this.sarStandardsInfoEO.DYBXH = checkedData.model + this.sarStandardsInfoEO.DYMC = checkedData.name + this.$forceUpdate() + } + }, + busVsFunc(){ + this.$http.get('sarVppsTree/list', '', { + _this: this + }, res => { + this.busVppsOptions = res.data + }) + }, + modelFunc(){ + this.$http.get('sarModelTree/list', '', { + _this: this + }, res => { + this.modelOptions = res.data + }) + }, popoverHide (checkedIds, checkedData) { - this.sarStandardsInfoEO.standSystem = checkedData.id + if(checkedData){ + this.sarStandardsInfoEO.standSystem = checkedData.id + } }, closeModal () { this.productModal = false @@ -1891,10 +1996,11 @@ export default { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values const formFieldList = this.formFieldList - this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) - console.log(this.sarStandardsInfoEO) - this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; - this.sarStandardsInfoEO.standSort = item.standSort + this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) + if(this.sarStandardsInfoEO.standSystem){ + this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; + } + this.sarStandardsInfoEO.standSort = item.standSort if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') { this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/') this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime) @@ -1916,13 +2022,22 @@ export default { if (value && field.attrType === 'DATE_PICKER') { value = this.$moment(value).format('YYYY-MM-DD') } + if(field.attrField === 'CYCVPPSBM'){ + this.defaultCheckedKeys1 = [value] + } + if(field.attrField === 'KCCVPPSBM'){ + this.defaultCheckedKeys2 = [value] + } + if(field.attrField === 'DYBXH'){ + this.defaultCheckedKeys3 = [value] + } field['value'] = value // 追加用户名称和部门名称和SVPPS名称 - if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') { - let attrFieldName = field.attrField + 'Name' - valueName = dynamicFormField[attrFieldName] - } - field['valueName'] = valueName + // if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') { + // let attrFieldName = field.attrField + 'Name' + // valueName = dynamicFormField[attrFieldName] + // } + // field['valueName'] = valueName if (field.showRegionId === location.value) { if (!location.child) { location['child'] = [] @@ -1932,6 +2047,7 @@ export default { }) }) this.dynamicFormField = displayLocation + console.log(this.dynamicFormField) this.loading = false }) }) @@ -2653,7 +2769,6 @@ export default { if (flag) { // 时间格式修改 let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO)) - console.log(nowstandinfo) if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') { nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss') } @@ -2683,8 +2798,6 @@ export default { sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] }) nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") - console.log(formFieldList) - console.log(nowstandinfo) this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, { _this: this }, res => { @@ -3599,9 +3712,50 @@ export default { const data = this.formFieldListData this.formFieldList = data.map((item) => { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - return Object.assign({}, item, { - options: this.allSelectOptions[item.selVal] - }) + if(item.attrField === 'WSSMR'){ + const options = [ + {label:"署名人1",value:"1"},{label:"署名人2",value:"2"} + ] + return Object.assign({}, item, { + options: options + }) + }else if(item.attrField === 'CYSD'){ + return Object.assign({}, item, { + options: this.allSelectOptions["WSCYSD"] + }) + }else if(item.attrField === 'CLLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ENERGYTYPES"] + }) + }else if(item.attrField === 'NYLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["NYLXCLASS"] + }) + }else if(item.attrField === 'SYCPX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYCPXCLASS"] + }) + }else if(item.attrField === 'SYRZ'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYRZCLASS"] + }) + }else if(item.attrField === 'ZRBM'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRBMCLASS"] + }) + }else if(item.attrField === 'ZRGCS'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRGCSCLASS"] + }) + }else if(item.attrField === 'TXLB'){ + return Object.assign({}, item, { + options: this.allSelectOptions["TXLBCLASS"] + }) + }else { + return Object.assign({}, item, { + options: this.allSelectOptions[item.selVal] + }) + } } else { return item } @@ -3915,6 +4069,8 @@ export default { // 加载动态表单数据 this.getAddFormFieldList() this.getDept() + this.busVsFunc() + this.modelFunc() }, destroyed () { this.allSelectOptions = {} diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index eea98e0e4..12f3fabf4 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -425,14 +425,14 @@ - + > + + + + + + -