From 42a1c947c9cd714f06df01140a784ba991ef65cf Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 4 Dec 2023 17:12:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96+=E5=B1=95=E7=A4=BA=E6=A3=80=E6=9F=A5=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/faultReport/index.vue       |  81 +++++++++--
 src/views/device/repairOrder/index.vue       | 109 +++++++++++----
 src/views/device/repairOrderReport/index.vue | 140 +++++++++++++++----
 3 files changed, 268 insertions(+), 62 deletions(-)

diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index 878527b..ab7dafe 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -312,7 +312,7 @@
     <el-dialog
       :title="title"
       :visible.sync="openCheck"
-      width="1100px"
+      width="1200px"
       append-to-body
       v-if="openCheck"
     >
@@ -362,7 +362,9 @@
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="检查项信息" v-if="checkList != null">
-            <el-table :data="checkList" border style="width: 100%">
+            <el-table :data="checkList" border style="width: 100%" :span-method="objectSpanMethod">
+              <el-table-column prop="itemTypeName" label="检查类型" width="100">
+              </el-table-column>
               <el-table-column prop="itemName" label="检查项名称" width="160">
               </el-table-column>
               <el-table-column prop="itemMethod" label="方法" width="100">
@@ -393,7 +395,7 @@
               </el-table-column>
               <el-table-column prop="detailUnit" label="单位" width="45">
               </el-table-column>
