修改

build/utils.js

@@ -17,8 +17,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 // let devModules = ['all']
-let devModules = ['index', 'statisticalReport']
-// let devModules = ['all']
+// let devModules = ['index']
+let devModules = ['all']
 // let devModules = ['index', 'ADMINISTRATORS']
 
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -72,7 +72,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   '/api/v1': {
-    target: 'http://172.16.33.166:80',
+    target: 'http://192.168.3.81:80',
     // target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
@@ -82,7 +82,7 @@ let proxyTable = {
   },
   '/views/api/v1': {
     //target: "http://172.16.33.166:80",
-    target: 'http://172.16.33.166:80',
+    target: 'http://192.168.3.81:80',
     ws: true,
     pathRewrite: {
       '^/views/api/v1': '/api/v1'

src/components/main.vue

@@ -271,7 +271,7 @@
               class="ifCompany el-dropdown-link"
               v-if="companys.length === 1"
             >
-              {{ companyName }}
+              湖南视拓信息技术股份有限公司智慧物流平台
             </span>
             <el-dropdown trigger="click" @command="selectComPany" v-else>
               <span class="el-dropdown-link">

src/views/index/components/login.vue

@@ -2,7 +2,7 @@
   <div class="icore-lg">
     <img
       style="width: 100%; height: 100%; position: absolute"
-      src="../../../assets/img/icore-shown-all.png"
+      src="../../../assets/img/Coverstdil.png"
     />
     <section v-if="isJump === true">
       <div class="jumpText">正在为您跳转,请稍后...</div>
@@ -220,7 +220,7 @@ export default {
                   }
                 }
                 //清空通知id
-                 window.top.localStorage.setItem('noticeId', null)
+                window.top.localStorage.setItem('noticeId', null)
               } else {
                 //  登录失败
                 // 提示

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -1379,7 +1379,20 @@ export default {
       //筛选条件1（客户）
       filters1: [],
       spanArr: [],
+      spanArr1:[],
+      spanArr2:[],
+      spanArr3:[],
       pos: 0,
+      pos1:0,
+      pos2:0,
+      pos3:0,
+      mergeListBatch : [
+        '净重',
+        '皮重时间',
+        '皮重',
+        '毛重时间',
+        '毛重',
+      ],
       //需要合并列的名称
       mergeList: [
         // '选择',
@@ -1412,11 +1425,6 @@ export default {
         '签收时间',
         '最终运价',
         '摘要',
-        '净重',
-        '皮重时间',
-        '皮重',
-        '毛重时间',
-        '毛重',
       ],
       //需要合并列的名称(已结算)
       mergeList1: [
@@ -1449,12 +1457,6 @@ export default {
         '抵达时间',
         '签收时间',
         '最终运价',
-        '摘要',
-        '净重',
-        '皮重时间',
-        '皮重',
-        '毛重时间',
-        '毛重',
       ],
 
       tableTitle: '销售钢材统计报表',
@@ -3337,19 +3339,33 @@ export default {
     getSpanArr(data) {
       //每次调用方法初始化
       this.spanArr = []
+      this.spanArr2 = []
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
           this.spanArr.push(1)
+          this.spanArr2.push(1)
           this.pos = 0
+          this.pos2 = 0
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId || ( data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId)) {
+          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
             this.spanArr[this.pos] += 1
-
             this.spanArr.push(0)
+
+            if(data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId){
+              //批次合并
+              this.spanArr2[this.pos2] += 1
+              this.spanArr2.push(0)
+            }else{
+              this.spanArr2.push(1)
+              this.pos2 = i
+            }
           } else {
             this.spanArr.push(1)
             this.pos = i
+
+            this.spanArr2.push(1)
+            this.pos2 = i
           }
         }
       }
@@ -3357,20 +3373,34 @@ export default {
     getSpanArr1(data) {
       //每次调用方法初始化
       this.spanArr1 = []
+      this.spanArr3 = []
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
           this.spanArr1.push(1)
-
           this.pos = 0
+
+          this.spanArr3.push(1)
+          this.pos3 = 0
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId || ( data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId)) {
+          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
             this.spanArr1[this.pos] += 1
-
             this.spanArr1.push(0)
+
+            if(data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId){
+              //批次合并
+              this.spanArr3[this.pos3] += 1
+              this.spanArr3.push(0)
+            }else{
+              this.spanArr3.push(1)
+              this.pos3 = i
+            }
           } else {
             this.spanArr1.push(1)
             this.pos = i
+
+            this.spanArr3.push(1)
+              this.pos3 = i
           }
         }
       }
@@ -3383,6 +3413,13 @@ export default {
           rowspan: _row,
           colspan: _col
         }
+      }else if(this.mergeListBatch.indexOf(column.label) != -1){
+        const _row = this.spanArr2[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
       }
     },
     objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
@@ -3393,6 +3430,13 @@ export default {
           rowspan: _row,
           colspan: _col
         }
+      }else if(this.mergeListBatch.indexOf(column.label) != -1){
+        const _row = this.spanArr2[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
       }
     },
     //计算总件数和总车数

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -2036,6 +2036,11 @@ export default {
       spanArr: [],
       pos: 0,
       spanArr1: [],
+      spanArr2: [],
+      spanArr3: [],
+      mergeListBatch: ['净重', '皮重时间', '皮重', '毛重时间', '毛重'],
+      pos2: 0,
+      pos3: 0,
       pos1: 0,
       //需要合并列的名称
       mergeList: [
@@ -2079,9 +2084,13 @@ export default {
         '拼数',
         '是否继续装',
         '订单上传时间',
-        '收款公司'
+        '收款公司',
+        '净重',
+        '皮重时间',
+        '皮重',
+        '毛重时间',
+        '毛重'
       ],
-      netWeightMegeList: ['净重', '皮重时间', '皮重', '毛重时间', '毛重'],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
       lineSpelling: [
@@ -4875,7 +4884,11 @@ export default {
           this.pos = 0
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
+          if (
+            data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId ||
+            (data[i].weightBatchId &&
+              data[i].weightBatchId === data[i - 1].weightBatchId)
+          ) {
             this.spanArr[this.pos] += 1
             // data[i].group = data[i - 1].group
             this.spanArr.push(0)
@@ -4890,11 +4903,14 @@ export default {
     getSpanArr1(data) {
       //每次调用方法初始化
       this.spanArr1 = []
+      this.spanArr3 = []
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
           this.spanArr1.push(1)
+          this.spanArr3.push(1)
           // data[i].group = i
           this.pos1 = 0
+          this.pos3 = 0
         } else {
           // 判断当前元素与上一个元素是否相同
           if (
@@ -4905,9 +4921,23 @@ export default {
             this.spanArr1[this.pos] += 1
             // data[i].group = data[i - 1].group
             this.spanArr1.push(0)
+
+            if (
+              data[i].weightBatchId &&
+              data[i].weightBatchId === data[i - 1].weightBatchId
+            ) {
+              //批次合并
+              this.spanArr3[this.pos3] += 1
+              this.spanArr3.push(0)
+            } else {
+              this.spanArr3.push(1)
+              this.pos3 = i
+            }
           } else {
             this.spanArr1.push(1)
             this.pos1 = i
+            this.spanArr3.push(1)
+            this.pos3 = i
             // data[i].group = data[i - 1].group + 1
           }
         }
@@ -4921,6 +4951,13 @@ export default {
           rowspan: _row,
           colspan: _col
         }
+      } else if (this.mergeListBatch.indexOf(column.label) != -1) {
+        const _row = this.spanArr2[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
       }
     },
     objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
@@ -4931,6 +4968,13 @@ export default {
           rowspan: _row,
           colspan: _col
         }
+      } else if (this.mergeListBatch.indexOf(column.label) != -1) {
+        const _row = this.spanArr3[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
       }
     },
     //计算总件数和总车数