修改

build/utils.js

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

config/index.js

@@ -64,7 +64,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-     //target: "http://localhost:8019",
+    //target: "http://localhost:8080",
     target: "http://172.16.33.166:8080",
     // target: "http://192.168.1.114:8019",
     ws: true,
@@ -103,7 +103,6 @@ module.exports = {
       assetsSubDirectory: 'static',
       assetsPublicPath: '/',
       proxyTable: proxyTable,
-
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
     port: 8802, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -324,11 +324,9 @@ export default {
         }else{
             arr.push(mapFirst)
         }
-        this.axios.post("http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult",arr).then((res) =>{
-            if(res.data.code == "200"){
-                this.$message.success("补录计量实绩成功")
-                this.$router.go(0)
-            }
+        this.axios.post("/api/v1/uc/recordingWeightResult",arr).then((res) =>{
+            this.$message.success("补录计量实绩成功")
+            this.$router.go(0)
         })
     },
     onClickCancel(){

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

@@ -50,9 +50,7 @@ export default {
         resultApproveDate: sjTime(this.form1.resultApproveDate),
         resultApproveNumber: this.form1.resultApproveNumber,
         shipperId: this.form1.shipperId,
-        resultCategory: this.form1.resultCategory,
-        sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId,
+        resultCategory: this.form1.resultCategory
       };
       function isNumber() {
         var value = approveWagonPlease.resultApproveNumber;
@@ -68,10 +66,7 @@ export default {
       if (
         approveWagonPlease.resultApproveDate == null ||
         approveWagonPlease.resultApproveNumber == null ||
-        approveWagonPlease.shipperId == null ||
-        approveWagonPlease.resultCategory == null ||
-        approveWagonPlease.sendStationId == null ||
-        approveWagonPlease.toTheStationId == null
+        approveWagonPlease.resultCategory == null
       )
         this.$message.error("存在空值！");
       else if (!isNumber(val)) this.$message.error("请车数必须是数字！");

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

@@ -46,6 +46,40 @@
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
     </div>
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+        <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:550px;">
+        <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="remark from" v-if="matching">
       <span class="text">船名/备注：</span>
       <el-input
@@ -66,7 +100,6 @@
       </el-input>
       <span class="span"></span>
     </div>
-
     <div class="form">
       <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="364" v-model="form1" ref="from1"></dil-form>
@@ -118,7 +151,6 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime, isNumber } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -165,6 +197,10 @@ export default {
         requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
         selectionType: "radio",
       },
+      sendStationId:null,
+      toTheStationId:1,
+      sendStation:null,
+      toTheStation:"老区轨道衡"
     };
   },
   watch: {
@@ -244,6 +280,72 @@ export default {
         });
       }
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     onClick(a) {
       if (a == 1) {
         this.frist.requestUrl =
@@ -314,8 +416,8 @@ export default {
       let state = 0;
       if (
         this.list.length > 0 &&
-        this.form1.sendStationId &&
-        this.form1.arrivalStationId &&
+        this.sendStationId &&
+        this.toTheStationId &&
         this.form1.resultLoadingDate
       ) {
         state = 1;
@@ -326,8 +428,8 @@ export default {
             message: "请输入车皮号！",
           });
         } else {
-          if (this.form1.sendStationId) {
-            if (this.form1.arrivalStationId) {
+          if (this.sendStationId) {
+            if (this.toTheStationId) {
               if (this.form1.resultLoadingDate) {
                 if (this.supplierId) {
                   if (this.materialId) {
@@ -366,8 +468,8 @@ export default {
       if (state == 1) {
         let map = {
           wagonNoList: this.list,
-          sendStationId: this.form1.sendStationId,
-          arrivalStationId: this.form1.arrivalStationId,
+          sendStationId: this.sendStationId,
+          arrivalStationId: this.toTheStationId,
           resultLoadingDate: sjTime(this.form1.resultLoadingDate),
           resultRemarks: this.form1.resultRemarks,
           resultType: 3,
@@ -377,8 +479,8 @@ export default {
         if (this.matching) {
           map = {
             wagonNoList: this.list,
-            sendStationId: this.form1.sendStationId,
-            arrivalStationId: this.form1.arrivalStationId,
+            sendStationId: this.sendStationId,
+            arrivalStationId: this.toTheStationId,
             resultLoadingDate: sjTime(this.form1.resultLoadingDate),
             resultRemarks: this.form1.resultRemarks,
             resultType: 3,
@@ -564,6 +666,9 @@ export default {
     justify-content: center;
     padding-top: 30px;
   }
+   .fromOther  .el-input__inner{
+    width: 250px;
+  }
 }
 </style>
 

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

@@ -1,11 +1,46 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div class="contractDetails"> 
+  <div class="contractDetails">
+    <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>
+    </div>
     <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
@@ -21,6 +56,10 @@ export default {
  data(){
      return {
       form1: {},
+      sendStationId:null,
+      toTheStationId:null,
+      sendStation:"",
+      toTheStation:""
   }
  },
   mounted() {
@@ -34,6 +73,11 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
+            console.log(e)
+            this.toTheStationId = e.arrivalStationId
+            this.sendStationId = e.sendStationId
+            this.sendStation = e.sendName
+            this.toTheStation = e.arrivalName
           });
         });
     },
@@ -47,15 +91,80 @@ export default {
     currentRadioChange(row) {
       this.aaaa = row;
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // 确认
     onClickConfirm() {
       let tmstrainLoadingResult = {
         resultId: this.$route.params.resultId,
         resultWagonNo: this.form1.resultWagonNo,
-        resultBillableTonnage: this.form1.resultBillableTonnage,
         resultClass: this.form1.resultClass,
-        sendStationId: this.form1.sendStationId,
-        arrivalStationId: this.form1.arrivalStationId,
+        sendStationId: this.sendStationId,
+        arrivalStationId: this.toTheStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
         batchId: this.form1.batchId,
         capacityId: this.form1.capacityId,
@@ -63,10 +172,9 @@ export default {
         resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
         resultRemarks: this.form1.resultRemarks
       };
+      console.log(tmstrainLoadingResult)
       if (
       tmstrainLoadingResult.resultWagonNo==null||
-      tmstrainLoadingResult.resultBillableTonnage==null||
-      tmstrainLoadingResult.resultClass==null||
       tmstrainLoadingResult.sendStationId==null||
       tmstrainLoadingResult.arrivalStationId==null||
       tmstrainLoadingResult.resultLoadingDate==null||

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

@@ -1,6 +1,6 @@
 <template>
   <div class="wagonLoadbu">
-    <span> </span>
+    <page-title>返回</page-title>
     <div class="wagonLoadbu_table">
       <dilTable
         v-bind.sync="option"
@@ -19,6 +19,11 @@
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点：</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
+    </div>
     <div class="remark from">
       <span class="text" style="margin-left: 60px; ">船名(备注)：</span>
       <el-input v-model="remark" @blur="onBlur" style="width: 230px; margin-right:140px"> </el-input>
@@ -62,13 +67,20 @@
           @radio-change="currentRadioChange2"
         ></dilTable>
       </div>
-
+      <div v-show="a == 3">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange3"
+        ></dilTable>
+      </div>
     </el-drawer>
   </div>
 </template>
 
 <script>
+import PageTitle from "@/components/Page/Title";
 export default {
+  components: { PageTitle },
   data() {
     return {
       form1: {},
@@ -164,6 +176,10 @@ export default {
       this.supplierId = selection.supplierId;
       this.getPurchaseOrderNo();
     },
+    currentRadioChange3(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
@@ -217,7 +233,7 @@ export default {
           this.materialId +
           "&index=" +
           this.inputText;
-      } else if (a == 4) {
+      } else if (a == 3) {
         this.third.requestUrl =
           "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.inputText;
       }

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

@@ -90,7 +90,7 @@ export default {
       sendStationId:null,
       toTheStationId:1,
       sendStation:null,
-      toTheStation:"达州站"
+      toTheStation:"老区轨道衡"
     };
   },
   mounted() {

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

@@ -6,7 +6,57 @@
         <div class="form_box">
           <dil-form :formId="117" v-model="form1"></dil-form>
         </div>
-    </div>  
+    </div>
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
+        <el-form-item label="发货单位">
+          <el-autocomplete
+            class="inline-input"
+            v-model="stateSupplier"
+            :fetch-suggestions="querySearchSupplier"
+            placeholder="请输入发货单位名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSupplier"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.supplierName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
+        <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:525px;">
+        <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">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
@@ -21,6 +71,12 @@ export default {
     data(){
           return {
           form1: {},
+          stateSupplier:null,
+          supplierId:null,
+          sendStationId:null,
+          toTheStationId:null,
+          sendStation:"",
+          toTheStation:""
         }
     },
   mounted() {
@@ -34,12 +90,107 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
+            console.log(e)
+            this.supplierId = e.supplierId
+            this.stateSupplier = e.supplierName
+            this.toTheStationId = e.toTheStationId
+            this.sendStationId = e.sendStationId
+            this.sendStation = e.sendName
+            this.toTheStation = e.arrivalName
+            
           });
         });
     },
      // 返回
     onClickCancel() {
       this.$router.go(-1);
+    },
+       //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      item.supplierName = this.stateSupplier
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
     },
      // 确认
     onClickConfirm() {
@@ -47,11 +198,12 @@ export default {
         resultId: this.$route.params.resultId,
         resultPlanDate: sjTime(this.form1.resultPlanDate),
         resultCategory: this.form1.resultCategory,
-        shipperId: this.form1.shipperId,
-        sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId,
+        supplierId: this.supplierId,
+        sendStationId: this.sendStationId,
+        toTheStationId: this.toTheStationId,
         resultPleaseNumber: this.form1.resultPleaseNumber
       };
+      console.log(tmstrainPleaseApproveResult)
       function isNumber() {
         var value = tmstrainPleaseApproveResult.resultPleaseNumber;
         //验证是否为数字
@@ -66,7 +218,6 @@ export default {
       if (
         tmstrainPleaseApproveResult.resultPlanDate==null||
         tmstrainPleaseApproveResult.resultCategory==null||
-        tmstrainPleaseApproveResult.shipperId==null||
         tmstrainPleaseApproveResult.sendStationId==null||
         tmstrainPleaseApproveResult.toTheStationId==null||
         tmstrainPleaseApproveResult.resultPleaseNumber==null

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
-    
+  <div class="unloadWagon">
+    <page-title>返回</page-title>
       <div class="form">
         <div class="form_box">
           <dil-form :formId="118" v-model="form1"></dil-form>
@@ -65,9 +65,7 @@ export default {
       if (
         tmstrainWagonUnloadResult.resultArrivalDate==null||
       tmstrainWagonUnloadResult.resultUnloadTime==null||
-      tmstrainWagonUnloadResult.unloadingPointId==null||
-      tmstrainWagonUnloadResult.resultBigTicketWeight==null||
-      tmstrainWagonUnloadResult.resultRailHorizontalWeight==null
+      tmstrainWagonUnloadResult.unloadingPointId==null
       ) this.$message.error("存在空值！");
       else
       this.axios
@@ -87,8 +85,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
-.contractDetails {
+.unloadWagon {
   .form {
     display: flex;
     .form_box {

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

@@ -43,6 +43,40 @@
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+        <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:550px;">
+        <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="form">
       <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="254" v-model="form1" ref="from1"></dil-form>
@@ -52,12 +86,13 @@
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
+
     <!-- 模态窗口 -->
     <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        style="margin-top: 0.625rem; margin-left: 1.25rem;width:250px"
         clearable
       ></el-input>
       <el-button
@@ -137,6 +172,10 @@ export default {
         requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
         selectionType: "radio",
       },
+      sendStationId:null,
+      toTheStationId:1,
+      sendStation:null,
+      toTheStation:"老区轨道衡"
     };
   },
   created(){
@@ -262,6 +301,72 @@ export default {
     onclick(index) {
       this.list.splice(index, 1);
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // 确定
     makeSure() {
       let state = 0;
@@ -271,8 +376,8 @@ export default {
         this.supplierId &&
         this.unloadPointId &&
         this.purchaseOrderId &&
-        this.form1.sendStationId &&
-        this.form1.arrivalStationId &&
+        this.sendStationId &&
+        this.toTheStationId &&
         this.form1.resultLoadingDate
       ) {
         state = 1;
@@ -288,8 +393,8 @@ export default {
             if (this.supplierId) {
               if (this.unloadPointId) {
                 if (this.purchaseOrderId) {
-                      if (this.form1.sendStationId) {
-                        if (this.form1.arrivalStationId) {
+                      if (this.sendStationId) {
+                        if (this.toTheStationId) {
                           if (this.form1.resultLoadingDate) {
                           } else {
                             this.$message({
@@ -344,8 +449,8 @@ export default {
           sendUnitId:this.supplierId,
           resultIsclear:this.form1.resultIsclear,
           resultClass: this.form1.resultClass,
-          sendStationId: this.form1.sendStationId,
-          arrivalStationId: this.form1.arrivalStationId,
+          sendStationId: this.sendStationId,
+          arrivalStationId: this.toTheStationId,
           resultLoadingDate: sjTime(this.form1.resultLoadingDate),
           resultRemarks: this.form1.resultRemarks,
           resultType:2,
@@ -526,6 +631,9 @@ export default {
     justify-content: center;
     padding-top: 30px;
   }
+  .fromOther .el-input__inner{
+    width: 250px;
+  }
 }
 </style>
 

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

@@ -8,7 +8,40 @@
         <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>
+    </div>
     <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
@@ -18,12 +51,16 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
     return {
       form1: {},
+      sendStationId:null,
+      toTheStationId:null,
+      sendStation:"",
+      toTheStation:""
     };
   },
   created() {
@@ -46,9 +83,11 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            // console.log(e);
-            // console.log(this.form1);
-            // console.log(this.$route.params.resultId);
+            console.log(e)
+            this.toTheStationId = e.arrivalStationId
+            this.sendStationId = e.sendStationId
+            this.sendStation = e.sendName
+            this.toTheStation = e.arrivalName
           });
         });
     },
@@ -62,6 +101,72 @@ export default {
     currentRadioChange(row) {
       this.aaaa = row;
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // 确认
     onClickConfirm() {
       let tmstrainLoadingResult = {
@@ -69,8 +174,8 @@ export default {
         resultWagonNo: this.form1.resultWagonNo,
         resultBillableTonnage: this.form1.resultBillableTonnage,
         resultClass: this.form1.resultClass,
-        sendStationId: this.form1.sendStationId,
-        arrivalStationId: this.form1.arrivalStationId,
+        sendStationId: this.sendStationId,
+        arrivalStationId: this.toTheStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
         batchId: this.form1.batchId,
         capacityId: this.form1.capacityId,
@@ -78,10 +183,9 @@ export default {
         resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
         resultRemarks: this.form1.resultRemarks,
       };
+      console.log(tmstrainLoadingResult)
       if (
         tmstrainLoadingResult.resultWagonNo == null ||
-        tmstrainLoadingResult.resultBillableTonnage == null ||
-        tmstrainLoadingResult.resultClass == null ||
         tmstrainLoadingResult.sendStationId == null ||
         tmstrainLoadingResult.arrivalStationId == null ||
         tmstrainLoadingResult.resultLoadingDate == null ||

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

@@ -1,13 +1,12 @@
 <template>
   <!-- 修改车皮装车实绩 -->
   <div class="contractDetails">
+    <page-title>返回</page-title>
       <div class="form">
         <div class="form_box">
           <dil-form :formId="118" v-model="form1"></dil-form>
         </div>
       </div>
-
-      
     <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
@@ -62,13 +61,8 @@ export default {
         resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
         resultRemark: this.form1.resultRemark
       };
-      console.log(tmstrainWagonUnloadResult);
       if (tmstrainWagonUnloadResult.resultWagonNo==null
-      ||tmstrainWagonUnloadResult.resultArrivalDate==null||
-      tmstrainWagonUnloadResult.resultUnloadTime==null||
-      tmstrainWagonUnloadResult.unloadingPointId==null||
-      tmstrainWagonUnloadResult.resultBigTicketWeight==null||
-      tmstrainWagonUnloadResult.resultRailHorizontalWeight==null
+      ||tmstrainWagonUnloadResult.resultArrivalDate==null
       ) this.$message.error("存在空值！");
       else
       this.axios

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

@@ -42,6 +42,40 @@
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+        <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:550px;">
+        <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="form">
       <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="102" v-model="form1" ref="from1"></dil-form>
@@ -136,14 +170,12 @@ export default {
         requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
         selectionType: "radio",
       },
+      sendStationId:2,
+      toTheStationId:1,
+      sendStation:"万州港",
+      toTheStation:"老区轨道衡"
     };
   },
-  created(){
-    this.form1 = {
-      // sendStationId:1,
-      arrivalStationId:1,
-    }
-  },
   methods: {
     currentRadioChange1(selection) {
       this.input = null;
@@ -218,6 +250,72 @@ export default {
           "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
       }
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     onchang() {
       var state = false;
       var cptop = this.input.substring(0, 2);
@@ -273,8 +371,8 @@ export default {
         this.purchaseOrderId &&
         this.form1.resultIsclear &&
         this.form1.resultClass &&
-        this.form1.sendStationId &&
-        this.form1.arrivalStationId &&
+        this.sendStationId &&
+        this.toTheStationId &&
         this.form1.resultLoadingDate
       ) {
         state = 1;
@@ -360,8 +458,8 @@ export default {
           sendUnitId:this.supplierId,
           resultIsclear:this.form1.resultIsclear,
           resultClass: this.form1.resultClass,
-          sendStationId: this.form1.sendStationId,
-          arrivalStationId: this.form1.arrivalStationId,
+          sendStationId: this.sendStationId,
+          arrivalStationId: this.toTheStationId,
           resultLoadingDate: sjTime(this.form1.resultLoadingDate),
           resultRemarks: this.form1.resultRemarks,
           resultType:1,
@@ -508,7 +606,6 @@ export default {
     .form_box {
       width: 340px;
       margin-left: 37%;
-     
       margin-right: 20px;
       .el-form {
         .preview-group {
@@ -541,6 +638,9 @@ export default {
     justify-content: center;
     padding-top: 30px;
   }
+  .fromOther  .el-input__inner{
+    width: 250px;
+  }
 }
 </style>
 

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

@@ -81,10 +81,10 @@ export default {
       supplierId: null,
       supplierName: "",
       stateSupplier: "",
-      sendStationId:null,
+      sendStationId:2,
       toTheStationId:1,
-      sendStation:null,
-      toTheStation:"达州站"
+      sendStation:"万州港",
+      toTheStation:"老区轨道衡"
     };
   },
   created() {

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

@@ -1,8 +1,6 @@
 <template>
  <div class="contractDetails">
     <page-title>返回</page-title>
-
-
     <div class="form">
       <div class="form_box">
        <dil-form :formId="140" v-model="form1"></dil-form>
@@ -19,6 +17,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
     data(){
@@ -48,12 +47,10 @@ export default {
     onClickConfirm() {
       let approveWagonPlease = {
         resultId: this.$route.params.resultId,
-        resultApproveDate: this.form1.resultApproveDate,
+        resultApproveDate: sjTime(this.form1.resultApproveDate),
         resultApproveNumber: this.form1.resultApproveNumber,
         // shipperId: this.form1.shipperId,
         resultCategory: this.form1.resultCategory,
-        sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId,
         userId:getCookie("orgCode"),
       };
       function isNumber() {
@@ -71,9 +68,7 @@ export default {
         approveWagonPlease.resultApproveDate==null||
         approveWagonPlease.resultApproveNumber==null||
         // approveWagonPlease.shipperId==null||
-        approveWagonPlease.resultCategory==null||
-        approveWagonPlease.sendStationId==null||
-        approveWagonPlease.toTheStationId==null
+        approveWagonPlease.resultCategory==null
       ) this.$message.error("存在空值！");
       else
       if (!isNumber(val)) this.$message.error("请车数必须是数字！");

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

@@ -8,7 +8,40 @@
         <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>
+    </div>
     <!-- 确定和取消 -->
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
@@ -25,6 +58,10 @@ export default {
   data() {
     return {
       form1: {},
+      sendStationId:null,
+      toTheStationId:null,
+      sendStation:"",
+      toTheStation:""
     };
   },
   mounted() {
@@ -42,9 +79,11 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            // console.log(e);
-            // console.log(this.form1);
-            // console.log(this.$route.params.resultId);
+            this.toTheStationId = e.arrivalStationId
+            this.sendStationId = e.sendStationId
+            this.sendStation = e.sendName
+            this.toTheStation = e.arrivalName
+            console.log(e)
           });
         });
     },
@@ -58,14 +97,80 @@ export default {
     currentRadioChange(row) {
       this.aaaa = row;
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // 确认
     onClickConfirm() {
       let tmstrainLoadingResult = {
         resultId: this.$route.params.resultId,
         resultIsclear: this.form1.resultIsclear,
         resultClass: this.form1.resultClass,
-        sendStationId: this.form1.sendStationId,
-        arrivalStationId: this.form1.arrivalStationId,
+        sendStationId: this.sendStationId,
+        arrivalStationId: this.toTheStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
         capacityId: this.form1.capacityId,
         resultMaterialNumber: this.form1.resultMaterialNumber,
@@ -140,12 +245,8 @@ export default {
     margin-left: 42%;
     margin-top: 55px;
   }
-}
-.fromOther {
-  margin-left: 34.5%;
-  width: 50%;
-  .inline-input {
-    width: 300px;
+  .fromOther  .el-input__inner{
+    width: 250px;
   }
 }
 </style>

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

@@ -7,7 +7,6 @@
         <dil-form :formId="117" v-model="form1"></dil-form>
       </div>
     </div>
-
     <div class="fromOther">
       <el-form :inline="true" class="demo-form-inline" label-width="80px">
         <el-form-item label="发货单位">
@@ -25,6 +24,38 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
+        <el-form :inline="true" class="demo-form-inline" label-width="80px" >
+        <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" >
+        <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>
 
     <!-- 确定和取消 -->
@@ -37,7 +68,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -46,6 +77,10 @@ export default {
       supplierId: null,
       supplierName: "",
       stateSupplier: "",
+      sendStationId:null,
+      toTheStationId:null,
+      sendStation:"",
+      toTheStation:""
     };
   },
   mounted() {
@@ -59,7 +94,13 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
+            console.log(e)
+            this.toTheStationId = e.toTheStationId
+            this.sendStationId = e.sendStationId
+            this.sendStation = e.sendName
+            this.toTheStation = e.arrivalName
           });
+          
           this.stateSupplier = res.data.data[0].supplierName;
           this.supplierId = res.data.data[0].supplierId;
         });
@@ -89,7 +130,72 @@ export default {
           return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
         };
       },
-
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
 
     // 确认
     onClickConfirm() {
@@ -98,10 +204,11 @@ export default {
         resultPlanDate: sjTime(this.form1.resultPlanDate),
         resultCategory: this.form1.resultCategory,
         supplierId: this.supplierId,
-        sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId,
+        sendStationId: this.sendStationId,
+        toTheStationId: this.toTheStationId,
         resultPleaseNumber: this.form1.resultPleaseNumber,
       };
+      console.log(tmstrainPleaseApproveResult)
       function isNumber() {
         var value = tmstrainPleaseApproveResult.resultPleaseNumber;
         //验证是否为数字
@@ -173,12 +280,14 @@ export default {
     margin-left: 42%;
     margin-top: 55px;
   }
-}
-.fromOther {
+  .fromOther {
   margin-left: 34.5%;
   width: 50%;
-  .inline-input {
-    width: 300px;
+  .el-input__inner{
+    width: 250px;
+  
   }
 }
+}
+
 </style>

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

@@ -2,7 +2,6 @@
   <!-- 新增请作业页面 -->
   <div class="contractDetails">
     <page-title>返回</page-title>
-
     <div class="form">
       <div class="form_box">
         <dil-form :formId="118" v-model="form1"></dil-form>

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

@@ -53,9 +53,8 @@ export default {
       this.getRequestUrl();
     },
   methods: {
- 
      getRequestUrl(){
-      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1"  
+      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&i=" + new Date()  
     },
     onclick() {
       this.option.requestUrl =

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

@@ -58,23 +58,27 @@ export default {
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl:
-          "",
+        requestUrl: ""
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl:
-          "",
-      },
+        requestUrl: ""
+      }
     };
   },
-  created(){
-      this.getRequestUrl()
+  created() {
+    this.getRequestUrl();
   },
   methods: {
-    getRequestUrl(){
-      this.option1.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=1" + "&i=" + new Date() 
-      this.option2.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=1" + "&i=" + new Date() 
+    getRequestUrl() {
+      this.option1.requestUrl =
+        "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=1" +
+        "&i=" +
+        new Date();
+      this.option2.requestUrl =
+        "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=1" +
+        "&i=" +
+        new Date();
     },
     onclick() {
       if (this.activeName == "first") {
@@ -93,26 +97,19 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          // console.log(this.arr[0].text_prop);
-          this.$axios
+          this.axios
             .post("/api/v1/tms/deleteApproveWagonPlease/" + resultId)
             .then(() => {
-              this.$router.go(0);
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.getRequestUrl();
             });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
+        })  
     },
     // 下发
     sendClick(resultId) {
@@ -120,29 +117,28 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
-          console.log("enter!1!")
-           this.axios
+          console.log("enter!1!");
+          this.axios
             .post("/api/v1/tms/sendWagonPlease/" + resultId)
-            .then((res) => {
-              if(res.data.code == "200"){
-                 this.getRequestUrl()
-              }              
+            .then(res => {
+              if (res.data.code == "200") {
+                this.getRequestUrl();
+              }
             });
           this.$message({
             type: "success",
-            message: "下发成功!",
+            message: "下发成功!"
           });
           // console.log(this.arr[0].text_prop);
-         
         })
         .catch(() => {
-          console.log("out!S")
+          console.log("out!S");
           this.$message({
             type: "info",
-            message: "取消下发!",
+            message: "取消下发!"
           });
         });
     },
@@ -154,12 +150,12 @@ export default {
     //修改
     updateClick(resultId) {
       this.$router.push("/editWagonPlease/" + resultId);
-    },
-  },
+    }
+  }
 };
 </script>
 
-<style lang='scss' >
+<style lang="scss">
 .trainTransport {
   .top {
     padding: 1.25rem 0.375rem;
@@ -167,7 +163,6 @@ export default {
       width: 20%;
       margin-right: 1.25rem;
     }
-
   }
 }
-</style>
+</style>

src/views/sale/app.js

@@ -17,8 +17,6 @@ import apollo from '@/config/apolloConfig.js'
 
 import Print from 'vue-print-nb';
 Vue.use(Print);
-
-
 import 'xe-utils' 
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/style.css'

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

@@ -290,6 +290,7 @@ export default {
         },
         initData(orderNumber){
             let that=this;
+            that.listPath=[];
             if(that.carNumber==""){
                 this.$message.error('车牌号不能为空！');
                 return;

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

@@ -67,7 +67,7 @@
          <el-table-column fixed="right" label="操作" width="220">
         <template slot-scope="scope">
           <el-button @click="historyclick(scope.row)" type="text" size="small" style="font-size: 17px">历史轨迹</el-button>
-          <el-button @click="allDistanceclick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">总距离</el-button>
+          <!-- <el-button @click="allDistanceclick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">总距离</el-button> -->
         </template>
       </el-table-column>
         </dilTable>