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

build/utils.js

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

config/index.js

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

src/views/RMS/components/addPort.vue

@@ -41,7 +41,7 @@ export default {
             // this.$refs.table.refreshData();
             this.$router.go(-1);
           } else {
-            this.$message.error("新增失败,可能存在重复！");
+            this.$message.error("新增失败,港口名称或者全称存在重复！");
           }
           // this.$refs['table'].resetField();
         });

src/views/RMS/components/editCapacity.vue

@@ -17,6 +17,10 @@
                   <el-radio v-model="form1.capacityGps" label="是">是</el-radio>
                   <el-radio v-model="form1.capacityGps" label="否">否</el-radio>
                 </el-form-item>
+                <el-form-item label="是否是黑名单车辆:">
+                  <el-radio v-model="form1.capacityBlackList" label="是">是</el-radio>
+                  <el-radio v-model="form1.capacityBlackList" label="否">否</el-radio>
+                </el-form-item>
               </div>
             </el-form>
           </div>
@@ -166,7 +170,8 @@ export default {
         capacityTel: this.form1.capacityTel,
         capacityNumber: this.form1.capacityNumber,
         capacityVip: this.form1.capacityVip,
-        capacityGps: this.form1.capacityGps
+        capacityGps: this.form1.capacityGps,
+        capacityBlackList: this.form1.capacityBlackList
       }
       this.axios.post('/api/v1/rms/updateCapacity', map).then(res => {
         if (res.data.code == '200') {

src/views/RMS/components/editPersonnel.vue

@@ -63,17 +63,19 @@ export default {
          personnelPost: this.form1.personnelPost,
          personnelWorkshopid: this.form1.personnelWorkshopid,
          personnelShifts: this.form1.personnelShifts,
-         shipperId: this.form1.shipperId,
+         departmentId: this.form1.departmentId,
          personnelTeam: this.form1.personnelTeam,
        }; 
          if(
-        RmsPersonnel.personnelJobNumber ==null ||
-        RmsPersonnel.personnelName ==null ||
-        RmsPersonnel.personnelPost ==null ||
-        RmsPersonnel.personnelWorkshopid==null ||
-        RmsPersonnel.personnelShifts==null ||
-        RmsPersonnel.departmentId==null 
-      )this.$message.error("存在空值！"); 
+        !RmsPersonnel.personnelJobNumber  ||
+        !RmsPersonnel.personnelName  ||
+        !RmsPersonnel.personnelPost  ||
+        !RmsPersonnel.personnelShifts ||
+        !RmsPersonnel.departmentId 
+      ){
+        this.$message.error("存在空值！"); 
+        return;
+      }
         this.axios
           .post(
             "/api/v1/rms/updatePersonnel",

src/views/RMS/components/truckCalculate.vue

@@ -23,7 +23,7 @@
                size="small"
                @click="updateTruckCalculate(scope)"
              >
-               详细
+               修改
              </el-button> 
             <el-button
               type="text"

src/views/SporadicManage/components/oldAreaSporadic/transportAppoint/addSporadicTransportAppoint.vue

@@ -259,9 +259,9 @@
   </div>
 </template>
 <script>
-import PageTitle from "@/components/Page/Title";
-import { sjTime, isNumber } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
+import PageTitle from '@/components/Page/Title'
+import { sjTime, isNumber } from '@/utils/sharedJsFile'
+import { getCookie } from '@/utils/util.js'
 export default {
   components: { PageTitle },
   data() {
@@ -272,8 +272,8 @@ export default {
       disabled: false,
       materialTimes: null,
       options: [],
-      value: "",
-      receiveName: "",
+      value: '',
+      receiveName: '',
       stateCarrier: null,
       stateSupplier: null,
       stateConsignee: null,
@@ -282,25 +282,25 @@ export default {
       orderTypeList: [
         {
           value: 12,
-          label: "进厂"
+          label: '进厂'
         },
         {
           value: 13,
-          label: "出厂"
+          label: '出厂'
         },
         {
           value: 14,
-          label: "中转"
+          label: '中转'
         },
         {
           value: 19,
-          label: "退货"
+          label: '退货'
         }
       ],
       orderType: null,
       restaurantsCarrier: null,
       // 线路名称
-      lineName: "",
+      lineName: '',
       //线路id
       lineId: null,
       // 件数与重量的开关
@@ -312,28 +312,28 @@ export default {
       //物资表格表头
       tableTop: [
         {
-          prop: "materialCode",
-          label: "物资编码",
-          width: "160"
+          prop: 'materialCode',
+          label: '物资编码',
+          width: '160'
         },
         {
-          prop: "materialName",
-          label: "物资名称",
-          width: "140"
+          prop: 'materialName',
+          label: '物资名称',
+          width: '140'
         },
         {
-          prop: "materialSpecification",
-          label: "规格型号",
-          width: "140"
+          prop: 'materialSpecification',
+          label: '规格型号',
+          width: '140'
         },
         {
-          prop: "materialPriority",
-          label: "装卸货优先级",
+          prop: 'materialPriority',
+          label: '装卸货优先级',
           slot: true
         },
         {
-          prop: "orderMaterialWeight",
-          label: "重量",
+          prop: 'orderMaterialWeight',
+          label: '重量',
           slot: true
         }
       ],
@@ -346,9 +346,9 @@ export default {
       selectionList1: [],
       newsArr: [],
       //物资名称
-      materialName: "",
+      materialName: '',
       //发货单位名称
-      supplierName: "",
+      supplierName: '',
       //发货单位id
       supplierId: null,
       //物资id
@@ -358,131 +358,133 @@ export default {
       //是否需要打开模态窗口
       drawer: false,
       a: 1,
-      direction: "rtl",
+      direction: 'rtl',
       inputMaterial: null,
       input: null,
       //物资模态框
       materialOptions: {
-        requestUrl: "",
-        selectionType: "select"
+        requestUrl: '',
+        selectionType: 'select'
       },
       line: {
-        requestUrl: "",
-        selectionType: "radio"
+        requestUrl: '',
+        selectionType: 'radio'
       },
       row: {}
-    };
+    }
   },
   watch: {
     value() {
       if (this.value) {
-        console.log(this.value);
-        console.log(this.tableTop.length);
-        this.tableTop.splice(this.tableTop.length - 1, 1);
+        console.log(this.value)
+        console.log(this.tableTop.length)
+        this.tableTop.splice(this.tableTop.length - 1, 1)
         this.tableTop.push({
-          prop: "orderMaterialNumber",
-          label: "件数",
+          prop: 'orderMaterialNumber',
+          label: '件数',
           slot: true
-        });
+        })
       } else {
-        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.splice(this.tableTop.length - 1, 1)
         this.tableTop.push({
-          prop: "orderMaterialWeight",
-          label: "重量",
+          prop: 'orderMaterialWeight',
+          label: '重量',
           slot: true
-        });
+        })
       }
     }
   },
   methods: {
     //关闭运输线路
     handleClose(done) {
-      done();
-      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3";
+      done()
+      this.line.requestUrl = '/api/v1/rms/getAllLineDesk?apiId=249&lineType=3'
     },
     onclickMaterial() {
       if (this.inputMaterial != null) {
         this.materialOptions.requestUrl =
-          "/api/v1/uc/selectAllMaterialName?apiId=395&index=" +
-          this.inputMaterial;
+          '/api/v1/uc/selectAllMaterialName?apiId=395&index=' +
+          this.inputMaterial +
+          '&i=' +
+          new Date()
       } else {
         this.materialOptions.requestUrl =
-          "/api/v1/uc/selectAllMaterialName?apiId=395";
+          '/api/v1/uc/selectAllMaterialName?apiId=395' + '&i=' + new Date()
       }
     },
     onInputTimes() {
       if (!isNumber(this.materialTimes)) {
-        this.$message.warning("趟次请输入数字");
+        this.$message.warning('趟次请输入数字')
       }
     },
     onblur() {
-      this.isMoreTrips = false;
+      this.isMoreTrips = false
       if (this.materaialTimes <= 0) {
-        this.$message.warning("趟次必须大于0");
-        this.materialTimes = null;
+        this.$message.warning('趟次必须大于0')
+        this.materialTimes = null
       }
       if (this.materialTimes > 1) {
-        this.isMoreTrips = true;
+        this.isMoreTrips = true
       }
     },
     onInputPriority(scope) {
       if (!isNumber(scope)) {
-        this.$message.warning("装卸货次序请输入数字");
+        this.$message.warning('装卸货次序请输入数字')
       }
     },
     onInputWeight(scope) {
       if (!isNumber(scope)) {
-        this.$message.warning("重量请输入数字");
+        this.$message.warning('重量请输入数字')
       }
     },
     onInputNumber(scope) {
       if (!isNumber(scope)) {
-        this.$message.warning("件数请输入数字");
+        this.$message.warning('件数请输入数字')
       }
     },
     //流向选择框变动后
     flowChange() {
       if (this.orderType == 12) {
-        this.inputLine = "零星进厂";
+        this.inputLine = '零星进厂'
       }
       if (this.orderType == 13) {
-        this.inputLine = "零星出厂";
+        this.inputLine = '零星出厂'
       }
       if (this.orderType == 14) {
-        this.inputLine = "零星中转";
+        this.inputLine = '零星中转'
       }
       if (this.orderType == 19) {
-        this.inputLine = "退货";
+        this.inputLine = '退货'
       }
     },
     drawTable() {
       this.materialOptions.requestUrl =
-        "/api/v1/uc/selectAllMaterialName?apiId=395" + "&test=" + new Date();
-      this.selectionList1 = [];
-      this.table = true;
+        '/api/v1/uc/selectAllMaterialName?apiId=395' + '&test=' + new Date()
+      this.selectionList1 = []
+      this.table = true
     },
     //收货单位弹出层
     handleSelectConsignee(item) {
-      this.consigneeId = item.consigneeId;
-      item.consigneeCompanyName = this.consigneeCompanyName;
+      this.consigneeId = item.consigneeId
+      item.consigneeCompanyName = this.consigneeCompanyName
     },
     //以下是发货单位边输边查搜索
     querySearchConsignee(queryString, cb) {
       this.axios
-        .post("/api/v1/uc/getConsigneeByLike?index=" + queryString)
+        .post('/api/v1/uc/getConsigneeByLike?index=' + queryString)
         .then(res => {
-          if (res.data.code == "200") {
-            console.log(res);
-            var restaurantsConsignee = res.data.data;
+          if (res.data.code == '200') {
+            console.log(res)
+            var restaurantsConsignee = res.data.data
             var results = queryString
               ? restaurantsConsignee.filter(
                   this.createFilterConsignee(queryString)
                 )
-              : restaurantsConsignee;
+              : restaurantsConsignee
             // 调用 callback 返回建议列表的数据
-            cb(results);
+            cb(results)
           }
-        });
+        })
     },
     createFilterConsignee(queryString) {
       return restaurantsConsignee => {
@@ -490,31 +492,31 @@ export default {
           restaurantsConsignee.value
             .toLowerCase()
             .indexOf(queryString.toLowerCase()) > -1
-        );
-      };
+        )
+      }
     },
     //以上是返回单位边输边查搜索
     //发货单位弹出层
     handleSelectSupplier(item) {
-      this.supplierId = item.supplierId;
-      item.supplierName = this.supplierName;
+      this.supplierId = item.supplierId
+      item.supplierName = this.supplierName
     },
     //以下是发货单位边输边查搜索
     querySearchSupplier(queryString, cb) {
       this.axios
-        .post("/api/v1/uc/getSupplierMesByLike?index=" + this.stateSupplier)
+        .post('/api/v1/uc/getSupplierMesByLike?index=' + this.stateSupplier)
         .then(res => {
-          if (res.data.code == "200") {
-            var restaurantsSupplier = res.data.data;
+          if (res.data.code == '200') {
+            var restaurantsSupplier = res.data.data
             var results = queryString
               ? restaurantsSupplier.filter(
                   this.createFilterSupplier(queryString)
                 )
-              : restaurantsSupplier;
+              : restaurantsSupplier
             // 调用 callback 返回建议列表的数据
-            cb(results);
+            cb(results)
           }
-        });
+        })
     },
     createFilterSupplier(queryString) {
       return restaurantsSupplier => {
@@ -522,29 +524,29 @@ export default {
           restaurantsSupplier.value
             .toLowerCase()
             .indexOf(queryString.toLowerCase()) > -1
-        );
-      };
+        )
+      }
     },
     //承运商弹出层
     handleSelectCarrier(item) {
-      this.carrierId = item.carrierId;
-      item.carrierName = this.stateCarrier;
+      this.carrierId = item.carrierId
+      item.carrierName = this.stateCarrier
     },
     //以下是承运商边输边查搜索
     querySearchCarrier(queryString, cb) {
       this.axios
-        .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
+        .post('/api/v1/uc/getCarrierMesByLike?index=' + queryString)
         .then(res => {
-          if (res.data.code == "200") {
-            var restaurantsCarrier = res.data.data;
-            console.log(restaurantsCarrier, "restaurantsCarrier");
+          if (res.data.code == '200') {
+            var restaurantsCarrier = res.data.data
+            console.log(restaurantsCarrier, 'restaurantsCarrier')
             var results = queryString
               ? restaurantsCarrier.filter(this.createFilterCarrier(queryString))
-              : restaurantsCarrier;
+              : restaurantsCarrier
             // 调用 callback 返回建议列表的数据
-            cb(results);
+            cb(results)
           }
-        });
+        })
     },
     createFilterCarrier(queryString) {
       return restaurantsCarrier => {
@@ -552,20 +554,20 @@ export default {
           restaurantsCarrier.value
             .toLowerCase()
             .indexOf(queryString.toLowerCase()) > -1
-        );
-      };
+        )
+      }
     },
     //以上是承运商边输边查搜索
     //删除行
     deleteRow(index, rows) {
-      rows.splice(index, 1);
+      rows.splice(index, 1)
     },
     // 返回主界面
     makeSure1() {
-      var arr = [];
+      var arr = []
       for (let i = 0; i < this.newsArr.length; i++) {
         if (arr.indexOf(this.newsArr[i]) === -1) {
-          arr.push(this.newsArr[i]);
+          arr.push(this.newsArr[i])
         }
       }
       arr.forEach(e => {
@@ -575,92 +577,92 @@ export default {
           materialCode: e.materialCode,
           materialId: e.materialId,
           materialPriority: 1
-        };
-        this.tableData.push(addmap);
-      });
-      this.newsArr = [];
-      this.table = false;
+        }
+        this.tableData.push(addmap)
+      })
+      this.newsArr = []
+      this.table = false
     },
     // 返回选中的物资信息
     selectionChange(selection) {
-      console.log(selection);
-      this.selectionList1 = [];
-      this.selectionList1 = selection;
-      this.newsArr = [];
+      console.log(selection)
+      this.selectionList1 = []
+      this.selectionList1 = selection
+      this.newsArr = []
       for (let i = 0; i < this.selectionList1.length; i++) {
         if (this.newsArr.indexOf(this.selectionList1[i]) === -1) {
-          this.newsArr.push(this.selectionList1[i]);
+          this.newsArr.push(this.selectionList1[i])
         }
       }
     },
     onclick(a) {
       if (a == 5) {
         this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+          '/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=' + this.input
       }
     },
     ondrawer(num) {
       this.line.requestUrl =
-        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" +
-        "&t=" +
+        '/api/v1/rms/getAllLineDesk?apiId=249&lineType=3' +
+        '&t=' +
         new Date() +
-        "&con=" +
-        this.inputLine;
-      this.drawer = true;
-      this.a = num;
+        '&con=' +
+        this.inputLine
+      this.drawer = true
+      this.a = num
     },
     // 返回
     onClickCancel() {
-      this.$router.push("/oldSporadicAppoint");
+      this.$router.push('/oldSporadicAppoint')
     },
     currentRadioChange5(selection) {
       if (selection.lineName == null && selection.lineDesk == null) {
-        this.lineName = "";
+        this.lineName = ''
       } else {
-        this.lineName = selection.lineName + "  " + selection.lineDesk;
-        this.lineId = selection.lineId;
+        this.lineName = selection.lineName + '  ' + selection.lineDesk
+        this.lineId = selection.lineId
       }
     },
     // 确认
     makeSure() {
       if (this.isMoreTrips == false) {
-        this.materialTimes = 1;
+        this.materialTimes = 1
       }
       if (Number(this.materialTimes) != 0) {
-        this.isMoreTrips = true;
+        this.isMoreTrips = true
       }
-      this.disabled = true;
+      this.disabled = true
       if (
         this.supplierId == null ||
         this.lineId == null ||
         this.consigneeId == null ||
         this.carrierId == null
       ) {
-        this.disabled = false;
-        this.$message.warning("存在值未填写");
-        return;
+        this.disabled = false
+        this.$message.warning('存在值未填写')
+        return
       } else if (this.tableData.length == 0) {
-        this.disabled = false;
-        this.$message.warning("请点击浏览勾选物资");
-        return;
+        this.disabled = false
+        this.$message.warning('请点击浏览勾选物资')
+        return
       }
-      var i = 0;
-      var j = 0;
+      var i = 0
+      var j = 0
       this.tableData.forEach(e => {
         if (e.materialPriority == null) {
-          i++;
+          i++
         } else if (e.orderMaterialWeight == null) {
-          j++;
+          j++
         }
-      });
+      })
       if (i != 0) {
-        this.$message.warning("装卸货优先级未填写");
-        this.disabled = false;
-        return;
+        this.$message.warning('装卸货优先级未填写')
+        this.disabled = false
+        return
       } else if (j != 0) {
-        this.$message.warning("物资重量未填写");
-        this.disabled = false;
-        return;
+        this.$message.warning('物资重量未填写')
+        this.disabled = false
+        return
       }
       let amsOrder = {
         supplierId: this.supplierId,
@@ -668,24 +670,24 @@ export default {
         carrierId: this.carrierId,
         orderType: this.orderType,
         receiveId: this.consigneeId,
-        userId: getCookie("orgCode"),
+        userId: getCookie('orgCode'),
         orderTime: this.materialTimes,
         mapList: this.tableData,
         isMoreTrips: Number(this.isMoreTrips)
-      };
-      console.log(amsOrder);
-      debugger;
-      this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then(res => {
-        if (res.data.code == "200") {
-          this.onClickCancel();
-          this.disabled = false;
+      }
+      console.log(amsOrder)
+      debugger
+      this.axios.post('/api/v1/ams/addSporadicOrders', amsOrder).then(res => {
+        if (res.data.code == '200') {
+          this.onClickCancel()
+          this.disabled = false
         } else {
-          this.disabled = false;
+          this.disabled = false
         }
-      });
+      })
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .addSporadic {

src/views/TMS/components/domesticMine/wagonLoadEdit.vue

@@ -1,47 +1,45 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div class="contractDetails">
+  <div class="edit-domesticMine">
     <page-title>返回</page-title>
       <div class="form">
         <div class="form_box">
           <dil-form :formId="254" v-model="form1"></dil-form>
-        </div>
+          <el-form :inline="true" label-width="70px">
+            <div class="preview-group">
+              <el-form-item label="发站:">
+                  <el-autocomplete
+                    class="inline-input"
+                    v-model="sendStation"
+                    :fetch-suggestions="querySearchSendStation"
+                    placeholder="请输入发站名称"
+                    :trigger-on-focus="false"
+                    @select="handleSelectSendStation"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name">{{ item.arrivalName }}</div>
+                    </template>
+                  </el-autocomplete>
+                </el-form-item>
+                <el-form-item label="到站:">
+                  <el-autocomplete
+                    class="inline-input"
+                    v-model="toTheStation"
+                    :fetch-suggestions="querySearchToTheStation"
+                    placeholder="请输入到站名称"
+                    :trigger-on-focus="false"
+                    @select="handleSelectToTheStation"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name">{{ item.arrivalName }}</div>
+                    </template>
+                  </el-autocomplete>
+                </el-form-item>
+            </div>
+          </el-form>
+      </div>
     </div>
-    <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="70px" style="margin-left:35%;">
-        <el-form-item label="发站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="sendStation"
-            :fetch-suggestions="querySearchSendStation"
-            placeholder="请输入发站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSendStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="70px" style="margin-left:35%;">
-        <el-form-item label="到站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="toTheStation"
-            :fetch-suggestions="querySearchToTheStation"
-            placeholder="请输入到站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectToTheStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="button_box">
+    <div class="button_box-domesticMine">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -206,7 +204,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.contractDetails {
+.edit-domesticMine {
   .form {
     display: flex;
     .form_box {
@@ -234,7 +232,7 @@ export default {
       }
     }
   }
-  .button_box {
+  .button_box-domesticMine {
     margin-left: 42%;
     margin-top: 55px;
     width: 300px;

src/views/TMS/components/importedEmergency/editWagonLoadEmergency.vue

@@ -1,48 +1,46 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div class="addWagonLoad">
+  <div class="edit-importedEmergency">
     <page-title>编辑</page-title>
 
     <div class="form">
       <div class="form_box">
         <dil-form :formId="254" v-model="form1"></dil-form>
-      </div>
-    </div>
-    <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
-        <el-form-item label="发站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="sendStation"
-            :fetch-suggestions="querySearchSendStation"
-            placeholder="请输入发站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSendStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
-        <el-form-item label="到站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="toTheStation"
-            :fetch-suggestions="querySearchToTheStation"
-            placeholder="请输入到站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectToTheStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
+        <el-form :inline="true" label-width="70px">
+          <div class="preview-group">
+              <el-form-item label="发站:">
+                <el-autocomplete
+                  class="inline-input"
+                  v-model="sendStation"
+                  :fetch-suggestions="querySearchSendStation"
+                  placeholder="请输入发站名称"
+                  :trigger-on-focus="false"
+                  @select="handleSelectSendStation"
+                >
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.arrivalName }}</div>
+                  </template>
+                </el-autocomplete>
+              </el-form-item>
+              <el-form-item label="到站:">
+                <el-autocomplete
+                  class="inline-input"
+                  v-model="toTheStation"
+                  :fetch-suggestions="querySearchToTheStation"
+                  placeholder="请输入到站名称"
+                  :trigger-on-focus="false"
+                  @select="handleSelectToTheStation"
+                >
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.arrivalName }}</div>
+                  </template>
+                </el-autocomplete>
+              </el-form-item>
+          </div>
       </el-form>
+      </div>
     </div>
-    <div class="button_box">
+    <div class="button_box-importedEmergency">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -219,7 +217,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.addWagonLoad {
+.edit-importedEmergency {
   color: #606266;
   font-size: 0.675rem;
   font-weight: 500;
@@ -255,7 +253,7 @@ export default {
       }
     }
   }
-  .button_box {
+  .button_box-importedEmergency {
     display: flex;
     justify-content: center;
     padding-top: 30px;

src/views/TMS/components/importedIngredients/transportReserveFu.vue

@@ -229,13 +229,17 @@ export default {
             '/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=' +
             getCookie('userId') +
             '&con=' +
-            this.input
+            this.input +
+            '&i=' +
+            new Date()
         } else {
           this.option1.requestUrl =
             '/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=' +
             null +
             '&con=' +
-            this.input
+            this.input +
+            '&i=' +
+            new Date()
         }
       } else {
         let startTime = null
@@ -334,6 +338,15 @@ export default {
       console.log(res.list)
     },
     issue() {
+      if (typeof this.mapList == 'undefined' || this.mapList.length == 0) {
+        this.$message({
+          type: 'warning',
+          duration: '2000',
+          offset: '250',
+          message: '请勾选订单'
+        })
+        return
+      }
       let mapvalue = {
         mapList: this.mapList
       }

src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue

@@ -150,7 +150,7 @@
       </el-table>
     </div>
     <!-- 模态窗口 -->
-    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
+    <el-drawer :visible.sync="drawer" :direction="direction" size="45%">
       <div class="drawer_top">
         <el-input
           placeholder="请输入内容"

src/views/TMS/components/importedIngredients/transportReserveFuEdit.vue

@@ -65,95 +65,105 @@
 </template>
 
 <script>
-import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
+import PageTitle from '@/components/Page/Title'
+import { sjTime } from '@/utils/sharedJsFile'
+import { getCookie } from '@/utils/util.js'
 export default {
   components: { PageTitle },
   data() {
     return {
       form1: {},
       drawer: false,
-      direction: "rtl",
+      direction: 'rtl',
       a: null,
       third: {
-        requestUrl: "",
-        selectionType: "radio",
+        requestUrl: '',
+        selectionType: 'radio'
       },
       unloadPoint: {
-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
-        selectionType: "radio",
+        requestUrl: '/api/v1/uc/getUnloadingMesByLike?apiId=374',
+        selectionType: 'radio'
       },
       capacityId: null,
       warehouseId: null,
       input: null,
-      orderType: null,
-    };
+      orderType: null
+    }
   },
   created() {
     //判断是否是承运商
-    if (getCookie("orgCode") == "chengyunshang") {
+    if (getCookie('orgCode') == 'chengyunshang') {
       this.third.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
-        getCookie("userId");
+        '/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=' +
+        getCookie('userId')
     } else {
       this.third.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+        '/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=' + null
     }
   },
   mounted() {
-    this.information();
+    this.information()
   },
   methods: {
     onclick(a) {
+      if (this.input == '') {
+        this.input = null
+      }
       if (a == 1) {
         //判断是否是承运商
-        if (getCookie("orgCode") == "chengyunshang") {
+        if (getCookie('orgCode') == 'chengyunshang') {
           this.third.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.input;
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=' +
+            getCookie('userId') +
+            '&index=' +
+            this.input +
+            '&i=' +
+            new Date()
         } else {
           this.third.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=' +
             null +
-            "&con=" +
-            this.input;
+            '&index=' +
+            this.input +
+            '&i=' +
+            new Date()
         }
       } else if (a == 2) {
         this.unloadPoint.requestUrl =
-          "/api/v1/uc/getUnloadingMesByLike?apiId=374&con=" + this.input;
+          '/api/v1/uc/getUnloadingMesByLike?apiId=374&index=' +
+          this.input +
+          '&i=' +
+          new Date()
       }
     },
     selectTruck() {
-      this.a = 1;
-      this.drawer = true;
+      this.a = 1
+      this.drawer = true
     },
     selectUnloadingPoint() {
-      this.a = 2;
-      this.drawer = true;
+      this.a = 2
+      this.drawer = true
     },
     currentRadioChange(row) {
-      this.form1.capacityNumber = row.capacityNumber;
-      this.capacityId = row.capacityId;
+      this.form1.capacityNumber = row.capacityNumber
+      this.capacityId = row.capacityId
     },
     currentRadioChange2(row) {
-      this.form1.warehouseName = row.warehouseName;
-      this.warehouseId = row.warehouseId;
+      this.form1.warehouseName = row.warehouseName
+      this.warehouseId = row.warehouseId
     },
     information() {
       this.axios
-        .post("/api/v1/oms/selectOrderByOrderId/" + this.$route.params.orderId)
-        .then((res) => {
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-          });
-        });
+        .post('/api/v1/oms/selectOrderByOrderId/' + this.$route.params.orderId)
+        .then(res => {
+          res.data.data.forEach(e => {
+            this.form1 = e
+          })
+        })
     },
     // 返回
     onClickCancel() {
-      this.$router.go(-1);
+      this.$router.go(-1)
     },
     // 确认
     onClickConfirm() {
@@ -162,20 +172,20 @@ export default {
         capacityId: parseInt(this.capacityId),
         unloadPointId: this.warehouseId,
         orderEntryTime: sjTime(this.form1.orderEntryTime),
-        orderType: parseInt(this.form1.orderType),
-      };
-      this.axios.post("/api/v1/oms/updateOrder", obj).then((res) => {
-        if (res.data.code == "200") {
+        orderType: parseInt(this.form1.orderType)
+      }
+      this.axios.post('/api/v1/oms/updateOrder', obj).then(res => {
+        if (res.data.code == '200') {
           this.$message({
-            type: "success",
-            message: "修改成功!",
-          });
-          this.$router.push("/transportReserveFu");
+            type: 'success',
+            message: '修改成功!'
+          })
+          this.$router.push('/transportReserveFu')
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 <style lang="scss">
 .contractTitle {
@@ -211,4 +221,4 @@ export default {
     margin: 10px;
   }
 }
-</style>
+</style>

src/views/TMS/components/importedMine/editWagonLoad.vue

@@ -1,49 +1,47 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div class="contractDetails">
+  <div class="edit-importedMine">
     <page-title>返回</page-title>
 
     <div class="form">
       <div class="form_box">
         <dil-form :formId="103" v-model="form1"></dil-form>
-      </div>
-    </div>
-    <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
-        <el-form-item label="发站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="sendStation"
-            :fetch-suggestions="querySearchSendStation"
-            placeholder="请输入发站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSendStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
-        <el-form-item label="到站:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="toTheStation"
-            :fetch-suggestions="querySearchToTheStation"
-            placeholder="请输入到站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectToTheStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
+        <el-form :inline="true"  label-width="70px">
+        <div class="preview-group">
+          <el-form-item label="发站:">
+            <el-autocomplete
+              class="inline-input"
+              v-model="sendStation"
+              :fetch-suggestions="querySearchSendStation"
+              placeholder="请输入发站名称"
+              :trigger-on-focus="false"
+              @select="handleSelectSendStation"
+            >
+              <template slot-scope="{ item }">
+                <div class="name">{{ item.arrivalName }}</div>
+              </template>
+            </el-autocomplete>
+          </el-form-item>
+          <el-form-item label="到站:">
+            <el-autocomplete
+              class="inline-input"
+              v-model="toTheStation"
+              :fetch-suggestions="querySearchToTheStation"
+              placeholder="请输入到站名称"
+              :trigger-on-focus="false"
+              @select="handleSelectToTheStation"
+            >
+              <template slot-scope="{ item }">
+                <div class="name">{{ item.arrivalName }}</div>
+              </template>
+            </el-autocomplete>
+          </el-form-item>
+        </div>
       </el-form>
+      </div>
     </div>
     <!-- 确定和取消 -->
-    <div class="button_box">
+    <div class="button_box-importedMine">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -220,7 +218,7 @@ export default {
 };
 </script>
 <style lang="scss">
-.contractDetails {
+.edit-importedMine {
   .form {
     display: flex;
     .form_box {
@@ -242,20 +240,13 @@ export default {
               .el-input {
                 width: 250px;
               }
-              .el-textarea {
-                .el-textarea__inner {
-                  width: 220px;
-                  margin-left: 65px;
-                  margin-top: 0.03rem;
-                }
-              }
             }
           }
         }
       }
     }
   }
-  .button_box {
+  .button_box-importedMine {
     margin-left: 42%;
     margin-top: 55px;
   }

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

@@ -82,7 +82,6 @@
         <el-button
           type="primary"
           @click="selectLineClick"
-          :loading="selectLineLoading"
           ><i class="el-icon-search"></i>查询</el-button
         >
         <el-button type="primary" @click="addoilPriceFormula">确定</el-button>
@@ -93,7 +92,6 @@
             v-bind.sync="oilPriceFormula"
             @radio-change="currentRadioChange"
             :isKuang="isKuang"
-            :loading="tableLoading"
             :drawer="oilPriceFormulaDrawer"
             @func="func"
           ></dilTable>
@@ -137,8 +135,8 @@
 </template>
 
 <script>
-import PageTitle from "@/components/Page/Title";
-import { sjTime, isNumber } from "@/utils/sharedJsFile";
+import PageTitle from '@/components/Page/Title'
+import { sjTime, isNumber } from '@/utils/sharedJsFile'
 export default {
   components: { PageTitle },
   data() {
@@ -165,16 +163,16 @@ export default {
       selectLineLoading: false,
       //油价联动公式模态窗口的数据
       oilPriceFormula: {
-        requestUrl: "",
-        selectionType: "radio"
+        requestUrl: '',
+        selectionType: 'radio'
       },
       options: [],
       newsArr: [],
       //模态窗口的打开的方向
-      direction: "rtl",
+      direction: 'rtl',
       materialOptions: {
-        requestUrl: "",
-        selectionType: "select"
+        requestUrl: '',
+        selectionType: 'select'
       },
       //表单数据
       form1: {
@@ -184,8 +182,8 @@ export default {
       },
       tableTop: [
         {
-          prop: "materialName",
-          label: "物资名称"
+          prop: 'materialName',
+          label: '物资名称'
         }
       ],
 
@@ -200,75 +198,75 @@ export default {
         bar: {
           hoverStyle: true,
           onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
-          background: "#5f9ea0", //滚动条颜色
+          background: '#5f9ea0', //滚动条颜色
           opacity: 0.8, //滚动条透明度
-          "overflow-x": "hidden"
+          'overflow-x': 'hidden'
         }
       }
-    };
+    }
   },
   mounted() {
-    this.axios.get("/api/v1/uc/getTransRange").then(res => {
-      console.log(res.data.data);
-      this.options = res.data.data;
-    });
+    this.axios.get('/api/v1/uc/getTransRange').then(res => {
+      console.log(res.data.data)
+      this.options = res.data.data
+    })
   },
   methods: {
     func(res) {
-      this.selectLineLoading = false;
-      this.isKuang = false;
-      this.tableLoading = false;
+      this.selectLineLoading = false
+      this.isKuang = false
+      this.tableLoading = false
     },
     materialDrawer() {
-      this.drawerMaterial = true;
+      this.drawerMaterial = true
       this.materialOptions.requestUrl =
-        "/api/v1/rms/getInwardContractMaterial?apiId=482&i=" + new Date();
+        '/api/v1/rms/getInwardContractMaterial?apiId=482&i=' + new Date()
     },
     selectMaterial() {
       if (this.materialText == null) {
         this.materialOptions.requestUrl =
-          "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date();
+          '/api/v1/uc/queryMaterialByLike?apiId=244&i=' + new Date()
       } else {
         this.materialOptions.requestUrl =
-          "/api/v1/rms/getInwardContractMaterial?apiId=482&con=" +
-          this.materialText;
+          '/api/v1/rms/getInwardContractMaterial?apiId=482&con=' +
+          this.materialText
       }
     },
     addMaterialList() {
-      this.drawerMaterial = false;
+      this.drawerMaterial = false
       this.newsArr.forEach(e => {
-        console.log(e.materialName);
+        console.log(e.materialName)
         var addmap = {
           materialName: e.materialTypeName,
           materialId: e.materialTypeId
-        };
-        this.selectionList.push(addmap);
-      });
-      console.log(this.selectionList);
-      this.newsArr = [];
+        }
+        this.selectionList.push(addmap)
+      })
+      console.log(this.selectionList)
+      this.newsArr = []
     },
     //点击删除按钮删除当前点击的对象
     deleteRow(index) {
-      this.selectionList.splice(index, 1);
+      this.selectionList.splice(index, 1)
     },
     selectionChange(selection) {
-      console.log(selection);
+      console.log(selection)
       for (let i = 0; i < selection.length; i++) {
         if (this.newsArr.indexOf(selection[i]) === -1) {
-          this.newsArr.push(selection[i]);
+          this.newsArr.push(selection[i])
         }
       }
     },
     selectLineClick() {
-      this.tableLoading = true;
-      this.selectLineLoading = true;
-      this.isKuang = true;
+      this.tableLoading = true
+      this.selectLineLoading = true
+      this.isKuang = true
       if (this.LineText) {
         this.oilPriceFormula.requestUrl =
-          "/api/v1/uc/getOilFormula?apiId=444&con=" + this.LineText;
+          '/api/v1/uc/getOilFormula?apiId=444&con=' + this.LineText
       } else {
         this.oilPriceFormula.requestUrl =
-          "/api/v1/uc/getOilFormula?apiId=444&i=" + new Date();
+          '/api/v1/uc/getOilFormula?apiId=444&i=' + new Date()
       }
     },
     //选定联动公式确定
@@ -284,24 +282,24 @@ export default {
         oilpriceBase: this.form1.oilpriceBase,
         oilTypeId: this.form1.oilTypeId,
         oilpriceChangeThreshold: this.form1.oilpriceChangeThreshold
-      };
-      this.form1 = mapvalue;
-      this.oilPriceFormulaDrawer = false;
+      }
+      this.form1 = mapvalue
+      this.oilPriceFormulaDrawer = false
     },
     currentRadioChange(val) {
-      this.formulaString = val.formulaString;
-      this.oilPriceFormulaId = val.formulaId;
+      this.formulaString = val.formulaString
+      this.oilPriceFormulaId = val.formulaId
     },
     //打开线路的模态窗口
     oilPriceFormulaClick() {
-      this.oilPriceFormulaDrawer = true;
-      this.oilPriceFormula.requestUrl = "/api/v1/uc/getOilFormula?apiId=444";
+      this.oilPriceFormulaDrawer = true
+      this.oilPriceFormula.requestUrl = '/api/v1/uc/getOilFormula?apiId=444'
     },
     //模态窗口关闭时调用
     handleClose() {
       if (this.oilPriceFormulaDrawer) {
-        this.oilPriceFormulaDrawer = false;
-        this.LineText = null;
+        this.oilPriceFormulaDrawer = false
+        this.LineText = null
       }
     },
     makeSure() {
@@ -316,24 +314,25 @@ export default {
         oilpriceChangeThreshold: this.form1.oilpriceChangeThreshold,
         rangeId: this.rangeId,
         mapList: this.selectionList
-      };
-      this.axios.post("/api/v1/ams/insertInwardPrice", mapValue).then(res => {
-        if (res.data.code == "200") {
-          // this.$router.go(-1);
+      }
+      this.axios.post('/api/v1/ams/insertInwardPrice', mapValue).then(res => {
+        if (res.data.code == '200') {
+          this.$router.go(-1)
           this.$message({
-            type: "success",
-            message: "新增运输单价成功!"
-          });
-          this.$router.go(-1);
+            type: 'success',
+            message: '新增运输单价成功!'
+          })
+          this.$router.go(-1)
         }
-      });
+        this.$router.go(-1)
+      })
     },
     // 取消
     cancel() {
-      this.$router.push("/inwardTransPrice");
+      this.$router.push('/inwardTransPrice')
     }
   }
-};
+}
 </script>
 <style lang="scss">
 .elForm {

src/views/appoint/components/purchase/addTrainPrice.vue

@@ -32,12 +32,23 @@ export default {
         trainPriceDate: sjTime(this.form1.trainPriceDate),
         trainType: this.form1.trainType
       };
+      try{
+        let temp=parseFloat(amsContractTrainPrice.trainPrice);
+        if(temp==temp){
+          amsContractTrainPrice.trainPrice=temp;
+        }
+      }catch(error){
+        
+      }
       console.log(amsContractTrainPrice);
       if (
-      amsContractTrainPrice.trainPrice==null||
-      amsContractTrainPrice.trainPriceDate==null||
-      amsContractTrainPrice.trainType==null
+      (!amsContractTrainPrice.trainPrice && amsContractTrainPrice.trainPrice!=0) ||
+      !amsContractTrainPrice.trainPriceDate ||
+      !amsContractTrainPrice.trainType
       ) this.$message.error("必填项存在空值!");
+      else if(typeof amsContractTrainPrice.trainPrice != 'number' || amsContractTrainPrice.trainPrice <= 0){
+        this.$message.error("单价必须是大于零的数字!"); 
+      }
       else
       this.axios
         .post(

src/views/appoint/components/purchase/updateTrainPrice.vue

@@ -55,7 +55,23 @@ export default {
         trainPriceDate: sjTime(this.form1.trainPriceDate),
         trainType: this.form1.trainType
       };
+      try{
+        let temp=parseFloat(amsContractTrainPrice.trainPrice);
+        if(temp==temp){
+          amsContractTrainPrice.trainPrice=temp;
+        }
+      }catch(error){
+        
+      }
       console.log(amsContractTrainPrice);
+      if (
+      (!amsContractTrainPrice.trainPrice && amsContractTrainPrice.trainPrice!=0) ||
+      !amsContractTrainPrice.trainPriceDate ||
+      !amsContractTrainPrice.trainType
+      ) this.$message.error("必填项存在空值!");
+      else if(typeof amsContractTrainPrice.trainPrice != 'number' || amsContractTrainPrice.trainPrice <= 0){
+        this.$message.error("单价必须是大于零的数字!"); 
+      }else
       this.axios
         .post(
           "/api/v1/ams/updateTrainPrice",

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

@@ -126,13 +126,13 @@
         id="offsetSteel_kucunList_Table"
         individual-panel
         @selection-change="
-          handleSelectionChange();
-          handleMulSendChange();
+          handleSelectionChange()
+          handleMulSendChange()
         "
       >
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column
-          prop="index"
+          prop="group"
           width="50"
           label="序号"
           align="center"
@@ -288,8 +288,8 @@
 <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 {
@@ -297,30 +297,30 @@ export default {
       endTime: null,
       options: [
         {
-          value: "到站",
-          lable: "到站"
+          value: '到站',
+          lable: '到站'
         },
         {
-          value: "收货单位",
-          lable: "收货单位"
+          value: '收货单位',
+          lable: '收货单位'
         },
         {
-          value: "调入部门",
-          lable: "调入部门"
+          value: '调入部门',
+          lable: '调入部门'
         }
       ],
       options1: [
         {
-          value: "到站",
-          lable: "到站"
+          value: '到站',
+          lable: '到站'
         },
         {
-          value: "收货单位",
-          lable: "收货单位"
+          value: '收货单位',
+          lable: '收货单位'
         },
         {
-          value: "调入部门",
-          lable: "调入部门"
+          value: '调入部门',
+          lable: '调入部门'
         }
       ],
       input: null,
@@ -330,13 +330,13 @@ export default {
       screen1: null,
       //需要合并的列集合
       mergeList: [
-        "saleNo",
-        "saleRemark",
-        "receiveName",
-        "index",
-        "operate",
-        "transInDep",
-        "transOutDep"
+        'saleNo',
+        'saleRemark',
+        'receiveName',
+        'index',
+        'operate',
+        'transInDep',
+        'transOutDep'
       ],
       spanArr: [],
       pos: null,
@@ -345,89 +345,89 @@ export default {
       consigneeList: [],
       receiveName: null,
       sendStationId: null
-    };
+    }
   },
   created() {
-    this.getRequestUrl();
+    this.getRequestUrl()
   },
   mounted() {
-    this.information();
+    this.information()
   },
   methods: {
     batchOperate() {
-      console.log(this.$refs.tableRef.data);
+      console.log(this.$refs.tableRef.data)
       this.axios
         .post(
-          "/api/v1/ams/batchUpdateInwardConsignee",
+          '/api/v1/ams/batchUpdateInwardConsignee',
           this.$refs.tableRef.data
         )
         .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("批量保存成功");
-            this.getRequestUrl();
+          if (res.data.code == '200') {
+            this.$message.success('批量保存成功')
+            this.getRequestUrl()
           }
-        });
+        })
     },
     handleSelectionChange() {
       //批量绑定收货客户
-      let selection = this.$refs.tableRef.selection;
-      console.log("selection:", selection);
-      if (!selection) return;
+      let selection = this.$refs.tableRef.selection
+      console.log('selection:', selection)
+      if (!selection) return
       this.consigneeList.forEach(e => {
         if (e.consigneeCompanyName == this.receiveName) {
           selection.forEach(row => {
-            row.receiveName = e.consigneeCompanyName;
-            row.consigneeId = e.consigneeId;
-          });
+            row.receiveName = e.consigneeCompanyName
+            row.consigneeId = e.consigneeId
+          })
         }
-      });
+      })
     },
     handleMulSendChange() {
       //批量绑定发站
-      let selection = this.$refs.tableRef.selection;
-      console.log("selection:", selection);
-      if (!selection || !this.sendStationId) return;
+      let selection = this.$refs.tableRef.selection
+      console.log('selection:', selection)
+      if (!selection || !this.sendStationId) return
       selection.forEach(row => {
-        row.sendStationId = this.sendStationId;
-        this.changesendStation(row);
-      });
+        row.sendStationId = this.sendStationId
+        this.changesendStation(row)
+      })
     },
     handleSelectConsignee(row, index, item) {
-      console.log(row);
+      console.log(row)
       this.consigneeList.forEach(e => {
         if (e.consigneeCompanyName == row.receiveName) {
-          row.consigneeId = e.consigneeId;
+          row.consigneeId = e.consigneeId
         }
-      });
+      })
     },
     //以下是收货单位边输边查搜索
     querySearchConsignee(queryString, cb) {
       if (queryString && queryString.length > 3) {
         this.axios
-          .post("/api/v1/uc/getConsigneeByLike?index=" + queryString)
+          .post('/api/v1/uc/getConsigneeByLike?index=' + queryString)
           .then(res => {
-            if (res.data.code == "200") {
-              console.log(res);
-              var restaurantsConsignee = res.data.data;
-              this.consigneeList = res.data.data;
+            if (res.data.code == '200') {
+              console.log(res)
+              var restaurantsConsignee = res.data.data
+              this.consigneeList = res.data.data
               var results = queryString
                 ? restaurantsConsignee.filter(
                     this.createFilterConsignee(queryString)
                   )
-                : restaurantsConsignee;
+                : restaurantsConsignee
               // 调用 callback 返回建议列表的数据
-              cb(results);
+              cb(results)
             }
-          });
+          })
       } else {
         //历史收货客户
-        this.axios.post("/api/v1/uc/getConsigneeHistory").then(res => {
-          if (res.data.code == "200") {
-            console.log(res);
-            this.consigneeList = res.data.data;
-            cb(this.consigneeList);
+        this.axios.post('/api/v1/uc/getConsigneeHistory').then(res => {
+          if (res.data.code == '200') {
+            console.log(res)
+            this.consigneeList = res.data.data
+            cb(this.consigneeList)
           }
-        });
+        })
       }
     },
     createFilterConsignee(queryString) {
@@ -436,180 +436,180 @@ export default {
           restaurantsConsignee.value
             .toLowerCase()
             .indexOf(queryString.toLowerCase()) > -1
-        );
-      };
+        )
+      }
     },
     //获取发站信息
     information() {
-      this.axios.get("/api/v1/uc/getInwardSendStation").then(res => {
-        console.log(res.data.data);
-        this.sendStationList = res.data.data;
-      });
+      this.axios.get('/api/v1/uc/getInwardSendStation').then(res => {
+        console.log(res.data.data)
+        this.sendStationList = res.data.data
+      })
     },
     //合并行
     //记录每一行的合并数
     getSpanArr(data) {
       //每次调用方法初始化
-      this.spanArr = [];
+      this.spanArr = []
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
-          this.spanArr.push(1);
-          data[i].group = i;
-          this.pos = 0;
+          this.spanArr.push(1)
+          data[i].group = i
+          this.pos = 0
         } else {
           // 判断当前元素与上一个元素是否相同
           if (data[i].saleOrderId === data[i - 1].saleOrderId) {
-            this.spanArr[this.pos] += 1;
-            data[i].group = data[i - 1].group;
-            this.spanArr.push(0);
+            this.spanArr[this.pos] += 1
+            data[i].group = data[i - 1].group
+            this.spanArr.push(0)
           } else {
-            this.spanArr.push(1);
-            this.pos = i;
-            data[i].group = data[i - 1].group + 1;
+            this.spanArr.push(1)
+            this.pos = i
+            data[i].group = data[i - 1].group + 1
           }
         }
       }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (this.mergeList.includes(column.property)) {
-        const _row = this.spanArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
         return {
           rowspan: _row,
           colspan: _col
-        };
+        }
       }
     },
     //修改发站
     changesendStation(row) {
-      this.axios.post("/api/v1/ams/updateInwardConsignee", row).then(res => {
-        if (res.data.code == "200") {
-          this.$message.success("保存成功");
+      this.axios.post('/api/v1/ams/updateInwardConsignee', row).then(res => {
+        if (res.data.code == '200') {
+          this.$message.success('保存成功')
         }
-      });
+      })
     },
     operate(row) {
       this.axios
-        .post("/api/v1/ams/updateInwardConsignee", row)
+        .post('/api/v1/ams/updateInwardConsignee', row)
         .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("保存成功");
-            this.getRequestUrl();
+          if (res.data.code == '200') {
+            this.$message.success('保存成功')
+            this.getRequestUrl()
           } else {
-            this.$message.error(res.data.data);
-            this.getRequestUrl();
+            this.$message.error(res.data.data)
+            this.getRequestUrl()
           }
         })
         .catch(e => {
-          this.$message.error(e);
-          this.getRequestUrl();
-        });
+          this.$message.error(e)
+          this.getRequestUrl()
+        })
     },
     //查询事件
     onclick() {
-      let startTime = null;
-      let endTime = null;
-      let totheStation = null;
-      let consigneeName = null;
-      let transferIndep = null;
-      let remark = null;
+      let startTime = null
+      let endTime = null
+      let totheStation = null
+      let consigneeName = null
+      let transferIndep = null
+      let remark = null
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
-      if (this.screen == "到站") {
-        totheStation = this.input;
-      } else if (this.screen == "收货单位") {
-        consigneeName = this.input;
-      } else if (this.screen == "调入部门") {
-        transferIndep = this.input;
+      if (this.screen == '到站') {
+        totheStation = this.input
+      } else if (this.screen == '收货单位') {
+        consigneeName = this.input
+      } else if (this.screen == '调入部门') {
+        transferIndep = this.input
       } else {
-        remark = this.input;
+        remark = this.input
       }
-      if (this.screen1 == "到站") {
-        totheStation = this.input1;
-      } else if (this.screen1 == "收货单位") {
-        consigneeName = this.input1;
-      } else if (this.screen1 == "调入部门") {
-        transferIndep = this.input1;
+      if (this.screen1 == '到站') {
+        totheStation = this.input1
+      } else if (this.screen1 == '收货单位') {
+        consigneeName = this.input1
+      } else if (this.screen1 == '调入部门') {
+        transferIndep = this.input1
       } else {
-        remark = this.input1;
+        remark = this.input1
       }
       this.axios
         .post(
-          "/api/v1/ams/getKucunList?startTime=" +
+          '/api/v1/ams/getKucunList?startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&totheStation=" +
+            '&totheStation=' +
             totheStation +
-            "&consigneeName=" +
+            '&consigneeName=' +
             consigneeName +
-            "&transferIndep=" +
+            '&transferIndep=' +
             transferIndep +
-            "&remark=" +
+            '&remark=' +
             remark
         )
         .then(res => {
-          this.tableData = res.data.data;
-          this.getSpanArr(this.tableData);
-        });
+          this.tableData = res.data.data
+          this.getSpanArr(this.tableData)
+        })
     },
     //获取后台数据
     getRequestUrl() {
       this.axios
         .post(
-          "/api/v1/ams/getKucunList?startTime=null&endTime=null&i=" + new Date()
+          '/api/v1/ams/getKucunList?startTime=null&endTime=null&i=' + new Date()
         )
         .then(res => {
-          console.log(res.data.data);
-          this.tableData = res.data.data;
-          this.getSpanArr(this.tableData);
-        });
+          console.log(res.data.data)
+          this.tableData = res.data.data
+          this.getSpanArr(this.tableData)
+        })
     },
     //刷新
     refresh() {
-      this.getRequestUrl();
+      this.getRequestUrl()
     },
     //筛选发站
     filterSend(value, row, column) {
-      return row.sendStation === value;
+      return row.sendStation === value
     },
     //导出Excel
     exportAllReportToExcel() {
-      console.log(this.$refs.tableRef);
+      console.log(this.$refs.tableRef)
       const loading = this.$loading({
         lock: true,
-        text: "正在导出Excel",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)"
-      });
-      var title = this.tableTitle;
-      let tHeader = [];
-      let filterVal = [];
-      console.log(this.$refs.tableRef);
+        text: '正在导出Excel',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      var title = this.tableTitle
+      let tHeader = []
+      let filterVal = []
+      console.log(this.$refs.tableRef.$children)
       this.$refs.tableRef.$children.forEach(item => {
         if (item.label != undefined && item.prop != undefined) {
           if (tHeader.indexOf(item.label) === -1) {
-            tHeader.push(item.label);
+            tHeader.push(item.label)
           }
           if (filterVal.indexOf(item.prop) === -1) {
-            filterVal.push(item.prop);
+            filterVal.push(item.prop)
           }
         }
-      });
-      this.downloadLoading = true;
+      })
+      this.downloadLoading = true
       require.ensure([], () => {
         const {
           export_json_to_excel
-        } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
-        let data = this.tableData.map(v => filterVal.map(j => v[j])); //3.formatJson格式转换
-        export_json_to_excel(tHeader, data, title); // (title)导出的表格名称
-      });
-      loading.close();
+        } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        let data = this.tableData.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+        export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
+      })
+      loading.close()
     }
   }
