界面调整

src/views/check/dialog.edit.vue

@@ -66,7 +66,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6" v-if="id ? false : true">
+            <el-col :span="6">
               <el-form-item
                 prop="buildTaskNow"
                 label="立即生效:"

src/views/check/index.vue

@@ -184,35 +184,35 @@
           ></el-table-column>
           <el-table-column
             prop="planName"
-            label="计划名称"
+            label="任务名称"
             v-if="columns[1].visible"
           ></el-table-column>
+         
           <el-table-column
-            prop="planOfOrgName"
-            label="计划所属机构"
-            v-if="columns[4].visible"
+            prop="checkType"
+            label="任务类型"
+            v-if="columns[2].visible"
           >
+            <template slot-scope="r"
+              >{{ getLabel(dict.type.check_type, `${r.row.checkType}`) }}
+            </template>
           </el-table-column>
-
           <el-table-column
             prop="planCreateOrgName"
-            label="计划创建机构"
+            label="创建机构"
             v-if="columns[3].visible"
           >
           </el-table-column>
           <el-table-column
-            prop="checkType"
-            label="检查类型"
-            v-if="columns[2].visible"
+            prop="planOfOrgName"
+            label="行社名称"
+            v-if="columns[4].visible"
           >
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.check_type, `${r.row.checkType}`) }}
-            </template>
           </el-table-column>
+
           <el-table-column
             prop="execOrgType"
-            label="检查机构类型"
-            v-if="columns[2].visible"
+            label="检查主体"
           >
             <template slot-scope="r"
               >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
@@ -221,9 +221,8 @@
 
           <el-table-column
             prop="checkOrgType"
-            label="受检机构类型"
+            label="受检机构"
             width="120px"
-            v-if="columns[6].visible"
           >
             <template slot-scope="r"
               >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
@@ -232,7 +231,7 @@
 
           <el-table-column
             prop="roleNames"
-            label="检查角色"
+            label="检查人员"
             v-if="columns[6].visible"
           >
             <template slot-scope="scope">
@@ -243,7 +242,7 @@
           ></el-table-column>
           <el-table-column
             prop="planCycle"
-            label="检查周期"
+            label="任务周期"
             width="80px"
             v-if="columns[6].visible"
           >
@@ -254,13 +253,13 @@
 
           <el-table-column
             prop="count"
-            label="检查次数"
+            label="任务次数"
             v-if="columns[6].visible"
           ></el-table-column>
 
           <el-table-column
             prop="planStatus"
-            label="状态"
+            label="任务状态"
             width="80px"
             v-if="columns[6].visible"
           >
@@ -272,14 +271,14 @@
           <el-table-column
             prop="modifiedName"
             label="修改人"
-            v-if="columns[6].visible"
+            v-if="false"
           ></el-table-column>
 
           <el-table-column
             prop="updateTime"
             label="修改时间"
             width="80px"
-            v-if="columns[6].visible"
+            v-if="false"
           >
             <template slot-scope="scope">
               <span>{{ formatTime(scope.row.updateTime, "YYYY-MM-DD") }}</span>

src/views/check/task/index.vue

@@ -179,21 +179,21 @@
           </el-table-column>
           <el-table-column
             prop="title"
-            label="检查名称"
+            label="任务名称"
             min-width="120"
             v-if="columns[1].visible"
           >
           </el-table-column>
           <el-table-column
             prop="checkOrgName"
-            label="检查机构"
+            label="检查主体"
             min-width="140"
             v-if="columns[5].visible"
           >
           </el-table-column>
           <el-table-column
             prop="roleName"
-            label="检查角色"
+            label="检查人员"
             min-width="150"
             v-if="columns[6].visible"
           >
@@ -204,6 +204,23 @@
             </template>
           </el-table-column>
           <el-table-column
+            prop="status"
+            label="任务进度"
+            width="100px"
+            v-if="columns[10].visible"
+          >
+            <template slot-scope="r">
+              <span>
+                <i class="circle" :style="statusColor(r.row.status, true)" />
+                <label :style="statusColor(r.row.status, false)">
+                  {{
+                    getLabel(dict.type.safety_check_status, r.row.status)
+                  }}</label
+                >
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
             prop="orgName"
             label="受检机构"
             min-width="140"
@@ -213,13 +230,17 @@
 
           <el-table-column
             prop="planStartTime"
-            label="开始日期"
-            min-width="100"
+            label="任务时间"
+            min-width="200"
             v-if="columns[2].visible"
             ><template slot-scope="r">
               {{
                 r.row.planStartTime
-                  ? dayjs(r.row.planStartTime).format("YYYY-MM-DD")
+                  ? dayjs(r.row.planStartTime).format("YYYY年-MM月-DD日")
+                  : ""
+              }}~{{
+                r.row.planEndTime
+                  ? dayjs(r.row.planEndTime).format("YYYY年-MM月-DD日")
                   : ""
               }}
             </template></el-table-column
@@ -228,7 +249,7 @@
             prop="planEndTime"
             label="截止日期"
             min-width="100"
-            v-if="columns[3].visible"
+            v-if="false"
             ><template slot-scope="r">
               {{
                 r.row.planEndTime
@@ -238,34 +259,18 @@
             </template></el-table-column
           >
 
-          <el-table-column
-            prop="status"
-            label="检查状态"
-            width="100px"
-            v-if="columns[10].visible"
-          >
-            <template slot-scope="r">
-              <span>
-                <i class="circle" :style="statusColor(r.row.status, true)" />
-                <label :style="statusColor(r.row.status, false)">
-                  {{
-                    getLabel(dict.type.safety_check_status, r.row.status)
-                  }}</label
-                >
-              </span>
-            </template>
-          </el-table-column>
+  
 
           <el-table-column
             prop="submitBy"
             label="检查人"
             min-width="100"
-            v-if="columns[7].visible"
+            v-if="false"
           ></el-table-column>
-          <el-table-column
+          <el-table-column 
             label="检查时间"
             min-width="120"
-            v-if="columns[8].visible"
+            v-if="false"
           >
             <template slot-scope="r">{{
               r.row.submitTime | dateTime
@@ -273,7 +278,7 @@
           </el-table-column>
           <el-table-column
             prop="exceptionCount"
-            label="问题数量"
+            label="隐患问题数"
             min-width="80"
             v-if="columns[9].visible"
           >
@@ -282,7 +287,7 @@
             prop="des"
             label="备注"
             min-width="80"
-            v-if="columns[9].visible"
+            v-if="false"
           >
           </el-table-column>
           <el-table-column label="操作" fixed="right" min-width="200">
@@ -306,13 +311,13 @@
                 type="text"
                 @click="showscanRecord(r.row)"
                 v-hasPermi="['resumption:taskManager:query']"
-                >扫描记录</el-button
+                >检查登记簿</el-button
               >
               <el-button
                 type="text"
                 @click="showRegister(r.row)"
                 v-if="showRegisterBtn(r.row)"
-                >登记</el-button
+                >任务登记</el-button
               >
             </template>
           </el-table-column>