Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -15,7 +15,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
-//let devModules = ['index', 'statisticalReport', 'queue','appoint','sale','TMS','RMS']
+// let devModules = ['index', 'statisticalReport', 'queue']
 let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
   // 所有数据的请求域名地址r
   '/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/RMS/components/capacity.vue

@@ -18,9 +18,8 @@
       <el-button type="primary" class="btn" @click="toInsert1">
         <i class="el-icon-plus"></i>新增特殊车牌
       </el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
+      <el-button type="primary" @click="exportAllExcel()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
     </div>
     <div class="table">
       <dilTable
@@ -77,7 +76,9 @@ export default {
       options: {
         // first请求数据的地址
         requestUrl: ""
-      }
+      },
+      noSettleDetailsColumn: [],
+      exportAllList:[]
     };
   },
   created() {
@@ -114,6 +115,137 @@ export default {
         this.selectLoading = false;
       }
     },
+    exportAllExcel() {
+      this.isKuang = true;
+      this.tableloading = true;
+      this.selectLoading = true;
+      if (this.textInput) {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.axios.post("/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.textInput +
+            "&i=" +
+            new Date())
+            .then(res => {
+            console.log(res.data.data)
+            this.exportAllList = res.data.data.list
+            this.noSettleDetailsColumn=res.data.data.columnData
+            this.exportAllReportToExcel(
+              this.tableTitle,
+              this.exportAllList,
+              this.noSettleDetailsColumn
+            )
+          })
+        } else if (getCookie("orgCode") == "baohua") {
+          this.axios.post("/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            this.textInput +
+            "&i=" +
+            new Date())
+            .then(res => {
+            console.log(res.data.data)
+            this.exportAllList = res.data.data.list
+            this.noSettleDetailsColumn=res.data.data.columnData
+            this.exportAllReportToExcel(
+              this.tableTitle,
+              this.exportAllList,
+              this.noSettleDetailsColumn
+            )
+          })
+        } else {
+          this.axios.post("/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.textInput +
+            "&i=" +
+            new Date())
+            .then(res => {
+            console.log(res.data.data)
+            this.exportAllList = res.data.data.list
+            this.noSettleDetailsColumn=res.data.data.columnData
+            this.exportAllReportToExcel(
+              this.tableTitle,
+              this.exportAllList,
+              this.noSettleDetailsColumn
+            )
+          })
+        }
+      } else {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.axios.post("/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date())
+            .then(res => {
+            console.log(res.data.data)
+            this.exportAllList = res.data.data.list
+            this.noSettleDetailsColumn=res.data.data.columnData
+            this.exportAllReportToExcel(
+              this.tableTitle,
+              this.exportAllList,
+              this.noSettleDetailsColumn
+            )
+          })
+        } else if (getCookie("orgCode") == "baohua") {
+          this.axios.post("/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date())
+            .then(res => {
+            console.log(res.data.data)
+            this.exportAllList = res.data.data.list
+            this.noSettleDetailsColumn=res.data.data.columnData
+            this.exportAllReportToExcel(
+              this.tableTitle,
+              this.exportAllList,
+              this.noSettleDetailsColumn
+            )
+          })
+        } else {
+          this.axios.post("/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            null +
+            "&i=" +
+            new Date())
+            .then(res => {
+            console.log(res.data.data)
+            this.exportAllList = res.data.data.list
+            this.noSettleDetailsColumn=res.data.data.columnData
+            this.exportAllReportToExcel(
+              this.tableTitle,
+              this.exportAllList,
+              this.noSettleDetailsColumn
+            )
+          })
+        }
+      }
+    },
+    //导出excel
+    exportAllReportToExcel(tableTitle, dataArr, columnData) {
+      var title = tableTitle
+      let tHeader = []
+      let filterVal = []
+      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)导出的表格名称
+      })
+      this.tableloading=false
+      this.selectLoading=false   
+    },
     onclick() {
       this.isKuang = true;
       this.tableloading = true;

src/views/RMS/components/editCapacity.vue

@@ -1,30 +1,28 @@
 <template>
-  
   <!-- 修改运力信息 -->
   <div class="editCapacity">
-
     <div id="contractDetails">
-      <page-title>编辑</page-title> 
+      <page-title>编辑</page-title>
       <div class="main">
-          <div class="contractTitle">
-            <div class="form_box_capacity" style="margin-right: 10rem">
-                    <dil-form :formId="380" v-model="form1"></dil-form>
-                    <el-form  v-show="flag">
-                      <div class="preview-group">
-                          <el-form-item label="是否是VIP车辆:">
-                            <el-radio v-model="form1.capacityVip" label="是">是</el-radio>
-                            <el-radio v-model="form1.capacityVip" label="否">否</el-radio>
-                          </el-form-item>
-                          <el-form-item label="是否无GPS派车:">
-                            <el-radio v-model="form1.capacityGps" label="是">是</el-radio>
-                            <el-radio v-model="form1.capacityGps" label="否">否</el-radio>
-                          </el-form-item>
-                      </div>
-                    </el-form>
-            </div>
+        <div class="contractTitle">
+          <div class="form_box_capacity" style="margin-right: 10rem">
+            <dil-form :formId="380" v-model="form1"></dil-form>
+            <el-form v-show="flag">
+              <div class="preview-group">
+                <el-form-item label="是否是VIP车辆:">
+                  <el-radio v-model="form1.capacityVip" label="是">是</el-radio>
+                  <el-radio v-model="form1.capacityVip" label="否">否</el-radio>
+                </el-form-item>
+                <el-form-item label="是否无GPS派车:">
+                  <el-radio v-model="form1.capacityGps" label="是">是</el-radio>
+                  <el-radio v-model="form1.capacityGps" label="否">否</el-radio>
+                </el-form-item>
+              </div>
+            </el-form>
+          </div>
         </div>
       </div>
-      
+
       <!-- <div class="elForm">
   <el-form
         :inline="true"
@@ -55,44 +53,44 @@
 </template>
 
 <script>
-import PageTitle from "@/components/Page/Title";
-import { getCookie } from "@/utils/util.js";
+import PageTitle from '@/components/Page/Title'
+import { getCookie } from '@/utils/util.js'
 export default {
   components: { PageTitle },
   data() {
     return {
-      state: "",
+      state: '',
       userId: null,
       restaurants: [],
       accessToken: null,
       userCode: null,
       carrierUserId: null,
       carrierId: null,
-      capacityCarrierId:null,
+      capacityCarrierId: null,
       carrierIds: null,
-      direction: "rtl",
-      inputText: "",
+      direction: 'rtl',
+      inputText: '',
       form1: {},
       carrierUserId: null,
-      carrierName: "",
-      map:[],
+      carrierName: '',
+      map: [],
       options: {
-        requestUrl: "/api/v1/rms/getCarrierList?apiId=417",
-        selectionType: "radio",
-        mapList: [],
+        requestUrl: '/api/v1/rms/getCarrierList?apiId=417',
+        selectionType: 'radio',
+        mapList: []
       },
-      flag:false
-    };
+      flag: false
+    }
   },
   // created(){
   //     this.carrierUserId = getCookie("userId");
   //     // console.log(this.carrierUserId ,'carrierUserId')
   // },
   mounted() {
-    this.information();
-    this.orgcode = getCookie("orgCode");
-    if(this.orgcode === "wuliuyunshubu" || this.orgcode === "dagangadmin"){
-      this.flag=true;
+    this.information()
+    this.orgcode = getCookie('orgCode')
+    if (this.orgcode === 'wuliuyunshubu' || this.orgcode === 'dagangadmin') {
+      this.flag = true
     }
   },
   //   mounted() {
@@ -143,79 +141,78 @@ export default {
     information() {
       //       //编辑
       //     console.log(this.$route.params)
-      // console.log(this.$route.params)
       this.axios
         .post(
-          "/api/v1/rms/getCapacityInfoById/" +
+          '/api/v1/rms/getCapacityInfoById/' +
             this.$route.params.capacityCarrierId
         )
-        .then((res) => {
-          console.log(res);
-          res.data.data.forEach((e) => {
-            console.log("from", this.form1);
-            this.form1 = e;
-          });
-        });
+        .then(res => {
+          console.log(res)
+          res.data.data.forEach(e => {
+            console.log('from', this.form1)
+            this.form1 = e
+          })
+        })
     }, // 返回
     onClickCancel() {
-      this.$router.go(-1);
+      this.$router.go(-1)
     }, // 确认
     onClickConfirm() {
-      console.log(this.form1);
+      console.log(this.form1)
       let map = {
         remark: this.form1.remark,
-        userDep:this.form1.userDep,
-        capacityCarrierId:this.$route.params.capacityCarrierId,
-        capacityTel:this.form1.capacityTel,
-        capacityNumber:this.form1.capacityNumber,
-        capacityVip:this.form1.capacityVip,
-        capacityGps:this.form1.capacityGps
-      };
-      this.axios.post("/api/v1/rms/updateCapacity", map).then((res) => {
-        if (res.data.code == "200") {
-          this.$message.success("修改成功");
-          this.$router.go(-1);
-        }else{
-          this.$message.success("修改失败");
-          this.$router.go(-1);
+        userDep: this.form1.userDep,
+        capacityCarrierId: this.$route.params.capacityCarrierId,
+        capacityTel: this.form1.capacityTel,
+        capacityNumber: this.form1.capacityNumber,
+        capacityVip: this.form1.capacityVip,
+        capacityGps: this.form1.capacityGps
+      }
+      this.axios.post('/api/v1/rms/updateCapacity', map).then(res => {
+        if (res.data.code == '200') {
+          this.$message.success('修改成功')
+          this.$router.go(-1)
+        } else {
+          this.$message.success('修改失败')
+          this.$router.go(-1)
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .editCapacity {
   .elForm {
     margin-left: 40%;
   }
-.form_box_capacity {
-      margin-left: 20%;
-      width: 340px;
-      .el-form {
-        .preview-group {
-          .el-form-item {
-            .el-form-item__label {
-              display: inline-block;
-              width: 70px !important;
+  .form_box_capacity {
+    margin-left: 35%;
+    width: 340px;
+    .el-form {
+      .preview-group {
+        .el-form-item {
+          .el-form-item__label {
+            display: inline-block;
+            width: 70px !important;
+          }
+          .el-form-item__content {
+            .el-select {
+              width: 250px;
             }
-            .el-form-item__content {
-              .el-select {
-                width: 250px;
-              }
-              .el-input {
-                width: 250px;
-              }
-              .el-textarea {
-                .el-textarea__inner {
-                  width: 225px;
-                  margin-top: 0.03rem;
-                }
+            .el-input {
+              width: 250px;
+            }
+            .el-textarea {
+              .el-textarea__inner {
+                width: 225px;
+                margin-top: 0.03rem;
               }
             }
           }
         }
       }
+    }
   }
   .button_box {
     display: flex;

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

@@ -121,12 +121,12 @@
             <!-- 是否可以勾选:selectable="selectInit" -->
             <el-table-column
               type="selection"
-              width="45"
+              width="40"
               reserve-selection
               align="center"
               :selectable="selectInit"
             ></el-table-column>
-            <el-table-column label="装货点" width="120">
+            <el-table-column label="装货点" width="110">
               <template slot-scope="scope">
                 <el-select
                   size="mini"
@@ -147,8 +147,7 @@
               prop="capacityNumber"
               label="车牌号"
               fit
-              align="center"
-              width="150px"
+              width="120"
             >
             </el-table-column>
             <el-table-column
@@ -175,27 +174,27 @@
             <el-table-column
               prop="materialName"
               label="物资名称"
-              min-width="200"
+              min-width="180"
             >
             </el-table-column>
             <el-table-column
               prop="steelMeter"
               label="钢材长度"
               align="center"
-              width="60"
+              width="55"
             >
             </el-table-column>
             <el-table-column
               prop="materialSpecification"
               label="规格型号"
-              min-width="180"
+              min-width="160"
             >
             </el-table-column>
             <el-table-column
               prop="materialNumber"
               label="物资件数"
               align="center"
-              width="70"
+              width="60"
             >
             </el-table-column>
             <el-table-column prop="driverTel" label="司机电话号码" width="120">
@@ -235,12 +234,12 @@
           >
             <el-table-column
               type="selection"
-              width="45"
+              width="40"
               align="center"
               reserve-selection
               :selectable="selectInitSplleing"
             ></el-table-column>
-            <el-table-column label="装货点" width="120">
+            <el-table-column label="装货点" width="110">
               <template slot-scope="scope">
                 <el-select
                   size="mini"
@@ -262,14 +261,14 @@
               label="车牌号"
               fit
               align="center"
-              width="150"
+              width="120"
             >
             </el-table-column>
             <el-table-column
               prop="listNodeOrder"
               label="序号"
               align="center"
-              width="45"
+              width="40"
             ></el-table-column>
             <el-table-column
               prop="resultStartTime"
@@ -288,20 +287,20 @@
             <el-table-column
               prop="materialName"
               label="物资名称"
-              min-width="200"
+              min-width="180"
             >
             </el-table-column>
             <el-table-column
               prop="steelMeter"
               label="钢材长度"
               align="center"
-              width="80"
+              width="60"
             >
             </el-table-column>
             <el-table-column
               prop="materialSpecification"
               label="规格型号"
-              min-width="180"
+              min-width="160"
             >
             </el-table-column>
             <el-table-column
@@ -355,12 +354,12 @@
           >
             <el-table-column
               type="selection"
-              width="45"
+              width="40"
               align="center"
               reserve-selection
               :selectable="selectInitSplleing"
             ></el-table-column>
-            <el-table-column label="装货点" width="120">
+            <el-table-column label="装货点" width="110">
               <template slot-scope="scope">
                 <el-select
                   size="mini"
@@ -382,13 +381,13 @@
               label="车牌号"
               fit
               align="center"
-              width="150"
+              width="120"
             >
             </el-table-column>
             <el-table-column
               prop="listNodeOrder"
               label="序号"
-              width="45"
+              width="40"
               align="center"
             ></el-table-column>
             <el-table-column
@@ -404,7 +403,7 @@
               prop="materialName"
               label="物资名称"
               align="center"
-              min-width="200"
+              min-width="180"
             >
             </el-table-column>
             <el-table-column
@@ -418,7 +417,7 @@
               prop="materialSpecification"
               label="规格型号"
               align="center"
-              min-width="180"
+              min-width="160"
             >
             </el-table-column>
             <el-table-column
@@ -523,12 +522,15 @@ export default {
       totalQueueNumFirst: null,
       //厂内钢材车辆总数
       steelOrderNum: 0,
-      isQueryCapacity: null
+      isQueryCapacity: null,
+      //排队放行限制
+      releaseFlag: false
     }
   },
-  mounted() {
+  created() {
     this.i = 0
     this.infomation()
+    this.getReleaseFlag()
     this.getSpellingArray()
     this.getNoSpellingArray()
     this.getStoreArray()
@@ -536,6 +538,7 @@ export default {
     this.wantEnfactory()
     this.start()
   },
+  mounted() {},
   computed: {
     wantS() {
       return this.totalQueueNum
@@ -552,6 +555,18 @@ export default {
     }
   },
   methods: {
+    //获取放行限制标志
+    getReleaseFlag() {
+      this.axios
+        .get('/api/v1/uc/getReleaseFlag')
+        .then(res => {
+          this.releaseFlag = res.data
+          console.log(res.data, 'res')
+        })
+        .catch(e => {
+          this.releaseFlag = false
+        })
+    },
     //单拼样式调整
     cellStyleSingle({ row, column, rowIndex, columnIndex }) {
       if (
@@ -629,6 +644,7 @@ export default {
       this.timer = setInterval(this.wantEnfactory, 60000)
     },
     refresh() {
+      this.getReleaseFlag()
       this.getSpellingArray()
       this.getNoSpellingArray()
       this.getSpellingArrayTwo()
@@ -653,6 +669,9 @@ export default {
       return row.ROW_ID
     },
     selectInit(row) {
+      if (!this.releaseFlag) {
+        return true
+      }
       //单拼的可勾选控制功能在这
       //过滤出处在同一个网格上的数据
       let gridData = this.tableData1.filter(e => {
@@ -702,6 +721,9 @@ export default {
       // }
     },
     selectInitSplleing(row) {
+      if (!this.releaseFlag) {
+        return true
+      }
       if (this.maplist.length == 0) {
         if (row.group + 1 == 1) {
           return true
@@ -955,7 +977,7 @@ export default {
             this.tableData1 = res.data.data
           })
         console.log('wzxxx')
-      } else if (this.activeName == "second") {
+      } else if (this.activeName == 'second') {
         this.axios
           .post(
             '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1&i=' +
@@ -968,7 +990,7 @@ export default {
             this.tableData = res.data.data
             this.getSpanArr(this.tableData)
           })
-      } else if (this.activeName == "fourth") {
+      } else if (this.activeName == 'fourth') {
         this.axios
           .post(
             '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=2&i=' +

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

@@ -98,7 +98,7 @@
             ><i class="el-icon-map-location"></i>实时路径</el-button
           >
         </el-form-item>
-        <el-form-item>
+        <el-form-item v-if="isShowOperate">
           <el-button type="primary" @click="openReceive()">
             <i class="el-icon-document"></i>签收抵达</el-button
           >
@@ -244,6 +244,23 @@
           :filters="filterorderStatus"
         >
         </el-table-column>
+        <el-table-column
+          prop="saleRemark"
+          column-key="saleRemark"
+          label="摘要"
+          width="150px"
+          align="center"
+          :filters="filterSaleRemark"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column
+          prop="capacityTel"
+          label="司机电话"
+          width="120px"
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           prop="queueStartTime"
           label="排队开始时间"
@@ -348,13 +365,7 @@
           align="center"
         >
         </el-table-column>
-        <el-table-column
-          prop="capacityTel"
-          label="司机电话"
-          width="120px"
-          align="center"
-        >
-        </el-table-column>
+
         <el-table-column prop="saler" label="业务员" align="center">
         </el-table-column>
         <el-table-column
@@ -373,6 +384,7 @@
         </el-table-column>
         <el-table-column prop="isSelfMention" label="是否自提" align="center">
         </el-table-column>
+
         <el-table-column
           prop="saleOrderNo"
           label="销售订单号"
@@ -1186,7 +1198,8 @@ export default {
         '销售片区',
         '抵达时间',
         '签收时间',
-        '系统建议运价'
+        '系统建议运价',
+        '摘要'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -1252,7 +1265,6 @@ export default {
         'wuliuyunshubu',
         'dagangadmin',
         'shichangxinxibu',
-        'xiaoshouyewuyuan',
         'zidonghuabu',
         'chengyunshang'
       ],
@@ -1265,6 +1277,7 @@ export default {
       filterorderStatus: [],
       filteraddressPlace: [],
       filtermaterialSpe: [],
+      filterSaleRemark: [],
       filterSaleOrderStatus: [],
       filterMap: {},
       //权限控制
@@ -1752,6 +1765,12 @@ export default {
       ) {
         delete this.filterMap.saleOrderStatusList
       }
+      if (typeof obj.saleRemark != 'undefined' && obj.saleRemark.length > 0) {
+        this.filterMap.saleRemarkList = obj.saleRemark
+      }
+      if (typeof obj.saleRemark != 'undefined' && obj.saleRemark.length == 0) {
+        delete this.filterMap.saleRemarkList
+      }
       // if (obj)
       this.onclick(this.filterMap)
     },
@@ -1809,6 +1828,9 @@ export default {
       let saleOrderStatusList = this.tableData.map(e => {
         return e.saleOrderStatus
       })
+      let saleRemarkList = this.tableData.map(e => {
+        return e.saleRemark
+      })
       this.filterConsigneeList = []
       this.filterCarrierList = []
       this.filterCapacityList = []
@@ -1818,6 +1840,7 @@ export default {
       this.filteraddressPlace = []
       this.filtermaterialSpe = []
       this.filterSaleOrderStatus = []
+      this.filterSaleRemark = []
       Array.from(new Set(consigneeNameList)).forEach(e => {
         let map = {}
         map.text = e
@@ -1872,6 +1895,12 @@ export default {
         map.value = e
         this.filterSaleOrderStatus.push(map)
       })
+      Array.from(new Set(saleRemarkList)).forEach(e => {
+        let map = {}
+        map.text = e
+        map.value = e
+        this.filterSaleRemark.push(map)
+      })
     },
     cellStyle({ row, column, rowIndex, columnIndex }) {
       if (
@@ -2219,18 +2248,24 @@ export default {
             if (res.data.code == 200) {
               this.$message.success('变更车牌号成功!')
               this.operation(this.steelMap)
-              this.axios
-                .post(
-                  '/api/v1/ams/matchingDriverTelRecently?capacityNumber=' +
-                    this.steelMap.capacityNo
-                )
-                .then(res => {
-                  if (res.data.data != null) {
-                    this.steelMap.capacityTel = res.data.data
-                    this.updateDriverTel()
-                  }
-                })
-
+              console.log('更改车牌号之后的变化')
+              console.log(res.data)
+              if (res.data.data.capacityTel != 0) {
+                console.log('进入了这个界面')
+                this.steelMap.capacityTel = res.data.data.capacityTel
+              } else {
+                this.axios
+                  .post(
+                    '/api/v1/ams/matchingDriverTelRecently?capacityNumber=' +
+                      this.steelMap.capacityNo
+                  )
+                  .then(res => {
+                    if (res.data.data != null) {
+                      this.steelMap.capacityTel = res.data.data
+                    }
+                  })
+              }
+              this.updateDriverTel()
               this.getSteelReport()
               loading.close()
             } else {
@@ -2309,6 +2344,13 @@ export default {
         this.steelMap.capacityTel == ''
       ) {
         this.$message.error('电话号码不能为空')
+        loading.close()
+        return
+      }
+      var regex = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/
+      if (!regex.test(this.steelMap.capacityTel)) {
+        this.$message.error('电话号码不符合规则')
+        loading.close()
         return
       }
       this.axios
@@ -2862,6 +2904,7 @@ export default {
       let carrierSsoId = null
       let carrierName = null
       let consigneeName = null
+      let consigneeSsoId = null
       let capacityNo = null
       let remark = null
       let saler = null
@@ -2875,6 +2918,10 @@ export default {
       if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
         saler = getCookie('loginName')
       }
+      if (getCookie('orgCode') == 'shouhuokehu') {
+        consigneeSsoId = getCookie('userId')
+        this.filterMap.consigneeSsoId = consigneeSsoId
+      }
       if (this.screen == '客户') {
         consigneeName = this.input
       } else if (this.screen == '承运商') {
@@ -2899,6 +2946,7 @@ export default {
       if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
         saler = getCookie('loginName')
       }
+
       this.axios
         .post(
           '/api/v1/tms/getSaleSteelReport?startTime=' +
@@ -2918,7 +2966,8 @@ export default {
             '&carrierName=' +
             carrierName +
             '&capacityNo=' +
-            capacityNo
+            capacityNo,
+          this.filterMap
         )
         .then(res => {
           this.tableData = res.data.data