fix: 数据导出表格字段调整、行业重复显示问题排查

Signed-off-by: tsz <2417024719@qq.com>

src/web/templates/pc/dataExport_sieve.html

@@ -1181,8 +1181,8 @@
               <td>${item.s_topscopeclass}</td>
               <td name="name">${textFormatForMosaic(item.buyerperson)}</td>
               <td name="phone">${textFormatForMosaic(item.buyertel, true)}</td>
-              <td>${item.agency}</td>
               <td>${item.buyeraddr}</td>
+              <td>${item.agency}</td>
               <td class="multi_packet" v-if="item.winnerList && item.winnerList.length">
                 <template>
                   <tr class="multi_packet_tr" v-for="win in item.winnerList" :key="win">
@@ -1265,8 +1265,8 @@
               <td>${item.s_topscopeclass}</td>
               <td name="name">${textFormatForMosaic(item.buyerperson)}</td>
               <td name="phone">${textFormatForMosaic(item.buyertel, true)}</td>
-              <td>${item.agency}</td>
               <td>${item.buyeraddr}</td>
+              <td>${item.agency}</td>
               <td class="multi_packet" v-if="item.winnerList && item.winnerList.length">
                 <template>
                   <tr class="multi_packet_tr" v-for="win in item.winnerList" :key="win">
@@ -1454,9 +1454,9 @@
         {rowspan: 2,colspan: 1,title: '报名截止日期',},
         {rowspan: 2,colspan: 1,title: '开标日期',},
         {rowspan: 2,colspan: 1,title: '投标截止日期',},
-        {rowspan: 1,colspan: 4,title: '采购单位信息',},
+        {rowspan: 1,colspan: 5,title: '采购单位信息',},
         {rowspan: 2,colspan: 1,title: '招标代理机构',},
-        {rowspan: 1,colspan: 4,title: '中标单位信息(来源:招标公告网站)',},
+        {rowspan: 1,colspan: 3,title: '中标单位信息(来源:招标公告网站)',},
         {rowspan: 1,colspan: 3,title: '中标单位信息(来源:国家企业公示网站)',},
       ],
       loading: false,
@@ -1728,17 +1728,21 @@
         if(item.minprice!=""||item.maxprice!=""){
           priceAllBtnSel = "0";
         }
-        if(item.industry==null){
+        if(!item.industry){
           ClassArr.arr = [];
         }else{
           ClassArr.arr = this.formatIndustry(item.industry).split('，')
         }
-        if(item.buyerclass==null){
+        if(!item.buyerclass){
           buyClassArr.arr = [];
         }else{
           buyClassArr.arr = item.buyerclass.split(',');
         }
-        InfoArr.arr = this.formatInfoType(item.subtype).split('，')
+        if(item.subtype) {
+          InfoArr.arr = this.formatInfoType(item.subtype).split('，')
+        } else {
+          InfoArr.arr = []
+        }
         selectDateBtnIndex = -1;
         paramObj = item;
         echo(paramObj);
@@ -2268,9 +2272,9 @@
             {rowspan: 2,colspan: 1,title: '报名截止日期',},
             {rowspan: 2,colspan: 1,title: '开标日期',},
             {rowspan: 2,colspan: 1,title: '投标截止日期',},
-            {rowspan: 1,colspan: 4,title: '采购单位信息',},
+            {rowspan: 1,colspan: 5,title: '采购单位信息',},
             {rowspan: 2,colspan: 1,title: '招标代理机构',},
-            {rowspan: 1,colspan: 4,title: '中标单位信息(来源:招标公告网站)',},
+            {rowspan: 1,colspan: 3,title: '中标单位信息(来源:招标公告网站)',},
             {rowspan: 1,colspan: 3,title: '中标单位信息(来源:国家企业公示网站)',},
           ]
         }
@@ -3584,6 +3588,7 @@
                 ClassArr.add(sel, dataValue);
             }
         });
+        console.info(ClassArr, 'ClassArr')
         // 采购单位类型
         var buyClassing = buyClassArr.arr;
         // if (paramObj.buyerclass) {