rms

config/index.js

@@ -57,6 +57,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/addCapacity.vue

@@ -43,6 +43,14 @@ export default {
   data() {
     return {
       form1: {},
+      form1Initialization : {
+        capacityTypeId : '汽车',
+        capacityNumber : '',
+        capacityCorlor : '黄',
+        capacityOwneris : '否',
+        capacityVip : '否',
+        capacityBlacklist : '否'
+      },
       value: undefined,
       carrierIds: null,
       state:null,
@@ -56,6 +64,7 @@ export default {
   },
   created(){
       this.carrierUserId = getCookie("userId");
+      this.form1 = this.form1Initialization;
       console.log(this.carrierUserId ,'carrierUserId')
       
   },

src/views/RMS/components/addConsignee.vue

@@ -1,10 +1,32 @@
 <template>
   <!-- 添加收货客户信息 -->
-  <div class="addWagonLoad">
+  <div class="addConsignee">
     <PageTitle>返回</PageTitle>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="367" v-model="form1" ref="from1"></dil-form>
       </div>
+      <div class="f-box">
+         <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="收货单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateConsignee"
+          :fetch-suggestions="querySearchConsignee"
+          placeholder="请输入收货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectConsignee"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.consigneeCompanyName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+        </el-form>
+      </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -20,10 +42,39 @@ export default {
   data() {
     return {
       form1: {},
+      stateConsignee:null,
+      restaurantsConsignee:null,
     };
   },
   mounted() {},
   methods: {
+        //收货单位弹出层
+    handleSelectConsignee(item){
+      console.log(this.consigneeId)
+      this.consigneeId = item.consigneeId
+      item.consigneeCompanyName = this.consigneeCompanyName
+      console.log(this.consigneeId)
+      console.log('这是选中的收货单位')
+    },
+    //以下是发货单位边输边查搜索
+    querySearchConsignee(queryString, cb) {
+      this.axios.post('/api/v1/uc/getConsigneeByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          console.log(res)
+          var restaurantsConsignee = res.data.data
+          var results = queryString ? restaurantsConsignee.filter(this.createFilterConsignee(queryString)) :restaurantsConsignee;
+            // 调用 callback 返回建议列表的数据
+          console.log(results,"results");
+          cb(results);
+        }
+      })    
+      },
+    createFilterConsignee(queryString) {
+        return (restaurantsConsignee) => {
+          return (restaurantsConsignee.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+      //以上是收货单位边输边查搜索
      makeSure() {
        console.log(this.form1)
        let RmsConsignee={
@@ -34,16 +85,12 @@ export default {
          consigneeRegistrationTime:this.form1.consigneeRegistrationTime,
          consigneeContactName:this.form1.consigneeContactName,
          consigneeContactTel:this.form1.consigneeContactTel,
+         consigneeFarId:this.consigneeId
        };
-              console.log("RmsConsignee",RmsConsignee)
+        console.log("RmsConsignee",RmsConsignee)
+
        if(
-        RmsConsignee.companyName == null ||
-        RmsConsignee.consigneeAbbreviation==null ||
-        RmsConsignee. consigneeRegisteredAddress ==null ||
-        RmsConsignee.consigneeReceiveAddress == null ||
-        RmsConsignee.consigneeRegistrationTime == null ||
-        RmsConsignee.consigneeContactName == null ||
-        RmsConsignee.consigneeContactTel == null
+        RmsConsignee.companyName == null
        )this.$message.error("存在空值！");
        else
          this.axios
@@ -64,7 +111,6 @@ export default {
             } else {
               this.$message.error("新增失败,可能有重复");
             }
-          // this.$refs['table'].resetField();
           });
     },
     // 取消
@@ -75,6 +121,10 @@ export default {
 };
 </script>
 <style lang='scss' >
+  .addConsignee{
+  .f-box{
+    margin-left: 36%;
+  }
   .button-box{
     display: flex;
     justify-content: center;
@@ -105,4 +155,6 @@ export default {
       }
     }
   }
+  }
+  
 </style>

src/views/RMS/components/addSupplier.vue

@@ -1,10 +1,33 @@
 <template>
   <!-- 添加供应商信息 -->
-  <div class="addWagonLoad">
+  <div class="addSupplier">
     <PageTitle>返回</PageTitle>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="320" v-model="form1" ref="from1"></dil-form>
-      </div>
+     </div>
+     <div class="f-box">
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <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>  
+     </div>
+     
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -21,10 +44,38 @@ export default {
     return {
       form1: {},
       value: undefined,
+       //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      restaurantsSupplier:null,
+      stateSupplier:null,
     };
   },
   mounted() {},
   methods: {
+    //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      item.supplierName = this.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    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);
+        };
+      },
+      //以上是发货单位边输边查搜索
      makeSure() {
        console.log(this.form1)
       let RmsSupplier = {
@@ -32,14 +83,12 @@ export default {
         supplierAddress: this.form1.supplierAddress,
         supplierRegisterDate: this.form1.supplierRegisterDate,
         supplierContactsName: this.form1.supplierContactsName,
-        supplierContactNumber: this.form1.supplierContactNumber
+        supplierContactNumber: this.form1.supplierContactNumber,
+        supplierId:this.supplierId
       };
+      console.log(RmsSupplier);
       if(
-        RmsSupplier.supplierName==null ||
-        RmsSupplier.supplierAddress==null ||
-        RmsSupplier.supplierRegisterDate==null ||
-        RmsSupplier.supplierContactsName==null ||
-        RmsSupplier.supplierContactNumber==null 
+        RmsSupplier.supplierName==null
       )this.$message.error("存在空值！");
       else
       this.axios
@@ -69,7 +118,8 @@ export default {
 };
 </script>
 <style lang='scss' >
- .button-box{
+ .addSupplier{
+    .button-box{
     display: flex;
     justify-content: center;
     .el-button{
@@ -77,6 +127,9 @@ export default {
       margin-right: 10px;
     }
   }
+  .f-box{
+    margin-left: 38%;
+  }
 .form-box{
   display: flex;
   justify-content: center;
@@ -97,4 +150,6 @@ export default {
     }
   }
 }
+ }
+ 
 </style>

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/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12",
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=12&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=15&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/grossWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12",
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=15",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=15&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12",
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/tareWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12",
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/unload.vue

@@ -20,13 +20,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=12",
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=15",
       },
     };
   },
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=15&con=" + this.input;
     },
    }
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/enFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13",
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/grossWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=13",
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=422&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=422&orderType=16&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/load.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=404&orderType=13",
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=404&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=13&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=16&con=" + this.input;
     },
    }
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/outFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13",
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13",
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=16&con=" + this.input;
     },
   },
 };

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

