修改

build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 let devModules = ['all']
-//let devModules = ['index', 'appoint', 'statisticalReport','sale','RMS','TMS']
+// let devModules = ['index', 'statisticalReport']
 // let devModules = ['index', 'ADMINISTRATORS']
 //let devModules=['index']
 

config/index.js

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

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

@@ -186,13 +186,17 @@
           type="selection"
           width="30"
           label="选择"
-          v-if="!notRoutList.includes('select')"
+          v-if="
+            !notRoutList.includes('select') ||
+              !columnNoRoutList.includes('选择')
+          "
         ></el-table-column>
         <el-table-column
           width="50"
           label="序号"
           align="center"
           :resizable="false"
+          v-if="!columnNoRoutList.includes('序号')"
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
         </el-table-column>
@@ -202,6 +206,7 @@
           width="110px"
           align="center"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('订单日期')"
         >
         </el-table-column>
         <el-table-column
@@ -209,6 +214,7 @@
           label="制单日期"
           width="130px"
           align="center"
+          v-if="!columnNoRoutList.includes('制单日期')"
         >
         </el-table-column>
         <el-table-column
@@ -219,6 +225,7 @@
           align="center"
           :filters="filterSaleOrderStatus"
           sortable
+          v-if="!columnNoRoutList.includes('销售订单状态')"
         >
         </el-table-column>
         <el-table-column
@@ -229,6 +236,7 @@
           column-key="consigneeName"
           :filters="filterConsigneeList"
           sortable
+          v-if="!columnNoRoutList.includes('客户')"
         >
         </el-table-column>
         <el-table-column
@@ -237,6 +245,7 @@
           label="运单状态"
           align="center"
           :filters="filterorderStatus"
+          v-if="!columnNoRoutList.includes('运单状态')"
         >
         </el-table-column>
         <!-- <el-table-column
@@ -257,6 +266,7 @@
           sortable
           show-overflow-tooltip
           :filters="filterCarrierList"
+          v-if="!columnNoRoutList.includes('承运商')"
         >
         </el-table-column>
         <el-table-column
@@ -268,6 +278,7 @@
           sortable
           show-overflow-tooltip
           :filters="filterCapacityList"
+          v-if="!columnNoRoutList.includes('车牌号')"
         >
         </el-table-column>
         <el-table-column
@@ -278,6 +289,7 @@
           width="150px"
           sortable
           :filters="filtermaterialNameList"
+          v-if="!columnNoRoutList.includes('物资名称')"
         >
         </el-table-column>
         <el-table-column
@@ -288,6 +300,7 @@
           sortable
           :filters="filtermaterialSpe"
           width="120px"
+          v-if="!columnNoRoutList.includes('物资规格')"
         >
         </el-table-column>
         <el-table-column
@@ -295,6 +308,7 @@
           label="物资件数"
           align="center"
           width="50px"
+          v-if="!columnNoRoutList.includes('物资件数')"
         >
         </el-table-column>
         <el-table-column
@@ -302,6 +316,7 @@
           label="理重"
           align="center"
           width="50px"
+          v-if="!columnNoRoutList.includes('理重')"
         >
         </el-table-column>
         <el-table-column
@@ -311,6 +326,7 @@
           sortable
           column-key="addressPlace"
           :filters="filteraddressPlace"
+          v-if="!columnNoRoutList.includes('收货地址')"
         >
         </el-table-column>
 
@@ -322,6 +338,7 @@
           align="center"
           :filters="filterSaleRemark"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('摘要')"
         >
         </el-table-column>
         <el-table-column
@@ -330,6 +347,7 @@
           width="150"
           align="center"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('备注')"
         >
         </el-table-column>
         <el-table-column
@@ -337,6 +355,7 @@
           label="司机电话"
           width="120px"
           align="center"
+          v-if="!columnNoRoutList.includes('司机电话')"
         >
         </el-table-column>
         <el-table-column
