diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index d2603ea18..acfe40b4e 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -62,6 +62,7 @@ 导入中... diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 271ca692a..2e1ce6e22 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3079,7 +3079,6 @@ export default { justify-content: space-between; height: 50px; border-bottom: 1px solid #E5E5E5; - .modular-header-title { font-size: 18px; font-weight: bold; diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index dd7c2ab28..eb7cec8e9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -21,7 +21,7 @@ -
+
@@ -85,6 +85,8 @@
+ 隐藏基础信息 + 展开基础信息
@@ -243,6 +245,7 @@ name: "bzdyStep1-1", data() { return { + foldFormFlag: false, fileMadel2: false, nodeList: [], nodeList2: [], @@ -314,6 +317,9 @@ ProcessTitle }, methods: { + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, getData () { queryTaskFirst({ bpnId: this.$route.query.bpnId diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue index d3c60b37a..f4ea48db1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue @@ -21,7 +21,7 @@ -
+
@@ -58,6 +58,8 @@
+ 隐藏基础信息 + 展开基础信息 @@ -199,6 +201,7 @@ export default { name: "bzdyStep1-9", data() { return { + foldFormFlag: false, histortData: [], commentText: '', tableData: [], @@ -230,6 +233,9 @@ export default { ProcessTitle }, methods: { + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index ec04289c7..33ed3f4cf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -21,7 +21,7 @@ -
+
@@ -85,6 +85,8 @@
+ 隐藏基础信息 + 展开基础信息
@@ -244,6 +246,7 @@ export default { name: "bzdyStep1", data() { return { + foldFormFlag: false, fileMadel2: false, commentText: '', nodeList: [], @@ -316,6 +319,9 @@ export default { ProcessTitle }, methods: { + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, checkedRole2 (data) { var idList = '' var nameList = '' diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 0378c41da..97069d856 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -21,7 +21,7 @@ -
+
@@ -71,6 +71,8 @@
+ 隐藏基础信息 + 展开基础信息
@@ -174,6 +176,7 @@ name: "bzdyStep2", data() { return { + foldFormFlag: false, histortData: [], commentText: '', taskIds: this.$route.query.taskIds, @@ -209,6 +212,9 @@ ProcessTitle }, methods: { + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 32e314426..c43e7f9f6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -21,7 +21,7 @@ -
+
@@ -60,6 +60,17 @@ - -
+ + +
+ 隐藏基础信息 + 展开基础信息 + + + +
+ +
+ + +
@@ -199,6 +217,7 @@ name: "bzdyStep3", data() { return { + foldFormFlag: false, histortData: [], commentText: '', taskIds: this.$route.query.taskIds, @@ -207,6 +226,7 @@ isSubmit: false, saveLoading: false, form: { + dyhz: '', title: '', // 调研标题 date: '', // 完成时间 modelList: [], @@ -232,6 +252,9 @@ ProcessTitle }, methods: { + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, @@ -304,6 +327,7 @@ handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { + this.json.dyhz = this.form.dyhz this.isSubmit = true var json = this.json json.commentText = this.commentText @@ -341,6 +365,7 @@ this.form.responUserListName = data.form.responUserListName this.form.fileName = data.form.fileName || data.fileName || '' this.form.fileId = data.form.fileId || data.fileId || '' + this.form.dyhz = data.form.dyhz || data.dyhz || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 2b10c7a85..d1e942968 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -21,7 +21,7 @@ -
+
@@ -71,6 +71,33 @@
+ 隐藏基础信息 + 展开基础信息 + + + +
+ + + +
+ {{ form.fileName }} +
+
+ - - +
+
+ + + +
+
+
@@ -171,6 +198,7 @@ name: "bzdyStep4", data() { return { + foldFormFlag: false, histortData: [], commentText: '', taskIds: this.$route.query.taskIds, @@ -179,6 +207,7 @@ isSubmit: false, saveLoading: false, form: { + dyhz: '', title: '', // 调研标题 date: '', // 完成时间 modelList: [], @@ -205,6 +234,9 @@ ProcessTitle }, methods: { + foldForm() { + this.foldFormFlag = !this.foldFormFlag + }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, @@ -264,6 +296,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.dyhz = data.dyhz || data.form.dyhz this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index c48455049..5b8b83f88 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -21,7 +21,7 @@ -
+
@@ -63,6 +63,8 @@
+ 隐藏基础信息 + 展开基础信息 @@ -81,6 +83,7 @@