Merge remote-tracking branch 'origin/master'

config/index.js

@@ -74,7 +74,7 @@ let proxyTable = {
   '/api/v1': {
     target: 'http://172.16.33.166:80',
     // target: 'http://localhost:8080',
-    // target: "http://192.168.1.101:8080",
+    // target: 'http://192.168.1.102:8080',
     ws: true,
     pathRewrite: {
       '^/api/v1': '/api/v1'

src/components/main.vue

@@ -338,7 +338,7 @@
               :hidden="badgeshow"
             >
               <el-button type="text" size="small" @click="goMyTaskPage"
-                >待办任务</el-button
+                >通知信息</el-button
               >
             </el-badge>
             <div class="Web_Notice" v-show="socketshow" style="z-index: 1 ; overflow-y: scroll">

src/views/TMS/components/bmsship/DryWetDetails.vue

@@ -63,11 +63,26 @@
           :filters="banlanceMonthList"
         >
         </el-table-column>
-        <el-table-column prop="portName" label="放货港口" min-width="80px" align="center">
+        <el-table-column
+          prop="portName"
+          label="放货港口"
+          min-width="80px"
+          align="center"
+        >
         </el-table-column>
-        <el-table-column prop="noticeTime" label="放货日期" width="80px" align="center">
+        <el-table-column
+          prop="noticeTime"
+          label="放货日期"
+          width="80px"
+          align="center"
+        >
         </el-table-column>
-        <el-table-column prop="commerceMethod" label="矿种" width="60px" align="center"></el-table-column>
+        <el-table-column
+          prop="commerceMethod"
+          label="矿种"
+          width="60px"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="materialName"
           label="品种"
@@ -130,9 +145,9 @@
           width="100px"
           align="center"
         >
-         <template slot-scope="scope" v-if="scope.row.lossWet">
-                {{(scope.row.lossWet*100).toFixed(2)}}%
-        </template>
+          <template slot-scope="scope" v-if="scope.row.lossWet">
+            {{ (scope.row.lossWet * 100).toFixed(2) }}%
+          </template>
         </el-table-column>
         <el-table-column
           prop="loadWaterRate"
@@ -140,9 +155,9 @@
           width="100px"
           align="center"
         >
-        <template slot-scope="scope" v-if="scope.row.loadWaterRate">
-                {{(scope.row.loadWaterRate*100).toFixed(2)}}%
-        </template>
+          <template slot-scope="scope" v-if="scope.row.loadWaterRate">
+            {{ (scope.row.loadWaterRate * 100).toFixed(2) }}%
+          </template>
         </el-table-column>
         <el-table-column
           prop="enWaterRate"
@@ -150,9 +165,9 @@
           width="120px"
           align="center"
         >
-        <template slot-scope="scope" v-if="scope.row.enWaterRate">
-                {{(scope.row.enWaterRate*100).toFixed(2)}}%
-        </template>
+          <template slot-scope="scope" v-if="scope.row.enWaterRate">
+            {{ (scope.row.enWaterRate * 100).toFixed(2) }}%
+          </template>
         </el-table-column>
         <el-table-column
           prop="totalDeduct"
@@ -169,7 +184,7 @@
         >
         </el-table-column>
         <el-table-column
-          prop="loadWaterTon"
+          prop="loadDryTon"
           label="装船干基重"
           width="120px"
           align="center"
@@ -188,9 +203,9 @@
           width="100px"
           align="center"
         >
-        <template slot-scope="scope" v-if="scope.row.lossDry">
-                {{(scope.row.lossDry*100).toFixed(2)}}%
-        </template>
+          <template slot-scope="scope" v-if="scope.row.lossDry">
+            {{ (scope.row.lossDry * 100).toFixed(2) }}%
+          </template>
         </el-table-column>
         <!-- <el-table-column
           prop="reduceEnDry"
@@ -229,7 +244,7 @@ export default {
         '车数',
         '计费吨位',
         '到厂湿吨',
-        '装船与到厂吨差',
+        '装船与到厂湿吨差',
         '到厂扣杂',
         '入厂水分吨位',
         '装船干基重',
@@ -300,35 +315,33 @@ export default {
     }
   },
   created() {},
-  mounted(){
-    this.onClick();
+  mounted() {
+    this.onClick()
   },
   methods: {
     filterTag(value, row) {
       return row.balanceMonth === value
     },
     //查询数据
-    onClick(){
-      let map={
-        con:this.con
-      };
-      let startTime = null;
-      let endTime = null;
+    onClick() {
+      let map = {
+        con: this.con
+      }
+      let startTime = null
+      let endTime = null
       if (this.startTime) {
-        startTime = sjTime(this.startTime);
+        startTime = sjTime(this.startTime)
       }
       if (this.endTime) {
-        endTime = sjTime(this.endTime);
+        endTime = sjTime(this.endTime)
       }
-      if(startTime && endTime && startTime < endTime){
-          map.startTime=startTime;
-          map.endTime=endTime;
+      if (startTime && endTime && startTime < endTime) {
+        map.startTime = startTime
+        map.endTime = endTime
       }
-      this.axios  
-        .post("/api/v1/bms/getWetDryDetails",map)
-        .then((res) => {
-         this.tableData=res.data.data;
-        });
+      this.axios.post('/api/v1/bms/getWetDryDetails', map).then(res => {
+        this.tableData = res.data.data
+      })
     },
     //处理表格数据
     computedTableData(data) {
@@ -366,8 +379,11 @@ export default {
             sums[index] = 'N/A'
           }
         }
-        //遍历数组,找到符合条件的列
       })
+      sums[12] = `${((1 - sums[10] / sums[6]) * 100).toFixed(2)}%`
+      sums[19] = `${((1 - sums[18] / sums[17]) * 100).toFixed(2)}%`
+      sums[13] = `${((sums[7] / sums[6]) * 100).toFixed(2)}%`
+      sums[14] = `${((sums[16] / sums[10]) * 100).toFixed(2)}%`
       return sums
     },
     //结算

src/views/TMS/components/bmsship/detailsStatement.vue

@@ -161,9 +161,7 @@
               width="100px"
               align="center"
             >
-             <template slot-scope="scope">
-                {{(scope.row.monthRealTonnage).toFixed(2)}}
-              </template>
+           
             </el-table-column>
            
             <el-table-column
@@ -199,9 +197,6 @@
               width="120px"
               align="center"
             >
-              <template slot-scope="scope" v-if="scope.row.totalPreviewFee">
-                {{(scope.row.totalPreviewFee).toFixed(2)}}
-              </template>
             </el-table-column>
             <el-table-column
               prop="monthMakeTonnage"
@@ -209,9 +204,7 @@
               width="100px"
               align="center"
             >
-             <template slot-scope="scope">
-                {{(scope.row.monthMakeTonnage).toFixed(2)}}
-              </template>
+            
             </el-table-column>
              <el-table-column
               prop="statementTotalAmount"
@@ -232,7 +225,6 @@
               label="操作"
               width="100px"
               align="center"
-              fixed="right"
             >
               <template slot-scope="scope">
                 <el-button type="text" @click="operate(scope.row)"
@@ -482,13 +474,13 @@ export default {
           item.totalEnTonnage = data[index - 1].totalEnTonnage;
         }
         //总计预开票金额
-        item.totalPreviewFee=Math.round(item.totalPreviewTonnage*item.unitPrice*100)/100;
+        item.totalPreviewFee = new BigNumber(item.totalPreviewTonnage).times(item.unitPrice).toFixed(2);
         //月份结算吨位/
-        item.monthRealTonnage = Math.round(item.totalEnTonnage*item.monthLoadingProportion*100)/100;
+        item.monthRealTonnage = new BigNumber(item.totalEnTonnage).times(item.monthLoadingProportion).toFixed(2);
         //月份开票吨位
-        item.monthMakeTonnage = Math.round((item.monthRealTonnage-item.totalPreviewTonnage)*100)/100;
+        item.monthMakeTonnage = new BigNumber(item.monthRealTonnage).minus(item.totalPreviewTonnage).toFixed(2);
         //月份开票金额
-        item.statementTotalAmount=Math.round((item.monthMakeTonnage*item.unitPrice-item.inspectionsFee)*100)/100;
+        item.statementTotalAmount=new BigNumber(item.monthMakeTonnage).times(item.unitPrice).minus(item.inspectionsFee).toFixed(2);
       });
       this.getSpanArr(this.tableData);
     },

src/views/WMS/components/intrainst/intrainst_real.vue

@@ -1,11 +1,11 @@
 <template>
-  <!-- 在途实时库存 -->
-  <div class="homeworkPath">
-    <div class="sache">
+  <!-- 在途实时库存 class="homeworkPath"-->
+  <div>
+    <div class="homeworkPath1">
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
-        clearable>
+        clearable style="width: 200px;margin-right: 20px">
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
@@ -30,16 +30,25 @@ export default {
     };
   },
   mounted() {
-    
+
   },
   methods: {
   },
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+/*.homeworkPath {
   .top {
     padding: 1.25rem 1.875rem;
   }
+}*/
+.homeworkPath1{
+  height: 60px;
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  margin-top: 10px;
+  flex-wrap: wrap;
+  align-items: center;
 }
 </style>

