wenhongquan 3 ani în urmă
părinte
comite
194a452dcb

+ 30 - 0
src/views/mb/task/detail/index.vue

@@ -216,6 +216,36 @@
                   ).jlr }}</van-col>
           </van-row>
           </van-collapse-item>
+
+
+          <van-collapse-item class="citem" title="核查反馈信息" name="5" v-if="taskinfo.status < 5 && (taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 6) ?? [])
+            .length > 0">
+            <van-row>
+            <van-col :span="24"
+              >核查人员:{{
+                JSON.parse(
+                    taskinfo.tblTaskLogList.filter(
+                      (ii) => ii.taskStatus === 6
+                    )[0].logDes ?? "{}"
+                  ).hcry
+              }}</van-col
+            >
+
+            <van-col :span="24">核查时间:{{ JSON.parse(
+                    taskinfo.tblTaskLogList.filter(
+                      (ii) => ii.taskStatus === 6
+                    )[0].logDes ?? "{}"
+                  ).hctime }}</van-col>
+            <van-col :span="24"
+              >核查备注:{{ JSON.parse(
+                    taskinfo.tblTaskLogList.filter(
+                      (ii) => ii.taskStatus === 6
+                    )[0].logDes ?? "{}"
+                  ).hcdes }}</van-col
+            >
+          </van-row>
+          </van-collapse-item>
+
           <van-collapse-item class="citem" title="响应信息" name="7" v-if="(taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === -1) ?? [])
             .length > 0">
           <div>

+ 5 - 1
src/views/mb/task/index.vue

@@ -29,7 +29,7 @@
               style="padding: 10px 10px; padding-bottom: 0"
               v-for="item in tasklist"
             >
-              <div class="item" @click="gotodetail(item)">
+              <div  @click="gotodetail(item)" :class="item.status < 5 && item.tblTaskLogList.filter((ii) => ii.taskStatus === 6).length>0?'item warning-row':'item'">
                 <div>
                   <div class="header">
                     <div>任务编号:{{ item.taskCode }}</div>
@@ -371,6 +371,10 @@ body {
   top: -1px;
 }
 
+.warning-row {
+  background: var(--el-color-warning-light-9) !important;
+}
+
 .listcontent {
   overflow-y: auto;
 

+ 48 - 1
src/views/task/detail/index.vue

@@ -248,6 +248,40 @@
         </div>
       </div>
 
+        <div class="card" v-if="taskinfo.status < 5 && (taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 6) ?? [])
+            .length > 0">
+        <div class="title" style="background:#f9d3e3">核查反馈信息</div>
+        <div class="body">
+          <el-row>
+            <el-col :span="12"
+              >核查人员:{{
+                JSON.parse(
+                  taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 6)[0]
+                    .logDes ?? "{}"
+                ).hcry
+              }}</el-col
+            >
+
+            <el-col :span="12"
+              >核查时间:{{
+                JSON.parse(
+                  taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 6)[0]
+                    .logDes ?? "{}"
+                ).hctime
+              }}</el-col
+            >
+            <el-col :span="24"
+              >核查备注:{{
+                JSON.parse(
+                  taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 6)[0]
+                    .logDes ?? "{}"
+                ).hcdes
+              }}</el-col
+            >
+          </el-row>
+        </div>
+      </div>
+
       <div
         class="card"
         v-if="
@@ -379,6 +413,8 @@
         </div>
       </div>
 
+
+
       <div class="card" v-if="taskinfo.status == 4">
         <div class="title">现场驳回</div>
         <div class="body">
@@ -1136,7 +1172,16 @@ const TaskSH = () => {
 };
 
 const TaskJJ = () => {
-  updateTask({
+  var gz = cloneDeep(shobj.value);
+   if (gz.hctime) {
+    gz.hctime = moment(gz.hctime).format("YYYY-MM-DD HH:mm:ss");
+  }
+  ddTask({
+    taskId: route.params.id,
+    taskStatus: 6,
+    logDes: JSON.stringify(gz),
+  }).then((res) => {
+    updateTask({
     taskId: route.params.id,
     status: 2,
   }).then((res) => {
@@ -1144,6 +1189,8 @@ const TaskJJ = () => {
     ElMessage.success("成功!");
     gettasklist();
   });
+  });
+
 }
 
 

+ 16 - 0
src/views/task/list/index.vue

@@ -95,6 +95,7 @@
           class="eltable"
           style="width: 100%"
           @row-click="tblrowclick"
+          :row-class-name="tableRowClassName"
         >
           <el-table-column prop="taskCode" label="工单号" width="180" />
           <el-table-column prop="taskArea" label="行政区">
@@ -399,6 +400,18 @@ const exportexcel2 = (row) => {
 }
 
 
+const tableRowClassName = ({
+  row,
+  rowIndex,
+}) => {
+
+  if (row.status < 5 && row.tblTaskLogList.filter((ii) => ii.taskStatus === 6).length>0) {
+    return 'warning-row'
+  }
+  return ''
+}
+
+
 onMounted(() => {
   if (currentstatus.value == '2') {
       queryparameters.value.status = 1;
@@ -435,4 +448,7 @@ onMounted(() => {
 .el-table__row:hover {
   cursor: pointer;
 }
+.el-table .warning-row {
+  --el-table-tr-bg-color: var(--el-color-warning-light-9);
+}
 </style>