@@ -17,7 +17,6 @@
           placeholder="请输入发货单位名称"
           :trigger-on-focus="false"
           @select="handleSelectSupplier"
-          @input="oninputSupplier"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.supplierName }}</div>
@@ -38,7 +37,6 @@
           placeholder="请输入收货单位名称"
           :trigger-on-focus="false"
           @select="handleSelectConsignee"
-          @input="oninputConsignee"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.consigneeCompanyName }}</div>
@@ -89,7 +87,6 @@
           placeholder="请输入承运商名称"
           :trigger-on-focus="false"
           @select="handleSelectCarrier"
-          @input="oninputCarrier"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.carrierName }}</div>
@@ -108,6 +105,7 @@
           v-model="materialTimes"
           placeholder="趟次"
           :trigger-on-focus="false"
+          @input="onInputTimes()"
         >
         </el-input>
         </el-form-item>
@@ -175,6 +173,7 @@
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.materialPriority"
+                  @input="onInputPriority(scope.row.materialPriority)"
                 ></el-input>
               </template>
               <!-- 物资件数 -->
@@ -182,12 +181,14 @@
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
                 ></el-input>
               </template>
               <!-- 物资重量 -->
                <template v-if="item.prop == 'orderMaterialWeight'">
                 <el-input
                   v-model.number="scope.row.orderMaterialWeight"
+                  @input="onInputWeight(scope.row.orderMaterialWeight)"
                 ></el-input>
               </template>           
             </template>
@@ -247,18 +248,6 @@
       >
         <i class="el-icon-search"></i>查询
       </el-button>
-       <div v-show="a == 1">
-        <dilTable
-          v-bind.sync="receiveOptions"
-          @radio-change="currentRadioChange1"
-        ></dilTable>
-      </div>
-      <div v-show="a == 2">
-        <dilTable
-          v-bind.sync="secend"
-          @radio-change="currentRadioChange2"
-        ></dilTable>
-      </div>
       <div v-show="a == 5">
         <dilTable
           v-bind.sync="line"
@@ -275,6 +264,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -362,12 +352,11 @@ export default {
       input: "",
       //物资模态框
       materialOptions:{
-          requestUrl:
-            "/api/v1/uc/selectAllMaterialName?apiId=395",
-           selectionType: "select",
+          requestUrl:"",
+          selectionType: "select",
       },
       line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        requestUrl: "",
         selectionType: "radio",
       },
       row: {},
@@ -395,8 +384,29 @@ export default {
     },
   },
   methods: {
+    onInputTimes(){
+      console.log(this.materialTimes)
+      if(!isNumber(this.materialTimes)){
+        this.$message.warning('趟次请输入数字')
+      }
+    },
+    onInputPriority(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('装卸货次序请输入数字')
+      }
+    },
+    onInputWeight(scope){
+      console.log(scope)
+      if(!isNumber(scope)){
+        this.$message.warning('重量请输入数字')
+      }
+    },
+    onInputNumber(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('件数请输入数字')
+      }
+    },
     drawTable(){
-      console.log('jll')
       this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&test=1"
       this.selectionList1 = []
       this.table = true
@@ -518,40 +528,20 @@ export default {
       this.selectionList1 = selection;
     },
     onclick(a) {
-      if (a == 1) {
-        this.frist.requestUrl =
-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input;
-      } else if (a == 2) {
-        this.secend.requestUrl =
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247" +
-          "&index=" +
-          this.input;
-      } else if (a == 5) {
-        this.option.requestUrl =
+      if (a == 5) {
+        this.line.requestUrl =
           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
       }
     },
     ondrawer(num) {
+      this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&test=1";
       this.drawer = true;
       this.a = num;
     },
     // 返回
     onClickCancel() {
-      this.$router.push("/importedFuel/transportReserveRan");
-    },
-    currentRadioChange1(selection) {
-      console.log(selection);
-      this.receiveName = selection.consigneeCompanyName;
-      this.receiveId = selection.consigneeId;
-    },
-    currentRadioChange2(selection) {
-      this.supplierName = selection.supplierName;
-      this.supplierId = selection.supplierId;
-    },
-    currentRadioChange4(selection) {
-      this.unloadPointId = selection.warehouseId;
-      this.unloadPointName = selection.warehouseName;
+      this.$router.push("/mornThanTransportAppoint");
     },
     currentRadioChange5(selection) {
       console.log(selection)
@@ -560,24 +550,10 @@ export default {
       }else{
           this.lineName = selection.lineName+'  '+selection.lineDesk 
           this.lineId = selection.lineId;
-      }
-      
-    },
-    currentRadioChange3(selection) {
-      this.carriermapList = [];
-      this.carriermapList = selection;
-    },
-    jgao(){
-      this.$alert('有数据未填写')
-      return
+      }    
     },
     // 确认
     makeSure() {
-        console.log(this.supplierId,"this.supplierId")
-        console.log(this.consigneeId,"this.consigneeId")
-        console.log(this.carrierId,"this.carrierId")
-        console.log(this.lineId,"this.lineId")
-        console.log(this.tableData)
         if(this.supplierId==null||this.lineId==null||this.carrierId==null||this.consigneeId==null){
           this.$alert('存在空值')
           return

src/views/SporadicManage/components/moreThanMaterialTruck/transportAppoint/transportAppoint.vue

@@ -62,18 +62,25 @@ export default {
       option1: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15",
+          "",
         // 控制显示多选列
         selectionType: "select",
       },
       option2: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15",
+          "",
       },
       selection: [],
     };
   },
