diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index aa23dabc5..90a5e4c11 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -130,11 +130,11 @@ export default { menuId: '2b25c67f10abbbadf37d60daaaec54d3' }, - // { - // title: '国内外政策', - // path: '/foreignRegulationsDatabase', - // menuId: '4DB4Y2H3NH' - // }, + { + title: '国内外政策', + path: '/foreignRegulationsDatabase', + menuId: 'ef02a3b0af9a4b3ede460456a9591ebc' + }, // // // { // // // title: '标准制修订管理', // // // path: '/demo2One' diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue index ddb33e2fe..0282e8977 100644 --- a/src/pages/config/pages/attributeCustom/components/laws.vue +++ b/src/pages/config/pages/attributeCustom/components/laws.vue @@ -2,8 +2,8 @@ + + diff --git a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue index 2bb479f84..bf6fa495d 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue @@ -50,10 +50,10 @@
标题：{{ item.collectTitle }}
- 创建时间：{{item.creationTime}} + 创建时间：{{getDate(item.creationTime)}} - {{$t('m.cancelCollection')}} + {{$t('m.cancelCollection')}} @@ -144,6 +144,9 @@ export default { } }, methods: { + getDate (date) { + return date != null ? date.substring(0, date.indexOf(' ')) : '' + }, // 对话框关闭清除表单 noteChange (type) { if (!type) { @@ -271,33 +274,17 @@ export default { this.$http.get('person/personCollect/page', { pageNo: this.page, pageSize: this.$store.getters.userInfo.configContent, - modeType: 'LAWS', + modeType: 'LAWS_STAND', collectTitle: this.search.collectionLaws, userId: this.$store.getters.userInfo.userId }, { _this: this, loading: 'loading' }, res => { - // for (let i = 0; i < res.data.list.length; i++) { - // res.data.list[i].check = false - // res.data.list[i].checked = false - // res.data.list[i].seeBtn = '查看笔记' - // } this.lawsList = [] - res.data.list.map((item, index) => { - item.checked = false - }) - this.lawsList = res.data.list - this.total = res.data.count + this.lawsList = res.data.records + this.total = res.data.total this.contentOpen = true - // if (this.saveNote !== '') { - // this.lawsList[this.saveNote].check = true - // if (this.lawsList[this.saveNote].check === true) { - // this.lawsList[this.saveNote].seeBtn = '关闭笔记' - // } else { - // this.lawsList[this.saveNote].seeBtn = '查看笔记' - // } - // } }, e => {}) }, // 取消收藏 diff --git a/src/pages/personal/pages/my-collection/index.vue b/src/pages/personal/pages/my-collection/index.vue index 2f383b30e..191b8146c 100644 --- a/src/pages/personal/pages/my-collection/index.vue +++ b/src/pages/personal/pages/my-collection/index.vue @@ -25,10 +25,12 @@ export default { // { // title: '已收藏的动态&资料 ', // name: 'CollectionDynamics' - // }, { - // title: '已收藏的政策', - // name: 'CollectionLaws' - // }, { + // }, + { + title: '已收藏的政策', + name: 'CollectionLaws' + }, + // { // title: '已收藏的标准拆分', // name: 'CollectionBreak' // } diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index d594b5bb4..0e7bcbdb5 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -70,7 +70,7 @@ size="mini" class="common-button-primary" @click="handleSave" - :loading="submitLoading" + :loading="saveLoading" v-if="showSave"> 保存 @@ -80,7 +80,7 @@ size="small" class="common-button-danger" @click="beforeBack" - :loading="submitLoading" + :loading="isSubmitBack" v-if="showBack"> {{ backBTNText }} @@ -239,7 +239,7 @@ export default { type: Boolean, default: false }, - // 保存按钮loading + // 退回按钮loading isSubmitBack: { type: Boolean, default: false diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index dd60c72b3..9d714ddac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -15,7 +15,7 @@
- + @@ -156,7 +156,7 @@ - + @@ -196,35 +196,35 @@ fontWeight: 'bold', height: '20px'}"> @@ -252,7 +252,7 @@ - +

技术委员会分委会主任/技术主管部门负责人

@@ -264,85 +264,85 @@ - + - +

责任工程师

- - + +
- + - +

参会人员所在部门负责人

- - + +
- + - +

标准法规部人员

- - + +
- + - +

标准法规部主管领导

