1.输入框内容调试

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

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

@@ -187,14 +187,14 @@ export default {
       dialogFormHuifuShow: false,
       statusList: [
         { ID: '', NAME: '请选择' },
-        { ID: '0', NAME: '待提交' },
+        { ID: '0', NAME: '盲板抽堵作业待提交' },
         { ID: '1', NAME: '作业负责人待审核' },
-        { ID: '4', NAME: '所在单位领导人待审核' },
+        { ID: '4', NAME: '所在单位待审核' },
         { ID: '5', NAME: '待验收' },
         { ID: '6', NAME: '验收归档' },
-        { ID: '-2', NAME: '作业负责人待审核打回' },
-        { ID: '-5', NAME: '所在单位领导人待审核打回' },
-        { ID: '-6', NAME: '待验收打回' }
+        { ID: '-2', NAME: '作业负责人审核打回' },
+        { ID: '-5', NAME: '所在单位审核打回' },
+        { ID: '-6', NAME: '验收打回' }
       ],
       STATUS: '',
       DEPTIDS: ''

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

@@ -137,8 +137,6 @@
       <el-button type="primary" @click="goBack">返 回</el-button>
     </div>
   </div>
-
-
 </template>
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
@@ -338,6 +336,7 @@ export default {
     goBack(){
       this.$parent.activeName = 'CorpInfo'
       this.$parent.HOISTING_ID = ''
+      this.$parent.ticketType =''
     }
   }
 }

src/views/keyprojects/platformelectronic/index.vue

@@ -101,7 +101,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="边界入侵区域" prop="bianjiequyu">
-          <el-select v-model="form.bianjiequyu" multiple placeholder="请选择监理单位" style="width: 100%;">
+          <el-select v-model="form.bianjiequyu" multiple placeholder="请选择边界入侵区域" style="width: 100%;">
             <el-option v-for="item in quyuList" :key="item.DICTIONARIES_ID" :label="item.name" :value="item.DICTIONARIES_ID" />
           </el-select>
         </el-form-item>