src/views/WMS/components/port_deposit/loadPortStock.vue

@@ -55,7 +55,7 @@
       :pageSize="pageSize"
       :expandRowKeys="expandRowKeys"
     >
-    <el-table-column fixed="right" label="点后出入库详情" width="120">
+    <el-table-column fixed="right" label="操作" width="180">
           <template slot-scope="scope">
               <el-button @click="detailclick1(scope.row)" type="text" size="small">
                 入库详情
@@ -63,6 +63,9 @@
               <el-button @click="detailclick2(scope.row)" type="text" size="small">
                 出库详情
               </el-button>
+              <el-button @click="detailclick3(scope.row)" type="text" size="small">
+                手动清场
+              </el-button>
           </template>
     </el-table-column>
     <el-table-column type="expand" width="1">
@@ -128,7 +131,7 @@ export default {
       tableHead1:[
         {
           prop: "resultMaterialNumber",
-          label: "入库吨位",
+          label: "点后入库吨位",
           width: 150
         },
         {
@@ -140,12 +143,12 @@ export default {
       tableHead2:[
          {
           prop: "resultMaterialNumber",
-          label: "出库吨位",
+          label: "点后出库吨位",
           width: 150
         },
         {
           prop: "wagonNumber",
-          label: "出库车皮数",
+          label: "点后出库车皮数",
           width: 150
         },
         {
@@ -206,6 +209,29 @@ export default {
         }
       });
     },
+    detailclick3(row){
+      console.log("row",row);
+       this.$confirm('确认清场?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+         this.axios.post("/api/v1/wmsh/clearWmshGridMaterial", row).then(res => {
+          console.log("res", res);
+          if(res.data.succeed){
+            this.$message.success("清场成功！");
+            this.onclick();
+          }else{
+            this.$message.error("清场失败！");
+          }
+        });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消操作'
+          });          
+        });
+    },
     func(res) {
       console.log("aaa" + res);
       var resultActualInstallations = 0;
@@ -216,11 +242,13 @@ export default {
     },
     // 点击查询查看
     onclick() {
-      this.option.requestUrl =
+      let requestUrl=
         "/api/v1/wmsh/getLoadPortStockList?apiId=158&i=" +
-        new Date() +
-        "&con=" +
-        this.input;
+        new Date() 
+      if(this.input){
+        requestUrl+="&con=" + this.input;
+      }
+      this.option.requestUrl =requestUrl;
     },
     onclick1() {
       this.option2.requestUrl =

src/views/WMS/components/steel/steel_real.vue

@@ -11,12 +11,12 @@
           <el-option label="高线库" value="3"></el-option>
           <el-option label="配送库" value="4"></el-option>
         </el-select>
-        <el-select v-model="time" placeholder="一个月" style="width: auto;">
+<!--        <el-select v-model="time" placeholder="一个月" style="width: auto;">
           <el-option label="不选择月份" value="0"></el-option>
           <el-option label="一个月" value="1"></el-option>
           <el-option label="半个月" value="2"></el-option>
-        <!-- <el-option label="" value="3"></el-option> -->
-        </el-select>
+        &lt;!&ndash; <el-option label="" value="3"></el-option> &ndash;&gt;
+        </el-select>-->
         <el-button type="primary" class="btn" @click="onClick">
           <i class="el-icon-search"></i>查询
         </el-button>
@@ -41,7 +41,7 @@ export default {
       mapList:[],
       inputText:"",
       option: {
-        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+"0"+"&time="+"0",
+        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+"1"+"&time="+"0",
       },
       rowId:''
     };

src/views/appoint/components/saleContract/dispacherSwitch.vue

@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <div style="margin-left:45%;margin-top:50px;font-size:40px">
+        <el-switch
+        v-model="value"
+        active-text="允许派车给无GPS车辆"
+        @change="updateSwitch">
+        </el-switch>
+    </div>
+    
+  </div>
+</template>
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "dispacherSwitch",
+  data() {
+    return {
+      value: true
+    };
+  },
+  mounted() {
+   this.getSwitch();
+  },
+  methods: {
+    getSwitch(){
+        this.axios.post("/api/v1/uc/getDispachSwitch").then((res)=>{
+            if(res.data.data.isOk==0){
+                this.value=false;
+            }else{
+                this.value=true;
+            }
+        });
+    },
+    updateSwitch(){
+        let map={};
+        if(this.value){
+            map.isOk=1;
+        }else{
+            map.isOk=0
+        }
+        this.axios.post("/api/v1/uc/updateDispachSwitch",map).then((res)=>{
+           console.log(res);
+        });
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

src/views/appoint/router/index.js

@@ -57,6 +57,7 @@ import saleOrderCoproductCarrier from '../components/saleContract/saleOrderCopro
 import saleOrderDetail from '../components/saleContract/saleOrderDetail.vue'
 import saleOrderDetailApproved from '../components/saleContract/saleOrderDetailApproved.vue'
 import saleOrderMaterial from '../components/saleContract/saleOrderMaterial.vue'
+import dispacherSwitch from '../components/saleContract/dispacherSwitch.vue'
 // import saleOrderSteel from "../components/saleContract/saleOrderSteel.vue";
 const saleOrderSteel = () =>
   import('../components/saleContract/saleOrderSteel.vue')
@@ -281,6 +282,12 @@ const constantRouterMap = [
         meta: { code: 'xtpzgl-jggl' },
         component: addSaleOrderSteelSend
       },
+      {
+        path: 'dispacherSwitch',
+        name: 'dispacherSwitch',
+        meta: { code: 'xtpzgl-jggl' },
+        component: dispacherSwitch
+      },
       {
         path: 'addSaleOrderSteelSendCarrier/:saleOrderId',
         name: 'addSaleOrderSteelSendCarrier',

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -114,7 +114,7 @@
             :row-key="getRowKey"
             style="width: 100%; margin-top: 20px"
             @selection-change="handleSelectionChange"
-            max-height="600px"
+            max-height="500px"
           >
             <!-- 是否可以勾选:selectable="selectInit" -->
             <el-table-column
@@ -191,6 +191,7 @@
             max-height="500px"
           >
             <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column width="80" align="center" prop="Nosort"></el-table-column>
             <el-table-column prop="capacityNumber" label="车牌号" fit>
             </el-table-column>
             <el-table-column prop="resultStartTime" label="排队开始时间">
@@ -488,6 +489,15 @@ export default {
           }
         }
       }
+
+      // 表格序号
+      let Nosort = 0
+      for(let n in this.spanArr){
+        if(this.spanArr[n]>0){
+          Nosort += 1
+          this.$set(data[n],'Nosort',Nosort)
+        }
+      }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (

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

@@ -1,6 +1,6 @@
 // 计费详单
 <template>
-  <div class="steel_inbound">
+  <div class="steelDetailsOrder">
     <div class="sache">
       <el-date-picker
         v-model="startTime"
@@ -22,7 +22,7 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"
+      <el-button type="primary" @click="exportAllExcel"
         ><i class="el-icon-download"></i>导出Excel</el-button
       >
     </div>
@@ -56,111 +56,49 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <!-- 修改详单单价弹出框 -->
-      <!-- 内层单价选择弹出框 -->
-<!--      <el-dialog
-        width="40%"
-        title="地址筛选"
-        :visible.sync="addressDrawer"
-        append-to-body
-      >
-        <el-input
-          v-model="addresText"
-          placeholder="请输入内容"
-          style="margin-top: 10px; margin-left: 20px; width: 250px"
-        ></el-input>
-        <el-button
-          type="primary"
-          @click="selectAddresClick"
-          :loading="selectLineLoading"
-          ><i class="el-icon-search"></i>查询</el-button
-        >
-        &lt;!&ndash; 已选中 省市(区)县 &ndash;&gt;
-        <el-form :inline="true" style="margin-top: 0.5rem;">
-          <el-form-item>
-            <label class="el-form-item__label" style="width: auto;"
-              >已选中省市县(区):</label
-            >
-          </el-form-item>
-          <el-form-item>
-            <el-input
-              class="el-form-item__content"
-              v-model="address"
-              placeholder="请输入内容"
-              :disabled="true"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-        &lt;!&ndash; 具体收货地址 &ndash;&gt;
-        <div v-if="address != null">
-          <el-form :inline="true" style="margin-top: 0.5rem;">
-            <el-form-item label="具体收货地址:">
-              <el-autocomplete
-                class="inline-input"
-                v-model="place"
-                :fetch-suggestions="querySearch1"
-                placeholder="请输入具体收货地址"
-                :trigger-on-focus="false"
-                @select="handleSelect1"
-              >
-              </el-autocomplete>
-            </el-form-item>
-
-            <el-button type="primary" @click="addAddressClick">确定</el-button>
-          </el-form>
-        </div>
-
-        <div class="tablecls">
-          &lt;!&ndash; 查询所有的运输单价 &ndash;&gt;
-          <dilTable
-            v-bind.sync="Address"
-            @radio-change="currentRadioChange2"
-          ></dilTable>
-        </div>
-      </el-dialog>-->
-      <!-- 内层单价选择弹出框 -->
-
-      <!--append-to-body-->
-      <el-drawer
-        title="修改详单地址"
-        :visible.sync="dialogFormVisible"
-        size="40%"
-        >
-<!--        <el-form-item label="原详单地址" :label-width="formLabelWidth">-->
-        原详单地址
-        <el-input
-            style="width:250px"
-            v-model="originalAddress"
-            disabled
-          ></el-input>
-          <label>原单价</label>
-          <el-input
-            style="width:100px"
-            v-model="originalPriceValue"
-            disabled
-          ></el-input>
-<!--        </el-form-item>-->
-        <!---->
-        <el-input
-          v-model="addresText"
-          placeholder="请输入内容"
-          style="margin-top: 10px; margin-left: 20px; width: 250px"
-          @keyup.native.enter="selectAddresClick"
-        ></el-input>
-        <el-button
-          type="primary"
-          @click="selectAddresClick"
-          :loading="selectLineLoading"
+    <el-drawer
+      title="修改详单地址"
+      :visible.sync="dialogFormVisible"
+      size="40%"
+    >
+      <!--        <el-form-item label="原详单地址" :label-width="formLabelWidth">-->
+      原详单地址
+      <el-input
+        style="width:250px"
+        v-model="originalAddress"
+        disabled
+      ></el-input>
+      <label>原单价</label>
+      <el-input
+        style="width:100px"
+        v-model="originalPriceValue"
+        disabled
+      ></el-input>
+      <!--        </el-form-item>-->
+      <!---->
+      <el-input
+        v-model="addresText"
+        placeholder="请输入内容"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        @keyup.native.enter="selectAddresClick"
+      ></el-input>
+      <el-button
+        type="primary"
+        @click="selectAddresClick"
+        :loading="selectLineLoading"
         ><i class="el-icon-search"></i>查询</el-button
-        >
-        <div class="tablecls">
-          <!-- 查询所有的运输单价 -->
+      >
+      <div class="tablecls">
+        <!-- 查询所有的运输单价 -->
+        <vue-scorll :ops="ops" style="width: 100%;height: 100%">
           <dilTable
             v-bind.sync="Address"
             @radio-change="currentRadioChange2"
+            :drawer="aaadrawer"
           ></dilTable>
-        </div>
-<!--        <el-form-item label="新详单地址" :label-width="formLabelWidth">
+        </vue-scorll>
+      </div>
+      <!--        <el-form-item label="新详单地址" :label-width="formLabelWidth">
           <el-input
             style="width:250px"
             v-model="newAddress"
@@ -177,42 +115,37 @@
           >
         </el-form-item>-->
 
-        <!-- class="dialog-footer" slot="footer"-->
+      <!-- class="dialog-footer" slot="footer"-->
       <div class="opreation">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="primary" @click="makeSure">确 定</el-button>
       </div>
-
-      </el-drawer>
-    <!-- 增加途损 -->
-    <el-dialog title="增加途损" width="30%" :visible.sync="dialogDamage">
-      <el-form>
-        <el-form-item label="达钢的干基" :label-width="formLabelWidth">
-          <el-input v-model="DaDryBasis"></el-input>
-        </el-form-item>
-        <el-form-item label="九江收货的干基" :label-width="formLabelWidth">
-          <el-input v-model="JiuDryBasis"></el-input>
-        </el-form-item>
-        <el-form-item label="单价" :label-width="formLabelWidth">
-          <el-input v-model="Fee"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogDamage = false">取 消</el-button>
-        <el-button type="primary" @click="makeSureAdd">确 定</el-button>
-      </div>
-    </el-dialog>
+    </el-drawer>
   </div>
-
 </template>
 
 <script>
-import { getCookie } from "@/utils/util.js";
-import { sjTime } from "../../../../ADMINISTRATORS/app";
+import { getCookie } from '@/utils/util.js'
+import { sjTime } from '../../../../ADMINISTRATORS/app'
 export default {
   data() {
     return {
-      tableTitle: "销售钢材汽运结算详单",
+      aaadrawer: false,
+      ops: {
+        vuescroll: {},
+        scrollPanel: {},
+        rail: {
+          keepShow: true
+        },
+        bar: {
+          hoverStyle: true,
+          onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
+          background: '#5f9ea0', //滚动条颜色
+          opacity: 0.8, //滚动条透明度
+          'overflow-x': 'hidden'
+        }
+      },
+      tableTitle: '销售钢材汽运结算详单',
       endTime: null,
       startTime: null,
       //已选中 省市县(区)
@@ -223,6 +156,7 @@ export default {
       addressId: null,
       //省市县(区)查询值
       addresText: null,
+      noSettleDetailsColumn: [],
       //达钢的干基
       DaDryBasis: null,
       //九江收货的干基
@@ -233,18 +167,18 @@ export default {
       damageFee: null,
       //加载
       selectLineLoading: false,
-      input: "",
-      activeName: "first",
+      input: '',
+      activeName: 'first',
       ssoId: null,
       //详单Id
       detailsId: null,
       options1: {
         // first请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
       },
       options2: {
         // second请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
       },
       //是否打开修改详单地址弹出框
       dialogFormVisible: false,
@@ -264,201 +198,230 @@ export default {
       addressDrawer: false,
       //运输单价的表格
       Address: {
-        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=511",
-        selectionType: "radio"
+        requestUrl: '/api/v1/ams/getAddressDeliveryAddress?apiId=511',
+        selectionType: 'radio'
       },
       // addressText:null,
       //缓存当前选中的运输单价
       priceMap: {},
-      formLabelWidth: "125px"
-    };
+      formLabelWidth: '125px'
+    }
   },
   created() {
-    this.options1GetRequestUrl();
-    this.options2GetRequestUrl();
+    this.options1GetRequestUrl()
+    this.options2GetRequestUrl()
   },
   methods: {
+    //excel方法
+    exportAllExcel() {
+      let startTime = null
+      let endTime = null
+      let carrierSsoId = null
+      if (getCookie('orgCode') == 'chengyunshang') {
+        carrierSsoId = getCookie('userId')
+      }
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
+      }
+      if (this.activeName == 'first') {
+        console.log('进入了first')
+        this.tableTitle = '销售钢材汽运结算详单(未结算)'
+        this.axios
+          .post(
+            '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
+              this.input +
+              '&startTime=' +
+              startTime +
+              '&endTime=' +
+              endTime +
+              '&status=0' +
+              '&i=' +
+              new Date()
+          )
+          .then(res => {
+            console.log(res.data.data)
+            console.log('测试打印功能')
+            console.log()
+            this.exportAllList = res.data.data.list
+            this.noSettleDetailsColumn = res.data.data.columnData
+            this.exportAllReportToExcel(
+              this.tableTitle,
+              this.exportAllList,
+              this.noSettleDetailsColumn
+            )
+          })
+      } else if (this.activeName == 'second') {
+        console.log('进入了second')
+        this.tableTitle = '销售钢材汽运结算详单(已结算)'
+        this.axios
+          .post(
+            '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
+              this.ssoId
+          )
+          .then(res => {
+            this.exportAllList = res.data.data
+            console.log('测试2')
+            console.log(res)
+            this.exportAllReportToExcel(
+              this.tableTitle,
+              this.exportAllList,
+              this.settleDetailsColumn
+            )
+          })
+      }
+    },
+    //导出excel
+    exportAllReportToExcel(tableTitle, dataArr, columnData) {
+      var title = tableTitle
+      let tHeader = []
+      let filterVal = []
+      console.log('进入了导出')
+      console.log(columnData)
+      columnData.forEach(e1 => {
+        if (tHeader.indexOf(e1.label) === -1) {
+          tHeader.push(e1.label)
+        }
+        if (filterVal.indexOf(e1.prop) === -1) {
+          filterVal.push(e1.prop)
+        }
+      })
+      //导出为excel
+      this.downloadLoading = true
+      require.ensure([], () => {
+        const {
+          export_json_to_excel
+        } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        // let list = this.$refs.excelDom.dataTabel;
+        let data = dataArr.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+        export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
+      })
+    },
     //未结算数据
     options1GetRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
-        this.ssoId = getCookie("userId");
+      if (getCookie('orgCode') == 'chengyunshang') {
+        this.ssoId = getCookie('userId')
         this.options1.requestUrl =
-          "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=" +
-          getCookie("userId");
+          '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
+          getCookie('userId')
       } else {
         this.options1.requestUrl =
-          "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=" +
-          this.ssoId;
+          '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
+          this.ssoId
       }
     },
     //已结算数据
     options2GetRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.options2.requestUrl =
-          "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=" +
-          getCookie("userId");
+          '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
+          getCookie('userId')
       } else {
         this.options2.requestUrl =
-          "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=" +
-          this.ssoId;
+          '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&carrierSsoId=' +
+          this.ssoId
       }
     },
     //收货地址弹出层
     handleSelect1(item) {
-      console.log("获取所有下拉值!");
+      console.log('获取所有下拉值!')
     },
     //查询全国省市县
     selectAddresClick() {
       if (this.addresText) {
         this.Address.requestUrl =
-          "/api/v1/ams/getAddressDeliveryAddress?apiId=511&con=" +
-          this.addresText;
+          '/api/v1/ams/getAddressDeliveryAddress?apiId=511&con=' +
+          this.addresText
       } else {
         this.Address.requestUrl =
-          "/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=" + new Date();
+          '/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=' + new Date()
       }
     },
     //以下是收货地址边输边查搜索
     querySearch1(queryString, cb) {
       this.axios
         .post(
-          "/api/v1/ams/getRealAddressByLike?addressId=" +
+          '/api/v1/ams/getRealAddressByLike?addressId=' +
             this.addressId +
-            "&index=" +
+            '&index=' +
             queryString
         )
         .then(res => {
-          if (res.data.code == "200") {
-            var restaurants = res.data.data;
+          if (res.data.code == '200') {
+            var restaurants = res.data.data
             var results = queryString
               ? restaurants.filter(this.createFilter1(queryString))
-              : restaurants;
+              : restaurants
             // 调用 callback 返回建议列表的数据
-            cb(results);
+            cb(results)
           }
-        });
+        })
     },
     createFilter1(queryString) {
       return restaurants => {
         return (
           restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
           -1
-        );
-      };
+        )
+      }
     },
     //以上是收货地址边输边查搜索
     toInsert() {
-      this.$router.push("/insertCheckInventory");
+      this.$router.push('/insertCheckInventory')
     },
     // getclick(scope){
     //   this.$router.push("/getTransportResult/"+scope.row.orderId)
     // },
     //增加途损
-    addDamage(row) {
-      this.detailsId = row.detailsId;
-      this.dialogDamage = true;
-    },
-    makeSureAdd() {
-      if (!this.DaDryBasis) {
-        this.$message.error("达钢的干基还未填!");
-      } else if (!this.JiuDryBasis) {
-        this.$message.error("九江收货的干基还未填!");
-      } else if (!this.Fee) {
-        this.$message.error("单价还未填!");
-      } else {
-        this.dialogDamage = false;
-        //计算途损 [（达钢的干基-九江收货的干基）/达钢的干基 - 0.03] * 单价 > 0, 扣除途损
-        this.damageFee =
-          ((this.DaDryBasis - this.JiuDryBasis) / this.DaDryBasis - 0.03) *
-          this.Fee;
-        if (this.damageFee > 0) {
-          let map = {
-            detailsId: this.detailsId,
-            lossFees: this.damageFee.toFixed(2)
-          };
-          //是否确定增加途损费!
-          this.$confirm("是否确定增加途损费", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-            center: true
-          })
-            .then(() => {
-              //初始化增加途损费对话框中的信息
-              (this.damageFee = null),
-                this.axios
-                  .post("/api/v1/bms/addLossFeeOfCoke", map)
-                  .then(res => {
-                    if (res.data.code == "0") {
-                      this.$message.success("增加途损费成功!");
-                      //重置未结算详单表单信息
-                      this.options1.requestUrl =
-                        "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&i=" +
-                        new Date();
-                    } else {
-                      this.$message.error("增加途损费失败,请联系管理员!");
-                    }
-                  });
-            })
-            .catch(() => {
-              this.$message({
-                type: "info",
-                message: "取消修改详单单价!"
-              });
-            });
-        }
-      }
-    },
     onclick() {
-
-      console.log("查询待定值");
-      let startTime = null;
-      let endTime = null;
-      let carrierSsoId = null;
-      if (getCookie("orgCode") == "chengyunshang") {
-        carrierSsoId = getCookie("userId");
+      console.log('查询待定值')
+      let startTime = null
+      let endTime = null
+      let carrierSsoId = null
+      if (getCookie('orgCode') == 'chengyunshang') {
+        carrierSsoId = getCookie('userId')
       }
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
       this.options1.requestUrl =
-        "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=" +
+        '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
         this.input +
-        "&startTime=" +
+        '&startTime=' +
         startTime +
-        "&endTime=" +
+        '&endTime=' +
         endTime +
-        "&status=0" +
-        "&i=" +
-        new Date();
+        '&status=0' +
+        '&i=' +
+        new Date()
       this.options2.requestUrl =
-        "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=" +
+        '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
         this.input +
-        "&startTime=" +
+        '&startTime=' +
         startTime +
-        "&endTime=" +
+        '&endTime=' +
         endTime +
-        "&status=1" +
-        "&i=" +
-        new Date();
+        '&status=1' +
+        '&i=' +
+        new Date()
     },
     //修改详单单价
     priceValueUpdate(row) {
-      this.originalAddress = row.realAddress;
-      this.originalPriceValue = row.priceValue;
-      this.detailsId = row.detailsId;
-      this.dialogFormVisible = true;
+      this.originalAddress = row.realAddress
+      this.originalPriceValue = row.priceValue
+      this.detailsId = row.detailsId
+      this.dialogFormVisible = true
     },
     //运输订单点击浏览的事件
     select() {
-      this.addressDrawer = true;
+      this.addressDrawer = true
     },
     //运输单价模态窗口的框计算
     selectAddressClick() {
       this.Price.requestUrl =
-        "/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=" +
-        this.addressText;
+        '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=' +
+        this.addressText
     },
     //运输单价模态窗口的点击事件
     addAddressClick() {
@@ -466,31 +429,31 @@ export default {
       let map = {
         place: this.place,
         addressId: this.addressId
-      };
-      this.axios.post("/api/v1/ams/getPriceMap", map).then(res => {
+      }
+      this.axios.post('/api/v1/ams/getPriceMap', map).then(res => {
         if (res.data.data.priceId == -1) {
-          this.newPriceValue = "未录单价!";
-          this.priceId = null;
+          this.newPriceValue = '未录单价!'
+          this.priceId = null
         } else {
           //赋值运输单价和运输单价ID
-          this.newPriceValue = res.data.data.priceValue; //this.priceMap.priceValue
-          this.priceId = res.data.data.priceId; //this.priceMap.priceId
+          this.newPriceValue = res.data.data.priceValue //this.priceMap.priceValue
+          this.priceId = res.data.data.priceId //this.priceMap.priceId
         }
-      });
+      })
       //priceMap
-      this.newAddress = this.address + this.place;
-      this.addressDrawer = false;
+      this.newAddress = this.address + this.place
+      this.addressDrawer = false
     },
     //运输单价模态框单选选中的事件
     currentRadioChange2(val) {
-      console.log(val);
+      console.log(val)
       //若具体地址有值，清空值
       if (this.place != null) {
-        this.place = null;
+        this.place = null
       }
-      (this.address = val.address), (this.addressId = val.addressId);
+      ;(this.address = val.address), (this.addressId = val.addressId)
 
-      this.priceId=val.priceid
+      this.priceId = val.priceid
       // this.priceMap = {};
       // this.priceMap = val;
     },
@@ -498,73 +461,77 @@ export default {
     makeSure() {
       //若没有单价Id
       if (this.priceId == null) {
-        this.$message.error("该区域没有录入单价,不可修改!");
+        this.$message.error('该区域没有录入单价,不可修改!')
       } else {
-        this.dialogFormVisible = false;
+        this.dialogFormVisible = false
         let mapValue = {
           detailsId: this.detailsId,
           priceId: this.priceId
-        };
+        }
         //是否确定修改详单地址!
-        this.$confirm("是否确定修改详单地址", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm('是否确定修改详单地址', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
           center: true
         })
           .then(() => {
             //初始化修改详单地址对话框的信息
-            (this.newPriceValue = null),
+            ;(this.newPriceValue = null),
               (this.newAddress = null),
               (this.address = null),
               (this.addresText = null),
               (this.addressId = null),
               (this.priceId = null),
               this.axios
-                .post("/api/v1/bms/updateDetailsOrder", mapValue)
+                .post('/api/v1/bms/updateDetailsOrder', mapValue)
                 .then(res => {
-                  if (res.data.code == "0") {
-                    this.$message.success("修改详单单价成功!");
+                  if (res.data.code == '0') {
+                    this.$message.success('修改详单单价成功!')
                     //重置未结算详单表单信息
                     this.options1.requestUrl =
-                      "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=" +
+                      '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
                       this.input +
-                      "&startTime=" +
+                      '&startTime=' +
                       startTime +
-                      "&endTime=" +
+                      '&endTime=' +
                       endTime +
-                      "&status=0" +
-                      "&i=" +
-                      new Date();
+                      '&status=0' +
+                      '&i=' +
+                      new Date()
                   } else {
-                    this.$message.error("修改详单单价失败,请联系管理员!");
+                    this.$message.error('修改详单单价失败,请联系管理员!')
                   }
-                });
+                })
           })
           .catch(() => {
             this.$message({
-              type: "info",
-              message: "取消修改详单单价!"
-            });
-          });
+              type: 'info',
+              message: '取消修改详单单价!'
+            })
+          })
       }
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scode>
-.steel_inbound {
+.steelDetailsOrder {
   .sache {
-    padding: 1.25rem 0.375rem;
+    margin-left: 20px;
+    margin-top: 20px;
     .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
+      width: 250px;
     }
   }
-}
-.opreation{
-  width: 300px;
-  height: 200px;
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .opreation {
+    width: 300px;
+    height: 200px;
+  }
 }
 </style>

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -16,13 +16,17 @@
         <el-button type="primary" class="btn" @click="getPdfs()">
           <i class="el-icon-download"></i>下载PDF
         </el-button>
