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

# Conflicts:
#	src/views/dangerousWork/hoisting/components/list.vue
#	src/views/dangerousWork/hoisting/index.vue

src/views/dangerousWork/highwork/components/detail.vue

@@ -248,7 +248,7 @@ export default {
       })
     },
     goBack() {
-      this.$parent.activeName = 'List'
+      this.$parent.activeName = 'highwork_list'
     }
 
   }

src/views/dangerousWork/highwork/components/list.vue

@@ -132,7 +132,14 @@
         <el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
       </div>
     </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
     </div>
+
+  </div>
+
+
 </template>
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
@@ -211,7 +218,9 @@ export default {
         '/dangerousWork/gfHighWork/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
         }
       ).then((data) => {
         this.listLoading = false
@@ -326,6 +335,10 @@ export default {
     goDetail(id) {
       this.$parent.activeName = 'Detail'
       this.$parent.HIGHWORK_ID = id
+    },
+    goBack(){
+      this.$parent.activeName = 'CorpInfo'
+      this.$parent.HIGHWORK_ID = ''
     }
   }
 }

src/views/dangerousWork/highwork/index.vue

@@ -1,28 +1,23 @@
 <template>
   <div>
-    <CorpInfo v-show="activeName=='CorpInfo'" />
+    <CorpInfo v-show="activeName=='CorpInfo'" ref="list"/>
-    <List v-show="activeName=='highwork_list'" />
+    <List v-if="activeName=='highwork_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
 
 <script>
+import CorpInfo from "./components/corpInfo";
 import List from './components/list'
 import Detail from './components/detail'
-import CorpInfo from "./components/corpInfo";
 export default {
   components: {CorpInfo,List,Detail},
   data() {
     return {
-      activeName: 'highwork_list',
+      activeName: 'CorpInfo',
-      HIGHWORK_ID: ''
+      HIGHWORK_ID: '',
-    }
+      ticketType : '',
-  },
+      CUTROAD_ID:''
-  watch: {
-    activeName(val) {
-      if (val == 'highwork_list') {
-        this.$refs.list.getQuery()
-      }
     }
   }
 }

src/views/dangerousWork/hoisting/components/corpInfo.vue

@@ -102,7 +102,7 @@ export default {
       this.$parent.activeName = tableName
       this.$parent.CORPINFO_ID = CORPINFO_ID
       this.$parent.ticketType = ticketType
-      this.$parent.CUTROAD_ID =''
+      this.$parent.HOISTING_ID =''
     },
     getList() {
       return new Promise((resolve) => {

src/views/dangerousWork/hoisting/index.vue

@@ -16,7 +16,8 @@ export default {
     return {
       activeName: 'CorpInfo',
       HOISTING_ID: '',
-      ticketType:''
+      ticketType : '',
+      CORPINFO_ID : ''
     }
   },
   watch: {