委托查询优化——列表加委托编号

itdmWeb/src/views/module-iTDM/weituochaxun/ItdmWeituoYangpinList.vue

@@ -205,6 +205,14 @@
             // }
           },
           {
+            title:'委托编号',
+            align:"center",
+            dataIndex: 'weituoNo',
+            customRender:function (t,r,index) {
+              return {children: t,attrs: {rowSpan:r.rowSpan3}};
+            },
+          },
+          {
             title:'样品名称',
             align:"center",
             dataIndex: 'sampleName',
@@ -392,9 +400,12 @@
           //判断跨行
             let rowSpan = 0
             let rowSpan2 = 0
+            let rowSpan3 = 0
             let weituoClient = ''
             let sampleName = ''
+            let weituoNo = ''
             for (let i = that.dataSource.length-1; i >= 0; i--) {
+              // 委托单位合并
               if (weituoClient == '') {
                 that.dataSource[i].rowSpan = 0
                 weituoClient = that.dataSource[i].weituoClient
@@ -411,6 +422,7 @@
                 }
 
               }
+              // 样品名称合并
               if (sampleName == '') {
                 that.dataSource[i].rowSpan2 = 0
                 sampleName = that.dataSource[i].sampleName
@@ -427,6 +439,23 @@
                 }
 
               }
+              // 委托编号合并
+              if (weituoNo == '') {
+                that.dataSource[i].rowSpan3 = 0
+                weituoNo = that.dataSource[i].weituoNo
+                rowSpan3++
+              } else {
+                if(weituoNo == that.dataSource[i].weituoNo){
+                  that.dataSource[i].rowSpan3 = 0
+                  rowSpan3++
+                }else{
+                  that.dataSource[i+1].rowSpan3 = rowSpan3
+                  that.dataSource[i].rowSpan3 = 0
+                  rowSpan3 = 1
+                  weituoNo = that.dataSource[i].weituoNo
+                }
+
+              }
             }
             that.dataSource[0].rowSpan = rowSpan
             that.dataSource[0].rowSpan2 = rowSpan2