修改

src/config/routerBefore.js

@@ -102,6 +102,8 @@ const routerBefore = function(router, constantRouterMap) {
   let flag = false
   router.beforeEach((to, from, next) => {
     //  面包屑
+    // console.log(from, 'from')
+    // localStorage.setItem('fromRoute', from)
     if (document.domain.indexOf('steerinfo.com') > -1) {
       document.domain = 'steerinfo.com'
     }

src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue

@@ -86,6 +86,9 @@
             <i class="el-icon-pie-chart"></i>
             合并或拆分
           </el-button>
+          <el-button @click="deleteClick" type="primary">
+            关闭
+          </el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -488,8 +491,51 @@ export default {
     this.getSendStations()
   },
   methods: {
+    deleteClick() {
+      if (this.$refs.tableRef.selection.length == 1) {
+        let map = {
+          orderId: this.$refs.tableRef.selection[0].orderId,
+          userId: getCookie('userId')
+        }
+        this.$confirm('是否关闭?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.axios.post('/api/v1/oms/closeOmstruckOrder', map).then(res => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: 'success',
+                  message: '关闭成功!'
+                })
+                this.getRequestUrl()
+              } else {
+                this.$message({
+                  message: '关闭失败',
+                  type: 'warning'
+                })
+              }
+            })
+          })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            })
+          })
+      } else {
+        this.$message({
+          type: 'error',
+          duration: '2500',
+          message: '请选择一条订单',
+          offset: '250'
+        })
+        return
+      }
+    },
     mergeSplit() {
-      if (this.$refs.tableRef.selection > 0) {
+      if (this.$refs.tableRef.selection.length > 0) {
         if (!this.$refs.tableRef.selection[0].saleOrderMaterialId) {
           this.$message({
             type: 'error',

src/views/inward/components/truckOrder/purInwardTruckOrder.vue

@@ -1,35 +1,47 @@
 //运输派单
 <template>
-  <div >
+  <div>
     <div style="margin:10px">
-      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
-          <el-option
+      <el-select
+        v-model="condition1"
+        placeholder="请选择筛选条件"
+        style="width:150px"
+        clearable
+      >
+        <el-option
           v-for="item in options"
           :key="item.value"
           :label="item.label"
-          :value="item.value">
-          </el-option>
+          :value="item.value"
+        >
+        </el-option>
       </el-select>
       <el-input
-          placeholder="请输入内容"
-          v-model="input1"
-          style="width:200px"
-          clearable
+        placeholder="请输入内容"
+        v-model="input1"
+        style="width:200px"
+        clearable
       >
       </el-input>
-      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
-          <el-option
+      <el-select
+        v-model="condition2"
+        placeholder="请选择筛选条件"
+        style="width:150px"
+        clearable
+      >
+        <el-option
           v-for="item in options"
           :key="item.value"
           :label="item.label"
-          :value="item.value">
-          </el-option>
+          :value="item.value"
+        >
+        </el-option>
       </el-select>
       <el-input
-          placeholder="请输入内容"
-          v-model="input2"
-          style="width:200px"
-          clearable
+        placeholder="请输入内容"
+        v-model="input2"
+        style="width:200px"
+        clearable
       >
       </el-input>
       <el-button type="primary" class="btn" @click="getRequestUrl">
@@ -54,7 +66,6 @@
       <dilTable
         v-bind.sync="truck"
         @radio-change="currentRadioChange1"
-        
       ></dilTable>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogTableVisible = false">取 消</el-button>
@@ -119,31 +130,31 @@
 </template>
 
 <script>
-import { getCookie } from "@/utils/util.js";
+import { getCookie } from '@/utils/util.js'
 export default {
   data() {
     return {
-      condition1:null,
-      condition2:null,
-      input1:null,
-      input2:null,
-      options:[
-          {
-          label:"采购订单号",
-          value:"purchaseOrderNo"
-          },
-          {
-          label:"发货单位",
-          value:"supplierName"
-          },
-          {
-          label:"卸货点",
-          value:"warehouseName"
-          },
-          {
-          label:"船名",
-          value:"shipName"
-          }
+      condition1: null,
+      condition2: null,
+      input1: null,
+      input2: null,
+      options: [
+        {
+          label: '采购订单号',
+          value: 'purchaseOrderNo'
+        },
+        {
+          label: '发货单位',
+          value: 'supplierName'
+        },
+        {
+          label: '卸货点',
+          value: 'warehouseName'
+        },
+        {
+          label: '船名',
+          value: 'shipName'
+        }
       ],
       //模态窗的框计算
       inputText: null,
@@ -152,41 +163,41 @@ export default {
       //输入框的值
       input: null,
       //选项卡的当前选中的值
-      activeName: "first",
+      activeName: 'first',
       //已下发的表格
       first: {
-        requestUrl: ""
+        requestUrl: ''
       },
       //车辆信息的表格
       truck: {
-        requestUrl: "",
+        requestUrl: '',
         // 控制显示当选列
-        selectionType: "radio"
+        selectionType: 'radio'
       },
       Received: {
-        requestUrl: ""
+        requestUrl: ''
       },
       completed: {
-        requestUrl: ""
+        requestUrl: ''
       },
       dispatched: {
-        requestUrl: ""
+        requestUrl: ''
       },
       //车辆的表格
       truck: {
-        requestUrl: "",
-        selectionType: "radio"
+        requestUrl: '',
+        selectionType: 'radio'
       },
       //当前选中的订单id
       selectOrderId: null,
       //选中的车辆号
-      capacityNumber: "",
+      capacityNumber: '',
       //选中的运力id
       capacityId: null,
       //是否关闭模态框
       drawer: false,
       //模态框从左往右打开
-      direction: "rtl",
+      direction: 'rtl',
 
       orderId: null,
       //多选的选中的订单id
@@ -197,282 +208,282 @@ export default {
       // actiones: { username: "湘M99999" } //传入后台的数据
       addPlanCount: 0,
       timer: null
-    };
+    }
   },
   created() {
-    if (getCookie("orgCode") == "chengyunshang") {
+    if (getCookie('orgCode') == 'chengyunshang') {
       this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-        getCookie("userId");
+        '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+        getCookie('userId')
     } else {
       this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+        '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' + null
     }
-    if (getCookie("orgCode") == "chengyunshang") {
+    if (getCookie('orgCode') == 'chengyunshang') {
       this.first.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&carrierId=" +
-        getCookie("userId");
+        '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&carrierId=' +
+        getCookie('userId')
       this.Received.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&carrierId=" +
-        getCookie("userId");
+        '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&carrierId=' +
+        getCookie('userId')
       this.completed.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=" +
-        getCookie("userId");
+        '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=' +
+        getCookie('userId')
       this.dispatched.requestUrl =
-        "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3&carrierSsoId=" +
-        getCookie("userId");
+        '/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3&carrierSsoId=' +
+        getCookie('userId')
     } else if (
-      getCookie("orgCode") == "dagangadmin" ||
-      getCookie("orgCode") == "zidonghuabu"
+      getCookie('orgCode') == 'dagangadmin' ||
+      getCookie('orgCode') == 'zidonghuabu'
     ) {
       this.first.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1";
+        '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1'
       this.Received.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5";
+        '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5'
       this.completed.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2";
+        '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2'
       this.dispatched.requestUrl =
-        "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3";
+        '/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3'
     } else {
       this.first.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&userId=" +
-        getCookie("orgCode");
+        '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&userId=' +
+        getCookie('orgCode')
       this.Received.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&userId=" +
-        getCookie("orgCode");
+        '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&userId=' +
+        getCookie('orgCode')
       this.completed.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&userId=" +
-        getCookie("orgCode");
+        '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&userId=' +
+        getCookie('orgCode')
       this.dispatched.requestUrl =
-        "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3&userId=" +
-        getCookie("orgCode");
+        '/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3&userId=' +
+        getCookie('orgCode')
     }
     // this.initWebSocket();
   },
   mounted() {
-    this.getAddPlan();
-    this.timer = setInterval(this.getAddPlan, 10000);
+    this.getAddPlan()
+    this.timer = setInterval(this.getAddPlan, 10000)
   },
   beforeDestroy() {
-    clearInterval(this.timer);
+    clearInterval(this.timer)
   },
   methods: {
     getAddPlan() {
       this.axios
         .post(
-          "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2&pageNum=1&pageSize=10"
+          '/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2&pageNum=1&pageSize=10'
         )
         .then(res => {
-          console.log("data:", res.data.data);
-          this.addPlanCount = res.data.data.total;
-        });
+          console.log('data:', res.data.data)
+          this.addPlanCount = res.data.data.total
+        })
     },
     //建立websocket连接
     initWebSocket() {
       //试图调用websocket
       //初始化weosocket
-      const wssUrl = this.wssUrl;
-      this.websock = new WebSocket(wssUrl);
-      this.websock.onmessage = this.websocketonmessage;
-      this.websock.onopen = this.websocketonopen;
-      this.websock.onerror = this.websocketonerror;
+      const wssUrl = this.wssUrl
+      this.websock = new WebSocket(wssUrl)
+      this.websock.onmessage = this.websocketonmessage
+      this.websock.onopen = this.websocketonopen
+      this.websock.onerror = this.websocketonerror
       // this.websock.onclose = this.websocketclose;
     },
     //发送数据
     websocketonopen() {
-      this.websocketsend();
+      this.websocketsend()
     },
     //接收数据
     websocketonmessage(e) {
-      console.log("收到信息");
-      let data = e.data;
-      console.log(data);
-      let websocketKey = data.messageContent;
-      let userName = "湘M99999";
+      console.log('收到信息')
+      let data = e.data
+      console.log(data)
+      let websocketKey = data.messageContent
+      let userName = '湘M99999'
       let message =
         "{'messageContent': '" +
         websocketKey +
-        ":" +
+        ':' +
         userName +
-        "','messageType':1,'receivePerson': 'app','sendPerson': 'self'}";
-      this.websocketsend(message);
+        "','messageType':1,'receivePerson': 'app','sendPerson': 'self'}"
+      this.websocketsend(message)
     },
     //连接建立失败重连
     websocketonerror() {
-      this.initWebSocket();
+      this.initWebSocket()
     },
     //发送数据
     websocketsend(message) {
-      this.websock.send({ message, async success() {} });
+      this.websock.send({ message, async success() {} })
     },
     //关闭连接
     websocketclose(e) {
-      console.log("断开连接", e);
+      console.log('断开连接', e)
     },
     continueDispatch(scope) {
-      this.$router.push("/addPurInwardOrderCon/" + scope.row.planId);
+      this.$router.push('/addPurInwardOrderCon/' + scope.row.planId)
     },
     onclick() {
-      console.log();
+      console.log()
     },
     handleClose(done) {
-      done();
-      this.$message.info("取消修改运力");
+      done()
+      this.$message.info('取消修改运力')
     },
     getRequestUrl() {
-      let requestQuery={}
-      if(this.condition1 == this.condition2){
-            requestQuery[this.condition1]=[this.input1+'',this.input2+'']
-      }else{
-          requestQuery[this.condition1]=[this.input1+'']
-          requestQuery[this.condition2]=[this.input2+'']
+      let requestQuery = {}
+      if (this.condition1 == this.condition2) {
+        requestQuery[this.condition1] = [this.input1 + '', this.input2 + '']
+      } else {
+        requestQuery[this.condition1] = [this.input1 + '']
+        requestQuery[this.condition2] = [this.input2 + '']
       }
-      this.first.requestQuery=requestQuery;
-      this.Received.requestQuery=requestQuery
-      this.completed.requestQuery=requestQuery
-      this.dispatched.requestQuery=requestQuery
-      if (getCookie("orgCode") == "chengyunshang") {
-        (this.first.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&carrierId=" +
+      this.first.requestQuery = requestQuery
+      this.Received.requestQuery = requestQuery
+      this.completed.requestQuery = requestQuery
+      this.dispatched.requestQuery = requestQuery
+      if (getCookie('orgCode') == 'chengyunshang') {
+        ;(this.first.requestUrl =
+          '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&carrierId=' +
           this.carrierUserId +
-          "&test=" +
+          '&test=' +
           new Date() +
-          "&con=" +
+          '&con=' +
           this.input),
           (this.Received.requestUrl =
-            "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&planEnableStatus=1&carrierId=" +
+            '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&planEnableStatus=1&carrierId=' +
             this.carrierUserId +
-            "&test=" +
-            new Date() ),
+            '&test=' +
+            new Date()),
           (this.completed.requestUrl =
-            "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=" +
-            getCookie("userId") );
+            '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=' +
+            getCookie('userId'))
       } else if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu'
       ) {
         this.first.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1" +
-          "&test=" +
-          new Date() ;
+          '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1' +
+          '&test=' +
+          new Date()
         this.Received.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5" +
-          "&test=" +
-          new Date();
+          '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5' +
+          '&test=' +
+          new Date()
         this.completed.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2" +
-          "&test=" +
-          new Date();
+          '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2' +
+          '&test=' +
+          new Date()
       } else {
         this.first.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1" +
-          "&test=" +
+          '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1' +
+          '&test=' +
           new Date() +
-          "&userId=" +
-          getCookie("orgCode");
+          '&userId=' +
+          getCookie('orgCode')
         this.Received.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5" +
-          "&test=" +
+          '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5' +
+          '&test=' +
           new Date() +
-          "&userId=" +
-          getCookie("orgCode");
+          '&userId=' +
+          getCookie('orgCode')
         this.completed.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2" +
-          "&test=" +
+          '/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2' +
+          '&test=' +
           new Date() +
-          "&userId=" +
-          getCookie("orgCode");
+          '&userId=' +
+          getCookie('orgCode')
       }
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
     getTruckRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.truck.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-          getCookie("userId") +
-          "&test=" +
-          new Date();
+          '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+          getCookie('userId') +
+          '&test=' +
+          new Date()
       } else {
         this.truck.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
           null +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
       }
     },
     currentRadioChange1(row) {
-      console.log(row);
-      this.capacityId = row.capacityId;
+      console.log(row)
+      this.capacityId = row.capacityId
     },
     //删除运输订单
     deleteClick(scope) {
       let map = {
         orderId: scope.row.orderId,
-        userId: getCookie("userId")
-      };
-      this.$confirm("是否删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+        userId: getCookie('userId')
+      }
+      this.$confirm('是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+          this.axios.post('/api/v1/oms/closeOmstruckOrder', map).then(res => {
             if (res.data.code == 200) {
               this.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-              this.getRequestUrl();
+                type: 'success',
+                message: '删除成功!'
+              })
+              this.getRequestUrl()
             } else {
               this.$message({
-                message: "删除失败",
-                type: "warning"
-              });
+                message: '删除失败',
+                type: 'warning'
+              })
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
-        });
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
     },
     //修改运输订单
     updateClick(scope) {
-      this.getTruckRequestUrl();
-      this.orderId = scope.row.orderId;
-      this.dialogTableVisible = true;
-      console.log(scope.row.orderId);
+      this.getTruckRequestUrl()
+      this.orderId = scope.row.orderId
+      this.dialogTableVisible = true
+      console.log(scope.row.orderId)
     },
     updateTruckCapacity() {
       if (this.capacityId == null) {
-        this.$message.error("未选中运力");
-        return;
+        this.$message.error('未选中运力')
+        return
       }
       this.axios
-        .post("/api/v1/oms/updateCapacityId", {
+        .post('/api/v1/oms/updateCapacityId', {
           capacityId: this.capacityId,
           orderId: this.orderId
         })
         .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("修改运力成功");
-            this.getRequestUrl();
-            this.dialogTableVisible = false;
+          if (res.data.code == '200') {
+            this.$message.success('修改运力成功')
+            this.getRequestUrl()
+            this.dialogTableVisible = false
           } else {
-            this.$message.error("修改运力失败");
+            this.$message.error('修改运力失败')
           }
-        });
+        })
     },
     handleClick(tab, event) {
-      this.getRequestUrl();
+      this.getRequestUrl()
     },
     Insert() {
-      this.$router.push("addPurInwardOrder");
+      this.$router.push('addPurInwardOrder')
     }
   }
-};
+}
 </script>
 
 <style lang="scss">

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

