Merge branch 'shang' into dev

src/views/task/taskEstimate/TaskEstimateList.vue

@@ -114,12 +114,16 @@ const columns = [
     title: "姓名",
     dataIndex: "realName",
     width: 80,
-    customRender: (value, row) => {
+    customRender: (value, record) => {
       const obj = {
         children: value,
         attrs: {},
       };
-      obj.attrs.rowSpan = row.rowspan;
+      obj.attrs.rowSpan = record.rowspan;
+      if (record.rowKey == "totaltotal") {
+        obj.attrs.colspan = 2;
+        obj.attrs.style = "font-weight: 600;";
+      }
       return obj;
     },
   },
@@ -135,6 +139,9 @@ const columns = [
       if (record.rowKey.startsWith("total")) {
         obj.attrs.style = "font-weight: 600;";
       }
+      if (record.rowKey == "totaltotal") {
+        obj.attrs.hidden = true;
+      }
       return obj;
     },
   },