+  created(){
+      console.log('-----sj');
+      console.log(new Date())
+      console.log('-----sj');
+      this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&dispatchStatus=0",
+      this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&sporadicStatus=1"
+  },
   methods: {
     //获取选中的订单
     selectionChange(selection) {
@@ -82,16 +89,21 @@ export default {
     onclick() {
       if (this.activeName == "first") {
         this.option1.requestUrl =
-          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&con=" +
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&dispatchStatus=0&con=" +
           this.input;
       } else {
         this.option2.requestUrl =
-          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&con=" +
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&sporadicStatus=1&con=" +
           this.input;
       }
     },
     handleClick(tab, event) {
-      console.log(tab, event);
+      
+      this.option1.requestUrl = this.option1.requestUrl + "&test=" + new Date()
+      this.option2.requestUrl = this.option2.requestUrl + "&test=" + new Date()
+      console.log(this.option1.requestUrl)
+      console.log(this.option2.requestUrl)
+     
     }, // 下发
     // 下发
     sendClick() {
@@ -100,9 +112,8 @@ export default {
         .post("/api/v1/ams/issueSporadicOrders", this.maplist)
         .then((res) => {
           if (res.data.code == "200") {
-            this.option1.requestUrl =
-              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&test=1"
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&test=1"
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&dispatchStatus=0&test=" + new Date();
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&sporadicStatus=1&test=" + new Date();
             this.$message({
               type: "success",
               message: "下发成功!",
@@ -120,10 +131,8 @@ export default {
         )
         .then((res) => {
           if (res.data.code == "200") {
-            this.option1.requestUrl =
-              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&test=1";
-            this.option2.requestUrl =
-            "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&test=1"
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&dispatchStatus=0&test=" + new Date();
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&sporadicStatus=1&test=" + new Date();
             this.$message({
               type: "success",
               message: "删除成功!",

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/addTransportOrder.vue

@@ -36,26 +36,6 @@
           align="center"
           show-overflow-tooltip
         >
-          <template slot="scope" v-if="item.label !== '重量'">
-            <span>{{ item.label }}</span>
-          </template>
-          <!-- 插入输入框 -->
-          <template slot-scope="scope">
-            <template v-if="item.slot">
-              <!-- 物资重量 -->
-              <template v-if="item.prop == 'orderPlanWeight'">
-                <el-input
-                  class="textinput"
-                  @input="onInput"
-                  placeholder="请输入内容(必填)"
-                  v-model.number="scope.row.orderPlanWeight"
-                ></el-input>
-              </template>
-            </template>
-            <template v-else>
-              <span>{{ scope.row[item.prop] }}</span>
-            </template>
-          </template>
         </el-table-column>
         <!-- 操作列 -->
         <el-table-column fixed="right" label="操作" width="100">
@@ -120,7 +100,6 @@
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
 import { getCookie } from "@/utils/util.js";
@@ -129,11 +108,12 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      //零星订单ID
+      sporadicOrderId:null,
+      //运输订单ID
+      orderId:null,
       //线路名称
       lineName:null,
-      lineId:null,
-      //线路表格单选缓存数据的
-      cacheLine:[],
       //已经选择车辆物资信息
       selectionList:[],
       //销售订单物资信息
@@ -147,49 +127,19 @@ export default {
       //当前选中的物资id
       materialId: null,
       //当前选中的物资名称
-      materialName: null,
-      //选中的线路名称
-      lineName: null,
-      //选中的线路id
-      lineId: null,
-      //是否打开选择线路的模态框
-      drawer:false,
+      materialName: null,   
       //是否打开选择车辆的模态框
       truckDrawer:false,
-      //是否打开收货地址的模态框
-      addressDrawer:false,
-      //线路的表格
-      line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
-        selectionType: "radio",
-      },
       //车辆的表格
       truck: {
         requestUrl: "",
         selectionType: "select",
       },
-      //收货地址的表格
-      Address: {
-        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
-        selectionType: "radio",
-      },
-      addressText:null,
-      //线路表格的框计算输入的值
-      lineText:null,
       tableTop: [
         {
           prop: "capacityNumber",
           label: "车牌号",
-        },
-        {
-          prop: "materialName",
-          label: "物资名称",
-        },
-        {
-          prop: "orderPlanWeight",
-          label: "重量",
-          slot: true,
-        },
+        }
       ],
       truckText:null,
       //当前多选选中的车辆
@@ -201,11 +151,13 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
         getCookie("userId");
+      this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&dispatchStatus=0&carrierSsoId=" + getCookie("userId");
     } else {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+      this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&dispatchStatus=0";
     }
-    this.option.requestUrl = "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" + this.$route.params.saleOrderId;
+    
   },
   methods: {
     onInput(val){
@@ -214,12 +166,10 @@ export default {
       }
     },
     //点击确定按钮的事件
-    makeSure(){
-      let state = false;
-      console.log(this.selectionList)
-      if(state){
-        this.axios.post('/api/v1/ams/dispatchTruckOrderBySale',{
-          saleOrderId:this.$route.params.saleOrderId,
+    makeSure(){   
+        this.axios.post('/api/v1/ams/addSporadicOrderTimes',{
+          orderId:this.orderId,
+          sporadicOrderId:this.sporadicOrderId,
           mapList:this.selectionList,
         }).then((res)=>{
           if(res.data.code == '200'){
@@ -227,63 +177,21 @@ export default {
             this.cancel();
           }
         })
-      }else{
-        this.$message.warning('重量请输入数字')
-      }
     },
     //点击取消按钮的事件
     cancel(){
-      this.$router.push('/saleOrder')
+      this.$router.push('/mornThanTransportOrder')
     },
     //点击删除按钮删除当前点击的对象
     deleteRow(index){
       this.selectionList.splice(index,1)
     },
-    //复制的方法
-    copyRow(index,row){
-      let arr = [];
-      for(var i = 0 ;i<this.selectionList.length; i++){
-        if(i == index){
-          arr.push(this.selectionList[i]);
-          arr.push({
-            capacityId:row.capacityId,
-            capacityNumber:row.capacityNumber,
-            carrierName:row.carrierName,
-            lineId:row.lineId,
-            lineName:row.lineName,
-            materialId:row.materialId,
-            materialName:row.materialName,
-            orderPlanWeight:row.orderPlanWeight,
-            saleDateOfReceipt:row.saleDateOfReceipt,
-            saleMaterialId:row.saleMaterialId,
-            saleOrderConsignee:row.saleOrderConsignee,
-            saleOrderConsigneeTel:row.saleOrderConsigneeTel,
-            saleShipperAddressName:row.saleShipperAddressName,
-            saleShippingAddressId:row.saleShippingAddressId,
-          }
-          )
-        }else{
-          arr.push(this.selectionList[i]);
-        }
-      }
-      this.selectionList = [];
-      this.selectionList = arr;
-    },
     //车辆模态框的确定事件
     AddTruckClick(){
-      console.log(this.selectTruck)
       this.selectTruck.forEach(e => {
-        // console.log(e)
         this.selectionList.push({
-          //销售订单与物资表主键
-          saleMaterialId:this.saleMaterialId,
           capacityId:e.capacityId,
           capacityNumber:e.capacityNumber,
-          carrierName:e.carrierName,
-          materialName:this.materialName,
-          materialId:this.materialId,
-          lineName:this.lineName,
-          lineId:this.lineId,
         })
       });
       this.truckDrawer = false;
@@ -306,24 +214,12 @@ export default {
     },
     //主界面表格单选
     currentRadioChange(row) {
-      this.materialId = row.materialId;
-      this.materialName = row.materialName;
-      this.saleMaterialId = row.saleMaterialId;
-    },
-    //线路表格的单选事件
-    currentRadioChange5(row){
-      this.cacheLine = row;
+      console.log(row)
+      this.sporadicOrderId = row.sporadicOrderId
+      this.orderId = row.orderId
     },
-    onClick(num) {
-      if (num == 1) {
-        this.drawer = true;
-      }else if(num == 2){
-        if(!this.materialId){
-          this.$message.warning('请选择物资后，在点击')
-        }else{
-          this.truckDrawer = true;
-        }
-      }
+    onClick() {
+        this.truckDrawer = true
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/transportOrder.vue

@@ -6,64 +6,12 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="Insert" v-if="activeName == 'option'">
+      <el-button type="primary" @click="Insert" v-if="activeName == 'first'">
         <i class="el-icon-plus"></i>新增
       </el-button>
-      <el-button type="primary" @click="Issue" v-if="activeName == 'option'">
-        <i class="el-icon-download"></i>下发
-      </el-button>
     </div>
     <div class="transportOrder_bottom">
-      <el-tabs v-model="activeName">
-        <!-- 未下发 -->
-        <el-tab-pane label="未下发" name="option">
-          <dilTable
-            v-bind.sync="option"
-            ref="table"
-            @selection-change="selectionChange"
-          >
-            <el-table-column fixed="right" label="操作" width="150">
-              <template slot-scope="scope">
-                <el-button @click="detailclick(scope.row)" type="text">
-                  物资详情
-                </el-button>
-                <el-button
-                  type="text"
-                  @click="addTruck(scope.row, 1)"
-                  v-if="!scope.row.capacityNumber"
-                >
-                  添加运力
-                </el-button>
-                <el-button type="text" @click="addTruck(scope.row, 2)" v-else>
-                  修改
-                </el-button>
-              </template>
-            </el-table-column>
-            <!-- 物资详情 -->
-            <el-table-column type="expand" width="1">
-              <template slot-scope="props">
-                <el-form
-                  label-position="center"
-                  inline
-                  class="demo-table-expand"
-                >
-                  <div v-if="false">{{ props }}</div>
-                  <div>
-                    <el-table :data="tableData">
-                      <el-table-column
-                        v-for="(item, i) in tableHead"
-                        :key="i"
-                        :prop="item.prop"
-                        :label="item.label"
-                        :width="item.width"
-                      ></el-table-column>
-                    </el-table>
-                  </div>
-                </el-form>
-              </template>
-            </el-table-column>
-          </dilTable>
-        </el-tab-pane>
+      <el-tabs v-model="activeName" @tab-click="handleClick">
         <!-- 已下发 -->
         <el-tab-pane label="已下发" name="first">
           <dilTable v-bind.sync="first"></dilTable>
@@ -73,65 +21,7 @@
           <dilTable v-bind.sync="Received"></dilTable>
         </el-tab-pane>
       </el-tabs>
-    </div>
-
-    <!-- <el-dialog
-      title="请选择车辆"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      width="30%"
-      show-close
-      modal
-      lock-scroll
-    >
-     <el-drawer
-      title="请选择车辆信息"
-      :visible.sync="drawer"
-      :direction="direction"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :wrapperClosable="false"
-      modal
-      show-close
-    >
-      <div class="drawer_top">
-        <el-input placeholder="请输入内容" v-model="inputText" clearable>
-        </el-input>
-        <el-button type="primary" class="btn" @click="inputClick">
-          <i class="el-icon-search"></i>查询
-        </el-button>
-      </div>
-      <div class="drawer_bottom">
-        <dilTable
-          v-bind.sync="truck"
-          @radio-change="currentRadioChange"
-        ></dilTable>
-      </div>
-    </el-drawer>
-    </el-dialog> -->
-    <el-drawer
-      title="请选择车辆信息"
-      :visible.sync="drawer"
-      :direction="direction"
-      :destroy-on-close="true"
-      :before-close="handleClose"
-    >
-      <div class="drawer_top">
-        <el-input placeholder="请输入内容" v-model="inputText" clearable>
-        </el-input>
-        <el-button type="primary" class="btn" @click="inputClick">
-          <i class="el-icon-search"></i>查询
-        </el-button>
-      </div>
-      <div class="drawer_bottom">
-        <dilTable
-          v-bind.sync="truck"
-          @radio-change="currentRadioChange"
-        ></dilTable>
-      </div>
-    </el-drawer>
+    </div> 
   </div>
 </template>
 
@@ -148,17 +38,10 @@ export default {
       //输入框的值
       input: "",
       //选项卡的当前选中的值
-      activeName: "option",
-      //未下发的表格
-      option: {
-        requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + '',
-        selectionType: "select",
-      },
+      activeName: "first",
       //已下发的表格
       first: {
-        requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +'',
+        requestUrl:"",
       },
       //车辆信息的表格
       truck: {
@@ -167,7 +50,7 @@ export default {
         selectionType: "radio",
       },
       Received:{
-        requestUrl: "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +'',
+        requestUrl: "",
       },
       //物资信息的数据
       tableData: [],
@@ -207,115 +90,24 @@ export default {
   },
   created(){
       this.carrierUserId = getCookie('userId')
-      console.log(this.carrierUserId)
-      this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId ,
-      this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
-      this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId ,
-      this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId 
+      if(getCookie('orgCode') == "dagangadmin"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4"
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5"
+      }else{
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" + this.carrierUserId ,
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + this.carrierUserId 
+      }     
   },
   methods: {
-    handleClose(done){
-        this.determine();
-        done();
-    },
     onclick(){
-      if(this.input != ''){
-        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input +"&carrierId=" + getCookie('userId');
-      }else{
-        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.userCarrierId
-      }     
-    },
-    //下发
-    Issue() {
-      if (this.selectionList.length == 0) {
-        this.$message({
-          message: "请选择订单！",
-          type: "warning",
-        });
-      } else {
-        this.selectionList.forEach((e) => {
-          if (!e.capacityNumber) {
-            this.$message({
-              message: "订单号为: " + e.orderNumber + "没有车牌号！",
-              type: "warning",
-            });
-          } else {
-            this.axios.post("/api/v1/oms/dispatchOrder",{mapList:this.selectionList}).then((res) => {
-              if (res.data.code == "200") {
-                this.$message({
-                  message: "下发成功",
-                  type: "success",
-                });
-                this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId +"&test=1",
-                this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId +"&test=1",
-                this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId +"&test=1" ,
-                this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId +"&test=1"
-              }
-            });
-          }
-        });
-      }
-    },
-    //对话框点击确定，执行增加车牌号
-    determine() {
-      this.axios
-        .post("/api/v1/oms/updateOmstruckOrder", {
-          orderId: this.selectOrderId,
-          capacityId: this.capacityId,
-        })
-        .then((res) => {
-          if (res.data.code == "200") {
-            if (this.index == 1) {
-              this.$message({
-                message: "添加成功！",
-                type: "success",
-              });
-            } else if (this.index == 2) {
-              this.$message({
-                message: "修改成功！",
-                type: "success",
-              });
-            }
-            this.dialogVisible = false;
-            this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId +"&test=1",
-            this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId +"&test=1",
-            this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId +"&test=1" ,
-            this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId +"&test=1"
-          }
-        });
-    },
-    //多选的选中的数据
-    selectionChange(selection) {
-      this.selectionList = [];
-      selection.forEach((element) => {
-        this.selectionList.push({
-          orderId: element.orderId,
-          capacityNumber: element.capacityNumber,
-          orderNumber: element.orderNumber,
-        });
-      });
-    },
-    //单选按钮选中的值
-    currentRadioChange(row) {
-      this.capacityId = row.carrierId;
-      this.capacityNumber = row.capacityNumber;
-    },
-    //打开模态窗口
-    // onDrawer() {
-    //   this.drawer = true;
-    // },
-    //弹出消息窗口
-    addTruck(row, index) {
-      this.index = index;
-      if (index == 1) {
-        this.selectOrderId = row.orderId;
-        this.drawer = true;
-      } else if (index == 2) {
-        this.selectOrderId = row.orderId;
-        this.capacityNumber = row.capacityNumber;
-        this.drawer = true;
-      }
+      console.log("dianji")
     },
+    handleClick(tab, event) {
+      this.first.requestUrl = this.first.requestUrl + "&test=" + new Date()
+      this.Received.requestUrl = this.Received.requestUrl + "&test=" + new Date()
+      console.log(this.first.requestUrl,this.Received.requestUrl)
+
+    }, // 下发
     // 查看物资详情
     detailclick(row) {
       // 记录重复点击次数
@@ -341,16 +133,6 @@ export default {
       this.oldRow = row;
       this.materialDetails(row.orderId);
     },
-    //框计算
-    onclick() {
-      if (this.activeName == "option") {
-        this.option.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId= &type=2&con=" +
-          this.input;
-      } else {
-        this.first.requestUrl = "con=" + this.input;
-      }
-    },
     //查看当前订单的物资信息
     materialDetails(orderId) {
       this.axios

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/load.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=404&orderType=13",
+        requestUrl: "/api/v1/tms/getAllLoadResult?apiId=404&orderType=13&status=0",
       },
     };
   },
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=13&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=13&status=0&con=" + this.input;
     },
    }
 };

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

@@ -17,7 +17,6 @@
           placeholder="请输入发货单位名称"
           :trigger-on-focus="false"
           @select="handleSelectSupplier"
-          @input="oninputSupplier"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.supplierName }}</div>
@@ -38,7 +37,6 @@
           placeholder="请输入收货单位名称"
           :trigger-on-focus="false"
           @select="handleSelectConsignee"
-          @input="oninputConsignee"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.consigneeCompanyName }}</div>
@@ -89,7 +87,6 @@
           placeholder="请输入承运商名称"
           :trigger-on-focus="false"
           @select="handleSelectCarrier"
-          @input="oninputCarrier"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.carrierName }}</div>
@@ -160,6 +157,7 @@
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.materialPriority"
+                  @input="onInputPriority(scope.row.materialPriority)"
                 ></el-input>
               </template>
               <!-- 物资件数 -->
@@ -167,12 +165,14 @@
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
                 ></el-input>
               </template>
               <!-- 物资重量 -->
                <template v-if="item.prop == 'orderMaterialWeight'">
                 <el-input
                   v-model.number="scope.row.orderMaterialWeight"
+                  @input="onInputWeight(scope.row.orderMaterialWeight)"
                 ></el-input>
               </template>           
             </template>
@@ -232,18 +232,6 @@
       >
         <i class="el-icon-search"></i>查询
       </el-button>
-       <div v-show="a == 1">
-        <dilTable
-          v-bind.sync="receiveOptions"
-          @radio-change="currentRadioChange1"
-        ></dilTable>
-      </div>
-      <div v-show="a == 2">
-        <dilTable
-          v-bind.sync="secend"
-          @radio-change="currentRadioChange2"
-        ></dilTable>
-      </div>
       <div v-show="a == 5">
         <dilTable
           v-bind.sync="line"
@@ -260,6 +248,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -320,6 +309,7 @@ export default {
           slot: true,
         },
       ],
+      consigneeId:null,
       // 收货单位ID
       receiveId:null,
       //承运商ID
@@ -381,6 +371,22 @@ export default {
     },
   },
   methods: {
+    onInputPriority(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('装卸货次序请输入数字')
+      }
+    },
+    onInputWeight(scope){
+      console.log(scope)
+      if(!isNumber(scope)){
+        this.$message.warning('重量请输入数字')
+      }
+    },
+    onInputNumber(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('件数请输入数字')
+      }
+    },
     drawTable(){
       console.log('jll')
       this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&test=1"
@@ -525,20 +531,7 @@ export default {
     },
     // 返回
     onClickCancel() {
-      this.$router.push("/importedFuel/transportReserveRan");
-    },
-    currentRadioChange1(selection) {
-      console.log(selection);
-      this.receiveName = selection.consigneeCompanyName;
-      this.receiveId = selection.consigneeId;
-    },
-    currentRadioChange2(selection) {
-      this.supplierName = selection.supplierName;
-      this.supplierId = selection.supplierId;
-    },
-    currentRadioChange4(selection) {
-      this.unloadPointId = selection.warehouseId;
-      this.unloadPointName = selection.warehouseName;
+      
     },
     currentRadioChange5(selection) {
       console.log(selection)
@@ -547,24 +540,10 @@ export default {
       }else{
           this.lineName = selection.lineName+'  '+selection.lineDesk 
           this.lineId = selection.lineId;
-      }
-      
-    },
-    currentRadioChange3(selection) {
-      this.carriermapList = [];
-      this.carriermapList = selection;
-    },
-    jgao(){
-      this.$alert('有数据未填写')
-      return
+      } 
     },
     // 确认
     makeSure() {
-        console.log(this.supplierId,"this.supplierId")
-        console.log(this.consigneeId,"this.consigneeId")
-        console.log(this.carrierId,"this.carrierId")
-        console.log(this.lineId,"this.lineId")
-        console.log(this.tableData)
         if(this.supplierId==null||this.lineId==null||this.carrierId==null||this.consigneeId==null){
           this.$alert('存在空值')
           return

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue

@@ -62,14 +62,14 @@ export default {
       option1: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12",
+          "/api/v1/ams/getSporadicOrdersList?apiId=427&issueStatus=0&orderType=12",
         // 控制显示多选列
         selectionType: "select",
       },
       option2: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12",
+          "/api/v1/ams/getSporadicOrdersList?apiId=427&issueStatus=1&orderType=12",
       },
       selection: [],
     };

src/views/SporadicManage/components/sporadicMaterial/transportOrder/transportOrder.vue

@@ -63,51 +63,16 @@
         </el-tab-pane>
         <!-- 已下发 -->
         <el-tab-pane label="已下发" name="first">
-          <dilTable v-bind.sync="first"></dilTable>
+          <dilTable v-bind.sync="first">
+          </dilTable>
         </el-tab-pane>
         <!-- 已接收 -->
         <el-tab-pane label="已接收" name="Received">
-          <dilTable v-bind.sync="Received"></dilTable>
+          <dilTable v-bind.sync="Received">
+          </dilTable>
         </el-tab-pane>
       </el-tabs>
     </div>
-
-    <!-- <el-dialog
-      title="请选择车辆"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      width="30%"
-      show-close
-      modal
-      lock-scroll
-    >
-     <el-drawer
-      title="请选择车辆信息"
-      :visible.sync="drawer"
-      :direction="direction"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :wrapperClosable="false"
-      modal
-      show-close
-    >
-      <div class="drawer_top">
-        <el-input placeholder="请输入内容" v-model="inputText" clearable>
-        </el-input>
-        <el-button type="primary" class="btn" @click="inputClick">
-          <i class="el-icon-search"></i>查询
-        </el-button>
-      </div>
-      <div class="drawer_bottom">
-        <dilTable
-          v-bind.sync="truck"
-          @radio-change="currentRadioChange"
-        ></dilTable>
-      </div>
-    </el-drawer>
-    </el-dialog> -->
     <el-drawer
       title="请选择车辆信息"
       :visible.sync="drawer"
@@ -149,25 +114,33 @@ export default {
       //未下发的表格
       option: {
         requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + '',
+          "" ,
         selectionType: "select",
       },
       //已下发的表格
       first: {
         requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +'',
+          "" ,
       },
       //车辆信息的表格
       truck: {
-        requestUrl: "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + '',
+        requestUrl: "" ,
         // 控制显示当选列
         selectionType: "radio",
       },
       Received:{
-        requestUrl: "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +'',
+        requestUrl: "",
       },
+      oldRow:"",
+      oldRowCount:1,
+      oldRow1:"",
+      oldRowCount1:1,
+      oldRow2:"",
+      oldRowCount2:1,
       //物资信息的数据
       tableData: [],
+      tableData1:[],
+      tableData2:[],
       //物资信息的表头
       tableHead: [
         {
@@ -203,14 +176,26 @@ export default {
     };
   },
   created(){
-      this.carrierUserId = getCookie('userId')
-      console.log(this.carrierUserId)
-      this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId ,
-      this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
-      this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId ,
-      this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId 
+    this.createdLike()
   },
   methods: {
+    createdLike(){
+        if(getCookie("orgCode") == "chengyunshang"){
+        this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+        this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + getCookie("userId") 
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") 
+        this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + getCookie("userId")
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId") 
+    }else{
+        this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null ;
+        this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3" 
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" 
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" 
+    }      
+    },
     handleClose(done){
       if(this.capacityId == null){
         done();
@@ -220,13 +205,6 @@ export default {
         done();
       }      
     },
-    onclick(){
-      if(this.input != ''){
-        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input +"&carrierId=" + getCookie('userId');
-      }else{
-        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.userCarrierId
-      }     
-    },
     //下发
     Issue() {
       if (this.selectionList.length == 0) {
@@ -248,10 +226,10 @@ export default {
                   message: "下发成功",
                   type: "success",
                 });
-                this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId +"&test=1",
-                this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId +"&test=1",
-                this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId +"&test=1" ,
-                this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId +"&test=1"
+               this.first.requestUrl = this.first.requestUrl + "&test=1" 
+               this.option.requestUrl = this.option.requestUrl + "&test=1" 
+               this.Received.requestUrl = this.Received.requestUrl + "&test=1" 
+               this.truck.requestUrl = this.truck.requestUrl + "&test=1" 
               }
             });
           }
@@ -272,17 +250,21 @@ export default {
                 message: "添加成功！",
                 type: "success",
               });
+               this.first.requestUrl = this.first.requestUrl + "&test=1" 
+               this.option.requestUrl = this.option.requestUrl + "&test=1" 
+               this.Received.requestUrl = this.Received.requestUrl + "&test=1" 
+               this.truck.requestUrl = this.truck.requestUrl + "&test=1" 
             } else if (this.index == 2) {
               this.$message({
                 message: "修改成功！",
                 type: "success",
               });
+              this.first.requestUrl = this.first.requestUrl + "&test=1" 
+              this.option.requestUrl = this.option.requestUrl + "&test=1" 
+              this.Received.requestUrl = this.Received.requestUrl + "&test=1" 
+              this.truck.requestUrl = this.truck.requestUrl + "&test=1" 
             }
-            this.dialogVisible = false;
-            this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId +"&test=1",
-            this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId +"&test=1",
-            this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId +"&test=1" ,
-            this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId +"&test=1"
+           
           }
         });
     },
@@ -299,13 +281,9 @@ export default {
     },
     //单选按钮选中的值
     currentRadioChange(row) {
-      this.capacityId = row.carrierId;
+      this.capacityId = row.capacityId;
       this.capacityNumber = row.capacityNumber;
     },
-    //打开模态窗口
-    // onDrawer() {
-    //   this.drawer = true;
-    // },
     //弹出消息窗口
     addTruck(row, index) {
       this.index = index;
@@ -343,15 +321,85 @@ export default {
       this.oldRow = row;
       this.materialDetails(row.orderId);
     },
+    // 查看物资详情
+    detailclick1(row) {
+      console.log(row)
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table1.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.table1.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      this.axios
+        .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + row.orderId)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.tableData1 = res.data.data;
+          }
+        });
+
+    },
+    // 查看物资详情
+    detailclick2(row) {
+      // 记录重复点击次数
+      if (this.oldRow2 === row) {
+        this.oldRowCount2 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table2.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow2 != "") {
+        if (this.oldRow2 != row) {
+          if (this.oldRowCount2 % 2 === 1) {
+            this.$refs.table2.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount2 = 1;
+          }
+        } else {
+          this.oldRow2 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow2 = row;
+      this.axios
+        .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + row.orderId)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.tableData2 = res.data.data;
+          }
+        });
+    },
     //框计算
     onclick() {
-      if (this.activeName == "option") {
-        this.option.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId= &type=2&con=" +
-          this.input;
-      } else {
-        this.first.requestUrl = "con=" + this.input;
+      if(this.inputText != null){
+        if(this.activeName == 'first'){
+        this.first.requestUrl = this.first.requestUrl + "&con=" + this.inputText
+      }else if(this.activeName = 'option'){
+        this.option.requestUrl = this.option.requestUrl + "&con=" + this.inputText
+      }else if(this.activeName = 'Received'){
+        this.Received.requestUrl = this.Received.requestUrl + "&con=" + this.inputText
+      }else{
+        this.truck.requestUrl = this.truck.requestUrl + "&con=" + this.inputText
       }
+      }else{
+        this.createdLike()
+      } 
     },
     //查看当前订单的物资信息
     materialDetails(orderId) {

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

@@ -36,13 +36,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "api/v1/tms/getApproveAllWagonPlease?apiId=70&resultType=3",
+        requestUrl: "/api/v1/tms/getApproveAllWagonPlease?apiId=70&resultType=3",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "api/v1/tms/getApproveAllWagonPlease?apiId=70&resultType=3&con="+this.input;
+      this.option.requestUrl = "/api/v1/tms/getApproveAllWagonPlease?apiId=70&resultType=3&con="+this.input;
     },
     btnclick() {
       this.$router.push("/approveWagonPleaseAdd");

src/views/TMS/components/importedTruck/breakdownPlanCheck.vue

@@ -63,13 +63,13 @@ export default {
       option1: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=89&orderStatus=3&orderType=8&planId=null" ,
+          "/api/v1/oms/getAllTruckOrder?apiId=89&orderStatus=3&orderType=8" ,
           mapList: [],
       },
       option2: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=86&orderStatus=8&orderType=8&planId=null",
+          "/api/v1/oms/getAllTruckOrder?apiId=86&orderStatus=8&orderType=8",
       },
       form1: [],
       orderId: 0,
@@ -91,16 +91,10 @@ export default {
     onclick() {
       if (this.activeName == "first") {
         this.option1.requestUrl =
-          "/api/v1/oms/selectAllOrderForSale?apiId=168/1&orderStatus=3&orderType=1" +
-          this.$route.params.planId +
-          "&con=" +
-          this.input;
+          "/api/v1/oms/selectAllOrderForSale?apiId=168/1&orderStatus=3&orderType=1&con=" +this.input;
       } else {
         this.option2.requestUrl =
-          "/api/v1/oms/selectAllOrderForSale?apiId=168/1&orderStatus=8&orderType=1" +
-          this.$route.params.planId +
-          "&con=" +
-          this.input;
+          "/api/v1/oms/selectAllOrderForSale?apiId=168/1&orderStatus=8&orderType=1&con=" +this.input;
       }
     },
      

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/exFactoryNew.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -22,13 +23,25 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18",
+        requestUrl: "",
       },
     };
   },