@@ -344,6 +363,7 @@
           label="排队开始时间"
           width="130px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('排队开始时间')"
         >
         </el-table-column>
         <el-table-column
@@ -351,6 +371,7 @@
           label="钢材科放行时间"
           width="130px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('钢材科放行时间')"
         >
         </el-table-column>
         <el-table-column
@@ -358,6 +379,7 @@
           label="进厂时间"
           width="130px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('进厂时间')"
         >
         </el-table-column>
         <el-table-column
@@ -365,15 +387,22 @@
           label="皮重时间"
           width="130px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('皮重时间')"
         >
         </el-table-column>
-        <el-table-column prop="tareWeight" label="皮重" show-overflow-tooltip>
+        <el-table-column
+          prop="tareWeight"
+          label="皮重"
+          show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('皮重')"
+        >
         </el-table-column>
         <el-table-column
           prop="loadTime"
           label="装货时间"
           width="130px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('装货时间')"
         >
         </el-table-column>
         <el-table-column
@@ -381,11 +410,22 @@
           label="毛重时间"
           width="130px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('毛重时间')"
         >
         </el-table-column>
-        <el-table-column prop="grossWeight" label="毛重" show-overflow-tooltip>
+        <el-table-column
+          prop="grossWeight"
+          label="毛重"
+          show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('毛重')"
+        >
         </el-table-column>
-        <el-table-column prop="netWeight" label="净重" show-overflow-tooltip>
+        <el-table-column
+          prop="netWeight"
+          label="净重"
+          show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('净重')"
+        >
         </el-table-column>
         <el-table-column
           prop="isPrintDelivery"
@@ -393,6 +433,7 @@
           align="center"
           width="100px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('送货单打印')"
         >
         </el-table-column>
         <el-table-column
@@ -401,6 +442,7 @@
           label="出厂时间"
           width="130px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('出厂时间')"
         >
         </el-table-column>
         <el-table-column
@@ -409,6 +451,7 @@
           width="100px"
           align="center"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('短信发送')"
         >
         </el-table-column>
         <el-table-column
@@ -416,32 +459,51 @@
           label="抵达地址"
           width="280px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('抵达地址')"
         >
         </el-table-column>
-        <el-table-column prop="arrivalTime" label="抵达时间" width="150px">
+        <el-table-column
+          prop="arrivalTime"
+          label="抵达时间"
+          width="150px"
+          v-if="!columnNoRoutList.includes('抵达时间')"
+        >
         </el-table-column>
         <el-table-column
           prop="receiptAddress"
           label="签收地址"
           width="280px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('签收地址')"
         >
         </el-table-column>
-        <el-table-column prop="receiptTime" label="签收时间" width="150px">
+        <el-table-column
+          prop="receiptTime"
+          label="签收时间"
+          width="150px"
+          v-if="!columnNoRoutList.includes('签收时间')"
+        >
         </el-table-column>
-        <el-table-column prop="priceValue" label="实际运价" width="100px">
+        <el-table-column
+          prop="priceValue"
+          label="实际运价"
+          width="100px"
+          v-if="!columnNoRoutList.includes('实际运价')"
+        >
         </el-table-column>
         <el-table-column
           prop="detailsAmount"
           label="实际运费"
           width="100px"
+          v-if="!columnNoRoutList.includes('实际运费')"
         ></el-table-column>
         <el-table-column
           prop="isAccept"
           label="异地库接收标志"
-          width="60px"
+          width="80px"
           show-overflow-tooltip
           align="center"
+          v-if="!columnNoRoutList.includes('异地库接收标志')"
         >
         </el-table-column>
         <el-table-column
@@ -449,16 +511,23 @@
           label="运输订单号"
           width="180px"
           align="center"
+          v-if="!columnNoRoutList.includes('运输订单号')"
         >
         </el-table-column>
 