@@ -427,7 +427,16 @@
             }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column
+          prop="consigneeTel"
+          column-key="consigneeTel"
+          key="consigneeTel"
+          label="收货客户电话"
+          width="120px"
+          align="center"
+          v-if="!columnNoRoutList.includes('收货客户电话')"
+        >
+        </el-table-column>
         <el-table-column
           prop="saleRemark"
           column-key="saleRemark"
@@ -671,16 +680,7 @@
           v-if="!columnNoRoutList.includes('发货单位')"
         >
         </el-table-column>
-        <el-table-column
-          prop="consigneeTel"
-          column-key="consigneeTel"
-          key="consigneeTel"
-          label="收货客户电话"
-          width="120px"
-          align="center"
-          v-if="!columnNoRoutList.includes('收货客户电话')"
-        >
-        </el-table-column>
+
         <el-table-column
           prop="isSelfMention"
           column-key="isSelfMention"
@@ -2244,6 +2244,9 @@ export default {
     }
   },
   created() {
+    // console.log(this.$route.params.data, 'filterMap')
+    // this.filterMap = this.$route.params.data
+    // this.headColumnList = this.$route.params.headColumnList
     this.getSteelReport = this.debounce(() => {
       this.getSteelReportDebounce()
     }, 100)
@@ -2422,7 +2425,6 @@ export default {
           tableName: '销售钢材报表'
         })
         .then(res => {
-          console.log(res.data.data, 'res')
           this.schemeMap = res.data.data
           this.columnNoRoutList = this.schemeMap.columnHiddenData
         })
