修改

build/utils.js

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

config/index.js

@@ -56,7 +56,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
+    target: "http://192.168.1.109:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/RMS/components/addTruckCalculate.vue

@@ -2,32 +2,37 @@
   <!-- 添加汽车衡信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-     <div class="form-box" style="margin-right: 10rem">
-        <dil-form :formId="317" v-model="form1" ref="from1">
-        </dil-form>
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="317" v-model="form1" ref="from1"> </dil-form>
     </div>
-  <div class="form-box f1">
-    <el-form :inline="true" :model="formInline" class="demo-form-inline">     
-    </el-form>
-  </div>
-  <div class="inputBox">
-  <el-input :inline="true"
+    <div class="form-box f1">
+      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      </el-form>
+    </div>
+    <div class="inputBox">
+      <el-input
+        :inline="true"
         placeholder="请输入内容"
         v-model="inputText"
-        clearable>
-    </el-input>
-    <el-button type="primary" class="btn" @click="onclick" :inline="true">
+        clearable
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick" :inline="true">
         <i class="el-icon-search"></i>物资列表查询
-    </el-button> 
-  </div>
-    
-          <div> <dilTable v-bind.sync="options" @selection-change="selectionChange"></dilTable></div>
+      </el-button>
+    </div>
+
+    <div>
+      <dilTable
+        v-bind.sync="options"
+        @selection-change="selectionChange"
+      ></dilTable>
+    </div>
 
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
-          
   </div>
 </template>
 
@@ -38,59 +43,52 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      materialName:"",
+      materialName: "",
       form1: {},