-        <el-table-column prop="saler" label="业务员" align="center">
+        <el-table-column
+          prop="saler"
+          label="业务员"
+          align="center"
+          v-if="!columnNoRoutList.includes('业务员')"
+        >
         </el-table-column>
         <el-table-column
           prop="shipperName"
           label="发货单位"
           width="170px"
           align="center"
+          v-if="!columnNoRoutList.includes('发货单位')"
         >
         </el-table-column>
         <el-table-column
@@ -466,9 +535,15 @@
           label="收货客户电话"
           width="120px"
           align="center"
+          v-if="!columnNoRoutList.includes('收货客户电话')"
         >
         </el-table-column>
-        <el-table-column prop="isSelfMention" label="是否自提" align="center">
+        <el-table-column
+          prop="isSelfMention"
+          label="是否自提"
+          align="center"
+          v-if="!columnNoRoutList.includes('是否自提')"
+        >
         </el-table-column>
 
         <el-table-column
@@ -476,6 +551,7 @@
           label="销售订单号"
           width="200px"
           align="center"
+          v-if="!columnNoRoutList.includes('销售订单号')"
         >
         </el-table-column>
         <el-table-column
@@ -483,6 +559,7 @@
           label="金蝶分录ID"
           width="120px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('金蝶分录ID')"
         >
         </el-table-column>
         <el-table-column
@@ -490,6 +567,7 @@
           label="订单变更时间"
           width="120px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('订单变更时间')"
         >
         </el-table-column>
         <el-table-column
@@ -497,6 +575,7 @@
           label="销售订单变更记录"
           width="120px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('销售订单变更记录')"
         >
         </el-table-column>
         <el-table-column
@@ -504,6 +583,7 @@
           label="运输订单变更记录"
           width="120px"
           show-overflow-tooltip
+          v-if="!columnNoRoutList.includes('运输订单变更记录')"
         >
         </el-table-column>
       </el-table>
@@ -1674,6 +1754,7 @@ export default {
       aaadrawer: false,
       downloadCapacityNo: null,
       batchCarrierList: [],
+      columnNoRoutList: [],
       ops: {
         vuescroll: {},
         scrollPanel: {},
@@ -1720,6 +1801,19 @@ export default {
         this.getinformation()
       }, 1000 * 10)
     }
+    if (getCookie('orgCode') == 'shouhuokehu') {
+      //如果是收货客户,则查询
+      this.axios
+        .post('/api/v1/uc/getColumnNoRoutList', {
+          orgCode: getCookie('orgCode'),
+          tableName: '销售钢材报表'
+        })
+        .then(res => {
+          this.columnNoRoutList = res.data
+          console.log(res)
+        })
+      this.notRoutList = ['select']
+    }
     //只要涉及提交即必须设计防抖,在初始化时绑定防抖函数
     this.updateCapacityDebounce = this.debounce(() => {
       this.updateCapacity()
@@ -3115,9 +3209,17 @@ export default {
               this.getSteelReport()
               loading.close()
             } else {
-              this.$message.success(res.data.data)
-              this.operation(this.steelMap)
-              this.getSteelReport()
+              this.$alert(res.data.data, '提示', {
+                confirmButtonText: '确定',
+                center: true,
+                type: 'warning',
+                callback: action => {
+                  this.getSteelReport()
+                  this.operation(this.steelMap)
+                }
+              })
+              // this.operation(this.steelMap)
+              // this.getSteelReport()
               loading.close()
             }
           })
@@ -3166,6 +3268,7 @@ export default {
               loading.close()
               this.$alert(res.data.data, '提示', {
                 confirmButtonText: '确定',
+                center: true,
                 callback: action => {
                   this.getSteelReport()
                   this.operation(this.steelMap)
@@ -3547,7 +3650,6 @@ export default {
       //通过车序号的个数来计算车数
       let arr = []
       arr = data.map(e => {
-        console.log(e)
         if (
           e.capacityNo != '取消' &&
           e.saleOrderStatus != '关闭' &&