@@ -2431,7 +2433,6 @@ export default {
         })
     },
     columnShowTabClick(e) {
-      console.log(e.paneName, 'e')
       this.schemeMap.activeName = e.paneName
     },
     //动态渲染列的显示方案
@@ -2462,7 +2463,6 @@ export default {
           })
       }
       if (action === 'remove') {
-        console.log(targetName, 'targetName')
         let map = {}
         map.columnHiddenData = []
         map.name = targetName || this.schemeMap.activeName
@@ -2565,7 +2565,6 @@ export default {
                   },
                   on: {
                     change: val => {
-                      console.log(val, 'val')
                       if (val) {
                         this.filterMap[filterVal] = [...new Set(val)]
                       } else {
@@ -2623,14 +2622,6 @@ export default {
       )
     },
     filterMethodChange(e, filterVal, renderColumnFilterList) {
-      console.log(
-        e,
-        'e',
-        filterVal,
-        'filterVal',
-        renderColumnFilterList,
-        'renderColumnFilterList'
-      )
       this.filterMap[filterVal] = [e]
     },
     ctrlColumnShow() {
@@ -2659,7 +2650,6 @@ export default {
       // console.log(row, 'row')
       // console.log('headCellStyle column.property: ', column.property)
       if (column.property && this.headColumnList.includes(column.property)) {
-        console.log(this.headColumnList, 'this.headColumnList', column.property)
         return { fontWeight: 700, fontSize: '15px' }
         //return {}
       }
@@ -2705,7 +2695,6 @@ export default {
         map.userName = getCookie('loginName')
         map.shipperAddressId = this.addressId
         this.axios.post('/api/v1/uc/submitSteel', this.steelMap).then(res => {
-          console.log(res.data.responseMapFailed, 'res.data')
           let _this = this
           if (res.data.responseMapFailed.length > 0) {
             let responseFailTitle = res.data.responseMapFailed.join(';')
@@ -5281,7 +5270,6 @@ export default {
           )
 
           this.getSpanArr(this.visibleList)
-          console.log(this.visibleList, 'this.visibleList--------------------')
           this.$refs.tableRef.bodyWrapper.scrollTop = 30 * (a - 1)
           loading.close()
         })

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

@@ -323,16 +323,47 @@ export default {
     this.showSummariesPosition()
   },
   methods: {
+    cellDbclick(row, column, cell, event) {
+      console.log(row, column)
+      let filterMap = {
+        consigneeNameList: [],
+        truckRemarkList: [],
+        saleRemarkList: [],
+        saleOrderStatusList: [],
+        materialSpeList: [],
+        addressPlaceList: [],
+        orderStatusList: [],
+        saleAreaList: [],
+        materialNameList: [],
+        carrierList: [],
+        capacityList: [],
+        isContinueList: [],
+        spellNumList: []
+      }
+
+      if (column.label.includes('未上报')) {
+        filterMap.saleOrderStatusList = ['未上报']
+        filterMap.carrierList = [row.carrier]
+        filterMap.addressPlaceList = [row.carrierDirection]
+      }
+      this.$router.push({
+        name: 'saleSteelReports',
+        params: {
+          data: filterMap,
+          headColumnList: ['carrierName']
+        }
+      })
+    },
     showSummariesPosition() {
       // const table = document.querySelector('.main')
-      const footer = document.querySelector('.main .el-table__footer-wrapper')
+      // const footer = document.querySelector('.main .el-table__footer-wrapper')
       // const footerTable = document.querySelector(
       //   '.main .el-table__footer-wrapper .el-table__footer .has-gutter'
       // )
       // console.log(footerTable, 'footerTable')
       // console.log(footer, 'foo')
       // footer.style.border = '1px,solid,#000'
-      footer.style.fontWeight = 700
+      // footer.style.fontWeight = 700
       // console.log(footer.style, 'foo')
       // table.removeChild(footer); // 移除表格最下方的合计行
       // table.insertBefore(footer, body); // 把合计行插入到表格body的上面

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

@@ -49,6 +49,7 @@
             :data="yawnReportData"
             :span-method="objectSpanMethod"
             :row-style="{ height: '30px' }"
+            :cell-style="returnClassName"
             style="width: 100%;font-size: 18px"
           >
             <el-table-column
@@ -103,7 +104,7 @@
             <el-table-column
               align="center"
               prop="receivedNum"
-              label="已接收"
+              label="已接单"
               width="80px"
             >
             </el-table-column>
@@ -252,6 +253,34 @@ export default {
     }
   },
   methods: {
+    returnClassName({ row, column, rowIndex, columnIndex }) {
+      if (row.flag == 1) {
+        console.log(row.carrierName)
+        return {
+          fontWeight: '700 !important',
+          backgroundColor: '#FFFF01'
+        }
+      }
+      if (row.daySumFlag == 1) {
+        return {
+          fontWeight: '700 !important',
+          backgroundColor: '#BFBFBF'
+        }
+      }
+      if (row.monthFlag == 1) {
+        return {
+          fontWeight: '700 !important',
+          backgroundColor: '#91D054'
+        }
+      }
+      if (row.onlyRowFlag == 1 && column.label != '方向') {
+        console.log(column.prop, 'BFBFBF')
+        return {
+          fontWeight: '700 !important',
+          backgroundColor: '#FFFF01'
+        }
+      }
+    },
     //查询装车数据
     search() {
       //时间校验
@@ -344,7 +373,9 @@ export default {
           } else {
             countRow.percent = 'NAL'
           }
+          countRow.daySumFlag = 1
           res.data.data.splice(res.data.data.length - 1, 0, countRow)
+          res.data.data[res.data.data.length - 1].monthFlag = 1
           const map1 = res.data.data.reduce((result, item) => {
             result[item.target] = result[item.target] || []
             result[item.target].push(item)
@@ -375,7 +406,8 @@ export default {
                 trainThoWeight: 0,
                 unloadThoWeight: 0,
                 carrierName: '合计',
-                target: arrayList[0].target
+                target: arrayList[0].target,
+                flag: 1
               }
               arrayList.forEach(item => {
                 if (!item.target.includes('合计')) {
@@ -411,8 +443,9 @@ export default {
                     (countRow1.planNum - countRow1.quxiaoNum)) *
                   100
                 ).toFixed(2) + '%'
-              console.log(countRow1, 'countRow1')
               arrayList.push(countRow1)
+            } else {
+              arrayList[0].onlyRowFlag = 1
             }
           })
           // console.log(result, 'result')
@@ -477,35 +510,6 @@ export default {
         if (typeof console !== 'undefined') console.log(e, table_write)
       }
       return table_write
-    },
-    getSummaries(param) {
-      console.log('param', param)
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '合计'
-          return
-        }
-        if (index === 1) {
-          sums[index] = ''
-          return
-        }
-        const values = data.map(item => Number(item[column.property]))
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return new BigNumber(prev).plus(curr).toNumber()
-            } else {
-              return prev
-            }
-          }, 0)
-        } else {
-          sums[index] = ''
-        }
-      })
-      return sums
     }
   }
 }