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

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -1103,7 +1103,16 @@
                                 } else {
                                     this.isSubmit = true
                                     this.$http.post('lawss/activiti/startProcessRollBack', {
-                                        type: '9'
+                                      createUser: this.$store.getters.userInfo.userId,
+                                      createUserName: this.$store.getters.userInfo.userName,
+                                      type: '9',
+                                      json: JSON.stringify({
+                                        form: this.form,
+                                        roleForm: this.roleForm,
+                                        commentText1: this.commentText1,
+                                        itemList: this.itemList,
+                                        sarType: this.sarType
+                                      })
                                     }, {}, res => {
                                         if (res.ok) {
                                             var json = Object.assign(this.form, this.roleForm)

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -1112,7 +1112,6 @@ export default {
               } else {
                 this.isSubmit = true
                 this.$http.post('lawss/activiti/startProcessRollBack', {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '9',

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-show="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -817,7 +817,7 @@ export default {
       this.listForm.commentText = this.commentText
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
-      // this.isSubmit = true
+      this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -161,12 +161,12 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item v-if="verifySarStandard" label="归档位置" class="add-form-item form-item-disabled">
+                <el-form-item v-if="verifySarStandard" label="归档位置" prop="treeListName" class="add-form-item form-item-disabled">
-                  <el-input
-                    style="display: none"
-                    v-model="form.treeListId"
-                  ></el-input>
                   <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
+                    <el-input
+                      v-show="false"
+                      v-model="form.treeListId"
+                    ></el-input>
                     <el-input
                       v-model="form.treeListName"
                       clearable
@@ -1669,6 +1669,12 @@ export default {
         ],
       },
       rules: {
+        standSystem: [
+          {required: true, message: '请选择标准体系', trigger: 'change'}
+        ],
+        treeListName: [
+          {required: true, message: '请选择归档位置', trigger: 'blur'}
+        ],
         standSort: [
           {required: true, message: '请选择标准类别', trigger: 'change'}
         ],
@@ -1750,6 +1756,9 @@ export default {
     }
   },
   watch: {
+    'form.treeListName'(val) {
+      console.log(this.form.treeListName)
+    },
     'form.country': {
       handler(val) {
         if (val !== '' && val !== null && typeof (val) !== 'undefined') {
@@ -3081,6 +3090,9 @@ export default {
           this.form.treeListName = checkedData.menuName
           this.form.treeListId = checkedData.id
         }
+        this.$nextTick(_ => {
+          this.$refs.form.validateField('treeListName')
+        })
         this.modalShowTree = false
       }
 

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue

@@ -469,6 +469,7 @@ export default {
         qbzxdFrom.type = this.toggleType
         this.saveLoading = true
         let _formData = new FormData()
+        console.log(qbzxdFrom);
         _formData.append('id', this.bpnId || '')
         _formData.append('createUser', this.$store.getters.userInfo.userId)
         _formData.append('createUserName', this.$store.getters.userInfo.userName)

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -3,7 +3,7 @@
   <div class="xmpg-step1">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程 - 项目</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -191,13 +191,13 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
+                  <h4>标准法规工程师</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
+                    <el-input v-model="roleForm.startUserName" placeholder="标准法规工程师" disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>