+  created(){
+    
+     if (getCookie("orgCode") == "chengyunshang") {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&carrierSsoId=" + getCookie("userId");
+      } else {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&carrierSsoId=" + null ;
+      }
+  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&con=" + this.input;
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&carrierSsoId=" + getCookie("userId")+"&con=" + this.input;;
+      } else {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&carrierSsoId=" + null +"&con=" + this.input;
+      }
     },
    }
 };

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

@@ -52,14 +52,14 @@ export default {
         "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=2&orderStatus=111&carrierSSOId=" +
         getCookie("userId");
       this.option2.requestUrl =
-        "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=5&carrierSSOId=" +
+        "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=6&carrierSSOId=" +
         getCookie("userId");
     } else {
       this.option1.requestUrl =
-        "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=2&orderStatus=5&carrierSSOId=" +
+        "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=2&orderStatus=111&carrierSSOId=" +
         null;
       this.option2.requestUrl =
-        "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=5&carrierSSOId=" +
+        "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=6&carrierSSOId=" +
         null;
     }
   },
@@ -71,7 +71,7 @@ export default {
           this.input;
       } else {
         this.option2.requestUrl =
-          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=5&con=" +
+          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=6&con=" +
           this.input;
       }
     },

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/appoint/components/saleContract/addSaleOrderSend.vue

