From 30e858fa504b268b9b436afca0a1259cf6e8c488 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 11:01:40 +0800
Subject: [PATCH] 优化

---
 admin/src/components/business/OperaWorkorderDetailDcaWindow.vue |   83 ++++++++++++++++++++++++++++++++---------
 1 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
index 374517c..5aeee8c 100644
--- a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
@@ -8,15 +8,16 @@
     <div class="modal_wrap">
       <div class="modal_content">
         <div class="header">
-          <img v-if="info.status == '3'" class="head_bg"
-               src="@/assets/task/bg_shenhe_fail@2x.png" alt="">
-          <img v-else-if="info.status == '4'" class="head_bg"
+          <!--          <img v-if="info.status == '0'" class="head_bg"
+                  src="@/assets/task/bg_shenhe_fail@2x.png" alt="">-->
+          <img v-if="info.status == '4' || info.status == '3'||info.status == '5'||info.status == '6'" class="head_bg"
                src="@/assets/task/bg_shenhe_pass@2x.png" alt="">
           <img v-else class="head_bg" src="@/assets/task/bg_shenhe@2x.png" alt="">
           <div class="left">
             <div class="h1">{{ cateList[type] }}</div>
             <div class="time">鎻愪氦鏃堕棿锛歿{ info.createDate }}</div>
           </div>
+          <div class="right"     :class="{ scs: info.status == '3' || info.status == '4' || info.status == '5',  msg: info.status == '6' }">{{statusMap[info.status] }}</div>
         </div>
         <div class="info">  <div class="title">宸ュ崟淇℃伅</div>
           <div class="list">
@@ -37,11 +38,11 @@
               <div class="value">{{ info.submitDate }}</div>
             </div>
             <div class="item">
-              <div class="label">鍙戠敓鏃堕棿</div>
+              <div class="label">鍙戠幇鏃堕棿</div>
               <div class="value">{{ info.happenTime}}</div>
             </div>
             <div class="item">
-              <div class="label">鍙戠敓鍦扮偣</div>
+              <div class="label">浣嶇疆</div>
               <div class="value">{{ info.locationName }}</div>
             </div>
             <div class="item">
@@ -79,7 +80,10 @@
         <div class="table_info">
           <div class="title">涓嶇鍚堥」宸ュ崟鍒楄〃</div>
           <el-table :data="info.dcaChildList" border fit>
-            <el-table-column label="宸ュ崟鍙�" prop="code" min-width="100">
+            <el-table-column prop="index" label="搴忓彿" width="55" fixed="left">
+              <template slot-scope="scope">{{ scope.$index+1}}</template>
+            </el-table-column>
+            <el-table-column label="宸ュ崟鍙�" prop="code" min-width="120">
               <template slot-scope="{row}">
                 <span style="color: #2E68EC;cursor: pointer" @click="$refs.OperaWorkorderDetailDcaInfoWindow.open('DCA涓嶇鍚堥」宸ュ崟璇︽儏', row)" >{{ row.code || '-'}}</span>
               </template>
@@ -87,20 +91,36 @@
             <el-table-column label="涓�绾т富棰�" prop="typeName" min-width="60"> </el-table-column>
             <el-table-column label="浜岀骇涓婚" prop="categoryName" min-width="60"> </el-table-column>
             <el-table-column label="瑙傚療椤�" prop="problemTitle" min-width="100"> </el-table-column>
-            <el-table-column label="涓嶇鍚堝師鍥�" prop="eventInfo" min-width="120" />
-            <el-table-column label="澶勭悊鐘舵��" prop="status" min-width="80">
+            <el-table-column label="鐘舵��" prop="status" min-width="80">
               <template slot-scope="{row}">
-                <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>
-                <span :class="'statusInfo'+row.status" v-else-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
+<!--                <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>-->
+                <span :class="'statusInfo'+row.status" v-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
                 <span :class="'statusInfo'+row.status" v-else>澶勭悊涓�</span>
               </template>
             </el-table-column>
