Merge branch 'develop' into 'FOTON'

标准评估流程

See merge request LAWS/laws-system-front-FOTON!309

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

@@ -16,7 +16,7 @@
         </process-title>
         <el-collapse-transition>
           <el-form
-            v-if="!foldFormFlag"
+            v-show="!foldFormFlag"
             :model="listForm"
             :rules="formRules"
             ref="listForm"
@@ -675,6 +675,11 @@ export default {
         this.roleForm.ministerUserName = item.ministerUserName
         this.submitFlag = '修改节点'
         this.dataList.distributePerson = item.dataList[0].distributePerson
+        this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+          standId: item.standId
+        }, {}, res => {
+          this.decomposeOptions = res.data;
+        });
       })
     },
     //折叠/展开基础信息方法
@@ -1154,6 +1159,7 @@ export default {
       this.getData()
     }
     if(this.$route.query.taskIds){
+      //被驳回时调用
       this.getHistoryData()
     }
     this.getStandData();