-      checkList:[],
-      inputText:"",
-      options:{
+      checkList: [],
+      inputText: "",
+      options: {
         // first请求数据的地址
         requestUrl: "/api/v1/rms/getMaterialList?apiId=351",
         selectionType: "select",
-         mapList:[]
-        
+        mapList: [],
       },
     };
   },
   mounted() {},
   methods: {
-      selectionChange(selection){
-      this.mapList=selection, 
-      console.log(this.mapList) 
-      this.materialName=this.mapList.materialName
-     
+    selectionChange(selection) {
+      (this.mapList = selection), console.log(this.mapList);
+      this.materialName = this.mapList.materialName;
     },
-    onclick(){
-      this.options.requestUrl="/api/v1/rms/getMaterialList?apiId=351&con=" +this.inputText;
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/rms/getMaterialList?apiId=351&con=" + this.inputText;
     },
-    
-     makeSure() {
- 
-       console.log(this.form1) 
-       
-       let rmsTruckCalculate={
-         truckCalculateNumber:this.form1.truckCalculateNumber,   
-         truckCalculateId:this.form1.truckCalculateId,
-         truckCalculateLongitude:this.form1.truckCalculateLongitude,
-         truckCalculateLatitude:this.form1.truckCalculateLatitude,
-         calculateType:this.form1.calculateType,
-         };  
-         let map = {
-        mapList:this.mapList,
-        rmsTruckCalculate:rmsTruckCalculate
+
+    makeSure() {
+      console.log(this.form1);
+
+      let rmsTruckCalculate = {
+        truckCalculateNumber: this.form1.truckCalculateNumber,
+        truckCalculateId: this.form1.truckCalculateId,
+        truckCalculateLongitude: this.form1.truckCalculateLongitude,
+        truckCalculateLatitude: this.form1.truckCalculateLatitude,
+        calculateType: this.form1.calculateType,
       };
-         if(
+      let map = {
+        mapList: this.mapList,
+        rmsTruckCalculate: rmsTruckCalculate,
+      };
+      if (
         rmsTruckCalculate.truckCalculateNumber == null ||
         rmsTruckCalculate.truckCalculateLongitude == null ||
         rmsTruckCalculate.truckCalculateLatitude == null ||
-        rmsTruckCalculate.calculateType ==null
-         )this.$message.error("存在空值！");
-         
-       else
-      this.axios
-        .post(
-          "/api/v1/rms/insertTruckCalculate",map
-        )
-        .then((res) => {
+        rmsTruckCalculate.calculateType == null
+      )
+        this.$message.error("存在空值！");
+      else
+        this.axios.post("/api/v1/rms/insertTruckCalculate", map).then((res) => {
           if (res.data.code == 200) {
             this.$message({
               type: "success",
@@ -101,37 +99,36 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+          this.$refs["table"].resetField();
         });
     },
-   
+
     // 取消
     cancel() {
       this.$router.go(-1);
     },
-    
   },
 };
 </script>
 <style lang='scss' >
- .button-box{
-    display: flex;
-    justify-content: center;
-    .el-button{
-      width: 80px;
-      margin-right: 10px;
-    }
+.button-box {
+  display: flex;
+  justify-content: center;
+  .el-button {
+    width: 80px;
+    margin-right: 10px;
   }
-.inputBox{
+}
+.inputBox {
   display: flex;
   text-align: center;
   align-items: center;
-   margin-top: 2rem;
-   width: 800px;
-  .el-input__inner{
+  margin-top: 2rem;
+  width: 800px;
+  .el-input__inner {
     display: flex;
-  text-align: center;
-  align-items: center;
+    text-align: center;
+    align-items: center;
   }
 }
 .btn-left {
@@ -140,28 +137,28 @@ export default {
 .input {
   margin-left: 90px;
 }
-.label{
+.label {
   margin-left: 445px;
   margin-bottom: -30px;
   font: bold;
   font-size: 1rem;
   padding-left: -30px;
-  font-family:Arial, Helvetica, sans-serif;
-  margin-bottom:20px;
-} 
-.label2{
+  font-family: Arial, Helvetica, sans-serif;
+  margin-bottom: 20px;
+}
+.label2 {
   margin-left: 425px;
   margin-bottom: -30px;
   font: bold;
   font-size: 1rem;
-  font-family:Arial, Helvetica, sans-serif
+  font-family: Arial, Helvetica, sans-serif;
 }
-.label1{
+.label1 {
   margin-left: 345px;
   margin-bottom: -30px;
   font: bold;
 }
-.common{
+.common {
   font-weight: 700;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
     Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
@@ -169,35 +166,35 @@ export default {
   cursor: default;
   color: #2c3e50;
 }
-.f1{
+.f1 {
   margin-top: -2.5rem;
   margin-left: 25rem;
 }
-.f11{
+.f11 {
   margin-top: -3rem;
   // margin-left: 29rem;
 }
-.f2{
+.f2 {
   margin-top: -2.5rem;
   margin-left: 20.7rem;
 }
-.f3{
+.f3 {
   margin-top: -2.5rem;
   margin-left: 25rem;
 }
-.form-box{
+.form-box {
   display: flex;
   justify-content: center;
-  .el-form-item{
+  .el-form-item {
     display: flex;
     justify-content: center;
-    .el-form-item__label{
+    .el-form-item__label {
       display: flex;
       align-items: center;
     }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
+    .el-form-item__content {
+      .el-input {
+        .el-input__inner {
           width: 250px;
         }
       }

src/views/RMS/components/capacity.vue

@@ -25,13 +25,6 @@
             >
               修改
             </el-button>
-            <!-- <el-button
-              type="text"
-              size="mini"
-              @click="deleteCapacity(scope)"
-            >
-              删除
-            </el-button> -->
           </template>
         </el-table-column>
       </dilTable>
@@ -62,7 +55,7 @@ export default {
   },
   methods:{
     onclick(){
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&con=" +this.textInput;
+      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&con=" +this.textInput + "&i=" + new Date();
     },
      toInsert() {
       this.$router.push("/addCapacity");

src/views/TMS/components/purchaseChemicalMaterials/transportationReservation.vue

@@ -95,22 +95,31 @@ export default {
       },
     };
   },
+  watch:{
+    activeName(val){
+      if(val == 'first'){
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + getCookie("userId")+"&i="+ new Date();
+        }else{
+          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + null + "&i="+ new Date();
+        }
+      }else{
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&i="+ new Date();
+        }else{
+          this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + null + "&i="+ new Date();
+        }
+      }
+    }
+  },
   created() {
     //判断是否是承运商
     if (getCookie("orgCode") == "chengyunshang") {
-      this.option1.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
-        getCookie("userId");
-      this.option2.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
-        getCookie("userId");
+      this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + getCookie("userId");
+      this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + getCookie("userId");
     } else {
-      this.option1.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
-        null;
-      this.option2.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
-        null;
+      this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + null;
+      this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + null;
     }
   },
   methods: {
@@ -118,32 +127,16 @@ export default {
       if (this.activeName == "first") {
         //判断是否是承运商
         if (getCookie("orgCode") == "chengyunshang") {
-          this.option1.requestUrl =
-            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.input;
+          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&con=" + this.input;
         } else {
-          this.option1.requestUrl =
-            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
-            null +
-            "&con=" +
-            this.input;
+          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + null + "&con=" + this.input;
         }
       } else {
         //判断是否是承运商
         if (getCookie("orgCode") == "chengyunshang") {
-          this.option1.requestUrl =
-            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.input;
+          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&con=" + this.input;
         } else {
-          this.option1.requestUrl =
-            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
-            null +
-            "&con=" +
-            this.input;
+          this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + null + "&con=" + this.input;
         }
       }
     },

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -249,13 +249,6 @@ export default {
       },
     };
   },
-  watch: {
-    drawer(val) {
-      if (!val) {
-        this.input = null;
-      }
-    },
-  },
   created() {
     if (getCookie("orgCode") == "chengyunshang") {
       this.third.requestUrl =
@@ -293,7 +286,6 @@ export default {
               });
               this.form1 = [];
             } else {
-              console.log();
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
@@ -344,12 +336,24 @@ export default {
       }
     },
     ondrawer(num) {
+      this.input = null;
       this.drawer = true;
       this.a = num;
-      if (num == 2) {
-        this.secend.requestUrl =
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
-          this.materialId;
+      if(num == 1){
+        this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&i="+new Date();
+      }else if (num == 2) {
+        this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId +"&i=" +new Date();
+      }else if(num == 3){
+        //判断是否是承运商查询车辆
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + getCookie("userId") + "&i=" + new Date();
+        } else {
+          this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&i="+new Date(); 
+        }
+      }else if(num == 4){
+        this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=347&i=" + new Date();
+      }else if(num == 5){
+        this.option.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
       }
     },
     // 返回

src/views/inward/components/inwardImport/daZhou/addTruckLoad.vue

@@ -44,11 +44,9 @@ export default {
       totalResultIdList: [],
     };
   },
-
   created() {
     this.form.loadTime = new Date();
-  },
-
+  }, 
   methods: {
     selectionChange(val) {
       this.totalResultIdList = []