提交代码

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']
-//let devModules = ["index", "statisticalReport", "appoint", "sale","AMS","TMS",'queue','WMS',"inward"];
+//let devModules = ["index", "statisticalReport", "appoint", "sale","AMS","TMS",'queue','WMS',"inward","RMS"];
 let devModules = ['all']
 
 if (pathSrc.indexOf('node_modules') > -1) {

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -364,6 +364,48 @@
               </div>
             </div>
           </el-tab-pane>
+          <el-tab-pane label="运输订单状态调整接口" name="eighth">
+            <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
+              </div>
+              <div class="poundNo from">
+                <span class="text">订单状态:</span>
+                <el-input v-model.number="orderStatus"></el-input>
+              </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="updateOrderStatus"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </template>
@@ -401,7 +443,8 @@ export default {
       lineQuence: null,
       gatePostList: [],
       enFactoryGatepost: null,
-      gatePostId: null
+      gatePostId: null,
+      orderStatus: null
     }
   },
   created() {
@@ -412,8 +455,31 @@ export default {
     this.information()
   },
   methods: {
+    updateOrderStatus() {
+      if (
+        this.orderNumber != null &&
+        this.orderNumber != '' &&
+        this.orderStatus != null
+      ) {
+        this.axios
+          .post('/api/v1/bp/updateOrderStatus', {
+            orderNumber: this.orderNumber,
+            orderStatus: this.orderStatus
+          })
+          .then(res => {
+            this.$message.success('修改成功')
+            this.$router.go(0)
+          })
+      }
+    },
     updateCanwork() {
-      console.log(this.capacityName)
+      console.log(this.orderNumber)
+      this.axios
+        .post('/api/v1/bp/updateOrderCanWork?orderNumber=' + this.orderNumber)
+        .then(res => {
+          this.$message.success('修改成功')
+          this.$router.go(0)
+        })
     },
     onchangeGatepost(value) {
       console.log(value)

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

@@ -4,9 +4,9 @@
     <div class="top">
       <el-form :inline="true">
         <el-form-item>
-          <el-input v-model="shipName" placeholder="请输入船名"></el-input>
+          <el-input v-model="shipName" placeholder="请输入船名" clearable></el-input>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <span class="demonstration">离港日期</span>
           <el-date-picker
             v-model="startTime"
@@ -23,7 +23,7 @@
             style="width:200px"
           >
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button @click="onClick" type="primary" icon="el-icon-search">查询</el-button>
         </el-form-item>
@@ -74,7 +74,6 @@
             ref="tableRef"
             border
             style="width: 100%; margin-top: 0px"
-            fit
             max-height="500px"
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
@@ -93,61 +92,77 @@
             <el-table-column
               prop="materialName"
               label="品种"
-              width="150px"
+              width="120px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="resultForeignShipName"
               label="船名"
-              width="150px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="portName"
               label="放货港口"
-              width="150px"
+              width="120px"
               align="center"
             >
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="carrierName"
               label="承运单位"
               width="100px"
               align="center"
             >
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="resultOutPortTime"
               label="离港日期"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
-            <el-table-column
-              prop="loadTonnage"
-              label="装船吨位"
+             <el-table-column
+              prop="monthLoadTonnage"
+              label="月份装船吨位"
               width="100px"
               align="center"
             >
+             <template slot-scope="scope" v-if="scope.row.unitPriceId">
+                {{(scope.row.monthLoadTonnage).toFixed(2)}}
+              </template>
             </el-table-column>
             <el-table-column
-              prop="loadingProportion"
-              label="装船比例"
+              prop="monthLoadingProportion"
+              label="月份装船比例"
               width="70px"
               align="center"
+            >
+             <template slot-scope="scope" v-if="scope.row.unitPriceId">
+                {{(scope.row.monthLoadingProportion*100).toFixed(2)}}%
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="monthRealTonnage"
+              label="月份结算吨位"
+              width="100px"
+              align="center"
             >
              <template slot-scope="scope">
-                {{(scope.row.loadingProportion*100).toFixed(2)}}%
+                {{(scope.row.monthRealTonnage).toFixed(2)}}
               </template>
             </el-table-column>
             <el-table-column
-              prop="realTonnage"
-              label="结算吨位"
+              prop="monthMakeTonnage"
+              label="月份开票吨位"
               width="100px"
               align="center"
             >
+             <template slot-scope="scope">
+                {{(scope.row.monthMakeTonnage).toFixed(2)}}
+              </template>
             </el-table-column>
             <el-table-column
               prop="totalEnTonnage"
@@ -156,7 +171,7 @@
               align="center"
             >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.totalEnTonnage"></el-input>
+                <el-input type="number" v-model="scope.row.totalEnTonnage"></el-input>
               </template>
             </el-table-column>
             <el-table-column
@@ -167,49 +182,38 @@
             >
             </el-table-column>
             <el-table-column
-              prop="inspectionFees"
+              prop="inspectionsFee"
               label="水分检测费"
-              width="100px"
+              width="120px"
               align="center"
             >
               <template slot-scope="scope">
-                  <el-input v-model="scope.row.inspectionFees"></el-input>
+                  <el-input type="number" v-model="scope.row.inspectionsFee"></el-input>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="fee"
-              label="金额(元)"
-              width="100px"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="previewTonnage"
-              label="已预开票吨位"
-              width="100px"
+             <el-table-column
+              prop="totalPreviewTonnage"
+              label="已预开总吨位"
+              width="120px"
               align="center"
             >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.previewTonnage"></el-input>
+                <el-input type="number" v-model="scope.row.totalPreviewTonnage"></el-input>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="previewFee"
-              label="已预开票金额"
-              width="100px"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="makeTonnage"
-              label="实际开票吨位"
-              width="100px"
+             <el-table-column
+              prop="totalPreviewFee"
+              label="已预开总金额"
+              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="actuallyMoney"
-              label="实际开票金额"
+             <el-table-column
+              prop="statementTotalAmount"
+              label="开票金额"
               width="100px"
               align="center"
             >
@@ -230,7 +234,7 @@
             >
               <template slot-scope="scope">
                 <el-button type="text" @click="operate(scope.row)"
-                  >保存</el-button
+                  >预开票</el-button
                 >
                 <el-button type="text" @click="settlement(scope.row)"
                   >结算</el-button
@@ -242,9 +246,10 @@
         <el-tab-pane label="已结算" name="second">
           <el-table
             :data="tableData1"
-            ref="tableRef1"
+            ref="tableRef"
             border
-            max-height="600px"
+            style="width: 100%; margin-top: 0px"
+            max-height="500px"
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
             class="table"
@@ -262,128 +267,101 @@
             <el-table-column
               prop="materialName"
               label="品种"
-              width="150px"
+              width="120px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="resultForeignShipName"
               label="船名"
-              width="150px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="portName"
               label="放货港口"
-              width="150px"
+              width="120px"
               align="center"
             >
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="carrierName"
               label="承运单位"
               width="100px"
               align="center"
             >
-            </el-table-column>
-            <el-table-column
-              prop="statementTotalAmount"
-              label="开票总金额"
-              width="100px"
-              align="center"
-            >
-            </el-table-column>
-             <el-table-column
-              prop="makeTonnageTotal"
-              label="开票总吨位"
-              width="100px"
-              align="center"
-            >
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="resultOutPortTime"
               label="离港日期"
-              width="200px"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="loadTonnage"
-              label="装船吨位"
               width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="loadingProportion"
-              label="装船比例"
-              width="100px"
-              align="center"
-            >
-              <template slot-scope="scope">
-                {{(scope.row.loadingProportion*100).toFixed(2)}}%
-              </template>
-            </el-table-column>
-              <el-table-column
-              prop="inspectionFees"
-              label="水分检测费"
+              prop="monthMakeTonnage"
+              label="月份开票吨位"
               width="100px"
               align="center"
             >
+             
             </el-table-column>
             <el-table-column
-              prop="realTonnage"
-              label="结算吨位"
+              prop="unitPrice"
+              label="合同单价"
               width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="totalEnTonnage"
-              label="到厂湿吨"
-              width="100px"
+              prop="inspectionsFee"
+              label="水分检测费"
+              width="120px"
               align="center"
             >
             </el-table-column>
-            <el-table-column
-              prop="unitPrice"
-              label="合同单价"
-              width="100px"
+             <el-table-column
+              prop="totalPreviewTonnage"
+              label="已预开总吨位"
+              width="120px"
               align="center"
             >
             </el-table-column>
-            <el-table-column
-              prop="fee"
-              label="金额(元)"
-              width="100px"
+             <el-table-column
+              prop="totalPreviewFee"
+              label="已预开总金额"
+              width="120px"
               align="center"
             >
             </el-table-column>
-            <el-table-column
-              prop="previewTonnage"
-              label="已预开票吨位"
+             <el-table-column
+              prop="statementTotalAmount"
+              label="开票金额"
               width="100px"
               align="center"
             >
             </el-table-column>
-            <el-table-column
-              prop="previewFee"
-              label="已预开票金额"
+             <el-table-column
+              prop="monthLoadTonnage"
+              label="月份装船吨位"
               width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="makeTonnage"
-              label="实际开票吨位"
-              width="100px"
+              prop="monthLoadingProportion"
+              label="月份装船比例"
+              width="70px"
               align="center"
             >
+             <template slot-scope="scope" >
+                {{(scope.row.monthLoadingProportion*100).toFixed(2)}}%
+              </template>
             </el-table-column>
             <el-table-column
-              prop="feeMake"
-              label="实际开票金额"
+              prop="monthRealTonnage"
+              label="月份结算吨位"
               width="100px"
               align="center"
             >
@@ -397,6 +375,7 @@
 <script>
 import { getCookie } from "@/utils/util.js";
 import { sjTime } from "@/utils/sharedJsFile";
+import BigNumber, {bigNumber} from "bignumber.js"
 export default {
   data() {
     return {
@@ -412,14 +391,10 @@ export default {
       pos: null,
       mergeList: [
         "index",
-        "carrierName",
-        "portName",
         "resultForeignShipName",
         "materialName",
         "totalEnTonnage",
         "operate",
-        "statementTotalAmount",
-        "makeTonnageTotal"
       ],
       activeName: "first",
       tableTitle: "结算账单报表",
@@ -438,8 +413,8 @@ export default {
     },
     tableData1: {
       handler(newVal) {
-        console.log("执行一次汇总函数");
-        this.computedTableData1(newVal);
+        //console.log("执行一次汇总函数");
+        //this.computedTableData1(newVal);
       },
       deep: true,
       immediate: false
@@ -451,17 +426,11 @@ export default {
       console.log("row:",row);
       //遍历tableData,找出相同批次的行数
       let arr = this.tableData.filter(e => {
-        return e.batchId == row.batchId && e.noticeTime==row.noticeTime;
+        return e.batchId == row.batchId;
       });
-      let statementTotalAmount = this.tableData.reduce((pre, item) => {
-        return  pre + parseFloat(item.actuallyMoney);
-      }, 0);
       let map = {
         list: arr,
-        statementType: 3,
-        totalEnTonnage: row.totalEnTonnage,
-        statementTotalAmount: statementTotalAmount.toFixed(2),
-        userID: getCookie("userId"),
+        userId: getCookie("userId"),
         statementStatus:1
       };
       console.log("map:",map);
@@ -470,29 +439,24 @@ export default {
         .then(res => {
           if (res.data.code == "200") {
             this.getNoDetailsStament();
-            this.$message.success("保存成功");
+            this.$message.success("结算成功");
           }
         })
         .catch(() => {
-          this.$message.error("保存失败");
+          this.$message.error("结算失败");
         });
     },
-    //保存
+    //预开保存
     operate(row) {
       console.log("row:",row);
       //遍历tableData,找出相同批次的行数
       let arr = this.tableData.filter(e => {
-        return e.batchId == row.batchId && e.noticeTime==row.noticeTime;
+        return e.batchId == row.batchId;
       });
-      let statementTotalAmount = this.tableData.reduce((pre, item) => {
-        return  pre + parseFloat(item.actuallyMoney);
-      }, 0);
       let map = {
         list: arr,
-        statementType: 3,
-        totalEnTonnage: row.totalEnTonnage,
-        statementTotalAmount: statementTotalAmount.toFixed(2),
-        userID: getCookie("userId")
+        userId: getCookie("userId"),
+        statementStatus:0
       };
       console.log("map:",map);
       this.axios
@@ -500,11 +464,11 @@ export default {
         .then(res => {
           if (res.data.code == "200") {
             this.getNoDetailsStament();
-            this.$message.success("保存成功");
+            this.$message.success("预开成功");
           }
         })
         .catch(() => {
-          this.$message.error("保存失败");
+          this.$message.error("预开失败");
         });
     },
     //处理表格数据
@@ -514,18 +478,14 @@ export default {
         } else if (item.batchId == data[index - 1].batchId) {
           item.totalEnTonnage = data[index - 1].totalEnTonnage;
         }
-        //预开金额
-        item.previewFee = (item.unitPrice * item.previewTonnage).toFixed(2);
-        //结算吨位
-        item.realTonnage = (
-          item.totalEnTonnage * item.loadingProportion
-        ).toFixed(2);
-         //金额
-        item.fee = (item.realTonnage * item.unitPrice).toFixed(2);
-        //开票吨位
-        item.makeTonnage = (item.realTonnage - item.previewTonnage).toFixed(2);
-        //实际开票金额
-        item.actuallyMoney = (item.makeTonnage * item.unitPrice-item.inspectionFees).toFixed(2);
+        //总计预开票金额
+        item.totalPreviewFee=item.totalPreviewTonnage*item.unitPrice;
+        //月份结算吨位/
+        item.monthRealTonnage = item.totalEnTonnage*item.monthLoadingProportion;
+        //月份开票吨位
+        item.monthMakeTonnage = item.monthRealTonnage-item.totalPreviewTonnage;
+        //月份开票金额
+        item.statementTotalAmount=(item.monthMakeTonnage.toFixed(2)*item.unitPrice-item.inspectionsFee).toFixed(2);
       });
       this.getSpanArr(this.tableData);
     },
@@ -559,16 +519,16 @@ export default {
       let startTime = null;
       let endTime = null;
       let map={con:this.shipName};
-      if (this.startTime) {
-        startTime = sjTime(this.startTime);
-      }
-      if (this.endTime) {
-        endTime = sjTime(this.endTime);
-      }
-      if(startTime && endTime && startTime < endTime){
-          map.startTime=startTime;
-          map.endTime=endTime;
-      }
+      // if (this.startTime) {
+      //   startTime = sjTime(this.startTime);
+      // }
+      // if (this.endTime) {
+      //   endTime = sjTime(this.endTime);
+      // }
+      // if(startTime && endTime && startTime < endTime){
+      //     map.startTime=startTime;
+      //     map.endTime=endTime;
+      // }
       this.axios.post("/api/v1/bms/getShipFeeStatement",map).then(res => {
         console.log(res.data.data);
         this.tableData = res.data.data;
@@ -630,7 +590,7 @@ export default {
           this.pos = 0;
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].statementId === data[i - 1].statementId) {
+          if (data[i].batchId === data[i - 1].batchId) {
             this.spanArr1[this.pos] += 1;
             data[i].group = data[i - 1].group;
             this.spanArr1.push(0);
@@ -702,7 +662,7 @@ export default {
     }
   },
   mounted() {
-    //this.getNoDetailsStament();
+    this.getNoDetailsStament();
     this.getDetailsStamented();
   }
 };
@@ -711,11 +671,10 @@ export default {
 #detailsStatement {
   .top {
     margin-left: 10px;
-    margin-top: 30px;
+    margin-top: 10px;
   }
   .main {
     margin-left: 10px;
-    margin-top: 30px;
     ::-webkit-scrollbar {
       // width: 20px;
       height: 20px;

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

@@ -109,7 +109,7 @@ export default {
         console.log("form1",this.form1);
       if(this.form1.sendPortId && this.form1.resultOutPortTime){
           let contract=this.unitPrices.find(item=>
-          item.portId==this.form1.sendPortId
+          item.portId==this.form1.startPortId
           && sjTime(this.form1.resultOutPortTime)>=sjTime(item.startTime)
           && sjTime(this.form1.resultOutPortTime)<=sjTime(item.endTime));
           if(contract){

src/views/appoint/components/inward/transPrice.vue

@@ -83,7 +83,7 @@ export default {
       this.isKuang = true;
       if (this.input) {
         this.option.requestUrl =
-          "/api/v1/ams/getInwardContractPrice?apiId=464&con=" + this.input;
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&con=" + this.input;
       } else {
           this.option.requestUrl =
             "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();

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

@@ -988,6 +988,7 @@ export default {
     }
   },
   created() {
+    this.getRmsReceivingCompany()
     let loadTime1 = new Date(
       new Date(new Date().toLocaleDateString()).getTime() +
         (3600 * 1000 * 8 - 1)
@@ -1057,6 +1058,12 @@ export default {
     }
   },
   methods: {
+    getRmsReceivingCompany() {
+      this.axios.post('/api/v1/rmsReceivingCompany/map').then(res => {
+        console.log(res.data)
+        this.receivingCompany = res.data
+      })
+    },
     //获取当前日期
     getRemarkDate() {
       let day = new Date().getDate()

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

@@ -5,6 +5,7 @@
     <div class="form">
       <div class="form_box">
         <dil-form :formId="287" v-model="form1" ref="from1"></dil-form>
+        <label>运输距离:</label><el-input type="number" v-model="haulDistance" class="el-input"></el-input>
       </div>
       <div id="liulan">
           <el-button type="primary" class="btn" @click="oilPriceFormulaClick">浏览</el-button>
@@ -173,6 +174,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      haulDistance:"",
       carrierIdArray:[],
       tableTop: [
         {
@@ -507,6 +509,12 @@ export default {
       }
     },
     makeSure() {
+      if (this.haulDistance=="" || this.haulDistance==null){
+        this.$message({
+          type: "warning",
+          message: "请输入运输距离!",});
+        return;
+      }
       for (let i = 0; i < this.selectionList.length; i++) {
         this.carrierIdArray.push(this.selectionList[i].carrierId)
       }
@@ -522,7 +530,8 @@ export default {
         oilpriceBase : this.form1.oilpriceBase,
         oilTypeId : this.form1.oilTypeId,
         oilpriceChangeThreshold : this.form1.oilpriceChangeThreshold,
-        place: this.place
+        place: this.place,
+        haulDistance: this.haulDistance
       }
       this.axios.post("/api/v1/ams/addAmsContractTransportPrice", mapValue).then((res) => {
           if (res.data.code == "200") {
@@ -542,6 +551,7 @@ export default {
 };
 </script>
 <style lang='scss'>
+
 .elForm {
     margin-left: 38%;
   }
@@ -579,6 +589,13 @@ export default {
           }
         }
       }
+      label{
+        display: inline-block;
+        width: 70px !important;
+      }
+      .el-input{
+        width: 250px;
+      }
     }
     #liulan{
       width: 120px;
@@ -613,6 +630,9 @@ export default {
     overflow: hidden;
     margin-top: 10px;
   }
+  #cysbutton{
+    margin-left: 70px;
+  }
 }
 </style>
 <style lang='scss'>

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

@@ -373,6 +373,7 @@ export default {
     }
   },
   created() {
+    this.getRmsReceivingCompany()
     if (getCookie('orgCode') == 'shouhuokehu') {
       this.option.requestUrl =
         '/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=' +
@@ -447,7 +448,11 @@ export default {
       this.saleDateOfReceipt = loadTime1
     }
   },
+  mounted() {
+    console.log('我在mouted被执行了')
+  },
   activated() {
+    console.log('我在activated被执行了')
     if (getCookie('orgCode') == 'shouhuokehu') {
       this.option.requestUrl =
         '/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=' +
@@ -497,6 +502,13 @@ export default {
     }
   },
   methods: {
+    //获取收款客户名称
+    getRmsReceivingCompany() {
+      this.axios.post('/api/v1/rmsReceivingCompany/name').then(res => {
+        this.receivingCompany = res.data
+        // console.log(res.data)
+      })
+    },
     //导入Excel格式
     //导入excel
     importExcel(file) {
@@ -548,7 +560,7 @@ export default {
                 }
               }
               if (e1.includes('规格型号')) {
-                console.log(e[e1])
+                // console.log(e[e1])
                 let str = e[e1]
                 let regex = /\((.+?)\)/g
                 if (str.match(regex) != null) {
@@ -622,7 +634,7 @@ export default {
               if (e1.includes('摘要')) {
                 if (e[e1]) {
                   let regex = /,定尺范围.*米|,范围定尺.*米/g
-                  console.log(e[e1])
+                  // console.log(e[e1])
                   map.saleRemark = e[e1].replace(/,|，/g, ',').split(regex)[0]
                 }
                 console.log(e[e1])
@@ -853,17 +865,17 @@ export default {
         })
     },
     func(res) {
-      console.log('func', res)
+      // console.log('func', res)
       this.matSum = res.list.reduce(function(prev, item) {
         return prev + item.materialNumber
       }, 0)
     },
     func1(res) {
-      console.log('func1', res)
+      // console.log('func1', res)
       this.matSum1 = res.list.reduce(function(prev, item) {
         return prev + item.materialNumber
       }, 0)
-      console.log(this.matSum, 'matsum')
+      // console.log(this.matSum, 'matsum')
     },
     func2(res) {
       this.matSum2 = res.list.reduce(function(prev, item) {

src/views/appoint/router/index.js

@@ -1,497 +1,499 @@
-import Vue from "vue";
-import Router from "vue-router";
-import routerBefore from "@/config/routerBefore.js";
+import Vue from 'vue'
+import Router from 'vue-router'
+import routerBefore from '@/config/routerBefore.js'
 // 主要
-import main from "@/components/main.vue";
+import main from '@/components/main.vue'
 // 系统配置管理
-import addCargoResult from "../components/ship/addCargoResult.vue";
-import addDeliveryAttorney from "../components/ship/addDeliveryAttorney.vue";
-import addDeliveryNotice from "../components/ship/addDeliveryNotice.vue";
-import attorneytext from "../components/ship/attorneytext.vue";
-import cargoResult from "../components/ship/cargoResult.vue";
-import deliveryAttorney from "../components/ship/deliveryAttorney.vue";
-import deliveryNotice from "../components/ship/deliveryNotice.vue";
-import modifyCargoResult from "../components/ship/modifyCargoResult.vue";
-import modifyDeliveryAttroney from "../components/ship/modifyDeliveryAttroney.vue";
-import modifyDeliveryNotice from "../components/ship/modifyDeliveryNotice.vue";
-import addBreach from "../components/purchase/addBreach.vue";
-import addOtherPrice from "../components/purchase/addOtherPrice.vue";
-import addShipPrice from "../components/purchase/addShipPrice.vue";
-import addTrainPrice from "../components/purchase/addTrainPrice.vue";
-import addTruckPrice from "../components/purchase/addTruckPrice.vue";
-import breach from "../components/purchase/breach.vue";
-import otherPrice from "../components/purchase/otherPrice.vue";
-import purchaseOrder from "../components/purchase/purchaseOrder.vue";
-import shipPrice from "../components/purchase/shipPrice.vue";
-import trainPrice from "../components/purchase/trainPrice.vue";
-import truckPrice from "../components/purchase/truckPrice.vue";
-import updateBreach from "../components/purchase/updateBreach.vue";
-import updateOtherPrice from "../components/purchase/updateOtherPrice.vue";
-import updateShipPrice from "../components/purchase/updateShipPrice.vue";
-import updateTrainPrice from "../components/purchase/updateTrainPrice.vue";
-import updateTruckPrice from "../components/purchase/updateTruckPrice.vue";
-import addSaleCokeSend from "../components/saleContract/addSaleCokeSend.vue";
-import addSaleOrder from "../components/saleContract/addSaleOrder.vue";
-import addSaleOrderArrange from "../components/saleContract/addSaleOrderArrange.vue";
-import addSaleOrderSend from "../components/saleContract/addSaleOrderSend.vue";
-import addSaleOrderCoproductSend from "../components/saleContract/addSaleOrderCoproductSend.vue";
-import addSaleOrderCoproductSendCarrier from "../components/saleContract/addSaleOrderCoproductSendCarrier.vue";
-import addSaleOrderSteelSend from "../components/saleContract/addSaleOrderSteelSend.vue";
-import addSaleOrderSteelSendCarrier from "../components/saleContract/addSaleOrderSteelSendCarrier.vue";
-import addSalePlan from "../components/saleContract/addSalePlan.vue";
-import addSalePlanDetail from "../components/saleContract/addSalePlanDetail.vue";
-import addTransportPrice from "../components/saleContract/addTransportPrice.vue";
-import addTruckNoDetail from "../components/saleContract/addTruckNoDetail.vue";
-import editaddress from "../components/saleContract/editaddress.vue";
-import editSaleOrder from "../components/saleContract/editSaleOrder.vue";
-import editSaleOrderDetail from "../components/saleContract/editSaleOrderDetail.vue";
-import editSalePalnDetail from "../components/saleContract/editSalePalnDetail.vue";
-import editSalePlan from "../components/saleContract/editSalePlan.vue";
-import editTransportPrice from "../components/saleContract/editTransportPrice.vue";
-import editTruckNoDetail from "../components/saleContract/editTruckNoDetail.vue";
-import saleCokeInward from "../components/saleContract/saleCokeInward.vue";
-import saleOrder from "../components/saleContract/saleOrder.vue";
-import saleOrderArrange from "../components/saleContract/saleOrderArrange.vue";
-import saleOrderCoproduct from "../components/saleContract/saleOrderCoproduct.vue";
-import saleOrderCoproductCarrier from "../components/saleContract/saleOrderCoproductCarrier.vue";
-import saleOrderDetail from "../components/saleContract/saleOrderDetail.vue";
-import saleOrderDetailApproved from "../components/saleContract/saleOrderDetailApproved.vue";
-import saleOrderMaterial from "../components/saleContract/saleOrderMaterial.vue";
-import saleOrderSteel from "../components/saleContract/saleOrderSteel.vue";
-import saleOrderSteelCar from "../components/saleContract/saleOrderSteelCar.vue";
-import saleOrderSteelCarrier from "../components/saleContract/saleOrderSteelCarrier.vue";
-import saleOrderSteelEmpower from "../components/saleContract/saleOrderSteelEmpower.vue";
-import saleOrderUpdateLog from "../components/saleContract/saleOrderUpdateLog.vue";
-import salePlan from "../components/saleContract/salePlan.vue";
-import transportPrice from "../components/saleContract/transportPrice.vue";
-import inwardTransPrice from "../components/inward/transPrice.vue";
-import inwardAddTransPrice from "../components/inward/addTransPrice.vue";
-import saleOrderOODetails from "../components/saleContract/saleOrderOODetails.vue";
-import updateSaleOrderSteel from "../components/saleContract/updateSaleOrderSteel.vue";
-import copySteelOrder from "../components/saleContract/copySteelOrder.vue";
-import rangeValuePoint from "../components/inward/rangePoint.vue";
-import updateTransPrice from "../components/inward/updateTransPrice.vue";
-Vue.use(Router);
+import addCargoResult from '../components/ship/addCargoResult.vue'
+import addDeliveryAttorney from '../components/ship/addDeliveryAttorney.vue'
+import addDeliveryNotice from '../components/ship/addDeliveryNotice.vue'
+import attorneytext from '../components/ship/attorneytext.vue'
+import cargoResult from '../components/ship/cargoResult.vue'
+import deliveryAttorney from '../components/ship/deliveryAttorney.vue'
+import deliveryNotice from '../components/ship/deliveryNotice.vue'
+import modifyCargoResult from '../components/ship/modifyCargoResult.vue'
+import modifyDeliveryAttroney from '../components/ship/modifyDeliveryAttroney.vue'
+import modifyDeliveryNotice from '../components/ship/modifyDeliveryNotice.vue'
+import addBreach from '../components/purchase/addBreach.vue'
+import addOtherPrice from '../components/purchase/addOtherPrice.vue'
+import addShipPrice from '../components/purchase/addShipPrice.vue'
+import addTrainPrice from '../components/purchase/addTrainPrice.vue'
+import addTruckPrice from '../components/purchase/addTruckPrice.vue'
+import breach from '../components/purchase/breach.vue'
+import otherPrice from '../components/purchase/otherPrice.vue'
+import purchaseOrder from '../components/purchase/purchaseOrder.vue'
+import shipPrice from '../components/purchase/shipPrice.vue'
+import trainPrice from '../components/purchase/trainPrice.vue'
+import truckPrice from '../components/purchase/truckPrice.vue'
+import updateBreach from '../components/purchase/updateBreach.vue'
+import updateOtherPrice from '../components/purchase/updateOtherPrice.vue'
+import updateShipPrice from '../components/purchase/updateShipPrice.vue'
+import updateTrainPrice from '../components/purchase/updateTrainPrice.vue'
+import updateTruckPrice from '../components/purchase/updateTruckPrice.vue'
+import addSaleCokeSend from '../components/saleContract/addSaleCokeSend.vue'
+import addSaleOrder from '../components/saleContract/addSaleOrder.vue'
+import addSaleOrderArrange from '../components/saleContract/addSaleOrderArrange.vue'
+import addSaleOrderSend from '../components/saleContract/addSaleOrderSend.vue'
+import addSaleOrderCoproductSend from '../components/saleContract/addSaleOrderCoproductSend.vue'
+import addSaleOrderCoproductSendCarrier from '../components/saleContract/addSaleOrderCoproductSendCarrier.vue'
+import addSaleOrderSteelSend from '../components/saleContract/addSaleOrderSteelSend.vue'
+import addSaleOrderSteelSendCarrier from '../components/saleContract/addSaleOrderSteelSendCarrier.vue'
+import addSalePlan from '../components/saleContract/addSalePlan.vue'
+import addSalePlanDetail from '../components/saleContract/addSalePlanDetail.vue'
+import addTransportPrice from '../components/saleContract/addTransportPrice.vue'
+import addTruckNoDetail from '../components/saleContract/addTruckNoDetail.vue'
+import editaddress from '../components/saleContract/editaddress.vue'
+import editSaleOrder from '../components/saleContract/editSaleOrder.vue'
+import editSaleOrderDetail from '../components/saleContract/editSaleOrderDetail.vue'
+import editSalePalnDetail from '../components/saleContract/editSalePalnDetail.vue'
+import editSalePlan from '../components/saleContract/editSalePlan.vue'
+import editTransportPrice from '../components/saleContract/editTransportPrice.vue'
+import editTruckNoDetail from '../components/saleContract/editTruckNoDetail.vue'
+import saleCokeInward from '../components/saleContract/saleCokeInward.vue'
+import saleOrder from '../components/saleContract/saleOrder.vue'
+import saleOrderArrange from '../components/saleContract/saleOrderArrange.vue'
+import saleOrderCoproduct from '../components/saleContract/saleOrderCoproduct.vue'
+import saleOrderCoproductCarrier from '../components/saleContract/saleOrderCoproductCarrier.vue'
+import saleOrderDetail from '../components/saleContract/saleOrderDetail.vue'
+import saleOrderDetailApproved from '../components/saleContract/saleOrderDetailApproved.vue'
+import saleOrderMaterial from '../components/saleContract/saleOrderMaterial.vue'
+// import saleOrderSteel from "../components/saleContract/saleOrderSteel.vue";
+const saleOrderSteel = () =>
+  import('../components/saleContract/saleOrderSteel.vue')
+import saleOrderSteelCar from '../components/saleContract/saleOrderSteelCar.vue'
+import saleOrderSteelCarrier from '../components/saleContract/saleOrderSteelCarrier.vue'
+import saleOrderSteelEmpower from '../components/saleContract/saleOrderSteelEmpower.vue'
+import saleOrderUpdateLog from '../components/saleContract/saleOrderUpdateLog.vue'
+import salePlan from '../components/saleContract/salePlan.vue'
+import transportPrice from '../components/saleContract/transportPrice.vue'
+import inwardTransPrice from '../components/inward/transPrice.vue'
+import inwardAddTransPrice from '../components/inward/addTransPrice.vue'
+import saleOrderOODetails from '../components/saleContract/saleOrderOODetails.vue'
+import updateSaleOrderSteel from '../components/saleContract/updateSaleOrderSteel.vue'
+import copySteelOrder from '../components/saleContract/copySteelOrder.vue'
+import rangeValuePoint from '../components/inward/rangePoint.vue'
+import updateTransPrice from '../components/inward/updateTransPrice.vue'
+Vue.use(Router)
 
 const constantRouterMap = [
   {
-    path: "/",
-    name: "main",
-    meta: { title: "首页", code: "xtpzgl" },
+    path: '/',
+    name: 'main',
+    meta: { title: '首页', code: 'xtpzgl' },
     component: main,
-    redirect: { name: "cargoResult" },
+    redirect: { name: 'cargoResult' },
     children: [
       {
-        path: "addCargoResult",
-        name: "addCargoResult",
-        meta: { code: "xtpzgl-jggl" },
+        path: 'addCargoResult',
+        name: 'addCargoResult',
+        meta: { code: 'xtpzgl-jggl' },
         component: addCargoResult
       },
       {
-        path: "addDeliveryAttorney",
-        name: "addDeliveryAttorney",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addDeliveryAttorney',
+        name: 'addDeliveryAttorney',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addDeliveryAttorney
       },
       {
-        path: "addDeliveryNotice",
-        name: "addDeliveryNotice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addDeliveryNotice',
+        name: 'addDeliveryNotice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addDeliveryNotice
       },
       {
-        path: "attorneytext/:test",
-        name: "attorneytext",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'attorneytext/:test',
+        name: 'attorneytext',
+        meta: { code: 'xtpzgl-yhgl' },
         component: attorneytext
       },
       {
-        path: "cargoResult",
-        name: "cargoResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'cargoResult',
+        name: 'cargoResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: cargoResult
       },
       {
-        path: "deliveryAttorney",
-        name: "deliveryAttorney",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'deliveryAttorney',
+        name: 'deliveryAttorney',
+        meta: { code: 'xtpzgl-yhgl' },
         component: deliveryAttorney
       },
       {
-        path: "deliveryNotice",
-        name: "deliveryNotice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'deliveryNotice',
+        name: 'deliveryNotice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: deliveryNotice
       },
       {
-        path: "modifyCargoResult/:cargoTransferResultId",
-        name: "modifyCargoResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'modifyCargoResult/:cargoTransferResultId',
+        name: 'modifyCargoResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: modifyCargoResult
       },
       {
-        path: "modifyDeliveryAttroney/:attorneyId",
-        name: "modifyDeliveryAttroney",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'modifyDeliveryAttroney/:attorneyId',
+        name: 'modifyDeliveryAttroney',
+        meta: { code: 'xtpzgl-yhgl' },
         component: modifyDeliveryAttroney
       },
       {
-        path: "modifyDeliveryNotice/:noticeId",
-        name: "modifyDeliveryNotice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'modifyDeliveryNotice/:noticeId',
+        name: 'modifyDeliveryNotice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: modifyDeliveryNotice
       },
       {
-        path: "addBreach",
-        name: "addBreach",
-        meta: { code: "xtpzgl-jggl" },
+        path: 'addBreach',
+        name: 'addBreach',
+        meta: { code: 'xtpzgl-jggl' },
         component: addBreach
       },
       {
-        path: "addOtherPrice",
-        name: "addOtherPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addOtherPrice',
+        name: 'addOtherPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addOtherPrice
       },
       {
-        path: "addShipPrice",
-        name: "addShipPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addShipPrice',
+        name: 'addShipPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addShipPrice
       },
       {
-        path: "addTrainPrice",
-        name: "addTrainPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addTrainPrice',
+        name: 'addTrainPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addTrainPrice
       },
       {
-        path: "addTruckPrice",
-        name: "addTruckPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addTruckPrice',
+        name: 'addTruckPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addTruckPrice
       },
       {
-        path: "breach",
-        name: "breach",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'breach',
+        name: 'breach',
+        meta: { code: 'xtpzgl-yhgl' },
         component: breach
       },
       {
-        path: "otherPrice",
-        name: "otherPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'otherPrice',
+        name: 'otherPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: otherPrice
       },
       {
-        path: "purchaseOrder",
-        name: "purchaseOrder",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'purchaseOrder',
+        name: 'purchaseOrder',
+        meta: { code: 'xtpzgl-yhgl' },
         component: purchaseOrder
       },
       {
-        path: "shipPrice",
-        name: "shipPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'shipPrice',
+        name: 'shipPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: shipPrice
       },
       {
-        path: "trainPrice",
-        name: "trainPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'trainPrice',
+        name: 'trainPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: trainPrice
       },
       {
-        path: "truckPrice",
-        name: "truckPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'truckPrice',
+        name: 'truckPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: truckPrice
       },
       {
-        path: "updateBreach/:breachId",
-        name: "updateBreach",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'updateBreach/:breachId',
+        name: 'updateBreach',
+        meta: { code: 'xtpzgl-yhgl' },
         component: updateBreach
       },
       {
-        path: "updateOtherPrice/:priceId",
-        name: "updateOtherPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'updateOtherPrice/:priceId',
+        name: 'updateOtherPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: updateOtherPrice
       },
       {
-        path: "updateShipPrice/:priceId",
-        name: "updateShipPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'updateShipPrice/:priceId',
+        name: 'updateShipPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: updateShipPrice
       },
       {
-        path: "updateTrainPrice/:priceId",
-        name: "updateTrainPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'updateTrainPrice/:priceId',
+        name: 'updateTrainPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: updateTrainPrice
       },
       {
-        path: "updateTruckPrice/:priceId",
-        name: "updateTruckPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'updateTruckPrice/:priceId',
+        name: 'updateTruckPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: updateTruckPrice
       },
       {
-        path: "addSaleCokeSend/:saleOrderId",
-        name: "addSaleCokeSend",
-        meta: { code: "xtpzgl-jggl" },
+        path: 'addSaleCokeSend/:saleOrderId',
+        name: 'addSaleCokeSend',
+        meta: { code: 'xtpzgl-jggl' },
         component: addSaleCokeSend
       },
       {
-        path: "addSaleOrder",
-        name: "addSaleOrder",
-        meta: { code: "xtpzgl-jggl" },
+        path: 'addSaleOrder',
+        name: 'addSaleOrder',
+        meta: { code: 'xtpzgl-jggl' },
         component: addSaleOrder
       },
       {
-        path: "addSaleOrderArrange/:saleOrderId",
-        name: "addSaleOrderArrange",
-        meta: { code: "xtpzgl-jggl" },
+        path: 'addSaleOrderArrange/:saleOrderId',
+        name: 'addSaleOrderArrange',
+        meta: { code: 'xtpzgl-jggl' },
         component: addSaleOrderArrange
       },
       {
-        path: "addSaleOrderCoproductSend/:saleOrderId",
-        name: "addSaleOrderCoproductSend",
-        meta: { code: "xtpzgl-jggl" },
+        path: 'addSaleOrderCoproductSend/:saleOrderId',
+        name: 'addSaleOrderCoproductSend',
+        meta: { code: 'xtpzgl-jggl' },
         component: addSaleOrderCoproductSend
       },
       {
-        path: "addSaleOrderCoproductSendCarrier/:saleOrderId",
-        name: "addSaleOrderCoproductSendCarrier",
-        meta: { code: "xtpzgl-jggl" },
+        path: 'addSaleOrderCoproductSendCarrier/:saleOrderId',
+        name: 'addSaleOrderCoproductSendCarrier',
+        meta: { code: 'xtpzgl-jggl' },
         component: addSaleOrderCoproductSendCarrier
       },
       {
-        path: "addSaleOrderSend/:saleOrderId",
-        name: "addSaleOrderSend",
-        meta: { code: "xtpzgl-jggl" },
+        path: 'addSaleOrderSend/:saleOrderId',
+        name: 'addSaleOrderSend',
+        meta: { code: 'xtpzgl-jggl' },
         component: addSaleOrderSend
       },
       {
-        path: "addSaleOrderSteelSend/:saleOrderMaterialId",
-        name: "addSaleOrderSteelSend",
-        meta: { code: "xtpzgl-jggl" },
+        path: 'addSaleOrderSteelSend/:saleOrderMaterialId',
+        name: 'addSaleOrderSteelSend',
+        meta: { code: 'xtpzgl-jggl' },
         component: addSaleOrderSteelSend
       },
       {
-        path: "addSaleOrderSteelSendCarrier/:saleOrderId",
-        name: "addSaleOrderSteelSendCarrier",
-        meta: { code: "xtpzgl-jggl" },
+        path: 'addSaleOrderSteelSendCarrier/:saleOrderId',
+        name: 'addSaleOrderSteelSendCarrier',
+        meta: { code: 'xtpzgl-jggl' },
         component: addSaleOrderSteelSendCarrier
       },
       {
-        path: "addSalePlan",
-        name: "addSalePlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addSalePlan',
+        name: 'addSalePlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addSalePlan
       },
       {
-        path: "addSalePlanDetail/:planId",
-        name: "addSalePlanDetail",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addSalePlanDetail/:planId',
+        name: 'addSalePlanDetail',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addSalePlanDetail
       },
       {
-        path: "saleOrderMaterial/:saleOrderId",
-        name: "saleOrderMaterial",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleOrderMaterial/:saleOrderId',
+        name: 'saleOrderMaterial',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleOrderMaterial
       },
       {
-        path: "addTransportPrice",
-        name: "addTransportPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addTransportPrice',
+        name: 'addTransportPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addTransportPrice
       },
       {
-        path: "addTruckNoDetail/:saleOrderMaterialId",
-        name: "addTruckNoDetail",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addTruckNoDetail/:saleOrderMaterialId',
+        name: 'addTruckNoDetail',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addTruckNoDetail
       },
       {
-        path: "editaddress/:saleOrderMaterialId",
-        name: "editaddress",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editaddress/:saleOrderMaterialId',
+        name: 'editaddress',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editaddress
       },
       {
-        path: "editSaleOrder/:saleOrderId",
-        name: "editSaleOrder",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editSaleOrder/:saleOrderId',
+        name: 'editSaleOrder',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editSaleOrder
       },
       {
-        path: "editSaleOrderDetail/:saleOrderMaterialId",
-        name: "editSaleOrderDetail",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editSaleOrderDetail/:saleOrderMaterialId',
+        name: 'editSaleOrderDetail',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editSaleOrderDetail
       },
       {
-        path: "editSalePalnDetail/:planMaterialId",
-        name: "editSalePalnDetail",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editSalePalnDetail/:planMaterialId',
+        name: 'editSalePalnDetail',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editSalePalnDetail
       },
       {
-        path: "editSalePlan/:planId",
-        name: "editSalePlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editSalePlan/:planId',
+        name: 'editSalePlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editSalePlan
       },
       {
-        path: "editTransportPrice/:priceId",
-        name: "editTransportPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editTransportPrice/:priceId',
+        name: 'editTransportPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editTransportPrice
       },
       {
-        path: "editTruckNoDetail/:trucknoMaterialId",
-        name: "editTruckNoDetail",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editTruckNoDetail/:trucknoMaterialId',
+        name: 'editTruckNoDetail',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editTruckNoDetail
       },
       {
-        path: "saleCokeInward",
-        name: "saleCokeInward",
-        meta: { code: "xtpzgl-yhgl", keepAlive: true },
+        path: 'saleCokeInward',
+        name: 'saleCokeInward',
+        meta: { code: 'xtpzgl-yhgl', keepAlive: true },
         component: saleCokeInward
       },
       {
-        path: "saleOrder",
-        name: "saleOrder",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleOrder',
+        name: 'saleOrder',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleOrder
       },
       {
-        path: "saleOrderArrange",
-        name: "saleOrderArrange",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleOrderArrange',
+        name: 'saleOrderArrange',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleOrderArrange
       },
       {
-        path: "saleOrderCoproduct",
-        name: "saleOrderCoproduct",
-        meta: { code: "xtpzgl-yhgl", keepAlive: true },
+        path: 'saleOrderCoproduct',
+        name: 'saleOrderCoproduct',
+        meta: { code: 'xtpzgl-yhgl', keepAlive: true },
         component: saleOrderCoproduct
       },
       {
-        path: "saleOrderCoproductCarrier",
-        name: "saleOrderCoproductCarrier",
-        meta: { code: "xtpzgl-yhgl", keepAlive: true },
+        path: 'saleOrderCoproductCarrier',
+        name: 'saleOrderCoproductCarrier',
+        meta: { code: 'xtpzgl-yhgl', keepAlive: true },
         component: saleOrderCoproductCarrier
       },
       {
-        path: "saleOrderSteel",
-        name: "saleOrderSteel",
-        meta: { code: "xtpzgl-yhgl", keepAlive: true },
+        path: 'saleOrderSteel',
+        name: 'saleOrderSteel',
+        meta: { code: 'xtpzgl-yhgl', keepAlive: true },
         component: saleOrderSteel
       },
       {
-        path: "saleOrderSteelCar",
-        name: "saleOrderSteelCar",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleOrderSteelCar',
+        name: 'saleOrderSteelCar',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleOrderSteelCar
       },
       {
-        path: "saleOrderSteelCarrier",
-        name: "saleOrderSteelCarrier",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleOrderSteelCarrier',
+        name: 'saleOrderSteelCarrier',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleOrderSteelCarrier
       },
       {
-        path: "saleOrderSteelEmpower/:saleOrderMaterialId",
-        name: "saleOrderSteelEmpower",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleOrderSteelEmpower/:saleOrderMaterialId',
+        name: 'saleOrderSteelEmpower',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleOrderSteelEmpower
       },
       {
-        path: "saleOrderDetail/:saleOrderId",
-        name: "saleOrderDetail",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleOrderDetail/:saleOrderId',
+        name: 'saleOrderDetail',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleOrderDetail
       },
       {
-        path: "saleOrderDetailApproved/:saleOrderId",
-        name: "saleOrderDetailApproved",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleOrderDetailApproved/:saleOrderId',
+        name: 'saleOrderDetailApproved',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleOrderDetailApproved
       },
       {
-        path: "saleOrderUpdateLog/:saleOrderId",
-        name: "saleOrderUpdateLog",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleOrderUpdateLog/:saleOrderId',
+        name: 'saleOrderUpdateLog',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleOrderUpdateLog
       },
       {
-        path: "salePlan",
-        name: "salePlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'salePlan',
+        name: 'salePlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: salePlan
       },
       {
-        path: "transportPrice",
-        name: "transportPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'transportPrice',
+        name: 'transportPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: transportPrice
       },
       {
-        path: "inwardTransPrice",
-        name: "inwardTransPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardTransPrice',
+        name: 'inwardTransPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardTransPrice
       },
       {
-        path: "inwardAddTransPrice",
-        name: "inwardAddTransPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardAddTransPrice',
+        name: 'inwardAddTransPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardAddTransPrice
       },
       {
-        path: "saleOrderOODetails/:saleOrderId",
-        name: "saleOrderOODetails",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleOrderOODetails/:saleOrderId',
+        name: 'saleOrderOODetails',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleOrderOODetails
       },
       {
-        path: "updateSaleOrderSteel/:saleOrderId/:deleted",
-        name: "updateSaleOrderSteel",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'updateSaleOrderSteel/:saleOrderId/:deleted',
+        name: 'updateSaleOrderSteel',
+        meta: { code: 'xtpzgl-yhgl' },
         component: updateSaleOrderSteel
       },
       {
-        path: "copySteelOrder/:saleOrderId",
-        name: "copySteelOrder",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'copySteelOrder/:saleOrderId',
+        name: 'copySteelOrder',
+        meta: { code: 'xtpzgl-yhgl' },
         component: copySteelOrder
       },
       {
-        path: "rangeValuePoint",
-        name: "rangeValuePoint",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'rangeValuePoint',
+        name: 'rangeValuePoint',
+        meta: { code: 'xtpzgl-yhgl' },
         component: rangeValuePoint
       },
       {
-        path: "updateTransPrice",
-        name: "updateTransPrice",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'updateTransPrice',
+        name: 'updateTransPrice',
+        meta: { code: 'xtpzgl-yhgl' },
         component: updateTransPrice
       }
     ]
   }
-];
+]
 const router = new Router({
   routes: constantRouterMap
-});
+})
 //  before
-routerBefore(router, constantRouterMap);
+routerBefore(router, constantRouterMap)
 
-export default router;
+export default router
 //  constantRouterMap
-export const routes = constantRouterMap;
+export const routes = constantRouterMap

src/views/index/router/index.js

@@ -1,131 +1,135 @@
-import Vue from "vue";
-import Router from "vue-router";
-import routerBefore from "@/config/routerBefore.js";
+import Vue from 'vue'
+import Router from 'vue-router'
+import routerBefore from '@/config/routerBefore.js'
 
 // 主页
-import main from "@/components/main.vue";
+// import main from '@/components/main.vue'
+const main = () => import('@/components/main.vue')
 
 // 登录
-import login from "@/views/index/components/login.vue"; // 登录
-import download from "@/views/index/components/download.vue";
+// import login from '@/views/index/components/login.vue' // 登录
+const login = () => import('@/views/index/components/login.vue')
+
+import download from '@/views/index/components/download.vue'
 // 抽奖结果
 //import luckDraw from "@/views/index/components/luckDraw.vue";
 
-import luckDraw from "@/views/index/components/luckDraw.vue";
+import luckDraw from '@/views/index/components/luckDraw.vue'
 
-import printScan1 from "../components/printScan1";
-import printScan2 from "../components/printScan2";
-import printReceipt from "../components/printReceipt";
-import printReceipt1 from "../components/printReceipt1";
-import printReceipt2 from "../components/printReceipt2";
+import printScan1 from '../components/printScan1'
+import printScan2 from '../components/printScan2'
+import printReceipt from '../components/printReceipt'
+import printReceipt1 from '../components/printReceipt1'
+import printReceipt2 from '../components/printReceipt2'
 // 网页登录不可访问
-import page404 from "@/views/index/components/page404.vue";
+import page404 from '@/views/index/components/page404.vue'
 
 // 集团公司选择过渡页
-import selectCompany from "@/views/index/components/selectCompany.vue";
+import selectCompany from '@/views/index/components/selectCompany.vue'
 
-import printScan from "@/views/index/components/printScan.vue";
+import printScan from '@/views/index/components/printScan.vue'
+// import { transform } from 'babel-core'
 
-Vue.use(Router);
+Vue.use(Router)
 
 export const constantRouterMap = [
   {
-    path: "/",
+    path: '/',
     meta: {
-      title: "登录"
+      title: '登录'
     },
     component: login
   },
 
   {
-    path: "/download",
-    name: "download",
+    path: '/download',
+    name: 'download',
     meta: {
-      title: "下载"
+      title: '下载'
     },
     component: download
   },
   {
-    path: "/printScan",
-    name: "printScan",
+    path: '/printScan',
+    name: 'printScan',
     meta: {
-      title: "下载"
+      title: '下载'
     },
     component: printScan
   },
   {
-    path: "/printScan1",
-    name: "printScan1",
+    path: '/printScan1',
+    name: 'printScan1',
     meta: {
-      title: "下载"
+      title: '下载'
     },
     component: printScan1
   },
   {
-    path: "/printScan2",
-    name: "printScan2",
+    path: '/printScan2',
+    name: 'printScan2',
     meta: {
-      title: "下载"
+      title: '下载'
     },
     component: printScan2
   },
   {
-    path: "/printReceipt",
-    name: "printReceipt",
+    path: '/printReceipt',
+    name: 'printReceipt',
     component: printReceipt
   },
   {
-    path: "/printReceipt1",
-    name: "printReceipt1",
+    path: '/printReceipt1',
+    name: 'printReceipt1',
     component: printReceipt1
   },
   {
-    path: "/printReceipt2",
-    name: "printReceipt2",
+    path: '/printReceipt2',
+    name: 'printReceipt2',
     component: printReceipt2
   },
   {
-    path: "/login",
-    name: "login",
+    path: '/login',
+    name: 'login',
     meta: {
-      title: "登录"
+      title: '登录'
     },
     component: login
   },
   {
-    path: "/luckDraw",
-    name: "luckDraw",
+    path: '/luckDraw',
+    name: 'luckDraw',
     meta: {
-      title: "抽奖结果"
+      title: '抽奖结果'
     },
     component: luckDraw
   },
   {
-    path: "/default",
-    name: "default",
+    path: '/default',
+    name: 'default',
     component: main,
     meta: {
-      title: "首页"
+      title: '首页'
     }
   },
   {
-    path: "/selectCompany",
-    name: "selectCompany",
+    path: '/selectCompany',
+    name: 'selectCompany',
     component: selectCompany,
     meta: {
-      title: "集团与公司用户跳转页"
+      title: '集团与公司用户跳转页'
     }
   },
   ,
   {
-    path: "/page404",
-    name: "page404",
+    path: '/page404',
+    name: 'page404',
     meta: {
-      title: "404"
+      title: '404'
     },
     component: page404
   }
-];
+]
 
 const router = new Router({
   // mode: 'history', // require service support
@@ -133,12 +137,12 @@ const router = new Router({
     y: 0
   }),
   routes: constantRouterMap
-});
+})
 
 //  before
-routerBefore(router, constantRouterMap);
+routerBefore(router, constantRouterMap)
 
-export default router;
+export default router
 
 //  constantRouterMap
-export const routes = constantRouterMap;
+export const routes = constantRouterMap

src/views/inward/components/truckAppoint/addPlan.vue

@@ -39,6 +39,17 @@
         </div>
       </el-form>
     </div>
+    <!--   运输单价按钮   -->
+    <div class="materialDrawer">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px">
+        <el-form-item label="运输单价"> </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onprice" class="truckBtn"
+          >浏览</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
     <template>
       <div>
         <mergeRowTable
@@ -60,6 +71,35 @@
         </mergeRowTable>
       </div>
     </template>
+    <!--   运输单价模态框   -->
+    <el-drawer
+      :visible.sync="drawerP"
+      :direction="direction"
+      close-on-press-escape
+      modal
+      wrapperClosable
+      size="60%"
+    >
+      <div class="selectText">
+        <el-input v-model="inputP" placeholder="请输入内容" style="width: 240px" clearable></el-input>
+        <el-button
+          type="primary"
+          @click="onpriceSelect"
+        ><i class="el-icon-search"></i>查询</el-button
+        >
+      </div>
+      <div class="LineTable">
+        <vue-scroll :ops="ops" style="width:100%;height:100%">
+          <dilTable
+            v-bind.sync="priceOptions"
+            :isKuang="isKuang"
+            :loading="tableLoading"
+            :drawer="PriceDrawer"
+            @func="funcP"
+          ></dilTable>
+        </vue-scroll>
+      </div>
+    </el-drawer>
     <div class="button-box">
       <el-button type="primary" @click="makeSure">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
@@ -73,6 +113,30 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      ops: {
+        vuescroll: {},
+        scrollPanel: {},
+        rail: {
+          keepShow: true
+        },
+        bar: {
+          hoverStyle: true,
+          onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
+          background: "#5f9ea0", //滚动条颜色
+          opacity: 0.8, //滚动条透明度
+          "overflow-x": "hidden"
+        }
+      },
+      direction: "rtl",
+      //表格加载状态
+      PriceDrawer:false,
+      tableLoading: false,
+      isKuang:false,
+      priceOptions: {
+        requestUrl: ""
+      },
+      inputP:"",
+      drawerP:false,
       restaurants: [],
       state2: null,
       planTruckNumber: null,
@@ -93,6 +157,33 @@ export default {
     };
   },
   methods: {
+    funcP(){
+      this.isKuang = false;
+      this.tableLoading = false;
+    },
+    handleCloseP(){
+      if (this.drawerP) {
+        this.drawerP = false;
+        this.inputP = null;
+      }
+    },
+    onpriceSelect(){
+      this.loading = true;
+      this.isKuang = true;
+      if (this.inputP) {
+        this.priceOptions.requestUrl =
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&con=" +
+          this.inputP;
+      } else {
+        this.priceOptions.requestUrl =
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();
+      }
+    },
+    onprice(){
+      this.drawerP=true;
+      this.priceOptions.requestUrl =
+        "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();
+    },
     handleSelect(item) {
       this.carrierId = item.carrierId;
       this.state2 = item.carrierName;
@@ -208,7 +299,7 @@ export default {
 .addInwardPlan {
   .carrier {
     display: inline-block !important;
-    margin-left: 38%;
+    margin-left: 40%;
     .el-input {
       width: 250px;
     }
@@ -229,5 +320,25 @@ export default {
     justify-content: center;
     margin-left: 25px !important;
   }
+  .materialDrawer {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .el-input {
+      width: 320px;
+    }
+    .el-select {
+      width: 320px;
+    }
+    .el-autocomplete {
+      width: 320px;
+    }
+    .el-form {
+      padding: 10px;
+    }
+    .truckBtn {
+      width: 320px;
+    }
+  }
 }
 </style>

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -121,6 +121,17 @@
           </el-form-item>
         </el-form>
       </div>
+      <!--   运输单价按钮   -->
+      <div class="materialDrawer">
+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
+          <el-form-item label="运输单价"> </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onprice" class="truckBtn"
+            >浏览</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
       <!-- 物资和装卸点以及装卸货次序 -->
       <div class="swtichTop">
         <span class="titile">点击浏览选择物资之前请选择物资单位！</span>
@@ -266,44 +277,33 @@
           </div>
         </el-drawer>
       </div>
+      <!--   运输单价模态框   -->
       <el-drawer
-        :visible.sync="drawer"
+        :visible.sync="drawerP"
         :direction="direction"
-        :before-close="handleClose"
-        size="30%"
+        close-on-press-escape
+        modal
+        wrapperClosable
+        size="60%"
       >
-        <el-input
-          placeholder="请输入内容"
-          v-model="input"
-          style="width: 250px"
-          clearable
-        >
-        </el-input>
-        <el-button
-          type="primary"
-          class="btn"
-          @click="onclick(a)"
-          style="margin-bottom: 15px"
-        >
-          <i class="el-icon-search"></i>查询
-        </el-button>
-        <div v-show="a == 2">
-          <dilTable
-            v-bind.sync="second1"
-            @radio-change="currentRadioChange2"
-          ></dilTable>
-        </div>
-        <div v-show="a == 3">
-          <dilTable
-            v-bind.sync="second1"
-            @radio-change="currentRadioChange2"
-          ></dilTable>
+        <div class="selectText">
+          <el-input v-model="inputP" placeholder="请输入内容" style="width: 240px"></el-input>
+          <el-button
+            type="primary"
+            @click="onpriceSelect"
+          ><i class="el-icon-search"></i>查询</el-button
+          >
         </div>
-        <div v-show="a == 4">
-          <dilTable
-            v-bind.sync="second1"
-            @radio-change="currentRadioChange2"
-          ></dilTable>
+        <div class="LineTable">
+          <vue-scroll :ops="ops" style="width:100%;height:100%">
+            <dilTable
+              v-bind.sync="priceOptions"
+              :isKuang="isKuang"
+              :loading="tableLoading"
+              :drawer="PriceDrawer"
+              @func="funcP"
+            ></dilTable>
+          </vue-scroll>
         </div>
       </el-drawer>
     </div>
@@ -324,6 +324,15 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      //表格加载状态
+      PriceDrawer:false,
+      tableLoading: false,
+      isKuang:false,
+      priceOptions: {
+        requestUrl: ""
+      },
+      inputP:"",
+      drawerP:false,
       aaadrawer: false,
       disabled: false,
       options6: [
@@ -514,6 +523,33 @@ export default {
     }
   },
   methods: {
+    funcP(){
+      this.isKuang = false;
+      this.tableLoading = false;
+    },
+    handleCloseP(){
+      if (this.drawerP) {
+        this.drawerP = false;
+        this.inputP = null;
+      }
+    },
+    onpriceSelect(){
+      this.loading = true;
+      this.isKuang = true;
+      if (this.inputP) {
+        this.priceOptions.requestUrl =
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&con=" +
+          this.inputP;
+      } else {
+        this.priceOptions.requestUrl =
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();
+      }
+    },
+    onprice(){
+      this.drawerP=true;
+      this.priceOptions.requestUrl =
+        "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();
+    },
     //用车单位弹出层
     handleSelectCarrier(item) {
       this.shipperId = item.shipperId;
@@ -1088,6 +1124,12 @@ export default {
     margin-top: 20px;
     margin-right: 90px;
   }
+  .LineTable {
+    width: 100%;
+    height: 480px;
+    overflow: hidden;
+    margin-top: 10px;
+  }
 }
 </style>
 <style>

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

@@ -155,10 +155,13 @@
         >
         <div class="tablecls">
           <!-- 查询所有的运输单价 -->
+          <vue-scorll :ops="ops" style="width: 100%;height: 100%">
           <dilTable
             v-bind.sync="Address"
             @radio-change="currentRadioChange2"
+            :drawer="aaadrawer"
           ></dilTable>
+          </vue-scorll>
         </div>
 <!--        <el-form-item label="新详单地址" :label-width="formLabelWidth">
           <el-input
@@ -212,6 +215,21 @@ import { sjTime } from "../../../../ADMINISTRATORS/app";
 export default {
   data() {
     return {
+      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,

src/views/statisticalReport/components/inwardReport/allInwardReport.vue

@@ -44,8 +44,8 @@
   </div>
 </template>
 <script>
-import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
+import { sjTime } from '@/utils/sharedJsFile'
+import { getCookie } from '@/utils/util.js'
 export default {
   data() {
     return {
@@ -68,805 +68,769 @@ export default {
       //一焦化-厂内统计报表
       oneCokeReport: [],
       input: null,
-      activeName: "first",
+      activeName: 'first',
       startTime: null,
       endTime: null,
       first: {
-        requestUrl: ""
+        requestUrl: ''
       },
       second: {
-        requestUrl: ""
+        requestUrl: ''
       },
       third: {
-        requestUrl: ""
+        requestUrl: ''
       },
       fourth: {
-        requestUrl: ""
+        requestUrl: ''
       },
       fifth: {
-        requestUrl: ""
+        requestUrl: ''
       },
       six: {
-        requestUrl: ""
+        requestUrl: ''
       },
       seven: {
-        requestUrl: ""
+        requestUrl: ''
       }
-    };
+    }
   },
   created() {
-    this.getRequestUrl();
+    this.getRequestUrl()
   },
   methods: {
     func(res) {
-      this.dataColumnData = res.columnData;
+      this.dataColumnData = res.columnData
     },
     exportSignleReport() {
       if (this.startTime && this.endTime) {
-        this.openFullScreen1();
+        this.openFullScreen1()
       } else {
         this.$confirm(
-          "没有输入时间区间，系统将默认导出今天0点到24点的单个报表数据,是否继续?",
-          "提示",
+          '没有输入时间区间，系统将默认导出今天0点到24点的单个报表数据,是否继续?',
+          '提示',
           {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           }
         )
           .then(() => {
-            this.openFullScreen1();
+            this.openFullScreen1()
           })
           .catch(() => {
-            this.$message.info("取消导出");
-          });
+            this.$message.info('取消导出')
+          })
       }
     },
     exportAllReport() {
       if (this.startTime && this.endTime) {
-        this.openFullScreen();
+        this.openFullScreen()
       } else {
         this.$confirm(
-          "没有输入时间区间，系统将默认导出今天0点到24点的全部报表数据,是否继续?",
-          "提示",
+          '没有输入时间区间，系统将默认导出今天0点到24点的全部报表数据,是否继续?',
+          '提示',
           {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           }
         )
           .then(() => {
-            this.openFullScreen();
+            this.openFullScreen()
           })
           .catch(() => {
-            this.$message.info("取消导出");
-          });
+            this.$message.info('取消导出')
+          })
       }
     },
     openFullScreen1() {
-      let startTime = null;
-      let endTime = null;
-      let orgCode = null;
+      let startTime = null
+      let endTime = null
+      let orgCode = null
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
       if (
-        getCookie("orgCode") != "dagangadmin" &&
-        getCookie("orgCode") != "zidonghuabu" &&
-        getCookie("orgCode") != "wuliuchuyunzhongxin"
+        getCookie('orgCode') != 'dagangadmin' &&
+        getCookie('orgCode') != 'zidonghuabu' &&
+        getCookie('orgCode') != 'wuliuchuyunzhongxin'
       ) {
-        orgCode = getCookie("orgCode");
+        orgCode = getCookie('orgCode')
       }
       const loading = this.$loading({
         lock: true,
-        text: "请等待导出",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)"
-      });
-      if (this.activeName == "first") {
+        text: '请等待导出',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      if (this.activeName == 'first') {
         this.axios
           .post(
-            "/api/v1/tms/getInwardInFactory?apiId=486&isPage=yes&startTime=" +
+            '/api/v1/tms/getInwardInFactory?apiId=486&isPage=yes&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&index=" +
+              '&index=' +
               this.input +
-              "&orgCode=" +
+              '&orgCode=' +
               orgCode
           )
           .then(res => {
-            this.totalArr = [];
-            this.inwardArr = [];
-            this.tableTitle = "纯内转统计报表";
-            this.inwardArr = res.data.data;
-            this.totalArr = this.totalArr.concat(this.inwardArr);
-            this.exportAllReportToExcel();
+            this.totalArr = []
+            this.inwardArr = []
+            this.tableTitle = '纯内转统计报表'
+            this.inwardArr = res.data.data
+            this.totalArr = this.totalArr.concat(this.inwardArr)
+            this.exportAllReportToExcel()
             setTimeout(() => {
-              loading.close();
-            }, 2000);
-          });
-      } else if (this.activeName == "second") {
+              loading.close()
+            }, 2000)
+          })
+      } else if (this.activeName == 'second') {
         this.axios
           .post(
-            "/api/v1/tms/getPurchaseInwardList?apiId=486&isPage=yes&startTime=" +
+            '/api/v1/tms/getPurchaseInwardList?apiId=486&isPage=yes&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&index=" +
+              '&index=' +
               this.input +
-              "&orgCode=" +
+              '&orgCode=' +
               orgCode
           )
           .then(res => {
-            this.totalArr = [];
-            this.purInward = [];
-            this.tableTitle = "采购内转统计报表";
-            this.purInward = res.data.data;
-            this.totalArr = this.totalArr.concat(this.purInward);
-            this.exportAllReportToExcel();
+            this.totalArr = []
+            this.purInward = []
+            this.tableTitle = '采购内转统计报表'
+            this.purInward = res.data.data
+            this.totalArr = this.totalArr.concat(this.purInward)
+            this.exportAllReportToExcel()
             setTimeout(() => {
-              loading.close();
-            }, 2000);
-          });
-      } else if (this.activeName == "third") {
+              loading.close()
+            }, 2000)
+          })
+      } else if (this.activeName == 'third') {
         this.axios
           .post(
-            "/api/v1/tms/getSaleOrderList?apiId=486&isPage=yes&startTime=" +
+            '/api/v1/tms/getSaleOrderList?apiId=486&isPage=yes&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&index=" +
+              '&index=' +
               this.input +
-              "&orgCode=" +
+              '&orgCode=' +
               orgCode
           )
           .then(res => {
-            thia.totalArr = [];
-            this.saleReport = [];
-            this.tableTitle = "销售内转统计报表";
-            this.saleReport = res.data.data;
-            this.totalArr = this.totalArr.concat(this.saleReport);
-            this.exportAllReportToExcel();
+            thia.totalArr = []
+            this.saleReport = []
+            this.tableTitle = '销售内转统计报表'
+            this.saleReport = res.data.data
+            this.totalArr = this.totalArr.concat(this.saleReport)
+            this.exportAllReportToExcel()
             setTimeout(() => {
-              loading.close();
-            }, 2000);
-          });
-      } else if (this.activeName == "fourth") {
+              loading.close()
+            }, 2000)
+          })
+      } else if (this.activeName == 'fourth') {
         this.axios
           .post(
-            "/api/v1/tms/getPurchaseOrderList?apiId=486&isPage=yes&startTime=" +
+            '/api/v1/tms/getPurchaseOrderList?apiId=486&isPage=yes&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&index=" +
+              '&index=' +
               this.input +
-              "&orgCode=" +
+              '&orgCode=' +
               orgCode
           )
           .then(res => {
-            this.totalArr = [];
-            this.purReport = [];
-            this.tableTitle = "采购燃料统计报表";
-            this.purReport = res.data.data;
-            this.totalArr = this.totalArr.concat(this.purReport);
-            this.exportAllReportToExcel();
+            this.totalArr = []
+            this.purReport = []
+            this.tableTitle = '采购燃料统计报表'
+            this.purReport = res.data.data
+            this.totalArr = this.totalArr.concat(this.purReport)
+            this.exportAllReportToExcel()
             setTimeout(() => {
-              loading.close();
-            }, 2000);
-          });
-      } else if (this.activeName == "fifth") {
+              loading.close()
+            }, 2000)
+          })
+      } else if (this.activeName == 'fifth') {
         this.axios
           .post(
-            "/api/v1/tms/getOutFactoryInwardList?apiId=486&isPage=yes&startTime=" +
+            '/api/v1/tms/getOutFactoryInwardList?apiId=486&isPage=yes&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&index=" +
+              '&index=' +
               this.input +
-              "&orgCode=" +
+              '&orgCode=' +
               orgCode
           )
           .then(res => {
-            this.totalArr = [];
-            this.outFactory = [];
-            this.tableTitle = "厂外-厂内统计报表";
-            this.outFactory = res.data.data;
-            this.totalArr = this.totalArr.concat(this.outFactory);
-            this.exportAllReportToExcel();
+            this.totalArr = []
+            this.outFactory = []
+            this.tableTitle = '厂外-厂内统计报表'
+            this.outFactory = res.data.data
+            this.totalArr = this.totalArr.concat(this.outFactory)
+            this.exportAllReportToExcel()
             setTimeout(() => {
-              loading.close();
-            }, 2000);
-          });
-      } else if (this.activeName == "six") {
+              loading.close()
+            }, 2000)
+          })
+      } else if (this.activeName == 'six') {
         this.axios
           .post(
-            "/api/v1/tms/getInwardReportForAssemble?apiId=486&isPage=yes&startTime=" +
+            '/api/v1/tms/getInwardReportForAssemble?apiId=486&isPage=yes&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&index=" +
+              '&index=' +
               this.input +
-              "&orgCode=" +
+              '&orgCode=' +
               orgCode +
-              "&orderType=15"
+              '&orderType=15'
           )
           .then(res => {
-            this.totalArr = [];
-            this.assembleReport = [];
-            this.tableTitle = "拼装车皮进厂统计报表";
-            this.assembleReport = res.data.data;
-            this.totalArr = this.totalArr.concat(this.assembleReport);
-            this.exportAllReportToExcel();
+            this.totalArr = []
+            this.assembleReport = []
+            this.tableTitle = '拼装车皮进厂统计报表'
+            this.assembleReport = res.data.data
+            this.totalArr = this.totalArr.concat(this.assembleReport)
+            this.exportAllReportToExcel()
             setTimeout(() => {
-              loading.close();
-            }, 2000);
-          });
-      } else if (this.activeName == "seven") {
+              loading.close()
+            }, 2000)
+          })
+      } else if (this.activeName == 'seven') {
         this.axios
           .post(
-            "/api/v1/tms/getInwardReportForAssemble?apiId=486&isPage=yes&startTime=" +
+            '/api/v1/tms/getInwardReportForAssemble?apiId=486&isPage=yes&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&index=" +
+              '&index=' +
               this.input +
-              "&orgCode=" +
+              '&orgCode=' +
               orgCode +
-              "&orderType=16"
+              '&orderType=16'
           )
           .then(res => {
-            this.totalArr = [];
-            this.oneCokeReport = [];
-            this.tableTitle = "一焦化-进厂统计报表";
-            this.oneCokeReport = res.data.data;
-            this.totalArr = this.totalArr.concat(this.oneCokeReport);
-            this.exportAllReportToExcel();
+            this.totalArr = []
+            this.oneCokeReport = []
+            this.tableTitle = '一焦化-进厂统计报表'
+            this.oneCokeReport = res.data.data
+            this.totalArr = this.totalArr.concat(this.oneCokeReport)
+            this.exportAllReportToExcel()
             setTimeout(() => {
-              loading.close();
-            }, 2000);
-          });
+              loading.close()
+            }, 2000)
+          })
       }
     },
     openFullScreen() {
-      let startTime = null;
-      let endTime = null;
-      this.totalArr = [];
+      let startTime = null
+      let endTime = null
+      this.totalArr = []
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
       const loading = this.$loading({
         lock: true,
-        text: "请等待导出",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)"
-      });
+        text: '请等待导出',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu" ||
-        getCookie("orgCode") == "wuliuchuyunzhongxin"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu' ||
+        getCookie('orgCode') == 'wuliuchuyunzhongxin'
       ) {
         this.axios
           .post(
-            "/api/v1/tms/getInwardInFactory?apiId=486&orgCode=null&isPage=yes&startTime=" +
+            '/api/v1/tms/getInwardInFactory?apiId=486&orgCode=null&isPage=yes&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&index=" +
+              '&index=' +
               this.input
           )
           .then(res => {
-            this.inwardArr = [];
-            this.inwardArr = res.data.data;
-            this.totalArr = this.totalArr.concat(this.inwardArr);
+            this.inwardArr = []
+            this.inwardArr = res.data.data
+            this.totalArr = this.totalArr.concat(this.inwardArr)
             this.axios
               .post(
-                "/api/v1/tms/getPurchaseInwardList?apiId=486&orgCode=null&isPage=yes&startTime=" +
+                '/api/v1/tms/getPurchaseInwardList?apiId=486&orgCode=null&isPage=yes&startTime=' +
                   startTime +
-                  "&endTime=" +
+                  '&endTime=' +
                   endTime +
-                  "&index=" +
+                  '&index=' +
                   this.input +
-                  "&i=" +
+                  '&i=' +
                   new Date()
               )
               .then(res => {
-                this.purInward = [];
-                this.purInward = res.data.data;
-                this.totalArr = this.totalArr.concat(this.purInward);
+                this.purInward = []
+                this.purInward = res.data.data
+                this.totalArr = this.totalArr.concat(this.purInward)
                 this.axios
                   .post(
-                    "/api/v1/tms/getSaleOrderList?apiId=486&orgCode=null&isPage=yes&startTime=" +
+                    '/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=null&isPage=yes&startTime=' +
                       startTime +
-                      "&endTime=" +
+                      '&endTime=' +
                       endTime +
-                      "&index=" +
+                      '&index=' +
                       this.input +
-                      "&i=" +
+                      '&i=' +
                       new Date()
                   )
                   .then(res => {
-                    this.saleReport = [];
-                    this.saleReport = res.data.data;
-                    this.totalArr = this.totalArr.concat(this.saleReport);
+                    this.purReport = []
+                    this.purReport = res.data.data
+                    this.totalArr = this.totalArr.concat(this.purReport)
                     this.axios
                       .post(
-                        "/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=null&isPage=yes&startTime=" +
+                        '/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=null&isPage=yes&startTime=' +
                           startTime +
-                          "&endTime=" +
+                          '&endTime=' +
                           endTime +
-                          "&index=" +
+                          '&index=' +
                           this.input +
-                          "&i=" +
+                          '&i=' +
                           new Date()
                       )
                       .then(res => {
-                        this.purReport = [];
-                        this.purReport = res.data.data;
-                        this.totalArr = this.totalArr.concat(this.purReport);
+                        this.outFactory = []
+                        this.outFactory = res.data.data
+                        this.totalArr = this.totalArr.concat(this.outFactory)
                         this.axios
                           .post(
-                            "/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=null&isPage=yes&startTime=" +
+                            '/api/v1/tms/getInwardReportForAssemble?apiId=486&orgCode=null&isPage=yes&startTime=' +
                               startTime +
-                              "&endTime=" +
+                              '&endTime=' +
                               endTime +
-                              "&index=" +
+                              '&orderType=15' +
+                              '&index=' +
                               this.input +
-                              "&i=" +
+                              '&i=' +
                               new Date()
                           )
                           .then(res => {
-                            this.outFactory = [];
-                            this.outFactory = res.data.data;
+                            this.assembleReport = []
+                            this.assembleReport = res.data.data
                             this.totalArr = this.totalArr.concat(
-                              this.outFactory
-                            );
+                              this.assembleReport
+                            )
                             this.axios
                               .post(
-                                "/api/v1/tms/getInwardReportForAssemble?apiId=486&orgCode=null&isPage=yes&startTime=" +
+                                '/api/v1/tms/getInwardReportForAssemble?apiId=486&orgCode=null&isPage=yes&startTime=' +
                                   startTime +
-                                  "&endTime=" +
+                                  '&endTime=' +
                                   endTime +
-                                  "&orderType=15" +
-                                  "&index=" +
+                                  '&orderType=16' +
+                                  '&index=' +
                                   this.input +
-                                  "&i=" +
+                                  '&i=' +
                                   new Date()
                               )
                               .then(res => {
-                                this.assembleReport = [];
-                                this.assembleReport = res.data.data;
+                                this.oneCokeReport = []
+                                this.oneCokeReport = res.data.data
                                 this.totalArr = this.totalArr.concat(
-                                  this.assembleReport
-                                );
-                                this.axios
-                                  .post(
-                                    "/api/v1/tms/getInwardReportForAssemble?apiId=486&orgCode=null&isPage=yes&startTime=" +
-                                      startTime +
-                                      "&endTime=" +
-                                      endTime +
-                                      "&orderType=16" +
-                                      "&index=" +
-                                      this.input +
-                                      "&i=" +
-                                      new Date()
-                                  )
-                                  .then(res => {
-                                    this.oneCokeReport = [];
-                                    this.oneCokeReport = res.data.data;
-                                    this.totalArr = this.totalArr.concat(
-                                      this.oneCokeReport
-                                    );
-                                    this.tableTitle = "全部内转车辆报表";
-                                    this.exportAllReportToExcel();
-                                    setTimeout(() => {
-                                      loading.close();
-                                    }, 2000);
-                                  });
-                              });
-                          });
-                      });
-                  });
-              });
-          });
+                                  this.oneCokeReport
+                                )
+                                this.tableTitle = '全部内转车辆报表'
+                                this.exportAllReportToExcel()
+                                setTimeout(() => {
+                                  loading.close()
+                                }, 2000)
+                              })
+                          })
+                      })
+                  })
+              })
+          })
       } else {
         this.axios
           .post(
-            "/api/v1/tms/getInwardInFactory?apiId=486&isPage=yes&orgCode=" +
-              getCookie("orgCode") +
-              "&startTime=" +
+            '/api/v1/tms/getInwardInFactory?apiId=486&isPage=yes&orgCode=' +
+              getCookie('orgCode') +
+              '&startTime=' +
               startTime +
-              "&endTime=" +
+              '&endTime=' +
               endTime +
-              "&index=" +
+              '&index=' +
               this.input
           )
           .then(res => {
-            this.inwardArr = [];
-            this.inwardArr = res.data.data;
-            this.totalArr = this.totalArr.concat(this.inwardArr);
+            this.inwardArr = []
+            this.inwardArr = res.data.data
+            this.totalArr = this.totalArr.concat(this.inwardArr)
             this.axios
               .post(
-                "/api/v1/tms/getPurchaseInwardList?apiId=486&isPage=yes&orgCode=" +
-                  getCookie("orgCode") +
-                  "&startTime=" +
+                '/api/v1/tms/getPurchaseInwardList?apiId=486&isPage=yes&orgCode=' +
+                  getCookie('orgCode') +
+                  '&startTime=' +
                   startTime +
-                  "&endTime=" +
+                  '&endTime=' +
                   endTime +
-                  "&index=" +
+                  '&index=' +
                   this.input
               )
               .then(res => {
-                this.purInward = [];
-                this.purInward = res.data.data;
-                this.totalArr = this.totalArr.concat(this.purInward);
+                this.purInward = []
+                this.purInward = res.data.data
+                this.totalArr = this.totalArr.concat(this.purInward)
                 this.axios
                   .post(
-                    "/api/v1/tms/getSaleOrderList?apiId=486&isPage=yes&orgCode=" +
-                      getCookie("orgCode") +
-                      "&startTime=" +
+                    '/api/v1/tms/getPurchaseOrderList?apiId=486&isPage=yes&orgCode=' +
+                      getCookie('orgCode') +
+                      '&startTime=' +
                       startTime +
-                      "&endTime=" +
+                      '&endTime=' +
                       endTime +
-                      "&index=" +
+                      '&index=' +
                       this.input
                   )
                   .then(res => {
-                    this.saleReport = [];
-                    this.saleReport = res.data.data;
-                    this.totalArr = this.totalArr.concat(this.saleReport);
+                    this.purReport = []
+                    this.purReport = res.data.data
+                    this.totalArr = this.totalArr.concat(this.purReport)
                     this.axios
                       .post(
-                        "/api/v1/tms/getPurchaseOrderList?apiId=486&isPage=yes&orgCode=" +
-                          getCookie("orgCode") +
-                          "&startTime=" +
+                        '/api/v1/tms/getOutFactoryInwardList?apiId=486&isPage=yes&orgCode=' +
+                          getCookie('orgCode') +
+                          '&startTime=' +
                           startTime +
-                          "&endTime=" +
+                          '&endTime=' +
                           endTime +
-                          "&index=" +
+                          '&index=' +
                           this.input
                       )
                       .then(res => {
-                        this.purReport = [];
-                        this.purReport = res.data.data;
-                        this.totalArr = this.totalArr.concat(this.purReport);
+                        this.outFactory = []
+                        this.outFactory = res.data.data
+                        this.totalArr = this.totalArr.concat(this.outFactory)
                         this.axios
                           .post(
-                            "/api/v1/tms/getOutFactoryInwardList?apiId=486&isPage=yes&orgCode=" +
-                              getCookie("orgCode") +
-                              "&startTime=" +
+                            '/api/v1/tms/getInwardReportForAssemble?apiId=477&startTime=' +
                               startTime +
-                              "&endTime=" +
+                              '&endTime=' +
                               endTime +
-                              "&index=" +
-                              this.input
+                              '&index=' +
+                              this.input +
+                              '&orgCode=' +
+                              getCookie('orgCode')
                           )
-                          .then(res => {
-                            this.outFactory = [];
-                            this.outFactory = res.data.data;
-                            this.totalArr = this.totalArr.concat(
-                              this.outFactory
-                            );
-                            this.axios
-                              .post(
-                                "/api/v1/tms/getInwardReportForAssemble?apiId=477&startTime=" +
-                                  startTime +
-                                  "&endTime=" +
-                                  endTime +
-                                  "&index=" +
-                                  this.input +
-                                  "&orgCode=" +
-                                  getCookie("orgCode")
-                              )
-                              .then(res => {});
-                            this.tableTitle = "全部内转车辆报表";
-                            this.exportAllReportToExcel();
-                            setTimeout(() => {
-                              loading.close();
-                            }, 2000);
-                          });
-                      });
-                  });
-              });
-          });
+                          .then(res => {})
+                        this.tableTitle = '全部内转车辆报表'
+                        this.exportAllReportToExcel()
+                        setTimeout(() => {
+                          loading.close()
+                        }, 2000)
+                      })
+                  })
+              })
+          })
       }
     },
     //导出excel
     exportAllReportToExcel() {
-      var title = this.tableTitle;
-      let tHeader = [];
-      let filterVal = [];
+      var title = this.tableTitle
+      let tHeader = []
+      let filterVal = []
       this.dataColumnData.forEach(e1 => {
         if (tHeader.indexOf(e1.label) === -1) {
-          tHeader.push(e1.label);
+          tHeader.push(e1.label)
         }
         if (filterVal.indexOf(e1.prop) === -1) {
-          filterVal.push(e1.prop);
+          filterVal.push(e1.prop)
         }
-      });
+      })
       //导出为excel
