diff --git a/src/components/phoneRole/index.vue b/src/components/phoneRole/index.vue index eb2ca4e12..3ee2a2086 100644 --- a/src/components/phoneRole/index.vue +++ b/src/components/phoneRole/index.vue @@ -141,7 +141,7 @@ export default { async getPhoneData() { this.phoneForm.page = 1 this.roleList = [] - this.result = [] + // this.result = [] phoneUser(this.phoneForm).then(res => { if (res.ok) { this.roleList = res.data diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 25fd891d0..c218baeca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -429,6 +429,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data); let jsonData = JSON.parse(res.mesg) this.jsonData = jsonData.form ? jsonData.form : jsonData this.commentText5 = data.commentText5 || '' @@ -449,8 +450,8 @@ newArr.push(arr[a]) } this.tableData = newArr - this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? hzfileId : '') - this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? hzfileName : '') + this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '') + this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '') this.newDocUser = data.form ? data.form.docUser : data.docUser this.json = data || data.form }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 683a81a5a..ea6779911 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -285,41 +285,40 @@ -
- - {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- - @@ -328,16 +327,16 @@ -
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- - @@ -346,24 +345,24 @@ -
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- - @@ -537,7 +536,7 @@ - + -
- {{ value.name }} +
+ {{ value.name }}
- - @@ -1032,6 +1031,9 @@ export default { } }) }, + downloadFileNew(attId) { + this.$preview(attId) + }, downloadFile(fileType) { //文件id中出现了','字符,去除掉 if (fileType === 'fbgbjbd') { @@ -1198,7 +1200,7 @@ export default { this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.standYear = this.form.standYear ? this.form.standYear : '' - if (this.form.country) { + if (this.form.country && this.form.country.indexOf(",") !== -1) { this.form.country = this.form.country.split(","); } this.form.prcNum = this.prcNum diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 70d86378e..d2a819423 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -257,41 +257,40 @@ -
- - {{value.name}} +
+ {{ value.name }}
- -
-
- {{value.name}} +
+ {{ value.name }}
- -
-
- {{value.name}} +
+ {{ value.name }}
- -
-
- {{value.name}} +
+ {{ value.name }}
- -
-
- {{value.name}} +
+ {{ value.name }}
- - @@ -300,8 +299,8 @@ -
- {{value.name}} +
+ {{ value.name }}
- - @@ -310,24 +309,24 @@ -
- {{value.name}} +
+ {{ value.name }}
- -
-
- {{value.name}} +
+ {{ value.name }}
- -
-
- {{value.name}} +
+ {{ value.name }}
- - @@ -542,8 +541,8 @@ -
- {{value.name}} +
+ {{ value.name }}
- - @@ -996,6 +995,9 @@ export default { } }) }, + downloadFileNew(attId) { + this.$preview(attId) + }, downloadFile (fileType,fileId) { if(fileType === 'fbgbjbd'){ window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + fileId; diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 56ea88033..fb3d05ead 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -285,41 +285,40 @@ -
- - {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- - @@ -328,16 +327,16 @@ -
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- - @@ -346,24 +345,24 @@ -
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- - @@ -581,8 +580,8 @@ -
- {{ value.name }} +
+ {{ value.name }}
- - @@ -1004,6 +1003,9 @@ export default { } }) }, + downloadFileNew(attId) { + this.$preview(attId) + }, downloadFile(fileType) { //文件id中出现了','字符,去除掉 if (fileType === 'fbgbjbd') { @@ -1170,7 +1172,7 @@ export default { this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.standYear = this.form.standYear ? this.form.standYear : '' - if (this.form.country) { + if (this.form.country && this.form.country.indexOf(",") !== -1) { this.form.country = this.form.country.split(","); } this.form.prcNum = this.prcNum diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue index d24a98a89..7596f4783 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue @@ -9,8 +9,8 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep2.vue index 554a012f7..93d22a8a1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep2.vue @@ -9,8 +9,8 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index 103c34cd5..10488a8ea 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -852,8 +852,8 @@ break; default : ; } - this.fileMadel = true; - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList); + this.fileMadelSub = true + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadelSub,this.fileList,fileType,this.madelSubList); }, filePreview(){ this.$preview(this.fileId) @@ -969,7 +969,7 @@ form: { handler: function (val) { if(val){ - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList); + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadelSub,this.fileList,'',this.madelSubList); } }, deep: true //对象的深度验证 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 86d86fd32..1653580bd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2185,6 +2185,7 @@ break; default : ; } + this.formKey++ }, popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { @@ -2456,6 +2457,8 @@ this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.topId = this.pId const json = JSON.stringify(this.form); + this.processCreateBuss(json) + return this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue index ab9b04792..d3882d6dc 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step2.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue @@ -55,7 +55,7 @@ clearable > - +
@@ -120,6 +120,7 @@ commentText2: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + showNodeList: [], nodeList2: [], type: '', modalshowflag2: false, // drawer开关 diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue index d31948e15..a1851c267 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step7.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue @@ -88,17 +88,19 @@
- - + +
- - + +
- - + + -
- - {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- - @@ -203,8 +202,8 @@ -
- {{ value.name }} +
+ {{ value.name }}
- - @@ -213,24 +212,24 @@ -
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- -
-
- {{ value.name }} +
+ {{ value.name }}
- - @@ -354,6 +353,17 @@ > + + + + +
@@ -366,8 +376,8 @@ -
- {{ value.name }} +
+ {{ value.name }}
- - @@ -590,6 +600,7 @@ export default { label: 'model' }, countryOptions: [],//国家地区 + cyzbpmOptions: [], // 我司参与制标排名 busVppsOptions: [], // 车系体系架构 modelOptions: [], // 模块体系架构 standSortOptions: [], // 标准类别 @@ -655,42 +666,8 @@ export default { } }) }, - downloadFile(fileType) { - //文件id中出现了','字符,去除掉 - if (fileType === 'fbgbjbd') { - if (this.fbgbjbdFileId.search(',')) { - this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", ""); - } - let attId = this.fbgbjbdFileId - this.$preview(attId) - } else if (fileType === 'xgd') { - let attId = this.xgdFileId - this.$preview(attId) - } else if (fileType === 'bpg') { - let attId = this.bpgFileId - this.$preview(attId) - } else if (fileType === 'ssg') { - let attId = this.ssgFileId - this.$preview(attId) - } else if (fileType === 'zqyjg') { - let attId = this.zqyjgFileId - this.$preview(attId) - } else if (fileType === 'jdwj') { - let attId = this.jdwjFileId - this.$preview(attId) - } else if (fileType === 'kwj') { - let attId = this.kwjFileId - this.$preview(attId) - } else if (fileType === 'glwj') { - let attId = this.glwjFileId - this.$preview(attId) - } else if (fileType === 'ca') { - let attId = this.caFileId - this.$preview(attId) - } else if (fileType === 'zbjbd') { - let attId = this.zbjbdFileId - this.$preview(attId) - } + downloadFile(fileType,attId) { + this.$preview(attId) }, getRule() { if (this.formTongGuo.approvalOpinion === 0) { @@ -836,7 +813,7 @@ export default { this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.standYear = this.form.standYear ? this.form.standYear : '' - if (this.form.country) { + if (this.form.country && this.form.country.indexOf(",") !== -1) { this.form.country = this.form.country.split(","); } this.form.prcNum = this.prcNum @@ -979,6 +956,7 @@ export default { this.standStateOptions = res.data.WBZTCLASS // 文本状态 this.setMap(this.standStateOptions) this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formList.vue b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue index 6514b4b78..612e0ed4e 100644 --- a/src/pages/processCenter/pages/phone/qbfs/common/formList.vue +++ b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue @@ -9,8 +9,8 @@