Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue

@@ -123,21 +123,6 @@
           </el-table-column>
         </el-table>
       </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue

@@ -275,6 +275,7 @@
         data() {
             return {
                 commentText41: '',
+                onlyKey: '',
                 itermsConditionsFlag: false,
                 itermsConditionsTitle: '',
                 drawerModal: false,
@@ -408,6 +409,7 @@
                         this.isSubmit = true
                         let json = this.json
                         json.info = this.data
+                        json.onlyKey = this.onlyKey
                         json.commentText = this.commentText41
                         json.bzfgId = this.form.bzfgId
                         json.bzfgName = this.form.bzfgName
@@ -432,6 +434,7 @@
               if (this.commentText41) {
                 var json = this.json
                   json.spFlag = '1'
+                json.onlyKey = this.onlyKey
                 json.commentText = this.commentText41
                 this.$http.post('lawss/activiti/completeTask', {
                   json: JSON.stringify(json),
@@ -455,6 +458,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
                         this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
                         this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
                         this.form.fjList = data.fjList || data.form.fjList

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue

@@ -267,6 +267,7 @@
         data() {
             return {
                 commentText42: '',
+                onlyKey: '',
                 itermsConditionsFlag: false,
                 itermsConditionsTitle: '',
                 drawerModal: false,
@@ -400,6 +401,7 @@
                 json.info = this.data
                 json.commentText = this.commentText42
                 json.bzFlag = '0'
+                json.onlyKey = this.onlyKey
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -416,6 +418,7 @@
                 if (this.commentText42) {
                     var json = this.json
                     json.bzFlag = '1'
+                    json.onlyKey = this.onlyKey
                     json.commentText = this.commentText42
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
@@ -440,6 +443,7 @@
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
                         this.form.fjList = data.fjList || data.form.fjList
+                        this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
                         this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
                         this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
                         this.commentText42 = data.commentText42 || ''

src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue

@@ -707,11 +707,6 @@ export default {
             this.submitShow = true
           }
           this.commentText4 =  data.commentText4 || ''
-          if(data.onlyKey){
-            this.onlyKey = data.onlyKey
-          }else{
-            this.onlyKey = data.form.onlyKey
-          }
           this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
           this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList
@@ -727,6 +722,11 @@ export default {
           this.standId =  data.standId
           this.getItemList(data.standId,data.textType)
           this.data = data.info || data.form.info
+          if(data.onlyKey){
+            this.onlyKey = data.onlyKey
+          }else{
+            this.onlyKey = data.form.onlyKey
+          }
         }).catch(e => {
         })
       })

src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue

@@ -300,6 +300,7 @@
     data() {
       return {
         data2: [],
+        onlyKey: '',
         commentText6: '',
         itermsConditionsFlag: false,
         itermsConditionsTitle: '',
@@ -482,6 +483,7 @@
             this.isSubmit = true;
             var json = this.json;
             json.hqFlag = '0';
+            json.onlyKey = this.onlyKey
             json.commentText = this.commentText6;
             json.user7 = this.form.user7;
             json.user7Name = this.form.user7Name;
@@ -506,6 +508,7 @@
           this.isSubmit = true;
           var json = this.json;
           json.hqFlag = '1';
+          json.onlyKey = this.onlyKey
           json.commentText = this.commentText6;
           this.$http.post("lawss/activiti/completeTask", {
             json: JSON.stringify(json),
@@ -530,6 +533,7 @@
           }).then(res => {
             let data = JSON.parse(res.mesg);
             this.commentText6 = data.commentText6 || ''
+            this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
             this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
             this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
             this.form.fjList = data.fjList || data.form.fjList

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -286,6 +286,7 @@ export default {
     return {
       data2: [],
       commentText7: '',
+      onlyKey: '',
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
       drawerModal: false,
@@ -449,6 +450,7 @@ export default {
         this.isSubmit = true
         var json = this.json
         json.bdFlag = '0'
+        json.onlyKey = this.onlyKey
         json.commentText = this.commentText7
         this.$http.post('lawss/activiti/completeTask', {
           json: JSON.stringify(json),
@@ -467,6 +469,7 @@ export default {
         this.isSubmit = true
         var json = this.json
         json.bdFlag = '1'
+        json.onlyKey = this.onlyKey
         json.commentText = this.commentText7
         this.$http.post('lawss/activiti/completeTask', {
           json: JSON.stringify(json),
@@ -491,6 +494,7 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText7 = data.commentText7 || ''
+          this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
           this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
           this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList

src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue

@@ -286,6 +286,7 @@ export default {
     return {
       data2: [],
       commentText8: '',
+      onlyKey: '',
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
       drawerModal: false,
@@ -449,6 +450,7 @@ export default {
         this.isSubmit = true
         var json = this.json
         json.directorFlag = '0'
+        json.onlyKey = this.onlyKey
         json.commentText = this.commentText8
         this.$http.post('lawss/activiti/completeTask', {
           json: JSON.stringify(json),
@@ -467,6 +469,7 @@ export default {
         this.isSubmit = true
         var json = this.json
         json.directorFlag = '1'
+        json.onlyKey = this.onlyKey
         json.commentText = this.commentText8
         this.$http.post('lawss/activiti/completeTask', {
           json: JSON.stringify(json),
@@ -491,6 +494,7 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText8 = data.commentText8 || ''
+          this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
           this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
           this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList

src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue

@@ -286,6 +286,7 @@ export default {
     return {
       data2: [],
       commentText9: '',
+      onlyKey: '',
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
       drawerModal: false,
@@ -449,6 +450,7 @@ export default {
         this.isSubmit = true;
         var json = this.json;
         json.presidentFlag = '0';
+        json.onlyKey = this.onlyKey
         json.commentText = this.commentText9;
         this.$http.post("lawss/activiti/completeTask", {
           json: JSON.stringify(json),
@@ -466,6 +468,7 @@ export default {
       if (this.commentText9) {
         this.isSubmit = true;
         var json = this.json;
+        json.onlyKey = this.onlyKey
         json.presidentFlag = '1';
         json.commentText = this.commentText9;
         this.$http.post("lawss/activiti/completeTask", {
@@ -491,6 +494,7 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText9 = data.commentText9 || ''
+          this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
           this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
           this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList