diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 678e004a8..5e8784304 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -533,15 +533,18 @@ @selection-change="selectAllStand"> + align="center" + width="60" + > - + + + width="170"> @@ -589,6 +600,7 @@ show-overflow-tooltip prop="applyArctic" label="适用车型" + width="90" > - - - + - + - +
{{ item.name }} diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 573bbe5b5..39a96db42 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -50,7 +50,7 @@ - -
- +
{{ item.name }} @@ -91,12 +91,16 @@
- + + @@ -249,6 +253,9 @@ formRules: { fileName: [ { required: true, message: '请上传调研结果', trigger: 'change' }, + ], + dyhz: [ + { required: true, message: '请输入回执说明', trigger: 'change' }, ] }, json: {}, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 330f6ecde..6d2708a05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -50,7 +50,7 @@ - -
- +
{{ item.name }} @@ -91,6 +91,9 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index ccc396254..6776e5aeb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -389,47 +389,22 @@ export default { if (this.data.length < 1) { this.$message.warning("请输入征求意见搞"); } else { - var a = 0; - var b = 0; - // var c = 0 - for (let s1 = 0; s1 < this.data.length; s1++) { - if (!this.data[s1].chapterNumber) { - a++; + this.isSubmit = true; + var json = this.json; + json.oldinfo = this.oldData; + json.commentText = this.commentText; + json.introduce = true; + 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"); } - if (!this.data[s1].chapterName) { - b++; - } - // if (!this.data[s1].commentText) { - // c++ - // } - } - if (a > 0) { - this.$message.warning("请输入章节编号"); - } else if (b > 0) { - this.$message.warning("请输入章节名称"); - } - // else if (c > 0) { - // this.$message.warning('请输入意见内容') - // } - else { - this.isSubmit = true; - var json = this.json; - json.oldinfo = this.oldData; - json.commentText = this.commentText; - json.introduce = true; - console.log(json); - 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; - }); - } + this.isSubmit = false; + }); } }, getData() { @@ -457,7 +432,7 @@ export default { if (data.introduce) { } else { this.$http.get("slrs/sar-public-idea-all/getPublicIdea", { - unique: data.uniques + unique: data.unique }, {}, res => { res.data.forEach(item => { item.chapterNumber = item.partCode; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index d760a1bce..0eaf5161c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -62,12 +62,12 @@ 导出汇总单 + size="mini">生成汇总单 导出征求意见稿 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见
导出汇总单 + size="mini">生成汇总单 导出征求意见搞 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见
导出汇总单 + size="mini">生成汇总单 导出征求意见搞 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见
导出汇总单 + size="mini">生成汇总单 导出征求意见搞 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见 基础信息 + 隐藏基础信息 + 展开基础信息 + @@ -101,8 +153,8 @@ placeholder="请选择分发负责人" readonly @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)" - v-if="!scope.row.distributePerson"> - {{ scope.row.distributePerson }} + > + @@ -401,6 +453,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, //用来判断提交事件条件是否满足 satisfyFlag: true, active: "1", @@ -509,6 +563,7 @@ export default { distributePerson: "", //分发责任人 distributePersonId: "", //分发责任人id id: "", + pastProject: [], //用来存放上次选中的产品线信息 sarStandProjectLibraries: [{ projectManager: "", projectLevel: "", @@ -532,6 +587,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, getData() { queryTaskFirst({ bpnId: this.$route.query.bpnId @@ -652,6 +711,7 @@ export default { }, //确认添加事件 okStand() { + this.pastProject = JSON.parse(localStorage.getItem('projectList')) let proData = []; if (this.dataList.length >= 1) { this.dataList.forEach(item => { @@ -669,9 +729,21 @@ export default { this.standModel = false; } else { if (this.standList.length >= 1) { - this.dataList = this.standList; - this.roleForm.directorUser = this.dataList[0].uname; + if (this.pastProject === null){ + this.dataList = this.standList; + }else { + this.pastProject.forEach(item => { + this.standList.map(items => { + if( item.productLine === items.productLine){ + items.distributePersonId = item.distributePersonId + items.distributePerson = item.distributePerson + } + }) + }) + this.dataList = this.standList + } this.listForm.dataList = this.standList; + this.roleForm.directorUser = this.dataList[0].uname; this.standModel = false; } else { this.$message.warning("请选择一条数据进行添加"); @@ -716,6 +788,7 @@ export default { this.isSubmit = true; this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); + localStorage.setItem('projectList', JSON.stringify(this.dataList)) this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue index 3a02b3ed5..6b31ed8fd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -191,6 +236,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, detailData: [], // 当前流程类型(1待办/2已办) processType: 1, @@ -266,6 +313,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue index 06374bbb5..5b2b323fb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -104,6 +149,18 @@ align="center" label="条款名称"> + + + + 基础信息 + 隐藏基础信息 + 展开基础信息 + @@ -389,6 +441,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, //用来判断提交事件条件是否满足 satisfyFlag: true, active: "1", @@ -500,6 +554,7 @@ export default { distributePerson: "", //分发责任人 distributePersonId: "", //分发责任人id id: "", + pastProject: [], //用来存放上次选中的产品线信息 sarStandProjectLibraries: [{ projectManager: "", projectLevel: "", @@ -523,6 +578,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, checkedRole(data) { if (this.type === "dockUser") { this.roleForm.dockUser = data[0].id; @@ -627,6 +686,7 @@ export default { }, //确认添加事件 okStand() { + this.pastProject = JSON.parse(localStorage.getItem('projectList')) let proData = []; if (this.dataList.length >= 1) { this.dataList.forEach(item => { @@ -644,9 +704,21 @@ export default { this.standModel = false; } else { if (this.standList.length >= 1) { - this.dataList = this.standList; - this.roleForm.directorUser = this.dataList[0].uname; + if (this.pastProject === null){ + this.dataList = this.standList; + }else { + this.pastProject.forEach(item => { + this.standList.map(items => { + if( item.productLine === items.productLine){ + items.distributePersonId = item.distributePersonId + items.distributePerson = item.distributePerson + } + }) + }) + this.dataList = this.standList + } this.listForm.dataList = this.standList; + this.roleForm.directorUser = this.dataList[0].uname; this.standModel = false; } else { this.$message.warning("请选择一条数据进行添加"); @@ -689,6 +761,7 @@ export default { this.isSubmit = true; this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); + localStorage.setItem('projectList', JSON.stringify(this.dataList)) this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 5c67efa1b..4e8eba0f0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -213,6 +258,8 @@ export default { }, data() { return { + //折叠的标志，true为折叠，false为不折叠 + foldFormFlag: false, nodeList:[], isTransfer: false, drawerTitle:'', @@ -293,6 +340,10 @@ export default { }; }, methods: { + //折叠/展开基础信息方法 + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, //确认转办 checkedRole (data) { this.assigneeNewLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 1d3755fc8..a09538cc5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -103,6 +148,16 @@ align="center" label="条款名称"> + + + + 基础信息 + 隐藏基础信息 + 展开基础信息 + @@ -104,6 +149,18 @@ align="center" label="条款名称"> + + + + 基础信息 + 隐藏基础信息 + 展开基础信息 + @@ -104,6 +149,18 @@ align="center" label="条款名称"> + + + + 基础信息 + 隐藏基础信息 + 展开基础信息 + @@ -104,6 +149,18 @@ align="center" label="条款名称"> + + + + { this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName - this.dataList = item.dataList + this.dataList = item.step3DTOS this.listForm.id = item.step3DTOS[0].id this.listForm.standName = item.step3DTOS[0].standName this.listForm.standNumber = item.step3DTOS[0].standNumber diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 300c8af2a..3d8169ec3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -15,6 +15,7 @@ + 隐藏基础信息 + 展开基础信息 + @@ -104,6 +149,18 @@ align="center" label="条款名称"> + + + + - - 选择项目 - - - + + + + + + 选择项目 + - - 选择清单 - - + + + + + 选择清单 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 82865c0aa..2f3c48612 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -23,11 +23,11 @@
- - 选择项目 - - - + + + + + + 选择项目 + - - 选择清单 - - + + + + + 选择清单
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 5a62053a6..03e821061 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -7,7 +7,7 @@
+ label-width="100px"> @@ -42,7 +42,7 @@ >

- + + + {{ sarAccessEO.remark || "-" }}

- +

{{ item.name }} @@ -109,6 +109,14 @@ width="55" align="center"> + + 基础信息

- + @@ -26,7 +26,7 @@ >

- + + +
+ label-width="100px"> @@ -39,7 +39,7 @@ >

- + + + 导出 - 批量删除 + --> + 配置标准 - 配置标准 -
@@ -182,6 +182,7 @@