界面调整

src/views/check/index.vue

@@ -253,6 +253,7 @@
               align="center"
               width="180px"
               label="检查主体"
+              v-if="columns[5].visible"
             >
               <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
@@ -264,6 +265,7 @@
               align="center"
               width="180px"
               label="受检机构"
+              v-if="columns[6].visible"
             >
               <!-- <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
@@ -275,7 +277,7 @@
               align="center"
               width="180px"
               label="检查人员"
-              v-if="columns[6].visible"
+              v-if="columns[7].visible"
             >
               <template slot-scope="scope">
                 <template v-for="item in splitRoleNames(scope.row.roleNames)">
@@ -288,7 +290,7 @@
               label="任务周期"
               align="center"
               width="180px"
-              v-if="columns[6].visible"
+              v-if="columns[8].visible"
             >
               <template slot-scope="r"
                 >{{ getLabel(dict.type.check_cycle, `${r.row.planCycle}`) }}
@@ -300,7 +302,7 @@
               label="任务次数"
               align="center"
               width="180px"
-              v-if="columns[6].visible"
+              v-if="columns[9].visible"
             ></el-table-column>
 
             <el-table-column
@@ -308,7 +310,7 @@
               label="任务状态"
               align="center"
               width="180px"
-              v-if="columns[6].visible"
+              v-if="columns[10].visible"
             >
               <template slot-scope="r"
                 >{{ getLabel(dict.type.check_status, `${r.row.planStatus}`) }}
@@ -467,17 +469,16 @@ export default {
       // 列信息
       columns: [
         { key: 0, label: `序号`, visible: true },
-        { key: 1, label: `计划名称`, visible: true },
-        { key: 2, label: `计划类型`, visible: true },
-        { key: 3, label: `计划创建机构`, visible: true },
-        { key: 4, label: `计划所属机构`, visible: true },
-        { key: 5, label: `履职机构类型`, visible: true },
-        { key: 6, label: `履职角色`, visible: true },
-        { key: 7, label: `履职周期`, visible: true },
-        { key: 8, label: `履职次数`, visible: true },
-        { key: 9, label: `履职时间`, visible: true },
-        { key: 10, label: `修改人`, visible: true },
-        { key: 11, label: `计划状态`, visible: true },
+        { key: 1, label: `任务名称`, visible: true },
+        { key: 2, label: `任务类型`, visible: true },
+        { key: 3, label: `创建机构`, visible: true },
+        { key: 4, label: `行社名称`, visible: true },
+        { key: 5, label: `检查主体`, visible: true },
+        { key: 6, label: `受检机构`, visible: true },
+        { key: 7, label: `检查人员`, visible: true },
+        { key: 8, label: `任务周期`, visible: true },
+        { key: 9, label: `任务次数`, visible: true },
+        { key: 10, label: `任务状态`, visible: true },
       ],
     };
   },

src/views/safetycheck/task/index.vue

@@ -225,7 +225,7 @@
               prop="checkOrgName"
               label="检查主体"
               width="180px"
-              v-if="columns[5].visible"
+              v-if="columns[2].visible"
             >
             </el-table-column>
             <el-table-column
@@ -233,7 +233,7 @@
               label="检查人员"
               align="center"
               width="180px"
-              v-if="columns[6].visible"
+              v-if="columns[3].visible"
             >
               <template slot-scope="r">
                 {{
@@ -248,7 +248,7 @@
               label="任务进度"
               align="center"
               width="120px"
-              v-if="columns[10].visible"
+              v-if="columns[4].visible"
             >
               <template slot-scope="r">
                 <span>
@@ -267,7 +267,7 @@
               label="受检机构"
               header-align="center"
               width="180px"
-              v-if="columns[4].visible"
+              v-if="columns[5].visible"
             >
             </el-table-column>
 
@@ -276,7 +276,7 @@
               label="任务时间"
               header-align="center"
               width="300px"
-              v-if="columns[2].visible"
+              v-if="columns[6].visible"
               ><template slot-scope="r">
                 {{
                   r.row.planStartTime
@@ -321,7 +321,7 @@
               prop="exceptionCount"
               label="隐患问题数"
               width="120px"
-              v-if="columns[9].visible"
+              v-if="columns[7].visible"
             >
             </el-table-column>
             <el-table-column
@@ -462,16 +462,13 @@ export default {
       pageData: [],
       columns: [
         { key: 0, label: `序号`, visible: true },
-        { key: 1, label: `计划名称`, visible: true },
-        { key: 2, label: `开始时间`, visible: true },
-        { key: 3, label: `结束时间`, visible: true },
-        { key: 4, label: `上级机构`, visible: true },
-        { key: 5, label: `检查机构`, visible: true },
-        { key: 6, label: `检查角色`, visible: true },
-        { key: 7, label: `提交人`, visible: true },
-        { key: 8, label: `提交时间`, visible: true },
-        { key: 9, label: `异常个数`, visible: true },
-        { key: 10, label: `任务状态`, visible: true },
+        { key: 1, label: `任务名称`, visible: true },
+        { key: 2, label: `检查主体`, visible: true },
+        { key: 3, label: `检查人员`, visible: true },
+        { key: 4, label: `任务进度`, visible: true },
+        { key: 5, label: `受检机构`, visible: true },
+        { key: 6, label: `任务时间`, visible: true },
+        { key: 7, label: `隐患问题数`, visible: true },
       ],
     };
   },