+            <el-table-column prop="statusInfo" label="鐘舵�佹弿杩�" min-width="100px">
+              <template slot-scope="{row}">
+                <span :class="'statusInfo'+row.status" >{{ row.statusName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="涓嶇鍚堝師鍥�" prop="eventInfo" min-width="180" />
             <el-table-column label="鎿嶄綔" prop="status" min-width="80">
               <template slot-scope="{row}">
                 <el-button type="text" @click="$refs.OperaWorkorderDetailDcaInfoWindow.open('DCA涓嶇鍚堥」宸ュ崟璇︽儏', row)" icon="el-icon-zoom-out" >鏌ョ湅璇︽儏</el-button>
                 <!--<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:workorder:delete']">鍒犻櫎</el-button>-->
               </template>
             </el-table-column>
+          </el-table>
+        </div>
+        <div class="table_info">
+          <div class="title">绗﹀悎椤瑰垪琛�</div>
+          <el-table :data="dataList2" border fit>
+            <el-table-column prop="index" label="搴忓彿" width="55" fixed="left">
+              <template slot-scope="scope">{{ scope.$index+1}}</template>
+            </el-table-column>
+            <el-table-column label="涓�绾т富棰�" prop="typeName" min-width="140"> </el-table-column>
+            <el-table-column label="浜岀骇涓婚" prop="categoryName" min-width="150"> </el-table-column>
+            <el-table-column label="瑙傚療椤�" prop="problemTitle" min-width="400"> </el-table-column>
           </el-table>
         </div>
       </div>
@@ -129,13 +149,14 @@
       type: null,
       title: '宸ュ崟璇︽儏',
       info: {},
+      dataList2: [],
       statusMap: {
-        0: '寰呭垎閰峎TS',
-        1: '寰呭垎閰嶄换鍔�',
-        2: '寰呭鐞�',
-        3: '宸茶В鍐�',
-        4: '宸茶В鍐�',
-        5: '宸茶В鍐�'
+        0: '澶勭悊涓�',
+        1: '澶勭悊涓�',
+        2: '澶勭悊涓�',
+        3: '宸插鐞�',
+        4: '宸插鐞�',
+        5: '宸插鐞�'
       },
       cateList: {
         0: 'SHE浜嬩欢宸ュ崟',
@@ -159,6 +180,7 @@
     getDetail () {
       getById(this.info.id).then(res => {
         this.info = res
+        this.getDataListByRemak()
         if (this.info.logList && this.info.logList.length > 0) {
           this.info.logList.forEach(item => {
             if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
@@ -171,6 +193,25 @@
           })
         }
       })
+    },
+    getDataListByRemak () {
+      this.dataList2 =[]
+      if(this.info.remark){
+        var obj = JSON.parse(this.info.remark)
+        console.log(obj)
+        if(obj && obj.childMapList){
+          obj.childMapList.forEach(item =>{
+            if(item && item.problemMapList){
+              item.problemMapList.forEach(item1 =>{
+                if(item1 && item1.status === 1){
+                  this.dataList2.push({'typeName':this.info.typeName, 'categoryName':item.childTitle,'problemTitle':item1.title})
+                }
+              })
+            }
+          })
+        }
+
+      }
     },
     reject () { },
     handleAvatarSuccess () { },
@@ -214,7 +255,7 @@
 
 .modal_wrap {
   display: flex;
-  height: 100%;
+  height: auto;
 
   .modal_content {
     flex: 1;
@@ -237,17 +278,21 @@
         flex-wrap: wrap;
         .item {
           display: flex;
-          width: 30%;
+          width: 50%;
           font-size: 14px;
           margin-bottom: 20px;
+
           &:nth-of-type(2n) {
-            width: 30%;
+            width: 50%;
           }
+
           .label {
             color: #888888;
             width: 100px;
           }
+
           .value {
+            width: calc(100% - 100px);
             color: #111111;
           }
         }

--
Gitblit v1.9.3