- - + +
- + - +

费用管理部门

- - + +
- + - +

技术委员会常务副主任/总院院长

- - + +
- + - +

总院技术委员会主任

- - + +
@@ -363,6 +363,12 @@ + { + let mes = JSON.parse(res.mes) + this.rh_pageData = mes.rh_pageData + this.roleForm = mes.roleForm + }); + }, //上传按钮 - uploadFile (val) { + uploadFile(val) { }, // 文件上传限制条件 handleBeforeUpload(file) { @@ -489,8 +521,8 @@ export default { handleBeforeRemove(file, fileList) { this.fileData = fileList this.fileTextList.forEach((item, index) => { - if (item.name === file.name || item.id === file.id ) { - this.fileTextList.splice(index,1) + if (item.name === file.name || item.id === file.id) { + this.fileTextList.splice(index, 1) } }) }, @@ -509,7 +541,7 @@ export default { name: res.data.standName }) } - this.fileListData.fileText = this.newDataList + this.rh_pageData.infoSources = this.newDataList this.$message({ showClose: true, message: res.message, @@ -563,31 +595,85 @@ export default { }, // 流程阶段负责人选择 - choiceZRR (type, title, id) { + choiceZRR(type, title, id) { this.nodeList = [] this.nodeList.push(id) this.type = type this.drawerTitle = title this.roleShowflag = true }, - drawerCheck (data) { + drawerCheck(data) { + var idList = '' + var nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id; + nameList += item.name; + }); + if (this.type === 'feeUser') { + this.roleForm.feeUser = nameList + this.roleForm.feeUserId = idList + } else { + this.roleForm.dockUser = idList + this.roleForm.dockUserName = nameList + this.rh_pageData.comityInRole = nameList + this.rh_pageData.comityInRoleId = idList + } + this.roleShowflag = false + }, + + // 流程阶段人选择 + choiceZRROne(type, title, id) { + this.nodeListOne = [] + this.nodeListOne.push(id) + this.type = type + this.drawerTitleOne = title + this.roleShowflagOne = true + }, + drawerCheckOne(data) { this.unqualidiedData.forEach(item => { item.engineer = data[0].name item.engineerId = data[0].id }) - this.roleForm.dockUser = data[0].id - this.roleForm.dockUserName = data[0].name - this.roleShowflag = false + if (this.type === 'leaderUser') { + this.roleForm.leaderUser = data[0].name + this.roleForm.leaderUserId = data[0].id + } else { + this.roleForm.engineerUser = data[0].name + this.roleForm.engineerUserId = data[0].id + } + this.roleShowflagOne = false }, + // 保存按钮 - handleSave(){}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '20') + _formData.append('json', JSON.stringify({ + roleForm: this.roleForm, + rh_pageData: this.rh_pageData + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, // 提交按钮 handleSubmit() { let json = { - prcCreateUser: this.$store.getters.userInfo.userId, - prcCreateUserName: this.$store.getters.userInfo.userName, + roleList: this.roleForm, rh_pageData: this.rh_pageData, - directorList: this.roleForm.dockUser, + directorList: this.rh_pageData.comityInRoleId, } this.$refs['rh_pageData'].validate((valid) => { if (valid) { @@ -595,16 +681,16 @@ export default { if (valid) { this.isSubmit = true const paramsInfo = { - type: '11' + type: '20' } - startProcess(paramsInfo).then(res=>{ + startProcess(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskId', this.taskID) completeTask(params).then(res => { - if(res.success === true) { + if (res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } @@ -613,7 +699,8 @@ export default { }) } }) - } }) + } + }) } } } @@ -621,15 +708,18 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index da2503594..6be10951f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -730,7 +730,7 @@ v-model="form.glwjName" clearable > -
+
{ + if(res && res.data){ + const bringData = res.data + bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0' + bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0' - const json = Object.assign(bringData, bringData.attrInfoCaseMap); - this.form = JSON.parse(JSON.stringify(json)) + const json = Object.assign(bringData, bringData.attrInfoCaseMap); + this.form = JSON.parse(JSON.stringify(json)) - this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] - this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] - this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] - this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : [] - this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : [] - this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : [] - this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : [] - this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : [] - this.defaultCheckedKeys = [this.form.standSystem]; - this.defaultCheckedKeys1 = [this.form.cycvppsbm]; - this.defaultCheckedKeys2 = [this.form.kccvppsbm]; - this.defaultCheckedKeys3 = [this.form.dybxh]; - this.key++ - this.key1++ - this.key2++ - this.key3++ - this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' - this.form.prcNum = this.prcNum - this.form.prcName = this.prcName - this.form['id'] = bringData.id - this.standardDrawer = false - this.verifySarStandard = true - this.busVsFunc() - this.modelFunc() - this.$forceUpdate() - - console.log("this.form",this.form); - // 遍历对象初始化文件信息 - for(const p in this.form) { - if (typeof (this.form[p]) != "function") { - this.initializeFileList(p,this.form[p]); + this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] + this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] + this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] + this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : [] + this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : [] + this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : [] + this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : [] + this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : [] + this.defaultCheckedKeys = [this.form.standSystem]; + this.defaultCheckedKeys1 = [this.form.cycvppsbm]; + this.defaultCheckedKeys2 = [this.form.kccvppsbm]; + this.defaultCheckedKeys3 = [this.form.dybxh]; + this.key++ + this.key1++ + this.key2++ + this.key3++ + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = bringData.id + this.standardDrawer = false + this.verifySarStandard = true + this.busVsFunc() + this.modelFunc() + this.$forceUpdate() } - } + // 遍历对象初始化文件信息 + for(const p in this.form) { + if (typeof (this.form[p ]) != "function") { + this.initializeFileList(p,this.form[p]); + } + } + console.log("res",res); + }) } else if (this.standardCheckedList.length > 1) { this.$message.warning('最多可以带入一条标准信息') @@ -1890,7 +1895,6 @@ this.getFileList(value,this.kwjFileList); break; case 'jdwj': - debugger this.getFileList(value,this.jdwjFileList); break; case 'bpg': @@ -1899,6 +1903,9 @@ case 'zqyjg': this.getFileList(value,this.zqyjgFileList); break; + case 'glwj': + this.getFileList(value,this.glwjFileList); + break; default: ; } },getFileList(fileIds,defaultFileList){ @@ -1909,7 +1916,7 @@ }, { _this: this }, res => { - debugger + let fileList = res.data if (fileList != null && fileList.length > 0) { for (let i = 0; i < fileList.length; i++) { @@ -2365,7 +2372,6 @@ // this.form.zbjbdName += response.data.name+','; // } - switch (this.fileType){ case 'fbgbjbd': this.FBGBJBDFileList=fileList; @@ -2454,6 +2460,7 @@ break; case 'jdwj': this.fileList=this.jdwjFileList + break; case 'kwj': this.fileList=this.kwjFileList break; @@ -2623,34 +2630,34 @@ //拼接文件名和id 提交到流程Activity this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",") - this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.response.data.name).join(",") + this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.name).join(",") this.form.xgd=this.xgdFileList.map(item => item.response.data.id).join(",") - this.form.xgdName=this.xgdFileList.map(item => item.response.data.name).join(",") + this.form.xgdName=this.xgdFileList.map(item => item.name).join(",") this.form.bpg=this.bpgFileList.map(item => item.response.data.id).join(",") - this.form.bpgName=this.bpgFileList.map(item => item.response.data.name).join(",") + this.form.bpgName=this.bpgFileList.map(item => item.name).join(",") this.form.ssg=this.ssgFileList.map(item => item.response.data.id).join(",") - this.form.ssgName=this.ssgFileList.map(item => item.response.data.name).join(",") + this.form.ssgName=this.ssgFileList.map(item => item.name).join(",") this.form.zqyjg=this.zqyjgFileList.map(item => item.response.data.id).join(",") - this.form.zqyjgName=this.zqyjgFileList.map(item => item.response.data.name).join(",") + this.form.zqyjgName=this.zqyjgFileList.map(item => item.name).join(",") this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",") - this.form.jdwjName=this.jdwjFileList.map(item => item.response.data.name).join(",") + this.form.jdwjName=this.jdwjFileList.map(item => item.name).join(",") this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",") - this.form.kwjName=this.kwjFileList.map(item => item.response.data.name).join(",") + this.form.kwjName=this.kwjFileList.map(item => item.name).join(",") this.form.ca=this.caFileList.map(item => item.response.data.id).join(",") - this.form.caName=this.caFileList.map(item => item.response.data.name).join(",") + this.form.caName=this.caFileList.map(item => item.name).join(",") this.form.zbjbd=this.zbjbdFileList.map(item => item.response.data.id).join(",") - this.form.zbjbdName=this.zbjbdFileList.map(item => item.response.data.name).join(",") + this.form.zbjbdName=this.zbjbdFileList.map(item => item.name).join(",") this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",") - this.form.glwjName=this.glwjFileList.map(item => item.response.data.name).join(",") + this.form.glwjName=this.glwjFileList.map(item => item.name).join(",") }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index a2b44f516..b9ef47549 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -215,84 +215,164 @@
- - - -
- {{ form.xgdName }} -
-
- - - -
- - -
- {{ form.fbgbjbdName }} -
-
- - - -
- - -
- {{ form.zbjbdName }} -
-
- - - -
- - -
- {{ form.ssgName }} -
-
- - - -
- - -
- {{ form.caName }} -
-
- - - -
- - - - -
- {{ form.kwjName }} -
-
- - - -
- - -
- {{ form.jdwjName }} -
-
- - - -
- - -
- {{ form.bpgName }} -
-
- - - -
- - -
- {{ form.zqyjgName }} -
-
- - - -
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + + + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
@@ -470,9 +550,9 @@ -
- {{ form.glwjName }} -
+
+ {{value.name}} +
- -
@@ -692,7 +772,22 @@ name: "bzrkStep2", data () { return { - // 调整处理人抽屉状态 + xgdFileMap: [], + fbgbjbdFileMap: [], + bpgFileMap: [], + ssgFileMap: [], + zqyjgFileMap: [], + jdwjFileMap: [], + kwjFileMap: [], + glwjFileMap: [], + caFileMap: [], + zbjbdFileMap: [], + + + + + + // 调整处理人抽屉状态 drawerModal: false, drawerTitle: '', nodeList: [], @@ -895,7 +990,6 @@ if(fileType === 'fbgbjbd'){ if(this.fbgbjbdFileId.search(',')){ this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); - console.log(this.fbgbjbdFileId); } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ @@ -979,6 +1073,16 @@ this.detailData = res }, e => {}) }, + assemble(ids,names){ + let list= new Array(); + let idArray=ids.split(','); + let nameArray=names.split(','); + for(var i=0;i { inboundLiaisonDetail({ @@ -987,6 +1091,8 @@ }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + + console.log("processFrom",processForm) this.xgdFileId = processForm.xgd this.fbgbjbdFileId = processForm.fbgbjbd this.bpgFileId = processForm.bpg @@ -998,8 +1104,27 @@ this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) - console.log(processForm); - console.log("processForm"); + + this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName); + + this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName); + // fbgbjbdFileMap: {}, + this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName); + // bpgFileMap: {}, + this.ssgFileMap=this.assemble(processForm.ssg,processForm.ssgName); + // ssgFileMap: {}, + this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName); + // zqyjgFileMap: {}, + this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwjName); + // jdwjFileMap: {}, + this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName); + // kwjFileMap: {}, + this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName); + // glwjFileMap: {}, + this.caFileMap=this.assemble(processForm.ca,processForm.caName); + // caFileMap: {}, + this.zbjbdFileMap=this.assemble(processForm.zbjbd,processForm.zbjbdName); + // zbjbdFileMap: {}, } }).catch(e => { @@ -1013,7 +1138,6 @@ this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.form.standSystem] - console.log(this.defaultCheckedKeys) this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys3 = [this.form.dybxh] @@ -1082,7 +1206,6 @@ }, { _this: this }, res => { - console.log(res); if (res.success) { if(this.formTongGuo.approvalOpinion === '1'){ this.$message.warning("驳回成功") diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index c30de6592..4ade29c0d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -472,8 +472,8 @@ -
- {{ form.glwjName }} +
+ {{value.name}}
- - @@ -973,12 +973,9 @@ export default { }, e => {}) }, assemble(ids,names){ - console.log("name",names) - console.log("id",ids) let list= new Array(); let idArray=ids.split(','); let nameArray=names.split(','); - console.log("idarray",idArray); for(var i=0;i { @@ -1044,8 +1039,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) - console.log("this.form"); - console.log(this.form); + console.log("this.form",this.form); this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 8dc9a84ff..95668c70b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -968,8 +968,17 @@ v-model="form.glwjName" clearable > -
- {{ form.glwjName }} +
+ + + + 查看已上传的文件 +