-      this.downloadLoading = true;
+      this.downloadLoading = true
       require.ensure([], () => {
         const {
           export_json_to_excel
-        } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径，使用@/+存放export2Excel的路径
         // let list = this.$refs.excelDom.dataTabel;
-        let data = this.totalArr.map(v => filterVal.map(j => v[j])); //3.formatJson格式转换
-        export_json_to_excel(tHeader, data, title); // (title)导出的表格名称
-      });
+        let data = this.totalArr.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+        export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
+      })
     },
     getRequestUrl() {
       if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu" ||
-        getCookie("orgCode") == "wuliuchuyunzhongxin"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu' ||
+        getCookie('orgCode') == 'wuliuchuyunzhongxin'
       ) {
         this.first.requestUrl =
-          "/api/v1/tms/getInwardInFactory?apiId=486&orgCode=" +
+          '/api/v1/tms/getInwardInFactory?apiId=486&orgCode=' +
           null +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
         this.second.requestUrl =
-          "/api/v1/tms/getPurchaseInwardList?apiId=486&orgCode=" +
+          '/api/v1/tms/getPurchaseInwardList?apiId=486&orgCode=' +
           null +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
         this.third.requestUrl =
-          "/api/v1/tms/getSaleOrderList?apiId=486&orgCode=" +
+          '/api/v1/tms/getSaleOrderList?apiId=486&orgCode=' +
           null +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
         this.fourth.requestUrl =
-          "/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=" +
+          '/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=' +
           null +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
         this.fifth.requestUrl =
-          "/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=" +
+          '/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=' +
           null +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
         this.six.requestUrl =
-          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          '/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=' +
           new Date() +
-          "&orderType=15";
+          '&orderType=15'
         this.seven.requestUrl =
-          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          '/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=' +
           new Date() +
-          "&orderType=16";
+          '&orderType=16'
       } else {
         this.first.requestUrl =
-          "/api/v1/tms/getInwardInFactory?apiId=486&orgCode=" +
-          getCookie("orgCode") +
-          "&i=" +
-          new Date();
+          '/api/v1/tms/getInwardInFactory?apiId=486&orgCode=' +
+          getCookie('orgCode') +
+          '&i=' +
+          new Date()
         this.second.requestUrl =
-          "/api/v1/tms/getPurchaseInwardList?apiId=486&orgCode=" +
-          getCookie("orgCode") +
-          "&i=" +
-          new Date();
+          '/api/v1/tms/getPurchaseInwardList?apiId=486&orgCode=' +
+          getCookie('orgCode') +
+          '&i=' +
+          new Date()
         this.third.requestUrl =
-          "/api/v1/tms/getSaleOrderList?apiId=486&orgCode=" +
-          getCookie("orgCode") +
-          "&i=" +
-          new Date();
+          '/api/v1/tms/getSaleOrderList?apiId=486&orgCode=' +
+          getCookie('orgCode') +
+          '&i=' +
+          new Date()
         this.fourth.requestUrl =
-          "/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=" +
-          getCookie("orgCode") +
-          "&i=" +
-          new Date();
+          '/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=' +
+          getCookie('orgCode') +
+          '&i=' +
+          new Date()
         this.fifth.requestUrl =
-          "/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=" +
-          getCookie("orgCode") +
-          "&i=" +
-          new Date();
+          '/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=' +
+          getCookie('orgCode') +
+          '&i=' +
+          new Date()
         this.six.requestUrl =
-          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          '/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=' +
           new Date() +
-          "&orgCode=" +
-          getCookie("orgCode") +
-          "&orderType=15";
+          '&orgCode=' +
+          getCookie('orgCode') +
+          '&orderType=15'
         this.seven.requestUrl =
-          "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=" +
+          '/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=null&endTime=null&i=' +
           new Date() +
-          "&orgCde=" +
-          getCookie("orgCode") +
-          "&orderType=16";
+          '&orgCde=' +
+          getCookie('orgCode') +
+          '&orderType=16'
       }
     },
     onClick() {
-      console.log("index", this.input);
-      let startTime = null;
-      let endTime = null;
+      console.log('index', this.input)
+      let startTime = null
+      let endTime = null
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
       if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu" ||
-        getCookie("orgCode") == "wuliuchuyunzhongxin"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu' ||
+        getCookie('orgCode') == 'wuliuchuyunzhongxin'
       ) {
-        if (this.activeName == "first") {
+        if (this.activeName == 'first') {
           this.first.requestUrl =
-            "/api/v1/tms/getInwardInFactory?apiId=486&orgCode=" +
+            '/api/v1/tms/getInwardInFactory?apiId=486&orgCode=' +
             null +
-            "&startTime=" +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&index=" +
+            '&index=' +
             this.input +
-            "&i=" +
-            new Date();
-        } else if (this.activeName == "second") {
+            '&i=' +
+            new Date()
+        } else if (this.activeName == 'second') {
           this.second.requestUrl =
-            "/api/v1/tms/getPurchaseInwardList?apiId=486&orgCode=" +
+            '/api/v1/tms/getPurchaseInwardList?apiId=486&orgCode=' +
             null +
-            "&startTime=" +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&index=" +
+            '&index=' +
             this.input +
-            "&i=" +
-            new Date();
-        } else if (this.activeName == "third") {
+            '&i=' +
+            new Date()
+        } else if (this.activeName == 'third') {
           this.third.requestUrl =
-            "/api/v1/tms/getSaleOrderList?apiId=486&orgCode=" +
+            '/api/v1/tms/getSaleOrderList?apiId=486&orgCode=' +
             null +
-            "&startTime=" +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&index=" +
+            '&index=' +
             this.input +
-            "&i=" +
-            new Date();
-        } else if (this.activeName == "fourth") {
+            '&i=' +
+            new Date()
+        } else if (this.activeName == 'fourth') {
           this.fourth.requestUrl =
-            "/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=" +
+            '/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=' +
             null +
-            "&startTime=" +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&index=" +
+            '&index=' +
             this.input +
-            "&i=" +
-            new Date();
-        } else if (this.activeName == "fifth") {
+            '&i=' +
+            new Date()
+        } else if (this.activeName == 'fifth') {
           this.fifth.requestUrl =
-            "/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=" +
+            '/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=' +
             null +
-            "&startTime=" +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&index=" +
+            '&index=' +
             this.input +
-            "&i=" +
-            new Date();
-        } else if (this.activeName == "six") {
+            '&i=' +
+            new Date()
+        } else if (this.activeName == 'six') {
           this.six.requestUrl =
-            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            '/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&input=" +
+            '&input=' +
             this.input +
-            "&i=" +
+            '&i=' +
             new Date() +
-            "&orderType=15";
-        } else if (this.activeName == "seven") {
+            '&orderType=15'
+        } else if (this.activeName == 'seven') {
           this.seven.requestUrl =
-            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            '/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&input=" +
+            '&input=' +
             this.input +
-            "&i=" +
+            '&i=' +
             new Date() +
-            "&orderType=16";
+            '&orderType=16'
         }
       } else {
-        if (this.activeName == "first") {
+        if (this.activeName == 'first') {
           this.first.requestUrl =
-            "/api/v1/tms/getInwardInFactory?apiId=486&orgCode=" +
-            getCookie("orgCode") +
-            "&startTime=" +
+            '/api/v1/tms/getInwardInFactory?apiId=486&orgCode=' +
+            getCookie('orgCode') +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&index=" +
+            '&index=' +
             this.input +
-            "&i=" +
-            new Date();
-        } else if (this.activeName == "second") {
+            '&i=' +
+            new Date()
+        } else if (this.activeName == 'second') {
           this.second.requestUrl =
-            "/api/v1/tms/getPurchaseInwardList?apiId=486&orgCode=" +
-            getCookie("orgCode") +
-            "&startTime=" +
+            '/api/v1/tms/getPurchaseInwardList?apiId=486&orgCode=' +
+            getCookie('orgCode') +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&index=" +
+            '&index=' +
             this.input +
-            "&i=" +
-            new Date();
-        } else if (this.activeName == "third") {
+            '&i=' +
+            new Date()
+        } else if (this.activeName == 'third') {
           this.third.requestUrl =
-            "/api/v1/tms/getSaleOrderList?apiId=486&orgCode=" +
-            getCookie("orgCode") +
-            "&startTime=" +
+            '/api/v1/tms/getSaleOrderList?apiId=486&orgCode=' +
+            getCookie('orgCode') +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&index=" +
+            '&index=' +
             this.input +
-            "&i=" +
-            new Date();
-        } else if (thia.activeName == "fourth") {
+            '&i=' +
+            new Date()
+        } else if (thia.activeName == 'fourth') {
           this.fourth.requestUrl =
-            "/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=" +
-            getCookie("orgCode") +
-            "&startTime=" +
+            '/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=' +
+            getCookie('orgCode') +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&index=" +
+            '&index=' +
             this.input +
-            "&i=" +
-            new Date();
-        } else if (thia.activeName == "fifth") {
+            '&i=' +
+            new Date()
+        } else if (thia.activeName == 'fifth') {
           this.fifth.requestUrl =
-            "/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=" +
-            getCookie("orgCode") +
-            "&startTime=" +
+            '/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=' +
+            getCookie('orgCode') +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&index=" +
+            '&index=' +
             this.input +
-            "&i=" +
-            new Date();
-        } else if (thia.activeName == "six") {
+            '&i=' +
+            new Date()
+        } else if (thia.activeName == 'six') {
           this.six.requestUrl =
-            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            '/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&input=" +
+            '&input=' +
             this.input +
-            "&i=" +
+            '&i=' +
             new Date() +
-            "&orgCode=" +
-            getCookie("orgCode") +
-            "&orderType=15";
-        } else if (thia.activeName == "seven") {
+            '&orgCode=' +
+            getCookie('orgCode') +
+            '&orderType=15'
+        } else if (thia.activeName == 'seven') {
           this.seven.requestUrl =
-            "/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=" +
+            '/api/v1/tms/getInwardReportForAssemble?apiId=486&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&input=" +
+            '&input=' +
             this.input +
-            "&i=" +
+            '&i=' +
             new Date() +
-            "&orgCode=" +
-            getCookie("orgCode") +
-            "&orderType=16";
+            '&orgCode=' +
+            getCookie('orgCode') +
+            '&orderType=16'
         }
       }
     },
     handleClick(tab, event) {
-      this.getRequestUrl();
+      this.getRequestUrl()
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .allInwardReport {

src/views/statisticalReport/components/inwardReport/getUnLoading.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <span>装车时间：</span>
+      <span>卸车时间：</span>
       <el-date-picker
         v-model="startTime"
         type="datetime"
@@ -9,18 +9,20 @@
       >
       </el-date-picker>
       <span>至</span>
-      <el-date-picker
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期"
-      >
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>   
+      <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
       <span style="margin-left: 1rem;">合计车数：</span>
-      <el-input v-model="totalCapacity" :disabled="true" style="width: 100px;"></el-input>
+      <el-input
+        v-model="totalCapacity"
+        :disabled="true"
+        style="width: 100px;"
+      ></el-input>
     </div>
     <div class="table">
       <dilTable ref="excelDom" v-bind.sync="option" @func="func"></dilTable>
@@ -29,59 +31,69 @@
 </template>
 
 <script>
-import { sjTime } from '@/utils/sharedJsFile';
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
-    return {   
-      totalCapacity:null,
+    return {
+      totalCapacity: null,
       option: {
-        requestUrl: "",
+        requestUrl: ''
       },
       startTime: null,
       endTime: null,
-      tableTitle:'达钢装货统计报表'
-    };
-  }, 
-  created(){
-          this.option.requestUrl = '/api/v1/tms/getUnLoading?apiId=454&startTime=null&endTime=null&i=' +new Date()
+      tableTitle: '达钢装货统计报表'
+    }
+  },
+  created() {
+    this.option.requestUrl =
+      '/api/v1/tms/getUnLoading?apiId=454&startTime=null&endTime=null&i=' +
+      new Date()
   },
   methods: {
-    func(res){
-        console.log(res.list)     
-        var currentCapacityTotal = 0
-        res.list.forEach(e => {
-          currentCapacityTotal = currentCapacityTotal+e.capacityNumber       
-        });
-        this.totalCapacity = currentCapacityTotal;
+    func(res) {
+      console.log(res.list)
+      var currentCapacityTotal = 0
+      res.list.forEach(e => {
+        currentCapacityTotal = currentCapacityTotal + e.capacityNumber
+      })
+      this.totalCapacity = currentCapacityTotal
     },
-    getRequestUrl(){
-        this.option.requestUrl = '/api/v1/tms/getUnLoading?apiId=454&startTime=null&endTime=null&i=' +new Date();
-     
+    getRequestUrl() {
+      this.option.requestUrl =
+        '/api/v1/tms/getUnLoading?apiId=454&startTime=null&endTime=null&i=' +
+        new Date()
     },
     onclick() {
-      let startTime = null;
-      let endTime = null;
-      if(this.startTime){
-        startTime = sjTime(this.startTime);
+      let startTime = null
+      let endTime = null
+      if (this.startTime) {
+        startTime = sjTime(this.startTime)
       }
-      if(this.endTime){
-        endTime = sjTime(this.endTime);
+      if (this.endTime) {
+        endTime = sjTime(this.endTime)
       }
-      if(startTime && endTime){
-        if(startTime < endTime){
-          this.option.requestUrl = '/api/v1/tms/getUnLoading?apiId=454' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
-        }else{
-          this.startTime = null;
-          this.endTime = null;
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          this.option.requestUrl =
+            '/api/v1/tms/getUnLoading?apiId=454' +
+            '&startTime=' +
+            startTime +
+            '&endTime=' +
+            endTime +
+            '&i=' +
+            new Date()
+        } else {
+          this.startTime = null
+          this.endTime = null
           this.$message.warning('开始时间要比结束时间早')
         }
-      }else{
+      } else {
         console.log(startTime && endTime)
         this.getRequestUrl()
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss">
@@ -92,9 +104,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .el-date-editor{
+    .el-date-editor {
       margin: 20px;
     }
   }
 }
-</style>
+</style>

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

@@ -59,12 +59,11 @@ export default {
   },
   created() {
     let that = this
-    that.initMap(105.602725, 37.076636)
-  },
-  mounted() {
     this.initData()
     this.initTimer()
+    that.initMap(105.602725, 37.076636)
   },
+  mounted() {},
   methods: {
     //初始化数据
     initData() {

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

@@ -132,9 +132,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="filters1"
+          sortable
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column
+          prop="areaName"
+          label="销售片区"
           width="160px"
           align="center"
           show-overflow-tooltip
@@ -145,6 +163,7 @@
           label="承运商"
           align="center"
           width="60px"
+          sortable
           show-overflow-tooltip
         >
         </el-table-column>
@@ -154,6 +173,7 @@
           label="车牌号"
           align="center"
           width="90px"
+          sortable
           show-overflow-tooltip
         >
         </el-table-column>
@@ -162,6 +182,7 @@
           label="物资名称"
           align="center"
           width="150px"
+          sortable
           show-overflow-tooltip
         >
         </el-table-column>
@@ -185,6 +206,7 @@
           prop="addressPlace"
           label="收货地址"
           width="250px"
+          sortable
           show-overflow-tooltip
         >
         </el-table-column>
@@ -251,6 +273,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="签收地址"
@@ -258,6 +287,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="运输订单号"
@@ -307,13 +343,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"
@@ -376,7 +405,7 @@
               <span>{{ steelMap.saler }}</span>
             </div>
             <div class="steelMapClass12">
-              <span>下单客户:</span>
+              <span>客户:</span>
               <span>{{ steelMap.consigneeName }}</span>
             </div>
           </div>
@@ -749,8 +778,8 @@ export default {
       screen1: '',
       options: [
         {
-          value: '下单客户',
-          lable: '下单客户'
+          value: '客户',
+          lable: '客户'
         },
         {
           value: '承运商',
@@ -763,8 +792,8 @@ export default {
       ],
       options1: [
         {
-          value: '下单客户',
-          lable: '下单客户'
+          value: '客户',
+          lable: '客户'
         },
         {
           value: '承运商',
@@ -785,6 +814,8 @@ export default {
       capacityList: [],
       carrierList: [],
       tableData: [],
+      //筛选条件1（客户）
+      filters1:[],
       spanArr: [],
       pos: 0,
       //需要合并列的名称
@@ -803,7 +834,7 @@ export default {
         '运单状态',
         '车牌号',
         '承运商',
-        '下单客户',
+        '客户',
         '收货地址',
         '业务员',
         '送货单打印',
@@ -940,7 +971,7 @@ export default {
     checkTrans(row) {
       this.isRowClick = 0
       if (Object.values(this.steelMap).length == 0) {
-        this.$message.error('请点击需要执行更改操作的行！')
+        this.$message.error('请点击需要查看轨迹的行！')
         return
       }
       if (typeof row === 'undefined') {
@@ -1035,7 +1066,6 @@ export default {
     checkPoint() {
       if (this.input || this.input1 || this.steelMap.capacityNo) {
         this.carNumber = this.input || this.input1 || this.steelMap.capacityNo
-        console.log(this.carNumber)
         this.value8 = true
       } else {
         this.$message.error('请输入或者点击有车牌号的行查询车牌号的实时路径')
@@ -1300,7 +1330,7 @@ export default {
               this.getSteelReport()
               loading.close()
             } else {
-              this.$message.error('派车失败,请联系管理员')
+              this.$message.error(res.data.data)
               this.getSteelReport()
               this.operation(this.steelMap)
               loading.close()
@@ -1788,7 +1818,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
@@ -1797,7 +1827,7 @@ export default {
       } else {
         remark = this.input
       }
-      if (this.screen1 == '下单客户') {
+      if (this.screen1 == '客户') {
         consigneeName = this.input1
       } else if (this.screen1 == '承运商') {
         carrierName = this.input1
@@ -1829,6 +1859,9 @@ export default {
         )
         .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()
         })
@@ -1858,7 +1891,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