@@ -68,7 +68,7 @@
                 <el-input
                   class="textinput"
                   @input="onInput"
-                  placeholder="请输入内容(必填)"
+                  placeholder="(必填)"
                   v-model.number="scope.row.orderPlanWeight"
                 ></el-input>
               </template>
@@ -83,7 +83,7 @@
                 </el-input>
                 <el-button
                   type="primary"
-                  placeholder="请输入内容(非必填)"
+                  placeholder="(非必填)"
                   @click="select(scope.$index,3)"
                   >浏览</el-button
                 >
@@ -100,7 +100,7 @@
               <template v-if="item.prop == 'saleOrderConsignee'">
                 <el-input
                   class="textinput4"
-                  placeholder="请输入内容(非必填)"
+                  placeholder="(非必填)"
                   v-model.number="scope.row.saleOrderConsignee"
                 ></el-input>
               </template>
@@ -108,7 +108,7 @@
               <template v-if="item.prop == 'saleOrderConsigneeTel'">
                 <el-input
                   class="textinput5"
-                  placeholder="请输入内容(非必填)"
+                  placeholder="(非必填)"
                   v-model.number="scope.row.saleOrderConsigneeTel"
                   @input="onInput"
                 ></el-input>
@@ -356,15 +356,15 @@ export default {
           slot: true,
         },
         {
-          prop: "saleShipperAddressName",
-          label: "收货地址",
-          width: "300",
+          prop: "saleDateOfReceipt",
+          label: "发货日期",
+          width: "230",
           slot: true,
         },
         {
-          prop: "saleDateOfReceipt",
-          label: "发货日期",
-          width: "270",
+          prop: "saleShipperAddressName",
+          label: "收货地址",
+          width: "300",
           slot: true,
         },
         {
@@ -575,6 +575,16 @@ export default {
       if (num == 1) {
         this.drawer = true;
       }else if(num == 2){
+        //再度初始化选择车辆表头
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.truck.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            getCookie("userId") + "&i=" + new Date();
+        } else {
+          this.truck.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&i=" + new Date();;
+        }
+        //后续操作
         if(!this.materialId){
           this.$message.warning('请选择物资后，再点击')
         }else if(!this.lineId){

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

@@ -11,43 +11,38 @@
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="未上报" name="first">
-        <dilTable v-bind.sync="option" ref="table3">
-          <el-table-column fixed="right" label="操作" align="center" width="200">
+      <!-- 已审批 -->
+       <el-tab-pane label="已审批" name="four">
+        <dilTable v-bind.sync="option4" ref="table">
+          <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
-                @click="uploadclick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >上传</el-button
-              >
-              <el-button
-                @click="click(scope.row.saleOrderId)"
+                @click="sendClick(scope.row.saleOrderId)"
                 type="text"
                 size="small"
-                >修改</el-button
+                >派车</el-button
               >
               <el-button
+                @click="addClick(scope.row.saleOrderId)"
                 type="text"
                 size="small"
-                @click="deleteclick(scope.row.saleOrderId)"
-                >删除</el-button
+                >排车</el-button
               >
               <el-button
-                @click="detailclick3(scope.row)"
+                @click="detailclick(scope.row)"
                 type="text"
                 size="small"
                 >物资详情</el-button
               >
             </template>
           </el-table-column>
-        <!-- 物资详情抽屉 -->
+          <!-- 物资详情抽屉 -->
         <el-table-column type="expand" width="1">
           <template slot-scope="props">
             <el-form label-position="center" inline class="demo-table-expand">
               <div v-if="false">{{ props }}</div>
               <div>
-                <el-table :data="tableData3" border >
+                <el-table :data="tableData" border >
                   <el-table-column
                     v-for="(item, i) in tableHead"
                     :key="i"
@@ -63,13 +58,31 @@
 
         </dilTable>
       </el-tab-pane>
-      <!-- 已下发 -->
-      <el-tab-pane label="已上报" name="second">
-        <dilTable v-bind.sync="option2" ref="table2">
-        <el-table-column fixed="right" label="操作" width="70">
+      <!-- 未上报 -->
+      <el-tab-pane label="未上报" name="first">
+        <dilTable v-bind.sync="option" ref="table3">
+          <el-table-column fixed="right" label="操作" align="center" width="200">
             <template slot-scope="scope">
               <el-button
-                @click="detailclick2(scope.row)"
+                @click="uploadclick(scope.row.saleOrderId)"
+                type="text"
+                size="small"
+                >上传</el-button
+              >
+              <el-button
+                @click="click(scope.row.saleOrderId)"
+                type="text"
+                size="small"
+                >修改</el-button
+              >
+              <el-button
+                type="text"
+                size="small"
+                @click="deleteclick(scope.row.saleOrderId)"
+                >删除</el-button
+              >
+              <el-button
+                @click="detailclick3(scope.row)"
                 type="text"
                 size="small"
                 >物资详情</el-button
@@ -82,7 +95,7 @@
             <el-form label-position="center" inline class="demo-table-expand">
               <div v-if="false">{{ props }}</div>
               <div>
-                <el-table :data="tableData2" border >
+                <el-table :data="tableData3" border >
                   <el-table-column
                     v-for="(item, i) in tableHead"
                     :key="i"
@@ -98,38 +111,26 @@
 
         </dilTable>
       </el-tab-pane>
-      <!-- 已审批 -->
-       <el-tab-pane label="已审批" name="four">
-        <dilTable v-bind.sync="option4" ref="table">
-          <el-table-column fixed="right" label="操作" width="200">
+      <!-- 已下发 -->
+      <el-tab-pane label="已上报" name="second">
+        <dilTable v-bind.sync="option2" ref="table2">
+        <el-table-column fixed="right" label="操作" width="70">
             <template slot-scope="scope">
               <el-button
-                @click="sendClick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >派车</el-button
-              >
-              <el-button
-                @click="addClick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >排车</el-button
-              >
-              <el-button
-                @click="detailclick(scope.row)"
+                @click="detailclick2(scope.row)"
                 type="text"
                 size="small"
                 >物资详情</el-button
               >
             </template>
           </el-table-column>
-          <!-- 物资详情抽屉 -->
+        <!-- 物资详情抽屉 -->
         <el-table-column type="expand" width="1">
           <template slot-scope="props">
             <el-form label-position="center" inline class="demo-table-expand">
               <div v-if="false">{{ props }}</div>
               <div>
-                <el-table :data="tableData" border >
+                <el-table :data="tableData2" border >
                   <el-table-column
                     v-for="(item, i) in tableHead"
                     :key="i"
@@ -145,6 +146,7 @@
 
         </dilTable>
       </el-tab-pane>
+      
     </el-tabs>
   </div>
 </template>
@@ -153,7 +155,7 @@ export default {
   name: "saleOrder",
   data() {
     return {
-      activeName: "first",
+      activeName: "four",
       input: "",
       option: {
         // 表格请求数据的地址

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 = []

src/views/sale/components/transport_appointment/directionalDispatch.vue

@@ -21,7 +21,6 @@
         <el-tabs v-model="activeName">
           <el-tab-pane label="未下发" name="first">
             <dilTable v-bind.sync="first" ref="table" @selection-change="selectionChange">
-
               <el-table-column fixed="right" label="操作" width="70">
             <template slot-scope="scope">
               <el-button
@@ -51,7 +50,7 @@
             </el-form>
           </template>
         </el-table-column>
-            </dilTable>
+        </dilTable>
 
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">

src/views/statisticalReport/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNew.vue

@@ -0,0 +1,47 @@
+// 采购化工材料新区汽运监控
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=18",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=18&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .input{
+      width: 250px;
+    }
+  }
+}
+</style>

src/views/statisticalReport/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOld.vue

@@ -0,0 +1,47 @@
+// 采购化工材料老区汽运监控
+<template>
+  <div class="purchasFuelOldMonitor">
+    <div class="frameCalculation">
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=17",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=17&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelOldMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .input{
+      width: 250px;
+    }
+  }
+}
+</style>

src/views/statisticalReport/router/index.js

@@ -13,6 +13,8 @@ import purchasFuelNewMonitor from '../components/purchasFuelMonitor/purchasFuelN
 import sporadicReportEnterFactory from '../components/sporadicReport/sporadicReportEnterFactory.vue'
 import sporadicReportExFactory from '../components/sporadicReport/sporadicReportExFactory.vue'
 import transportationPerformance from '../components/salesLogisticsStatistics/transportationPerformance.vue'
+import purchaseChemicalMaterialsNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNew.vue'
+import purchaseChemicalMaterialsOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOld.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -23,6 +25,8 @@ const constantRouterMap = [
     component: main,
     redirect: {name: 'cargoResult'},
     children: [
+      {path: 'purchaseChemicalMaterialsNew', name: 'purchaseChemicalMaterialsNew', meta: {code: 'xtpzgl-yhgl'}, component: purchaseChemicalMaterialsNew},
+      {path: 'purchaseChemicalMaterialsOld', name: 'purchaseChemicalMaterialsOld', meta: {code: 'xtpzgl-yhgl'}, component: purchaseChemicalMaterialsOld},
       {path: 'ShipDynamicTable', name: 'ShipDynamicTable', meta: {code: 'xtpzgl-yhgl'}, component: ShipDynamicTable},
       {path: 'purchaseAccessoriesMonitor', name: 'purchaseAccessoriesMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchaseAccessoriesMonitor},
       {path: 'purchasFuelOldMonitor', name: 'purchasFuelOldMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelOldMonitor},