Merge branch '1122-动火台账' into 相关方关联分公司功能

src/views/hotwork/pigeonhole/components/list.vue

@@ -1,19 +1,50 @@
 <template>
   <div class="app-container">
     <el-form ref="searchForm" :model="searchForm" label-width="80px">
-      <el-row :gutter="12">
-        <el-col :span="4">
+      <el-row>
+        <el-col :span="6">
           <el-form-item label="作业编号" prop="keySource">
             <el-input v-model="searchForm.keyJobNumber" placeholder="请输入作业编号" class="filter-item" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="特级动火审批状态" prop="keyHiddenDescr" label-width="130px">
             <el-select v-model="searchForm.keyState" placeholder="请选择">
               <el-option v-for="item in statusSuperList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="动火等级" prop="HOT_WORK_LEVEL_INDEX" label-width="130px">
+            <el-select v-model="searchForm.HOT_WORK_LEVEL_INDEX" placeholder="请选择">
+              <el-option v-for="item in hotworklevelList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="动火内容" prop="keySource">
+            <el-input v-model="searchForm.JOB_CONTENT" placeholder="请输入动火内容" class="filter-item" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="动火部位" prop="keySource">
+            <el-input v-model="searchForm.HOT_WORK_POSITION" placeholder="请输入动火部位" class="filter-item" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="动火区域管辖单位" prop="keySource" label-width="130px">
+            <SelectTree
+              ref="deptTree_Inspected"
+              :clearable="false"
+              :options="treeData"
+              :props="defaultProps"
+              v-model="searchForm.UNIT_LEADER_DEPARTMENT_ID"
+              placeholder="请选择动火区域管辖单位"
+            />
+          </el-form-item>
+        </el-col>
         <!--        <el-col :span="4">-->
         <!--          <el-form-item label="申请人" prop="keyApplyUserName">-->
         <!--            <el-input v-model="searchForm.keyApplyUserName" placeholder="请输入申请人" class="filter-item" />-->
@@ -35,7 +66,7 @@
         <!--            />-->
         <!--          </el-form-item>-->
         <!--        </el-col>-->
-        <el-col :span="4">
+        <el-col :span="6">
           <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getList">
             搜索
           </el-button>
@@ -54,6 +85,10 @@
           {{ translate(row.JOB_TYPE_INDEX, jobTypeList) }}
         </template>
       </el-table-column>
+      <el-table-column prop="HOT_WORK_LEVEL_NAME" label="动火等级" />
+      <el-table-column prop="JOB_CONTENT" label="动火内容" />
+      <el-table-column prop="HOT_WORK_POSITION" label="动火部位" />
+      <el-table-column prop="UNIT_LEADER_DEPARTMENT_NAME" label="动火区域管辖单位" />
       <el-table-column prop="WORK_LEVEL" label="申请单位" >
         <template slot-scope="{row}">
           {{ getUserName('deptName', row.HOT_WORK_APPLICATION_List) }}
@@ -89,8 +124,10 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+
 export default {
-  components: { Pagination },
+  components: { Pagination, SelectTree },
   directives: { waves },
   data() {
     return {
@@ -109,6 +146,7 @@ export default {
 
       multipleSelectionAll: [], // 所有选中的数据包含跨页数据
       multipleSelection: [], // 当前页选中的数据
+      treeData: [], // 动火前管辖单位
       dialogFormShow: false,
       dialogFormEdit: false,
       dialogType: 'add',
@@ -132,6 +170,17 @@ export default {
         { id: '3', name: '审批通过' },
         { id: '4', name: '已打回' }
       ],
+      hotworklevelList: [
+        { id: '0', name: '特级' },
+        { id: '1', name: '一级' },
+        { id: '2', name: '二级' },
+        { id: '3', name: '三级' }
+      ],
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
       STATUS: '0',
       DEPTIDS: '',
       searchForm: {
@@ -139,12 +188,17 @@ export default {
         keyState: '',
         keyApplyUserName: '',
         keyApproveUserName: '',
-        keyApproveTime: ''
+        keyApproveTime: '',
+        HOT_WORK_LEVEL_INDEX: '',
+        JOB_CONTENT: '',
+        HOT_WORK_POSITION: '',
+        UNIT_LEADER_DEPARTMENT_ID: ''
       }
     }
   },
   created() {
     this.getList()
+    this.getDictTreeData()
   },
   methods: {
     getRowKey(row) {
@@ -209,6 +263,18 @@ export default {
       this.$parent.HOTWORKAPPLICATION_ID = id
       this.$parent.HOTWORKAPPLICATION_TYPE = type
     },
+    getDictTreeData() {
+      return new Promise((resolve) => {
+        requestFN(
+          '/department/listTreeCorpDept',
+          {}
+        ).then((data) => {
+          this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+          resolve('ok')
+        }).catch((e) => {
+        })
+      })
+    },
     chongzhi() {
       this.searchForm = {
         stateConfirm: '',
@@ -222,8 +288,12 @@ export default {
         keyFindTime: [],
         keyFindStateTime: '',
         keyFindEndTime: '',
-        keyConfirmUser: ''
+        keyConfirmUser: '',
+        HOT_WORK_LEVEL_INDEX: '',
+        JOB_CONTENT: '',
+        HOT_WORK_POSITION: ''
       }
+      this.$refs.deptTree_Inspected.clearHandle()
       this.$refs.searchForm.resetFields()
       this.getList()
     }