-              <el-table-column prop="picturePath" label="图片" w` idth="60">
+              <el-table-column prop="picturePath" label="图片" width="60">
                 <template slot-scope="scope">
                   <el-popover placement="right" width="300" trigger="hover">
                     <div class="standardUrl_body">
@@ -637,12 +639,12 @@
     <el-dialog
       :title="title"
       :visible.sync="viewCheck"
-      width="1100px"
+      width="1200px"
       append-to-body
       v-if="viewCheck"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-tabs type="border-card" :key="new Date().getTime()">
+        <el-tabs type="border-card">
           <el-tab-pane label="基本信息">
             <el-descriptions
               :column="3"
@@ -703,7 +705,9 @@
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="检查项信息" v-if="checkList != null">
-            <el-table :data="checkList" border style="width: 100%">
+            <el-table :data="checkList" border style="width: 100%" :span-method="objectSpanMethod">
+              <el-table-column prop="itemTypeName" label="检查类型" width="100">
+              </el-table-column>
               <el-table-column prop="itemName" label="检查项名称" width="160">
               </el-table-column>
               <el-table-column prop="itemMethod" label="方法" width="100">
@@ -990,7 +994,7 @@
     <el-dialog
       :title="title"
       :visible.sync="openView"
-      width="1100px"
+      width="1200px"
       append-to-body
       v-if="openView"
     >
@@ -1040,7 +1044,9 @@
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="检查项信息" v-if="checkList != null">
-            <el-table :data="checkList" border style="width: 100%">
+            <el-table :data="checkList" border style="width: 100%" :span-method="objectSpanMethod">
+              <el-table-column prop="itemTypeName" label="检查类型" width="100">
+              </el-table-column>
               <el-table-column prop="itemName" label="检查项名称" width="160">
               </el-table-column>
               <el-table-column prop="itemMethod" label="方法" width="100">
@@ -1471,6 +1477,7 @@ export default {
             if (item1 != null) {
               item1.standardList.forEach((item) => {
                 var standard = {};
+                standard.itemTypeName = item1.itemTypeName;
                 standard.itemName = item1.itemName;
                 standard.itemMethod = item1.itemMethod;
                 standard.itemTools = item1.itemTools;
@@ -1490,7 +1497,7 @@ export default {
                     standardUrlLists.push(item2.fileAddress);
                   });
                   standard.standardUrlLists = standardUrlLists;
-                }else{
+                } else {
                   standard.standardUrlLists = null;
                 }
                 standards.push(standard);
@@ -1548,6 +1555,7 @@ export default {
             if (item1 != null) {
               item1.standardList.forEach((item) => {
                 var standard = {};
+                standard.itemTypeName = item1.itemTypeName;
                 standard.itemName = item1.itemName;
                 standard.itemMethod = item1.itemMethod;
                 standard.itemTools = item1.itemTools;
@@ -1567,7 +1575,7 @@ export default {
                     standardUrlLists.push(item2.fileAddress);
                   });
                   standard.standardUrlLists = standardUrlLists;
-                }else{
+                } else {
                   standard.standardUrlLists = null;
                 }
                 standards.push(standard);
@@ -1668,6 +1676,59 @@ export default {
         `faultReport_${new Date().getTime()}.xlsx`
       );
     },
+
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        // 获取当前单元格的值
+        const currentValue = row[column.property];
+        // 获取上一行相同列的值
+        const preRow = this.checkList[rowIndex - 1];
+        const preValue = preRow ? preRow[column.property] : null;
+        // 如果当前值和上一行的值相同，则将当前单元格隐藏
+        if (currentValue === preValue) {
+          return { rowspan: 0, colspan: 0 };
+        } else {
+          // 否则计算当前单元格应该跨越多少行
+          let rowspan = 1;
+          for (let i = rowIndex + 1; i < this.checkList.length; i++) {
+            const nextRow = this.checkList[i];
+            const nextValue = nextRow[column.property];
+            if (nextValue === currentValue) {
+              rowspan++;
+            } else {
+              break;
+            }
+          }
+          return { rowspan, colspan: 1 };
+        }
+      }
+
+      if (columnIndex === 1) {
+        // 获取当前单元格的值
+        const currentValue = row[column.property];
+        // 获取上一行相同列的值
+        const preRow = this.checkList[rowIndex - 1];
+        const preValue = preRow ? preRow[column.property] : null;
+        // 如果当前值和上一行的值相同，则将当前单元格隐藏
+        if (currentValue === preValue) {
+          return { rowspan: 0, colspan: 0 };
+        } else {
+          // 否则计算当前单元格应该跨越多少行
+          let rowspan = 1;
+          for (let i = rowIndex + 1; i < this.checkList.length; i++) {
+            const nextRow = this.checkList[i];
+            const nextValue = nextRow[column.property];
+            if (nextValue === currentValue) {
+              rowspan++;
+            } else {
+              break;
+            }
+          }
+          return { rowspan, colspan: 1 };
+        }
+      }
+    },
+
   },
 };
 </script>
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index f21bc78..df1b4b8 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -794,7 +794,7 @@
     <el-dialog
       :title="title"
       :visible.sync="openWrite"
-      width="1100px"
+      width="1200px"
       append-to-body
       v-if="openWrite"
     >
@@ -883,10 +883,14 @@
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="检查项信息">
-            <el-table :data="detailList" border :contentStyle="CS" :label-style="LS">
+            <el-table :data="detailList" border :contentStyle="CS" :label-style="LS" :span-method="objectSpanMethod">
+              <el-table-column prop="itemTypeName" label="检查类型" width="100">
+              </el-table-column>
               <el-table-column prop="itemName" label="检查项名称" width="150">
               </el-table-column>
-              <el-table-column prop="itemMethod" label="检查项方法" width="150">
+              <el-table-column prop="itemMethod" label="方法" width="150">
+              </el-table-column>
+              <el-table-column prop="itemTools" label="工具" width="50">
               </el-table-column>
               <el-table-column prop="standardName" label="标准名称" width="150">
               </el-table-column>
@@ -905,7 +909,7 @@
                 width="110"
               >
                 <template scope="scope">
-                  <el-radio-group v-model="scope.row.repairReach">
+                  <el-radio-group v-model="scope.row.repairReach" v-if="scope.row.standardType != 'quantify'">
                     <el-radio label="1">达标</el-radio>
                     <el-radio label="0">不达标</el-radio>
                   </el-radio-group>
@@ -934,10 +938,9 @@
               </el-table-column>
               <el-table-column prop="detailDownLimit" label="下限" width="50">
               </el-table-column>
-              <el-table-column prop="detailUnit" label="单位" width="50">
-              </el-table-column>
+              <el-table-column prop="detailUnit" label="单位" width="40">
               </el-table-column>
-              <el-table-column prop="picturePath" label="图片">
+              <el-table-column prop="picturePath" label="图片" width="60">
                 <template slot-scope="scope">
                   <el-popover placement="right" width="300" trigger="hover">
                     <div class="standardUrl_body">
@@ -1124,14 +1127,14 @@ export default {
       },
       WLS: {
         "text-align": "center",
-        width: "200px",
+        width: "225px",
       },
       CS: {
         "text-align": "center",
       },
       LS: {
         "text-align": "center",
-        width: "200px",
+        width: "225px",
       },
       //图片表格样式
       LSP: {
@@ -1493,20 +1496,24 @@ export default {
           this.detailList.forEach((item1) => {
             //检查项名字
             if (item1 != null) {
-            item1.standardList.forEach((item) => {
-              var standard = {};
-              standard.itemName = item1.itemName;
-              standard.itemMethod = item1.itemMethod;
-              standard.standardName = item.standardName;
-              standard.detailUpLimit = item.detailUpLimit;
-              standard.detailDownLimit = item.detailDownLimit;
-              standard.detailUnit = item.detailUnit;
-              standard.detailReach = item.detailReach;
-              standard.actualValue = item.actualValue;
-              //实际值
-              standard.repairValue = item.repairValue;
-              standard.repairReach = item.repairReach;
-              standard.standardType = item.standardType;
+              item1.standardList.forEach((item) => {
+                var standard = {};
+                standard.itemTypeName = item1.itemTypeName;
+                standard.itemName = item1.itemName;
+                standard.itemMethod = item1.itemMethod;
+                standard.itemTools = item1.itemTools;
+                standard.planLoop = item1.planLoop;
+                standard.planLoopType = item1.planLoopType;
+                standard.standardName = item.standardName;
+                standard.detailUpLimit = item.detailUpLimit;
+                standard.detailDownLimit = item.detailDownLimit;
+                standard.detailUnit = item.detailUnit;
+                standard.detailReach = item.detailReach;
+                standard.actualValue = item.actualValue;
+                //实际值
+                standard.repairValue = item.repairValue;
+                standard.repairReach = item.repairReach;
+                standard.standardType = item.standardType;
                 //检查项图片
                 var standardUrlLists = [];
                 if (item.picturePaths != null) {
@@ -1514,8 +1521,10 @@ export default {
                     standardUrlLists.push(item2.fileAddress);
                   });
                   standard.standardUrlLists = standardUrlLists;
-                  standards.push(standard);
+                } else {
+                  standard.standardUrlLists = null;
                 }
+                standards.push(standard);
               });
             }
           });
@@ -1646,6 +1655,58 @@ export default {
         ` repairOrder_${new Date().getTime()}.xlsx`
       );
     },
+
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        // 获取当前单元格的值
+        const currentValue = row[column.property];
+        // 获取上一行相同列的值
+        const preRow = this.detailList[rowIndex - 1];
+        const preValue = preRow ? preRow[column.property] : null;
+        // 如果当前值和上一行的值相同，则将当前单元格隐藏
+        if (currentValue === preValue) {
+          return { rowspan: 0, colspan: 0 };
+        } else {
+          // 否则计算当前单元格应该跨越多少行
+          let rowspan = 1;
+          for (let i = rowIndex + 1; i < this.detailList.length; i++) {
+            const nextRow = this.detailList[i];
+            const nextValue = nextRow[column.property];
+            if (nextValue === currentValue) {
+              rowspan++;
+            } else {
+              break;
+            }
+          }
+          return { rowspan, colspan: 1 };
+        }
+      }
+
+      if (columnIndex === 1) {
+        // 获取当前单元格的值
+        const currentValue = row[column.property];
+        // 获取上一行相同列的值
+        const preRow = this.detailList[rowIndex - 1];
+        const preValue = preRow ? preRow[column.property] : null;
+        // 如果当前值和上一行的值相同，则将当前单元格隐藏
+        if (currentValue === preValue) {
+          return { rowspan: 0, colspan: 0 };
+        } else {
+          // 否则计算当前单元格应该跨越多少行
+          let rowspan = 1;
+          for (let i = rowIndex + 1; i < this.detailList.length; i++) {
+            const nextRow = this.detailList[i];
+            const nextValue = nextRow[column.property];
+            if (nextValue === currentValue) {
+              rowspan++;
+            } else {
+              break;
+            }
+          }
+          return { rowspan, colspan: 1 };
+        }
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/device/repairOrderReport/index.vue b/src/views/device/repairOrderReport/index.vue
index 42f5db9..47948bc 100644
--- a/src/views/device/repairOrderReport/index.vue
+++ b/src/views/device/repairOrderReport/index.vue
@@ -342,13 +342,18 @@
     <el-dialog
       :title="title"
       :visible.sync="openView"
-      width="1100px"
+      width="1200px"
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-tabs type="border-card">
           <el-tab-pane label="报修基本信息">
-            <el-descriptions :column="3" border :contentStyle="CS" :label-style="LS">
+            <el-descriptions
+              :column="3"
+              border
+              :contentStyle="CS"
+              :label-style="LS"
+            >
               <el-descriptions-item label="报修单编号">{{
                 form.orderCode
               }}</el-descriptions-item>
@@ -390,7 +395,11 @@
               }}</el-descriptions-item>
             </el-descriptions>
             <el-descriptions :column="1" border>
-              <el-descriptions-item label="维修前故障图片" :contentStyle="CS" :label-style="LS">
+              <el-descriptions-item
+                label="维修前故障图片"
+                :contentStyle="CS"
+                :label-style="LS"
+              >
                 <el-image
                   v-for="(item, index) in urlBeforeLists"
                   :key="index"
@@ -401,7 +410,12 @@
           </el-tab-pane>
 
           <el-tab-pane label="维修基本信息">
-            <el-descriptions :column="2" border :contentStyle="CS" :label-style="LS">
+            <el-descriptions
+              :column="2"
+              border
+              :contentStyle="CS"
+              :label-style="LS"
+            >
               <el-descriptions-item label="维修工单号">{{
                 form.workCode
               }}</el-descriptions-item>
@@ -465,7 +479,12 @@
                 form.workReason
               }}</el-descriptions-item>
             </el-descriptions>
-            <el-descriptions :column="1" border :contentStyle="CS" :label-style="LS">
+            <el-descriptions
+              :column="1"
+              border
+              :contentStyle="CS"
+              :label-style="LS"
+            >
               <el-descriptions-item label="维修后图片">
                 <el-image
                   v-for="(item, index) in urlAfterLists"
@@ -477,10 +496,14 @@
           </el-tab-pane>
 
           <el-tab-pane label="检查项信息">
-            <el-table :data="detailList" border >
+            <el-table :data="detailList" border :span-method="objectSpanMethod">
+              <el-table-column prop="itemTypeName" label="检查类型" width="100">
+              </el-table-column>
               <el-table-column prop="itemName" label="检查项名称" width="150">
               </el-table-column>
-              <el-table-column prop="itemMethod" label="检查项方法" width="150">
+              <el-table-column prop="itemMethod" label="方法" width="150">
+              </el-table-column>
+              <el-table-column prop="itemTools" label="工具" width="50">
               </el-table-column>
               <el-table-column prop="standardName" label="标准名称" width="150">
               </el-table-column>
@@ -499,7 +522,10 @@
                 width="110"
               >
                 <template scope="scope">
-                  <el-radio-group v-model="scope.row.repairReach">
+                  <el-radio-group
+                    v-model="scope.row.repairReach"
+                    v-if="scope.row.standardType != 'quantify'"
+                  >
                     <el-radio label="1">达标</el-radio>
                     <el-radio label="0">不达标</el-radio>
                   </el-radio-group>
@@ -528,10 +554,9 @@
               </el-table-column>
               <el-table-column prop="detailDownLimit" label="下限" width="50">
               </el-table-column>
-              <el-table-column prop="detailUnit" label="单位" width="50">
+              <el-table-column prop="detailUnit" label="单位" width="40">
               </el-table-column>
-              </el-table-column>
-              <el-table-column prop="picturePath" label="图片">
+              <el-table-column prop="picturePath" label="图片" width="60">
                 <template slot-scope="scope">
                   <el-popover placement="right" width="300" trigger="hover">
                     <div class="standardUrl_body">
@@ -551,7 +576,7 @@
                   </el-popover>
                 </template>
               </el-table-column>
-              </el-table>
+            </el-table>
           </el-tab-pane>
         </el-tabs>
       </el-form>
@@ -582,6 +607,7 @@ export default {
       //表格样式
       CS: {
         "text-align": "center",
+         width: "200px",
       },
       LS: {
         "text-align": "center",
@@ -616,7 +642,7 @@ export default {
       openView: false,
       // 查询参数
       queryParams: {
-        workStatus:"1",
+        workStatus: "1",
         pageNum: 1,
         pageSize: 10,
         orderId: null,
@@ -831,20 +857,24 @@ export default {
           this.detailList.forEach((item1) => {
             //检查项名字
             if (item1 != null) {
-            item1.standardList.forEach((item) => {
-              var standard = {};
-              standard.itemName = item1.itemName;
-              standard.itemMethod = item1.itemMethod;
-              standard.standardName = item.standardName;
-              standard.detailUpLimit = item.detailUpLimit;
-              standard.detailDownLimit = item.detailDownLimit;
-              standard.detailUnit = item.detailUnit;
-              standard.detailReach = item.detailReach;
-              standard.actualValue = item.actualValue;
-              //实际值
-              standard.repairValue = item.repairValue;
-              standard.repairReach = item.repairReach;
-              standard.standardType = item.standardType;
+              item1.standardList.forEach((item) => {
+                var standard = {};
+                standard.itemTypeName = item1.itemTypeName;
+                standard.itemName = item1.itemName;
+                standard.itemMethod = item1.itemMethod;
+                standard.itemTools = item1.itemTools;
+                standard.planLoop = item1.planLoop;
+                standard.planLoopType = item1.planLoopType;
+                standard.standardName = item.standardName;
+                standard.detailUpLimit = item.detailUpLimit;
+                standard.detailDownLimit = item.detailDownLimit;
+                standard.detailUnit = item.detailUnit;
+                standard.detailReach = item.detailReach;
+                standard.actualValue = item.actualValue;
+                //实际值
+                standard.repairValue = item.repairValue;
+                standard.repairReach = item.repairReach;
+                standard.standardType = item.standardType;
                 //检查项图片
                 var standardUrlLists = [];
                 if (item.picturePaths != null) {
@@ -852,8 +882,10 @@ export default {
                     standardUrlLists.push(item2.fileAddress);
                   });
                   standard.standardUrlLists = standardUrlLists;
-                  standards.push(standard);
+                } else {
+                  standard.standardUrlLists = null;
                 }
+                standards.push(standard);
               });
             }
           });
@@ -879,6 +911,58 @@ export default {
         ` repairOrder_${new Date().getTime()}.xlsx`
       );
     },
+
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        // 获取当前单元格的值
+        const currentValue = row[column.property];
+        // 获取上一行相同列的值
+        const preRow = this.detailList[rowIndex - 1];
+        const preValue = preRow ? preRow[column.property] : null;
+        // 如果当前值和上一行的值相同，则将当前单元格隐藏
+        if (currentValue === preValue) {
+          return { rowspan: 0, colspan: 0 };
+        } else {
+          // 否则计算当前单元格应该跨越多少行
+          let rowspan = 1;
+          for (let i = rowIndex + 1; i < this.detailList.length; i++) {
+            const nextRow = this.detailList[i];
+            const nextValue = nextRow[column.property];
+            if (nextValue === currentValue) {
+              rowspan++;
+            } else {
+              break;
+            }
+          }
+          return { rowspan, colspan: 1 };
+        }
+      }
+
+      if (columnIndex === 1) {
+        // 获取当前单元格的值
+        const currentValue = row[column.property];
+        // 获取上一行相同列的值
+        const preRow = this.detailList[rowIndex - 1];
+        const preValue = preRow ? preRow[column.property] : null;
+        // 如果当前值和上一行的值相同，则将当前单元格隐藏
+        if (currentValue === preValue) {
+          return { rowspan: 0, colspan: 0 };
+        } else {
+          // 否则计算当前单元格应该跨越多少行
+          let rowspan = 1;
+          for (let i = rowIndex + 1; i < this.detailList.length; i++) {
+            const nextRow = this.detailList[i];
+            const nextValue = nextRow[column.property];
+            if (nextValue === currentValue) {
+              rowspan++;
+            } else {
+              break;
+            }
+          }
+          return { rowspan, colspan: 1 };
+        }
+      }
+    },
   },
 };
 </script>