+         <el-button type="primary" class="btn" @click="getExcel('船舶动态')">
+          <i class="el-icon-download"></i>下载Excel
+        </el-button>
       </div>
-      <table-item :tableData="tableData" :col="col" id="pdfDom"> </table-item>
+      <table-item ref="ship" :tableData="tableData" :col="col" id="pdfDom"> </table-item>
     </div>
   </div>
 </template>
 <script>
 import tableItem from "./tableItem";
+import FileSaver from "file-saver";
 export default {
   name: "TableView",
   components: {
@@ -170,6 +174,26 @@ export default {
           }
         });
     },
+    getExcel(tableTitle) {
+        //let tables = this.$refs.ship;//此处是拿表格document元素,也可以取父div的ref
+        let tables = document.getElementById("pdfDom");
+        let table_book = XLSX.utils.table_to_book(tables);
+        console.log("table_book:",table_book);
+        var table_write = XLSX.write(table_book, {
+            bookType: "xlsx",
+            bookSST: true,
+            type: "array"
+        });
+        try {
+            FileSaver.saveAs(
+                new Blob([table_write], { type: "application/octet-stream" }),
+                tableTitle+".xlsx"
+            );
+        } catch (e) {
+            if (typeof console !== "undefined") console.log(e, table_write);
+        }
+        return table_write;
+    },
     initialization() {
       this.axios.post("/api/v1/tms/selectAllShipDynamaics").then(res => {
         if (res.data.code == "200") {

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

@@ -115,6 +115,7 @@
         @cell-mouse-leave="cellLeave"
         @row-click="rowClick"
         :cell-style="cellStyle"
+        @filter-change="filterChange"
       >
         <el-table-column
           width="50"
@@ -132,9 +133,27 @@
           show-overflow-tooltip
         >
         </el-table-column>
+        <el-table-column
+          prop="saleOrderStatus"
+          label="销售订单状态"
+          width="100px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
         <el-table-column
           prop="consigneeName"
-          label="下单客户"
+          label="客户"
+          width="160px"
+          align="center"
+          column-key="consigneeName"
+          :filters="filterConsigneeList"
+          sortable
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column
+          prop="areaName"
+          label="销售片区"
           width="160px"
           align="center"
           show-overflow-tooltip
@@ -144,8 +163,11 @@
           prop="carrierName"
           label="承运商"
           align="center"
-          width="60px"
+          width="80px"
+          column-key="carrierList"
+          sortable
           show-overflow-tooltip
+          :filters="filterCarrierList"
         >
         </el-table-column>
         <el-table-column
@@ -156,6 +178,7 @@
           width="90px"
           sortable
           show-overflow-tooltip
+          :filters="filterCapacityList"
         >
         </el-table-column>
         <el-table-column
@@ -163,7 +186,10 @@
           label="物资名称"
           align="center"
           width="150px"
+          sortable
           show-overflow-tooltip
+          :filters="filtermaterialNameList"
+          column-key="materialNameList"
         >
         </el-table-column>
         <el-table-column
@@ -186,6 +212,7 @@
           prop="addressPlace"
           label="收货地址"
           width="250px"
+          sortable
           show-overflow-tooltip
         >
         </el-table-column>
@@ -260,6 +287,13 @@
           show-overflow-tooltip
         >
         </el-table-column>
+        <el-table-column
+          prop="receiptTime"
+          label="抵达时间"
+          width="280px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
         <el-table-column
           prop="receiptAddress"
           label="签收地址"
@@ -267,6 +301,13 @@
           show-overflow-tooltip
         >
         </el-table-column>
+        <el-table-column
+          prop="arrivalTime"
+          label="签收时间"
+          width="280px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
         <el-table-column
           prop="orderNo"
           label="运输订单号"
@@ -316,13 +357,6 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column
-          prop="saleOrderStatus"
-          label="销售订单状态"
-          width="100px"
-          show-overflow-tooltip
-        >
-        </el-table-column>
         <el-table-column
           prop="closeEntryId"
           label="金蝶分录ID"
@@ -385,7 +419,7 @@
               <span>{{ steelMap.saler }}</span>
             </div>
             <div class="steelMapClass12">
-              <span>下单客户:</span>
+              <span>客户:</span>
               <span>{{ steelMap.consigneeName }}</span>
             </div>
           </div>
@@ -736,6 +770,7 @@ import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
 import PathView from './mapTest.vue'
 import currentLocation from './currentLocation.vue'
+import newNoticeVue from '../../../sale/components/dilNotice/newNotice.vue'
 export default {
   components: {
     PathView,
@@ -758,8 +793,8 @@ export default {
       screen1: '',
       options: [
         {
-          value: '下单客户',
-          lable: '下单客户'
+          value: '客户',
+          lable: '客户'
         },
         {
           value: '承运商',
@@ -776,8 +811,8 @@ export default {
       ],
       options1: [
         {
-          value: '下单客户',
-          lable: '下单客户'
+          value: '客户',
+          lable: '客户'
         },
         {
           value: '承运商',
@@ -798,6 +833,8 @@ export default {
       capacityList: [],
       carrierList: [],
       tableData: [],
+      //筛选条件1（客户）
+      filters1: [],
       spanArr: [],
       pos: 0,
       //需要合并列的名称
@@ -816,13 +853,17 @@ export default {
         '运单状态',
         '车牌号',
         '承运商',
-        '下单客户',
+        '客户',
         '收货地址',
         '业务员',
         '送货单打印',
         '收货客户电话',
         '是否自提',
-        '订单日期'
+        '订单日期',
+        '短信发送',
+        '销售片区',
+        '抵达时间',
+        '签收时间'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -891,7 +932,12 @@ export default {
         'xiaoshouyewuyuan',
         'zidonghuabu'
       ],
-      isShowOperate: false
+      isShowOperate: false,
+      filterConsigneeList: [],
+      filterCarrierList: [],
+      filterCapacityList: [],
+      filtermaterialNameList: [],
+      filterMap: {}
     }
   },
   created() {
@@ -900,6 +946,16 @@ export default {
     }
     this.getSteelReport()
   },
+  watch: {
+    tableData: {
+      handler(oldVal, newVal) {
+        this.filterListChange()
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  computed: {},
   mounted() {
     this.$nextTick(() => {
       window.onresize = () => {
@@ -914,6 +970,105 @@ export default {
   },
   computed: {},
   methods: {
+    //筛选
+    filterChange(obj) {
+      if (typeof obj.carrierList != 'undefined' && obj.carrierList.length > 0) {
+        this.filterMap.carrierList = obj.carrierList
+      }
+      if (
+        typeof obj.carrierList != 'undefined' &&
+        obj.carrierList.length == 0
+      ) {
+        delete this.filterMap.carrierList
+      }
+      if (
+        typeof obj.materialNameList != 'undefined' &&
+        obj.materialNameList.length > 0
+      ) {
+        this.filterMap.materialNameList = obj.materialNameList
+      }
+      if (
+        typeof obj.materialNameList != 'undefined' &&
+        obj.materialNameList.length == 0
+      ) {
+        delete this.filterMap.materialNameList
+      }
+      if (typeof obj.capacityNo != 'undefined' && obj.capacityNo.length > 0) {
+        this.filterMap.capacityList = obj.capacityNo
+      }
+      if (typeof obj.capacityNo != 'undefined' && obj.capacityNo.length == 0) {
+        delete this.filterMap.capacityList
+      }
+      if (
+        typeof obj.consigneeName != 'undefined' &&
+        obj.consigneeName.length > 0
+      ) {
+        this.filterMap.consigneeNameList = obj.consigneeName
+      }
+      if (
+        typeof obj.consigneeName != 'undefined' &&
+        obj.consigneeName.length == 0
+      ) {
+        delete this.filterMap.consigneeNameList
+      }
+      // if (obj)
+      this.onclick(this.filterMap)
+    },
+    //控制筛选数组变化
+    filterListChange() {
+      let consigneeNameList = this.tableData.map(e => {
+        return e.consigneeName
+      })
+      let carrierNameList = this.tableData
+        .map(e => {
+          return e.carrierName
+        })
+        .filter(e => {
+          return e != null
+        })
+      let capacityList = this.tableData
+        .map(e => {
+          return e.capacityNo
+        })
+        .filter(e => {
+          return e != null
+        })
+      let materialNameList = this.tableData
+        .map(e => {
+          return e.materialName
+        })
+        .filter(e => {
+          return e != null
+        })
+      this.filterConsigneeList = []
+      this.filterCarrierList = []
+      this.filterCapacityList = []
+      this.filtermaterialNameList = []
+      Array.from(new Set(consigneeNameList)).forEach(e => {
+        let map = {}
+        map.text = e
+        map.value = e
+        this.filterConsigneeList.push(map)
+      })
+      Array.from(new Set(carrierNameList)).forEach(e => {
+        let map = {}
+        map.text = e
+        map.value = e
+        this.filterCarrierList.push(map)
+      })
+      Array.from(new Set(capacityList)).forEach(e => {
+        let map = {}
+        map.text = e
+        map.value = e
+        this.filterCapacityList.push(map)
+      })
+      Array.from(new Set(materialNameList)).forEach(e => {
+        let map = {}
+        map.text = e
+        map.value = e
+        this.filtermaterialNameList.push(map)
+      })
+    },
     cellStyle({ row, column, rowIndex, columnIndex }) {
       if (
         column.property == 'arrivalAddress' ||
@@ -1773,7 +1928,7 @@ export default {
         })
     },
     //查询，输入查询条件
-    onclick() {
+    onclick(obj) {
       this.isRowClick = 0
       const loading = this.$loading({
         lock: true,
@@ -1800,7 +1955,7 @@ export default {
       if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
         saler = getCookie('loginName')
       }
-      if (this.screen == '下单客户') {
+      if (this.screen == '客户') {
         consigneeName = this.input
       } else if (this.screen == '承运商') {
         carrierName = this.input
@@ -1811,7 +1966,7 @@ export default {
       } else {
         remark = this.input
       }
-      if (this.screen1 == '下单客户') {
+      if (this.screen1 == '客户') {
         consigneeName = this.input1
       } else if (this.screen1 == '承运商') {
         carrierName = this.input1
@@ -1841,10 +1996,14 @@ export default {
             '&saler=' +
             saler +
             '&easPrimaryId=' +
-            easPrimaryId
+            easPrimaryId,
+          obj
         )
         .then(res => {
           this.tableData = res.data.data
+          this.filters1 = res.data.data.consigneeName
+          console.log('客户数据')
+          console.log(res.data.data.consigneeName)
           this.getSpanArr(res.data.data)
           loading.close()
         })
@@ -1874,7 +2033,7 @@ export default {
       if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
         saler = getCookie('loginName')
       }
-      if (this.screen == '下单客户') {
+      if (this.screen == '客户') {
         consigneeName = this.input
       } else if (this.screen == '承运商') {
         carrierName = this.input