-};
+}
 </script>
 <style lang="scss">
 #platformStockInfo {

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

@@ -39,7 +39,7 @@
       <dilTable v-bind.sync="truck" @radio-change="currentRadioChange1">
       </dilTable>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="cancelUpdate()">取 消</el-button>
+        <el-button @click="dialogTableVisible = false">取 消</el-button>
         <el-button type="primary" @click="updateTruckCapacity()"
           >确 定</el-button
         >
@@ -90,8 +90,8 @@
   </div>
 </template>
 <script>
-import { getCookie } from "@/utils/util.js";
-import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from '@/utils/util.js'
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
@@ -99,229 +99,229 @@ export default {
       endTime: null,
       inputText: null,
       truckInput: null,
-      userCarrierId: "",
+      userCarrierId: '',
       //是否弹出对话框
       dialogTableVisible: false,
       first: {},
       //车辆信息的表格
       truck: {
         requestUrl:
-          "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + "",
+          '/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=' + '',
         // 控制显示当选列
-        selectionType: "radio"
+        selectionType: 'radio'
       },
       //选中的运力id
       capacityId: null,
-      activeName: "first",
+      activeName: 'first',
       second: {
-        requestUrl: ""
+        requestUrl: ''
       },
       third: {
-        requestUrl: ""
+        requestUrl: ''
       }
-    };
+    }
   },
   created() {
-    if (getCookie("orgCode") == "chengyunshang") {
+    if (getCookie('orgCode') == 'chengyunshang') {
       this.first.requestUrl =
-        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" +
-        getCookie("userId");
+        '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=' +
+        getCookie('userId')
       this.second.requestUrl =
-        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&carrierId=" +
-        getCookie("userId");
+        '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&carrierId=' +
+        getCookie('userId')
       this.third.requestUrl =
-        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2&carrierId=" +
-        getCookie("userId");
+        '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2&carrierId=' +
+        getCookie('userId')
     } else {
       this.first.requestUrl =
-        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4";
+        '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4'
       this.second.requestUrl =
-        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5";
+        '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5'
       this.third.requestUrl =
-        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2";
+        '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2'
     }
   },
   methods: {
     onClick() {
-      console.log("dks");
-      let orgCode = null;
-      let startTime = null;
-      let endTime = null;
+      console.log('dks')
+      let orgCode = null
+      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") == "chengyunshang") {
-        orgCode = getCookie("userId");
+      if (getCookie('orgCode') == 'chengyunshang') {
+        orgCode = getCookie('userId')
       }
-      if (this.activeName == "first") {
+      if (this.activeName == 'first') {
         this.first.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&orgCode=" +
+          '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&orgCode=' +
           orgCode +
-          "&con=" +
+          '&con=' +
           this.inputText +
-          "&startTime=" +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&i=" +
-          new Date();
-      } else if (this.activeName == "second") {
+          '&i=' +
+          new Date()
+      } else if (this.activeName == 'second') {
         this.second.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&orgCode=" +
+          '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&orgCode=' +
           orgCode +
-          "&con=" +
+          '&con=' +
           this.inputText +
-          "&startTime=" +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
       } else {
         this.third.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2&orgCode=" +
+          '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2&orgCode=' +
           orgCode +
-          "&con=" +
+          '&con=' +
           this.inputText +
-          "&startTime=" +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
       }
     },
     getRequest() {
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.first.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" +
-          getCookie("userId") +
-          "&i=" +
-          new Date();
+          '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=' +
+          getCookie('userId') +
+          '&i=' +
+          new Date()
         this.second.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&carrierId=" +
-          getCookie("userId") +
-          "&i=" +
-          new Date();
+          '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&carrierId=' +
+          getCookie('userId') +
+          '&i=' +
+          new Date()
         this.third.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2&carrierId=" +
-          getCookie("userId") +
-          "&i=" +
-          new Date();
+          '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2&carrierId=' +
+          getCookie('userId') +
+          '&i=' +
+          new Date()
       } else {
         this.first.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4" +
-          "&i=" +
-          new Date();
+          '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4' +
+          '&i=' +
+          new Date()
         this.second.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5" +
-          "&i=" +
-          new Date();
+          '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5' +
+          '&i=' +
+          new Date()
         this.third.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2" +
-          "&i=" +
-          new Date();
+          '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2' +
+          '&i=' +
+          new Date()
       }
     },
     handleClick() {
-      this.getRequest();
+      this.getRequest()
     },
     handleClose(done) {
-      done();
-      this.$message.info("取消修改运力");
+      done()
+      this.$message.info('取消修改运力')
     },
     currentRadioChange1(row) {
-      console.log(row);
-      this.capacityId = row.capacityId;
+      console.log(row)
+      this.capacityId = row.capacityId
     },
     getTruckRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.truck.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-          getCookie("userId") +
-          "&test=" +
-          new Date();
+          '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+          getCookie('userId') +
+          '&test=' +
+          new Date()
       } else {
         this.truck.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
           null +
-          "&test=" +
-          new Date();
+          '&test=' +
+          new Date()
       }
     },
     //修改运输订单
     updatePlan(scope) {
-      this.getTruckRequestUrl();
-      this.orderId = scope.row.orderId;
-      this.dialogTableVisible = true;
-      console.log(scope.row.orderId);
+      this.getTruckRequestUrl()
+      this.orderId = scope.row.orderId
+      this.dialogTableVisible = true
+      console.log(scope.row.orderId)
     },
     updateTruckCapacity() {
       if (this.capacityId == null) {
-        this.$message.error("未选中运力");
-        return;
+        this.$message.error('未选中运力')
+        return
       }
       this.axios
-        .post("/api/v1/oms/updateCapacityId", {
+        .post('/api/v1/oms/updateCapacityId', {
           capacityId: this.capacityId,
           orderId: this.orderId
         })
         .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("修改运力成功");
-            this.dialogTableVisible = false;
-            this.getRequest();
+          if (res.data.code == '200') {
+            this.$message.success('修改运力成功')
+            this.dialogTableVisible = false
+            this.getRequest()
           } else {
-            this.$message.error("修改运力失败");
-            this.dialogTableVisible = false;
-            this.getRequest();
+            this.$message.error('修改运力失败')
+            this.dialogTableVisible = false
+            this.getRequest()
           }
-        });
+        })
     },
     clickTruck() {
       this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
         null +
-        "&index=" +
-        this.truckInput;
+        '&index=' +
+        this.truckInput
     },
     //删除运输订单
     deleteClick(scope) {
       let map = {
         orderId: scope.row.orderId,
-        userId: getCookie("userId")
-      };
-      this.$confirm("是否删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+        userId: getCookie('userId')
+      }
+      this.$confirm('是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+          this.axios.post('/api/v1/oms/closeOmstruckOrder', map).then(res => {
             if (res.data.code == 200) {
               this.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-              this.getRequest();
+                type: 'success',
+                message: '删除成功!'
+              })
+              this.getRequest()
             } else {
               this.$message({
-                message: "删除失败",
-                type: "warning"
-              });
+                message: '删除失败',
+                type: 'warning'
+              })
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
-        });
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
     }
   }
