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

src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="app" ref="appView">
+  <div id="app">
 <!--    <router-view v-if="!isBoolean"/>-->
     <span v-if="this.$route.name === 'Login'|| !isBoolean">
       <router-view />
@@ -34,7 +34,7 @@
             <nav-menu></nav-menu>
             <div class="sub-container" style="margin-left: 60px">
               <div class="container-box">
-                <router-view/>
+                <router-view  ref="appView1"/>
               </div>
             </div>
           </el-main>
@@ -70,7 +70,7 @@
             <nav-menu></nav-menu>
             <div class="sub-container" style="margin-left: 200px">
               <div class="container-box">
-                <router-view/>
+                <router-view  ref="appView2"/>
               </div>
             </div>
           </el-main>
@@ -104,9 +104,15 @@ export default {
   },
   methods: {
     handleRefreshTable() {
+      
       this.$nextTick(() => {
         // 获取页面中已注册过ref的所有的子组件。
-        let refList = this.$refs.appView.$refs;
+        let refList = ''
+        if(this.$refs.appView1){
+          refList = this.$refs.appView1.$children[0].$refs;
+        }else{
+          refList = this.$refs.appView2.$children[0].$refs;
+        }
         if (refList) {
           for (let i of Object.keys(refList)) {
             // 根据doLayout方法判断子组件是不是el-table

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

@@ -2267,7 +2267,7 @@ export default {
                 bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
                 const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                 this.form = JSON.parse(JSON.stringify(json))
-                this.form.textStatus = this.form.textStatus === 'jjxoynfepp' ? '' : this.form.textStatus
+                this.form.textStatus = this.form.textStatus === 'jjxoynfepp' || this.form.textStatus === 'vsaga7nwub' ? '' : this.form.textStatus
                 this.getListTree(bringData)
                 this.form.standId = bringData.id
                 if (this.form.country) {