-};
+}
 </script>
 <style lang="scss">
 .inwardOrder {

src/views/sale/components/offSiteTransportation/currentLocation.vue

@@ -103,7 +103,7 @@ export default {
           console.log(res.data.data);
           if (res.data.data == "-1") {
             this.$message.error("运输订单未关闭,自提车辆无权查看!");
-          } else if (res.data.data.status != "1006") {
+          } else if (res.data.data.status == "1001") {
             that.map.setCenter([
               res.data.data.result.lon,
               res.data.data.result.lat
@@ -136,8 +136,8 @@ export default {
             }
             this.lon = res.data.data.result.lon;
             this.lat = res.data.data.result.lat;
-          } else {
-            this.$message.error("车辆暂时无GPS");
+          } else{
+             this.$message.error(res.data.data.statusStr);
             //清除定时器
             clearTimeout(this.timer);
           }

src/views/statisticalReport/components/purachaseMineral.vue

@@ -48,7 +48,7 @@ export default {
       totalNumber: 0,
       //合计车数
       totalCapacity: 0,
-      tableTitle:'采购燃料老区统计报表'
+      tableTitle:'采购进口矿汽运监控统计报表'
     };
   },
   methods: {

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

@@ -57,6 +57,7 @@
             type="date"
             placeholder="选择日期"
             style="width:150px"
+            :picker-options="pickerOptions"
           >
           </el-date-picker>
           <span>至</span>
@@ -65,6 +66,7 @@
             type="date"
             placeholder="选择日期"
             style="width:150px"
+            :picker-options="pickerOptions1"
           >
           </el-date-picker>
           <el-button type="primary" class="btn" @click="onclick">
@@ -1598,6 +1600,64 @@ export default {
           lable: '车牌号'
         }
       ],
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now()
+        },
+        shortcuts: [
+          {
+            text: '今天',
+            onClick(picker) {
+              picker.$emit('pick', new Date())
+            }
+          },
+          {
+            text: '昨天',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24)
+              picker.$emit('pick', date)
+            }
+          },
+          {
+            text: '一周前',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', date)
+            }
+          }
+        ]
+      },
+      pickerOptions1: {
+        disabledDate(time) {
+          return time.getTime() > Date.now()
+        },
+        shortcuts: [
+          {
+            text: '今天',
+            onClick(picker) {
+              picker.$emit('pick', new Date())
+            }
+          },
+          {
+            text: '昨天',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24)
+              picker.$emit('pick', date)
+            }
+          },
+          {
+            text: '一周前',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', date)
+            }
+          }
+        ]
+      },
       startTime: new Date(),
       endTime: new Date(),
       //合计净重
@@ -3836,7 +3896,16 @@ export default {
         .then(res => {
           this.tableData = res.data.data
           this.totalHeight += this.itemHeight
-          this.visibleList = res.data.data
+          this.totalHeight += this.itemHeight
+          this.visibleList = []
+          this.maxHeight = window.innerHeight - 130
+          this.visibleList = this.tableData.slice(
+            0,
+            Math.floor(this.maxHeight / this.itemHeight) + 1
+          )
+          console.log(this.visibleList)
+          console.log(this.maxHeight, 'this.maxHeight')
+          loading.close()
           console.log(this.visibleList, 'this.visibleList')
           this.getSpanArr(this.visibleList)
           this.getTotalNum(this.tableData)