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

src/views/TMS/components/importedFuel/transportReserveRan.vue

@@ -1,12 +1,35 @@
 <template>
   <!-- 燃料运输预约 -->
-  <div class="homeworkPath">
-    <div class="top">
+  <div >
+    <div style="margin:10px">
+      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
       <el-input
-        class="input"
-        placeholder="请输入内容"
-        v-model="input"
-        clearable
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
       >
       </el-input>
       <span class="text" v-if="activeName == 'second'">下发时间：</span>
@@ -165,6 +188,24 @@ export default {
   name: "inplantTMS",
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"车牌号",
+          value:"capacityNumber"
+          },
+          {
+          label:"物资名称",
+          value:"materialName"
+          },
+          {
+          label:"发货单位",
+          value:"supplierName"
+          }
+      ],
       input: "",
       Time: "",
       startTime: null,
@@ -239,6 +280,13 @@ export default {
       }
     },
     onclick() {
+       let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            requestQuery[this.condition1]=[this.input1+'']
+            requestQuery[this.condition2]=[this.input2+'']
+        }
       if (this.activeName == "first") {
         //判断是否是承运商
         if (getCookie("orgCode") == "chengyunshang") {
@@ -254,6 +302,7 @@ export default {
             "&con=" +
             this.input;
         }
+        this.option1.requestQuery=requestQuery;
       } else {
         let startTime = null;
         let endTime = null;
@@ -292,6 +341,7 @@ export default {
                 new Date();
             }
           }
+          this.option2.requestQuery=requestQuery;
         }
         else{
             console.log("我进来了");
@@ -314,7 +364,9 @@ export default {
                 new Date();
             }
         }
+        this.option2.requestQuery=requestQuery;
       }
+      this.$forceUpdate();
     },
     closePurOrder() {
       if (this.inputPurOrder == null) {

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -20,7 +20,7 @@
         >温馨提示：卸货到达钢请选择一厂，达兴二焦化请选择二厂<br />如选错厂区将会影响车辆上秤计量！！！</span
       >
     </div>
-    <div class="orderType from" style="margin-top: 15px">
+    <div class="orderType_AddTransportReserveRan from_AddTransportReserveRan" style="margin-top: 15px">
       <span class="text">卸货厂区：</span>
       <el-select
         class="select"
@@ -39,7 +39,7 @@
 
       <span class="span"></span>
     </div>
-    <div class="supplieUnit">
+    <div class="supplieUnit_AddTransportReserveRan">
       <el-form :inline="true" class="demo-form-inline" label-width="80px">
         <el-form-item label="发货单位:">
           <el-autocomplete
@@ -57,54 +57,54 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="material from">
+    <div class="material_AddTransportReserveRan from_AddTransportReserveRan">
       <span class="text">物资：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
-    <div class="remark from">
+    <div class="remark_AddTransportReserveRan from_AddTransportReserveRan">
       <span class="text">船名：</span>
       <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true">
       </el-input>
       <span class="span"></span>
     </div>
-    <div class="forwardingUnit from">
+    <div class="forwardingUnit_AddTransportReserveRan from_AddTransportReserveRan">
       <span class="text">卸货点：</span>
       <el-input class="input" v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
-    <div class="loadUnit from">
+    <div class="loadUnit_AddTransportReserveRan from_AddTransportReserveRan">
       <span class="text">装货点：</span>
       <el-input class="input" v-model="loadNames" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(8)">浏览</el-button>
     </div>
-    <div class="lineId from">
+    <div class="lineId_AddTransportReserveRan from_AddTransportReserveRan">
       <span class="text">选择路线：</span>
       <el-input class="input" v-model="lineName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
     </div>
-    <div class="lineId from">
+    <div class="lineId_AddTransportReserveRan from_AddTransportReserveRan">
       <span class="text">采购订单号：</span>
       <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
     </div>
-    <div class="contractTitle from">
+    <div class="contractTitle_AddTransportReserveRan from_AddTransportReserveRan">
       <dil-form :formId="219" v-model="form1"></dil-form>
     </div>
-    <div class="truckList1">
-      <div class="truckList from">
+    <div class="truckList1_AddTransportReserveRan">
+      <div class="truckList_AddTransportReserveRan from_AddTransportReserveRan">
         <span class="text">选择车辆：</span>
         <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
           >浏览</el-button
         >
       </div>
     </div>
-    <div class="lineId from">
+    <div class="lineId_AddTransportReserveRan from_AddTransportReserveRan">
       <span class="text">该批车辆是否一车多趟：</span>
       <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
       </el-switch>
     </div>
-    <div class="truckListTable">
+    <div >
       <el-table
         ref="table1"
         :data="selectionList"
@@ -812,14 +812,14 @@ export default {
 .el-drawer__container ::-webkit-scrollbar {
   display: none;
 }
-.from {
+.from_AddTransportReserveRan {
   display: flex;
   align-items: center;
   justify-content: center;
   margin-top: 5px;
   margin-bottom: 20px;
 }
-.remark {
+.remark_AddTransportReserveRan {
   display: flex;
   justify-content: center;
   .text {
@@ -832,7 +832,7 @@ export default {
     margin-right: 20px;
   }
 }
-.supplieUnit {
+.supplieUnit_AddTransportReserveRan {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -841,7 +841,7 @@ export default {
     width: 250px;
   }
 }
-.lineId {
+.lineId_AddTransportReserveRan {
   display: flex;
   justify-content: center;
   .text {
@@ -859,7 +859,7 @@ export default {
     height: 1px;
   }
 }
-.material {
+.material_AddTransportReserveRan {
   display: flex;
   justify-content: center;
   margin-top: 20px;
@@ -873,7 +873,7 @@ export default {
     margin-right: 20px;
   }
 }
-.orderType {
+.orderType_AddTransportReserveRan {
   display: flex;
   justify-content: center;
   .text {
@@ -890,7 +890,7 @@ export default {
     height: 10px;
   }
 }
-.contractTitle {
+.contractTitle_AddTransportReserveRan {
   display: flex;
   justify-content: center;
   .el-form-item {
@@ -905,7 +905,7 @@ export default {
     }
   }
 }
-.forwardingUnit {
+.forwardingUnit_AddTransportReserveRan {
   display: flex;
   justify-content: center;
   .text {
@@ -918,7 +918,7 @@ export default {
     margin-right: 20px;
   }
 }
-.loadUnit {
+.loadUnit_AddTransportReserveRan {
   display: flex;
   justify-content: center;
   .text {
@@ -932,9 +932,9 @@ export default {
   }
 }
 
-.truckList1 {
+.truckList1_AddTransportReserveRan {
   width: 100%;
-  .truckList {
+  .truckList_AddTransportReserveRan {
     width: 96%;
     .text {
       display: inline-block;

src/views/TMS/components/importedFuel/truckDriverReceiveRan.vue

@@ -1,12 +1,35 @@
 <template>
   <!-- 燃料运输派单 -->
-  <div class="homeworkPath">
-    <div class="top">
+  <div>
+    <div  style="margin:10px">
+     <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
       <el-input
-        placeholder="请输入内容"
-        class="input"
-        v-model="input"
-        clearable
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
       >
       </el-input>
       <span class="text">下发时间：</span>
@@ -53,6 +76,29 @@ export default {
   name: "inplantTMS",
   data() {
     return {
+       condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"车牌号",
+          value:"capacityNumber"
+          },
+          {
+          label:"物资名称",
+          value:"materialName"
+          },
+          {
+          label:"发货单位",
+          value:"supplierName"
+          },
+          {
+          label:"采购订单",
+          value:"purchaseOrderNo"
+          }
+          
+      ],
       startTime: null,
       endTime: null,
       input: "",
@@ -180,31 +226,35 @@ export default {
       }
     },
     onclick() {
+      let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            requestQuery[this.condition1]=[this.input1+'']
+            requestQuery[this.condition2]=[this.input2+'']
+        }
       if (getCookie("orgCode") == "chengyunshang") {
         if (this.activeName == "option") {
           this.option.requestUrl =
-            "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" +
-            this.input +
-            "&i=" +
+            "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i=" +
             new Date() +
             "&carrierSSOId=" +
             getCookie("userId");
+            this.option.requestQuery=requestQuery;
         } else if (this.activeName == "first") {
           this.option1.requestUrl =
-            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" +
-            this.input +
-            "&i=" +
+            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&i=" +
             new Date() +
             "&carrierSSOId=" +
             getCookie("userId");
+            this.option1.requestQuery=requestQuery;
         } else if (this.activeName == "second") {
           this.option2.requestUrl =
-            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" +
-            this.input +
-            "&i=" +
+            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i=" +
             new Date() +
             "&carrierSSOId=" +
             getCookie("userId");
+            this.option2.requestQuery=requestQuery;
         }
       } else {
         let startTime = null;
@@ -219,9 +269,7 @@ export default {
           if (startTime < endTime) {
             if (this.activeName == "option") {
               this.option.requestUrl =
-                "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" +
-                this.input +
-                "&i=" +
+                "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i=" +
                 new Date() +
                 "&carrierSSOId=" +
                 null +
@@ -229,11 +277,10 @@ export default {
                 startTime +
                 "&endTime=" +
                 endTime;
+                this.option.requestQuery=requestQuery;
             } else if (this.activeName == "first") {
               this.option1.requestUrl =
-                "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" +
-                this.input +
-                "&i=" +
+                "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&i=" +
                 new Date() +
                 "&carrierSSOId=" +
                 null +
@@ -241,11 +288,10 @@ export default {
                 startTime +
                 "&endTime=" +
                 endTime;
+                this.option1.requestQuery=requestQuery;
             } else if (this.activeName == "second") {
               this.option2.requestUrl =
-                "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" +
-                this.input +
-                "&i=" +
+                "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i=" +
                 new Date() +
                 "&carrierSSOId=" +
                 null +
@@ -253,37 +299,36 @@ export default {
                 startTime +
                 "&endTime=" +
                 endTime;
+                this.option2.requestQuery=requestQuery;
             }
           }
         } else {
           console.log("aaaa");
           if (this.activeName == "option") {
             this.option.requestUrl =
-              "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" +
-              this.input +
-              "&i=" +
+              "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i=" +
               new Date() +
               "&carrierSSOId=" +
               null;
+              this.option.requestQuery=requestQuery;
           } else if (this.activeName == "first") {
             this.option1.requestUrl =
-              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" +
-              this.input +
-              "&i=" +
+              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&i=" +
               new Date() +
               "&carrierSSOId=" +
               null;
+              this.option1.requestQuery=requestQuery;
           } else if (this.activeName == "second") {
             this.option2.requestUrl =
-              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" +
-              this.input +
-              "&i=" +
+              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i=" +
               new Date() +
               "&carrierSSOId=" +
               null;
+              this.option2.requestQuery=requestQuery;
           }
         }
       }
+      this.$forceUpdate();
     },
     clickClose() {
       console.log(this.list);

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

@@ -1,17 +1,40 @@
 <template>
   <!-- 辅料运输预约 -->
-  <div class="transportReserveFu">
-    <div class="top">
+  <div >
+    <div style="margin:10px">
       <el-form>
         <el-form-item
-          ><el-input
-            class="input"
-            placeholder="请输入内容"
-            v-model="input"
-            style="width:250px"
-            clearable
           >
-          </el-input>
+           <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+                <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+            </el-select>
+            <el-input
+                placeholder="请输入内容"
+                v-model="input1"
+                style="width:200px"
+                clearable
+            >
+            </el-input>
+            <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+                <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+            </el-select>
+            <el-input
+                placeholder="请输入内容"
+                v-model="input2"
+                style="width:200px"
+                clearable
+            >
+            </el-input>
           <!-- 时间查询框 -->
           <span class="text" v-if="activeName == 'second'">下发时间：</span>
           <el-date-picker
@@ -190,6 +213,24 @@ export default {
   name: 'inplantTMS',
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"车牌号",
+          value:"capacityNumber"
+          },
+          {
+          label:"物资名称",
+          value:"materialName"
+          },
+          {
+          label:"发货单位",
+          value:"supplierName"
+          }
+      ],
       input: '',
       Time: '',
       startTime: null,
@@ -271,6 +312,13 @@ export default {
       }
     },
     onclick() {
+      let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            requestQuery[this.condition1]=[this.input1+'']
+            requestQuery[this.condition2]=[this.input2+'']
+        }
       if (this.activeName == 'first') {
         //判断是否是承运商
         if (getCookie('orgCode') == 'chengyunshang') {
@@ -290,6 +338,7 @@ export default {
             '&i=' +
             new Date()
         }
+        this.option1.requestQuery=requestQuery;
       } else {
         let startTime = null
         let endTime = null
@@ -347,7 +396,9 @@ export default {
               new Date()
           }
         }
+        this.option2.requestQuery=requestQuery;
       }
+      this.$forceUpdate();
     },
     selectionChange(selection) {
       this.mapList = selection

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

@@ -13,11 +13,10 @@
     >
       <span>辅料预约界面</span>
     </div>
-    <div class="supplieUnit">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px">
+    <div class="supplieUnit_AddTransportReserveFu">
+      <el-form :inline="true"  label-width="80px">
         <el-form-item label="发货单位:">
           <el-autocomplete
-            class="inline-input"
             v-model="stateSupplier"
             :fetch-suggestions="querySearchSupplier"
             placeholder="请输入发货单位名称"
@@ -31,52 +30,52 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="material from">
+    <div class="material_AddTransportReserveFu">
       <span class="text">物资：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
-    <div class="remark from">
+    <div class="remark_AddTransportReserveFu from">
       <span class="text">船名：</span>
       <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true">
       </el-input>
       <span class="span"></span>
     </div>
-    <div class="forwardingUnit from">
+    <div class="forwardingUnit_AddTransportReserveFu from">
       <span class="text">卸货点：</span>
       <el-input class="input" v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
-    <div class="lineId from">
+    <div class="lineId_AddTransportReserveFu from">
       <span class="text">选择路线：</span>
       <el-input class="input" v-model="lineName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
     </div>
-    <div class="lineId from">
+    <div class="lineId_AddTransportReserveFu from">
       <span class="text">采购订单号：</span>
       <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
     </div>
-    <div class="contractTitle from">
+    <div class="contractTitle_AddTransportReserveFu from">
       <dil-form :formId="219" v-model="form1"></dil-form>
     </div>
-    <div class="truckList1">
-      <div class="truckList from">
+    <div class="truckList1_AddTransportReserveFu">
+      <div class="truckList_AddTransportReserveFu from">
         <span class="text">选择车辆：</span>
         <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
           >浏览</el-button
         >
       </div>
     </div>
-    <div class="lineId from">
+    <div class="lineId_AddTransportReserveFu from">
       <span class="text">该批车辆是否一车多趟：</span>
       <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
       </el-switch>
     </div>
     <!-- 物资和装卸点以及装卸货次序 -->
-    <div class="swtichTop">
-      <span class="titile">选择车辆前请选择物资单位！</span>
-      <div class="switch" v-if="selectionList.length > 0">
+    <div class="swtichTop_AddTransportReserveFu">
+      <span class="titile_AddTransportReserveFu">选择车辆前请选择物资单位！</span>
+      <div class="switch_AddTransportReserveFu" v-if="selectionList.length > 0">
         <el-tooltip placement="top">
           <div slot="content">下面表格已有数据，不能进行更改！！！</div>
           <el-switch
@@ -88,7 +87,7 @@
           </el-switch>
         </el-tooltip>
       </div>
-      <div class="switch" v-else>
+      <div class="switch_AddTransportReserveFu" v-else>
         <el-tooltip placement="top">
           <div slot="content">当下面表格有数据之后，将不能进行更改！！！</div>
           <el-switch v-model="value" active-text="件数" inactive-text="重量">
@@ -96,7 +95,7 @@
         </el-tooltip>
       </div>
     </div>
-    <div class="truckListTable">
+    <div>
       <el-table
         :data="selectionList"
         border
@@ -755,7 +754,7 @@ export default {
     margin-top: 5px;
     margin-bottom: 20px;
   }
-  .remark {
+  .remark_AddTransportReserveFu {
     display: flex;
     justify-content: center;
     .text {
@@ -768,7 +767,7 @@ export default {
       margin-right: 20px;
     }
   }
-  .lineId {
+  .lineId_AddTransportReserveFu {
     display: flex;
     justify-content: center;
     .text {
@@ -786,21 +785,21 @@ export default {
       height: 1px;
     }
   }
-  .swtichTop {
+  .swtichTop_AddTransportReserveFu {
     display: flex;
     height: 40px;
     align-content: center;
     justify-content: center;
     padding-right: 20px;
-    .titile {
+    .titile_AddTransportReserveFu {
       color: red;
       font-size: 14px;
     }
-    .switch {
+    .switch_AddTransportReserveFu {
       margin-right: -30px;
     }
   }
-  .supplieUnit {
+  .supplieUnit_AddTransportReserveFu {
     display: flex;
     justify-content: center;
     align-items: center;
@@ -809,7 +808,7 @@ export default {
       width: 250px;
     }
   }
-  .material {
+  .material_AddTransportReserveFu {
     display: flex;
     justify-content: center;
     margin-top: 20px;
@@ -840,7 +839,7 @@ export default {
       height: 10px;
     }
   }
-  .contractTitle {
+  .contractTitle_AddTransportReserveFuitle {
     display: flex;
     justify-content: center;
     .el-form-item {
@@ -855,7 +854,7 @@ export default {
       }
     }
   }
-  .forwardingUnit {
+  .forwardingUnit_AddTransportReserveFu {
     display: flex;
     justify-content: center;
     .text {
@@ -868,9 +867,9 @@ export default {
       margin-right: 20px;
     }
   }
-  .truckList1 {
+  .truckList1_AddTransportReserveFu {
     width: 100%;
-    .truckList {
+    .truckList_AddTransportReserveFu {
       width: 96%;
       .text {
         display: inline-block;

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

@@ -1,12 +1,35 @@
 <template>
   <!-- 辅料运输派单 -->
-  <div class="homeworkPath">
-    <div class="top">
+  <div>
+    <div style="margin:10px">
+      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
       <el-input
-        placeholder="请输入内容"
-        class="input"
-        v-model="input"
-        clearable
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
       >
       </el-input>
       <span class="text">下发时间：</span>
@@ -53,6 +76,29 @@ export default {
   name: "inplantTMS",
   data() {
     return {
+       condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"车牌号",
+          value:"capacityNumber"
+          },
+          {
+          label:"物资名称",
+          value:"materialName"
+          },
+          {
+          label:"发货单位",
+          value:"supplierName"
+          },
+          {
+          label:"采购订单",
+          value:"purchaseOrderNo"
+          }
+          
+      ],
       startTime: null,
       endTime: null,
       input: "",
@@ -181,31 +227,35 @@ export default {
       }
     },
     onclick() {
+      let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            requestQuery[this.condition1]=[this.input1+'']
+            requestQuery[this.condition2]=[this.input2+'']
+        }
       if (getCookie("orgCode") == "chengyunshang") {
         if (this.activeName == "option") {
           this.option.requestUrl =
-            "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" +
-            this.input +
-            "&i=" +
+            "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i=" +
             new Date() +
             "&carrierSSOId=" +
             getCookie("userId");
+            this.option.requestQuery=requestQuery;
         } else if (this.activeName == "first") {
           this.option1.requestUrl =
-            "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" +
-            this.input +
-            "&i=" +
+            "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&i=" +
             new Date() +
             "&carrierSSOId=" +
             getCookie("userId");
+            this.option1.requestQuery=requestQuery;
         } else if (this.activeName == "second") {
           this.option2.requestUrl =
-            "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" +
-            this.input +
-            "&i=" +
+            "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i=" +
             new Date() +
             "&carrierSSOId=" +
             getCookie("userId");
+            this.option2.requestQuery=requestQuery;
         }
       } else {
         let startTime = null;
@@ -220,9 +270,7 @@ export default {
           if (startTime < endTime) {
             if (this.activeName == "option") {
               this.option.requestUrl =
-                "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" +
-                this.input +
-                "&i=" +
+                "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i=" +
                 new Date() +
                 "&carrierSSOId=" +
                 null +
@@ -230,11 +278,10 @@ export default {
                 startTime +
                 "&endTime=" +
                 endTime;
+              this.option.requestQuery=requestQuery;
             } else if (this.activeName == "first") {
               this.option1.requestUrl =
-                "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" +
-                this.input +
-                "&i=" +
+                "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&i=" +
                 new Date() +
                 "&carrierSSOId=" +
                 null +
@@ -242,11 +289,10 @@ export default {
                 startTime +
                 "&endTime=" +
                 endTime;
+              this.option1.requestQuery=requestQuery;
             } else if (this.activeName == "second") {
               this.option2.requestUrl =
-                "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" +
-                this.input +
-                "&i=" +
+                "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i=" +
                 new Date() +
                 "&carrierSSOId=" +
                 null +
@@ -254,36 +300,35 @@ export default {
                 startTime +
                 "&endTime=" +
                 endTime;
+                this.option2.requestQuery=requestQuery;
             }
           }
         } else {
           if (this.activeName == "option") {
             this.option.requestUrl =
-              "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" +
-              this.input +
-              "&i=" +
+              "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i=" +
               new Date() +
               "&carrierSSOId=" +
               null;
+              this.option.requestQuery=requestQuery;
           } else if (this.activeName == "first") {
             this.option1.requestUrl =
-              "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" +
-              this.input +
-              "&i=" +
+              "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&i=" +
               new Date() +
               "&carrierSSOId=" +
               null;
+              this.option1.requestQuery=requestQuery;
           } else if (this.activeName == "second") {
             this.option2.requestUrl =
-              "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" +
-              this.input +
-              "&i=" +
+              "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i=" +
               new Date() +
               "&carrierSSOId=" +
               null;
+              this.option2.requestQuery=requestQuery;
           }
         }
       }
+      this.$forceUpdate();
     },
     clickClose() {
       console.log(this.list);

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

@@ -1,12 +1,35 @@
 //采购化工材料运输派单
 <template>
-  <div class="homeworkPath">
-    <div class="top">
+  <div >
+    <div style="margin:10px">
+           <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
       <el-input
-        placeholder="请输入内容"
-        class="input"
-        v-model="input"
-        clearable
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
       >
       </el-input>
       <span class="text">下发时间：</span>
@@ -43,6 +66,29 @@ export default {
   name: "inplantTMS",
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"车牌号",
+          value:"capacityNumber"
+          },
+          {
+          label:"物资名称",
+          value:"materialName"
+          },
+          {
+          label:"发货单位",
+          value:"supplierName"
+          },
+          {
+          label:"采购订单",
+          value:"purchaseOrderNo"
+          }
+          
+      ],
       input: "",
       Time: "",
       startTime: null,
@@ -78,6 +124,13 @@ export default {
   },
   methods: {
     onclick() {
+       let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            requestQuery[this.condition1]=[this.input1+'']
+            requestQuery[this.condition2]=[this.input2+'']
+        }
       let startTime = null;
       let endTime = null;
       if (this.startTime) {
@@ -90,41 +143,38 @@ export default {
         if (startTime < endTime) {
           if (this.activeName == "first") {
             this.option1.requestUrl =
-              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=111&con=" +
-              this.input +
-              "&startTime=" +
+              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=111&startTime=" +
               startTime +
               "&endTime=" +
               endTime +
               "&i=" +
               new Date();
+            this.option1.requestQuery=requestQuery;
           } else {
             this.option2.requestUrl =
-              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=6&con=" +
-              this.input +
-              "&startTime=" +
+              "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=6&startTime=" +
               startTime +
               "&endTime=" +
               endTime +
               "&i=" +
               new Date();
+            this.option2.requestQuery=requestQuery;
           }
         }
       } else {
         if (this.activeName == "first") {
           this.option1.requestUrl =
-            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=111&con=" +
-            this.input +
-            "&i=" +
+            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=111&i=" +
             new Date();
+            this.option1.requestQuery=requestQuery;
         } else {
           this.option2.requestUrl =
-            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=6&con=" +
-            this.input +
-            "&i=" +
+            "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=6&i=" +
             new Date();
+            this.option2.requestQuery=requestQuery;
         }
       }
+      this.$forceUpdate();
     },
   },
 };

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

@@ -1,12 +1,35 @@
 //采购化工材料运输预约
 <template>
-  <div class="homeworkPath">
-    <div class="top">
+  <div >
+    <div style="margin:10px">
+      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
       <el-input
-        class="input"
-        placeholder="请输入内容"
-        v-model="input"
-        clearable
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
       >
       </el-input>
       <span class="text" v-if="activeName == 'second'">下发时间：</span>
@@ -97,6 +120,29 @@ export default {
   name: "inplantTMS",
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"车牌号",
+          value:"capacityNumber"
+          },
+          {
+          label:"物资名称",
+          value:"materialName"
+          },
+          {
+          label:"发货单位",
+          value:"supplierName"
+          },
+          {
+          label:"采购订单",
+          value:"purchaseOrderNo"
+          }
+          
+      ],
       input: "",
       Time: "",
       startTime: null,
@@ -193,21 +239,25 @@ export default {
       }
     },
     onclick() {
+       let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            requestQuery[this.condition1]=[this.input1+'']
+            requestQuery[this.condition2]=[this.input2+'']
+        }
       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;
+            getCookie("userId")
         } else {
           this.option1.requestUrl =
             "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
-            null +
-            "&con=" +
-            this.input;
+            null
         }
+        this.option1.requestQuery=requestQuery;
       } else {
         let startTime = null;
         let endTime = null;
@@ -224,8 +274,6 @@ export default {
               this.option2.requestUrl =
                 "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
                 getCookie("userId") +
-                "&con=" +
-                this.input +
                 "&startTime=" +
                 startTime +
                 "&endTime=" +
@@ -236,8 +284,6 @@ export default {
               this.option2.requestUrl =
                 "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
                 null +
-                "&con=" +
-                this.input +
                 "&startTime=" +
                 startTime +
                 "&endTime=" +
@@ -246,6 +292,7 @@ export default {
                 new Date();
             }
           } 
+          this.option2.requestQuery=requestQuery;
         }else{
             console.log("我进来了");
             //判断是否是承运商
@@ -253,21 +300,19 @@ export default {
               this.option2.requestUrl =
                 "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
                 getCookie("userId") +
-                "&con=" +
-                this.input +
                 "&i=" +
                 new Date();
             } else {
               this.option2.requestUrl =
                 "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
                 null +
-                "&con=" +
-                this.input +
                 "&i=" +
                 new Date();
             }
+            this.option2.requestQuery=requestQuery;
         }
       }
+      this.$forceUpdate();
     },
 
     selectionChange(selection) {

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

@@ -8,7 +8,7 @@
     <div style="text-align: center; font-size:15px; margin-top:15px; color:red">
       <span>温馨提示：卸货到达钢请选择一厂，达兴二焦化、化工厂请选择二厂<br>如选错厂区将会影响车辆上秤计量！！！</span>
     </div>
-    <div class="orderType from" style="margin-top: 15px;">
+    <div class="orderType_transportationReservation from_transportationReservation" style="margin-top: 15px;">
       <span class="text">卸货厂区：</span>
       <el-select
         class="select"
@@ -26,15 +26,13 @@
       </el-select>
       <span class="span"></span>
     </div>
-    <div class="supplieUnit">
+    <div class="supplieUnit_transportationReservation">
       <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="请输入发货单位名称"
@@ -48,43 +46,43 @@
         </el-form-item>
      </el-form>
     </div>
-    <div class="material from">
+    <div class="material_transportationReservation from_transportationReservation">
       <span class="text">物资：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
-    <div class="remark from">
+    <div class="remark_transportationReservation from_transportationReservation">
       <span class="text">船名：</span>
       <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
       <span class="span"></span>
     </div>
-    <div class="forwardingUnit from">
+    <div class="forwardingUnit_transportationReservation from_transportationReservation">
       <span class="text">卸货点：</span>
       <el-input class="input" v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
-    <div class="lineId from">
+    <div class="lineId_transportationReservation from_transportationReservation">
       <span class="text">选择路线：</span>
       <el-input class="input" v-model="lineName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
     </div>
-    <div class="lineId from">
+    <div class="lineId_transportationReservation from_transportationReservation">
       <span class="text">采购订单号：</span>
       <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
     </div>
-    <div class="contractTitle from">
+    <div class="contractTitle_transportationReservation from_transportationReservation">
       <dil-form :formId="219" v-model="form1"></dil-form>
     </div>
-    <div class="truckList1">
-      <div class="truckList from">
+    <div class="truckList1_transportationReservation">
+      <div class="truckList_transportationReservation from_transportationReservation">
         <span class="text">选择车辆：</span>
         <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
           >浏览</el-button
         >
       </div>
     </div>
-    <div class="truckListTable">
+    <div class="truckListTable_transportationReservation">
       <el-table
         :data="selectionList"
         border
@@ -142,7 +140,7 @@
           <i class="el-icon-search"></i>查询
         </el-button>
       </div>
-      <div class="drawer_table1" v-show="onDrawerNumber == 1">
+      <div class="drawer_table1_transportationReservation" v-show="onDrawerNumber == 1">
         <dilTable
           v-bind.sync="frist"
           @radio-change="currentRadioChange1"
@@ -209,7 +207,7 @@
         ></dilTable>
       </div>
     </el-drawer>
-    <div class="button_box">
+    <div class="button_box_transportationReservation">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -665,14 +663,14 @@ export default {
 .el-drawer__container ::-webkit-scrollbar {
   display: none;
 }
-.from {
+.from_transportationReservation {
   display: flex;
   align-items: center;
   justify-content: center;
   margin-top: 5px;
   margin-bottom: 20px;
 }
-.remark {
+.remark_transportationReservation {
   display: flex;
   justify-content: center;
   .text {
@@ -685,7 +683,7 @@ export default {
     margin-right: 20px;
   }
 }
-.lineId {
+.lineId_transportationReservation {
   display: flex;
   justify-content: center;
   .text {
@@ -703,7 +701,7 @@ export default {
     height: 1px;
   }
 }
-.material {
+.material_transportationReservation {
   display: flex;
   justify-content: center;
   margin-top: 20px;
@@ -717,7 +715,7 @@ export default {
     margin-right: 20px;
   }
 }
-.orderType {
+.orderType_transportationReservation {
   display: flex;
   justify-content: center;
   .text {
@@ -734,7 +732,7 @@ export default {
     height: 10px;
   }
 }
-.contractTitle {
+.contractTitle_transportationReservation {
   display: flex;
   justify-content: center;
   .el-form-item {
@@ -749,7 +747,7 @@ export default {
     }
   }
 }
-.forwardingUnit {
+.forwardingUnit_transportationReservation {
   display: flex;
   justify-content: center;
   .text {
@@ -762,9 +760,9 @@ export default {
     margin-right: 20px;
   }
 }
-.truckList1 {
+.truckList1_transportationReservation {
   width: 100%;
-  .truckList {
+  .truckList_transportationReservation {
     width: 96%;
     .text {
       display: inline-block;
@@ -776,7 +774,7 @@ export default {
     }
   }
 }
-.supplieUnit {
+.supplieUnit_transportationReservation {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -791,10 +789,10 @@ export default {
   display: flex;
   align-items: center;
 }
-.drawer_table1{
+.drawer_table1_transportationReservation{
   width: 100%;height: 500px;
 }
-.button_box {
+.button_box_transportationReservation {
   display: flex;
   justify-content: center;
   align-items: center;

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

@@ -18,10 +18,33 @@
         style="width:200px"
       >
       </el-date-picker>
+      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
       <el-input
         placeholder="请输入内容"
-        v-model="input"
-        style="width:250px"
+        v-model="input1"
+        style="width:200px"
+        clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input2"
+        style="width:200px"
         clearable
       >
       </el-input>
@@ -71,6 +94,24 @@ export default {
   name: "saleOrder",
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+        {
+          label:"装货仓库",
+          value:"saleWareHouse"
+        },
+         {
+          label:"收货单位",
+          value:"consigneeCompanyName"
+        },
+         {
+          label:"物资名称",
+          value:"materialName"
+        },
+      ],
       endTime: null,
       startTime: null,
       startDate: new Date().getTime() - 3600 * 1000 * 24 * 85,
@@ -95,22 +136,39 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event);
     },
-    onclick() {
+    async onclick() {
       let startTime = null;
       let endTime = null;
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
         endTime = sjTime(this.endTime);
       }
-      this.option4.requestUrl =
-        "/api/v1/ams/getSaleCokeOrder?apiId=475&shipperId=2&con=" +
-        this.input +
+      let option={
+        requestQuery:{}
+      }
+      option.requestQuery[this.condition1]=[];
+      option.requestQuery[this.condition2]=[];
+      if(this.condition1 == this.condition2){
+         option.requestQuery[this.condition1]=[this.input1,this.input2]
+      }else{
+         option.requestQuery[this.condition1]=[this.input1]
+         option.requestQuery[this.condition2]=[this.input2]
+      }
+      option.requestUrl =
+        "/api/v1/ams/getSaleCokeOrder?apiId=475&shipperId=2" +
         "&startTime=" +
         startTime +
         "&endTime=" +
         endTime +
         "&i=" +
         new Date();
+        await this.setOption("option4",option)
+    },
+    setOption(prop,option){
+        return new Promise((resolve,reject)=>{
+          this.$set(this,prop,option)
+          resolve("更新表格数据成功!");
+        });
     },
     click(saleOrderId) {
       this.$router.push("/editSaleOrder/" + saleOrderId);

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

@@ -18,11 +18,34 @@
         style="width:200px"
       >
       </el-date-picker>
+      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
       <el-input
         placeholder="请输入内容"
-        v-model="input"
+        v-model="input1"
+        style="width:200px"
         clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input2"
         style="width:200px"
+        clearable
       >
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
@@ -119,6 +142,20 @@ export default {
   name: 'saleOrder',
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+         {
+          label:"收货单位",
+          value:"consigneeCompanyName"
+        },
+         {
+          label:"物资名称",
+          value:"materialName"
+        },
+      ],
       startTime: null,
       endTime: null,
       activeName: 'four',
@@ -204,15 +241,28 @@ export default {
         Number(2)
     },
     handleClick(tab, event) {},
-    onclick() {
+    async onclick() {
       let startTime = null
       let endTime = null
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime)
         endTime = sjTime(this.endTime)
       }
+     let option={
+        requestQuery:{},       
+        comparison: 'saleNumber',
+        columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
+      }
+      option.requestQuery[this.condition1]=[];
+      option.requestQuery[this.condition2]=[];
+      if(this.condition1 == this.condition2){
+         option.requestQuery[this.condition1]=[this.input1,this.input2]
+      }else{
+         option.requestQuery[this.condition1]=[this.input1]
+         option.requestQuery[this.condition2]=[this.input2]
+      }
       if (this.activeName == 'four') {
-        this.option4.requestUrl =
+        option.requestUrl =
           '/api/v1/ams/getFuSaleOrderList?apiId=481&con=' +
           this.input +
           '&deleted=' +
@@ -223,8 +273,10 @@ export default {
           endTime +
           '&i=' +
           new Date()
+        option.selectionType='select',
+        await this.setOption("option4",option)
       } else {
-        this.option.requestUrl =
+        option.requestUrl =
           '/api/v1/ams/getFuSaleOrderList?apiId=481&con=' +
           this.input +
           '&deleted=' +
@@ -235,8 +287,15 @@ export default {
           endTime +
           '&i=' +
           new Date()
+        await this.setOption("option",option)
       }
     },
+    setOption(prop,option){
+        return new Promise((resolve,reject)=>{
+          this.$set(this,prop,option)
+          resolve("更新表格数据成功!");
+        });
+    },
     //模糊查询承运商
     onclickCarrier() {
       this.carrier.requestUrl =

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

@@ -1,11 +1,35 @@
 // 采购内转需求
 <template>
-  <div class="steel_inbound">
-    <div class="sache">
+  <div >
+    <div style="margin:10px">
+     <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
       <el-input
-        placeholder="可查询采购订单号、发货单位、卸货点、物资名称、船名"
-        v-model="inputText"
-        clearable
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
       >
       </el-input>
       <span>需求时间：</span>
@@ -86,6 +110,28 @@ import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"采购订单号",
+          value:"purchaseOrderNo"
+          },
+          {
+          label:"发货单位",
+          value:"supplierName"
+          },
+          {
+          label:"卸货点",
+          value:"warehouseName"
+          },
+          {
+          label:"船名",
+          value:"shipName"
+          }
+      ],
       endTime: null,
       startTime: null,
       startStop: null,
@@ -134,6 +180,13 @@ export default {
     },
     //查询方法，支持查采购订单号、发货单位、卸货点、物资名称、船名
     onclick() {
+       let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            requestQuery[this.condition1]=[this.input1+'']
+            requestQuery[this.condition2]=[this.input2+'']
+        }
       console.log(this.inputText);
       let orgCode = null;
       let startTime = null;
@@ -152,27 +205,26 @@ export default {
         this.first.requestUrl =
           "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=0&orgCode=" +
           orgCode +
-          "&con=" +
-          this.inputText +
           "&startTime=" +
           startTime +
           "&endTime=" +
           endTime +
           "&i=" +
           new Date();
+           this.first.requestQuery=requestQuery;
       } else {
         this.second.requestUrl =
           "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&orgCode=" +
           orgCode +
-          "&con=" +
-          this.inputText +
           "&startTime=" +
           startTime +
           "&endTime=" +
           endTime +
           "&i=" +
           new Date();
+           this.second.requestQuery=requestQuery;
       }
+      this.$forceUpdate();
     },
     getRequestUrl() {
       if (
@@ -315,7 +367,6 @@ export default {
     margin-left: 20px;
     margin-top: 20px;
     .el-input {
-      width: 20%;
       margin-right: 1.25rem;
     }
   }

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

@@ -2,7 +2,35 @@
 <template>
   <div class="inwardRequirement">
     <div class="sache">
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+     <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
+      >
       </el-input>
       <span>需求时间：</span>
       <el-date-picker
@@ -86,6 +114,32 @@ import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"物资名称",
+          value:"materialName"
+          },
+          {
+          label:"用车单位",
+          value:"shipperName"
+          },
+          {
+          label:"装货点",
+          value:"loadName"
+          },
+          {
+          label:"卸货点",
+          value:"unloadName"
+          },
+          {
+          label:"需求类型",
+          value:"requirementType"
+          }
+      ],
       inputText: null,
       orgCode: "",
       startTime: null,
@@ -147,31 +201,37 @@ export default {
       ) {
         orgCode = getCookie("orgCode");
       }
+      let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            requestQuery[this.condition1]=[this.input1+'']
+            requestQuery[this.condition2]=[this.input2+'']
+        }
       if (this.activeName == "first") {
         this.first.requestUrl =
           "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" +
           orgCode +
-          "&index=" +
-          this.inputText +
           "&startTime=" +
           startTime +
           "&endTime=" +
           endTime +
           "&i=" +
           new Date();
+        this.first.requestQuery=requestQuery;
       } else {
         this.second.requestUrl =
           "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" +
           orgCode +
-          "&index=" +
-          this.inputText +
           "&startTime=" +
           startTime +
           "&endTime=" +
           endTime +
           "&i=" +
           new Date();
+        this.second.requestQuery=requestQuery;
       }
+      this.$forceUpdate();
     },
     //查看需求下面的运单
     getRequirementOrder(scope) {

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

@@ -2,7 +2,35 @@
 <template>
   <div class="inwardRequirement">
     <div class="sache">
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
+      >
       </el-input>
       <span>需求时间：</span>
       <el-date-picker
@@ -88,6 +116,32 @@ import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"物资名称",
+          value:"materialName"
+          },
+          {
+          label:"用车单位",
+          value:"shipperName"
+          },
+          {
+          label:"装货点",
+          value:"loadName"
+          },
+          {
+          label:"卸货点",
+          value:"unloadName"
+          },
+          {
+          label:"需求类型",
+          value:"requirementType"
+          }
+      ],
       inputText: null,
       orgCode: null,
       endTime: null,
@@ -148,31 +202,37 @@ export default {
       ) {
         orgCode = getCookie("orgCode");
       }
+       let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            requestQuery[this.condition1]=[this.input1+'']
+            requestQuery[this.condition2]=[this.input2+'']
+        }
       if (this.activeName == "first") {
         this.first.requestUrl =
           "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" +
           orgCode +
-          "&index=" +
-          this.inputText +
           "&startTime=" +
           startTime +
           "&endTime=" +
           endTime +
           "&i=" +
           new Date();
+          this.first.requestQuery=requestQuery;
       } else {
         this.second.requestUrl =
           "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" +
           orgCode +
-          "&index=" +
-          this.inputText +
           "&startTime=" +
           startTime +
           "&endTime=" +
           endTime +
           "&i=" +
           new Date();
+          this.second.requestQuery=requestQuery;
       }
+      this.$forceUpdate();
     },
     //查看需求下面的运单
     getRequirementOrder(scope) {

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

@@ -1,11 +1,35 @@
 // 分派计划
 <template>
-  <div class="inwardOrder">
-    <div class="sache">
+  <div>
+    <div style="margin:10px">
+      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
       <el-input
-        placeholder="可查询车牌号、物资、装卸货点"
-        v-model="inputText"
-        clearable
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
       >
       </el-input>
       <span>订单时间：</span>
@@ -47,7 +71,7 @@
     </el-dialog>
     <template>
       <div>
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tabs v-model="activeName">
           <el-tab-pane label="待接收" name="first">
             <dilTable v-bind.sync="first" ref="table" max-height="300">
               <el-table-column fixed="right" label="操作" width="120">
@@ -95,6 +119,28 @@ import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"车牌号",
+          value:"capacityNumber"
+          },
+          {
+          label:"物资名称",
+          value:"materialName"
+          },
+          {
+          label:"装货点",
+          value:"loadName"
+          },
+          {
+          label:"卸货点",
+          value:"unloadName"
+          }
+      ],
       startTime: null,
       endTime: null,
       inputText: null,
@@ -143,6 +189,13 @@ export default {
   },
   methods: {
     onClick() {
+      let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+      }else{
+          requestQuery[this.condition1]=[this.input1+'']
+          requestQuery[this.condition2]=[this.input2+'']
+      }
       console.log('dks')
       let orgCode = null
       let startTime = null
@@ -158,39 +211,37 @@ export default {
         this.first.requestUrl =
           '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&orgCode=' +
           orgCode +
-          '&con=' +
-          this.inputText +
           '&startTime=' +
           startTime +
           '&endTime=' +
           endTime +
           '&i=' +
           new Date()
+        this.first.requestQuery=requestQuery;
       } else if (this.activeName == 'second') {
         this.second.requestUrl =
           '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&orgCode=' +
           orgCode +
-          '&con=' +
-          this.inputText +
           '&startTime=' +
           startTime +
           '&endTime=' +
           endTime +
           '&i=' +
           new Date()
+         this.second.requestQuery=requestQuery;
       } else {
         this.third.requestUrl =
           '/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=2&orgCode=' +
           orgCode +
-          '&con=' +
-          this.inputText +
           '&startTime=' +
           startTime +
           '&endTime=' +
           endTime +
           '&i=' +
           new Date()
+         this.third.requestQuery=requestQuery;
       }
+      this.$forceUpdate();
     },
     getRequest() {
       if (getCookie('orgCode') == 'chengyunshang') {

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

@@ -1,16 +1,60 @@
 // 分解计划
 <template>
-  <div class="inwardDisPlan">
-    <div class="sache">
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+  <div>
+    <div style="margin:10px">
+     <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
       </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <span>需求时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:220px"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:220px"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
     <template>
       <div>
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tabs v-model="activeName" >
           <el-tab-pane label="待分解" name="second">
             <mergeRowTable v-bind.sync="second" ref="table1" max-height="300">
               <el-table-column fixed="right" label="操作" width="100">
@@ -65,9 +109,34 @@
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"用车单位",
+          value:"shipperName"
+          },
+          {
+          label:"物资名称",
+          value:"materialName"
+          },
+          {
+          label:"装货点",
+          value:"loadName"
+          },
+          {
+          label:"卸货点",
+          value:"unloadName"
+          }
+      ],
+      endTime: null,
+      startTime: null,
       inputText: "",
       carrierId: 40,
       second: {
@@ -115,22 +184,44 @@ export default {
       this.getRequestUrl();
     },
     onclick() {
-      if (getCookie("orgCode") == "chengyunshang") {
-        this.third.requestUrl =
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" +
-          getCookie("userId") +
-          "&i=" +
-          new Date() +
-          "&con=" +
-          this.inputText;
-      } else {
-        this.third.requestUrl =
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3" +
-          "&i=" +
-          new Date() +
-          "&con=" +
-          this.inputText;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      let requestQuery={
+        startTime:startTime,
+        endTime:endTime
+      }
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1,this.input2]
+      }else{
+          requestQuery[this.condition1]=[this.input1+'']
+          requestQuery[this.condition2]=[this.input2+'']
       }
+      this.second.requestQuery=requestQuery
+      this.third.requestQuery=requestQuery
+      this.four.requestQuery=requestQuery
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.second.requestUrl =
+        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" +
+        getCookie("userId");
+      this.third.requestUrl =
+        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" +
+        getCookie("userId");
+      this.four.requestUrl =
+        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4&carrierId=" +
+        getCookie("userId");
+    } else {
+      this.second.requestUrl =
+        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2";
+      this.third.requestUrl =
+        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3";
+      this.four.requestUrl =
+        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4";
+    }
+      this.$forceUpdate();
     },
     getRequestUrl() {
       if (getCookie("orgCode") == "chengyunshang") {

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

@@ -1,8 +1,37 @@
 //运输派单
 <template>
-  <div class="transportOrder">
-    <div class="transportOrder_top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+  <div >
+    <div style="margin:10px">
+      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
       <el-button type="primary" class="btn" @click="getRequestUrl">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -94,6 +123,28 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"采购订单号",
+          value:"purchaseOrderNo"
+          },
+          {
+          label:"发货单位",
+          value:"supplierName"
+          },
+          {
+          label:"卸货点",
+          value:"warehouseName"
+          },
+          {
+          label:"船名",
+          value:"shipName"
+          }
+      ],
       //模态窗的框计算
       inputText: null,
       //是否弹出对话框
@@ -269,6 +320,17 @@ export default {
       this.$message.info("取消修改运力");
     },
     getRequestUrl() {
+      let requestQuery={}
+      if(this.condition1 == this.condition2){
+            requestQuery[this.condition1]=[this.input1+'',this.input2+'']
+      }else{
+          requestQuery[this.condition1]=[this.input1+'']
+          requestQuery[this.condition2]=[this.input2+'']
+      }
+      this.first.requestQuery=requestQuery;
+      this.Received.requestQuery=requestQuery
+      this.completed.requestQuery=requestQuery
+      this.dispatched.requestQuery=requestQuery
       if (getCookie("orgCode") == "chengyunshang") {
         (this.first.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&carrierId=" +
@@ -281,14 +343,10 @@ export default {
             "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&planEnableStatus=1&carrierId=" +
             this.carrierUserId +
             "&test=" +
-            new Date() +
-            "&con=" +
-            this.input),
+            new Date() ),
           (this.completed.requestUrl =
             "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.input);
+            getCookie("userId") );
       } else if (
         getCookie("orgCode") == "dagangadmin" ||
         getCookie("orgCode") == "zidonghuabu"
@@ -296,51 +354,36 @@ export default {
         this.first.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1" +
           "&test=" +
-          new Date() +
-          "&con=" +
-          this.input;
-
+          new Date() ;
         this.Received.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5" +
           "&test=" +
-          new Date() +
-          "&con=" +
-          this.input;
-
+          new Date();
         this.completed.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2" +
           "&test=" +
-          new Date() +
-          "&con=" +
-          this.input;
+          new Date();
       } else {
         this.first.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1" +
           "&test=" +
           new Date() +
-          "&con=" +
-          this.input +
           "&userId=" +
           getCookie("orgCode");
-
         this.Received.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5" +
           "&test=" +
           new Date() +
-          "&con=" +
-          this.input +
           "&userId=" +
           getCookie("orgCode");
-
         this.completed.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2" +
           "&test=" +
           new Date() +
-          "&con=" +
-          this.input +
           "&userId=" +
           getCookie("orgCode");
       }
+      this.$forceUpdate();
     },
     getTruckRequestUrl() {
       if (getCookie("orgCode") == "chengyunshang") {

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

@@ -1,8 +1,36 @@
 // 定向派单接单
 <template>
-  <div class="steel_inbound">
-    <div class="sache">
-      <el-input placeholder="请输入内容" v-model="input" clearable>
+  <div >
+    <div >
+        <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input1"
+        style="width:200px"
+        clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input2"
+        style="width:200px"
+        clearable
+      >
       </el-input>
       <el-button type="primary" class="btn" @click="onclick1">
         <i class="el-icon-search"></i>查询
@@ -120,6 +148,20 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+         {
+          label:"物资名称",
+          value:"materialName"
+        },
+        {
+          label:"备注",
+          value:"saleRemark"
+        },
+      ],
       drawer: false,
       ssoId: null,
       direction: "rtl",
@@ -212,26 +254,62 @@ export default {
       console.log(tab, event);
     },
     firstGetRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
-        this.first.requestUrl =
-          "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId=" +
-          getCookie("userId")+"&con=" +this.input;
-      } else {
-        this.first.requestUrl =
-          "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId=" +
-          this.ssoId+"&con=" +this.input;
-      }
+      let _this=this;
+      new Promise((resolve,reject)=>{
+        let option={
+          requestQuery:{},
+          selectionType: "select"
+        }
+        option.requestQuery[this.condition1]=[];
+        option.requestQuery[this.condition2]=[];
+        if(this.condition1 == this.condition2){
+          option.requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+          option.requestQuery[this.condition1]=[this.input1]
+          option.requestQuery[this.condition2]=[this.input2]
+        }
+        if (getCookie("orgCode") == "chengyunshang") {
+            option.requestUrl =
+            "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId=" +
+            getCookie("userId");
+        } else {
+            option.requestUrl =
+            "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId=" +
+            this.ssoId;
+        }
+        resolve(option);
+      }).then((option)=>{
+        _this.first=option
+      });
     },
     secondGetRequestUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
-        this.second.requestUrl =
-          "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSsoId=" +
-          getCookie("userId")+"&con=" +this.input;
-      } else {
-        this.second.requestUrl =
-          "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSsoId=" +
-          this.ssoId+"&con=" +this.input;
-      }
+      let _this=this;
+      new Promise((resolve,reject)=>{
+        let option={
+          requestQuery:{},
+          selectionType: "select"
+        }
+        option.requestQuery[this.condition1]=[];
+        option.requestQuery[this.condition2]=[];
+        if(this.condition1 == this.condition2){
+          option.requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+          option.requestQuery[this.condition1]=[this.input1]
+          option.requestQuery[this.condition2]=[this.input2]
+        }
+        if (getCookie("orgCode") == "chengyunshang") {
+          option.requestUrl =
+            "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSsoId=" +
+            getCookie("userId")+"&con=" +this.input;
+        } else {
+          option.requestUrl =
+            "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSsoId=" +
+            this.ssoId+"&con=" +this.input;
+        }
+        resolve(option);
+      }).then((option)=>{
+        _this.second=option
+      });
     },
     onclick1() {
       console.log();
@@ -506,15 +584,6 @@ export default {
 </script>
 
 <style lang="scss" scode>
-.steel_inbound {
-  .sache {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
-  }
-}
 .button-box {
   display: flex;
   text-align: center;

src/views/sale/components/transport_excute/enFactoryResult.vue

@@ -9,6 +9,36 @@
       <span class="text">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
+      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input1"
+        style="width:200px"
+        clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input2"
+        style="width:200px"
+        clearable
+      >
+      </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -50,6 +80,25 @@ import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+        {
+          label:"车牌号",
+          value:"capacityNumber"
+        },
+        {
+          label:"发货单位",
+          value:"shipperName"
+        },
+         {
+          label:"收货单位",
+          value:"supplierName"
+        },
+        
+      ],
       inputText: "",
       startTime: null,
       endTime: null,
@@ -88,7 +137,7 @@ export default {
   },
   methods: {
     //   时间查询
-    onclick() {
+    async onclick() {
       let startTime = null;
       let endTime = null;
       if (this.startTime) {
@@ -97,10 +146,22 @@ export default {
       if (this.endTime) {
         endTime = sjTime(this.endTime);
       }
+      let option={
+        requestQuery:{},
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2",
+      }
+      option.requestQuery[this.condition1]=[];
+      option.requestQuery[this.condition2]=[];
+      if(this.condition1 == this.condition2){
+         option.requestQuery[this.condition1]=[this.input1,this.input2]
+      }else{
+         option.requestQuery[this.condition1]=[this.input1]
+         option.requestQuery[this.condition2]=[this.input2]
+      }
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
 
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
@@ -112,9 +173,15 @@ export default {
           this.endTime = null;
           this.$message.warning("开始时间要比结束时间早");
         }
-      } else {
-        this.getRequestUrl()
       }
+      await this.setOption("option",option)
+    },
+    setOption(prop,option){
+        return new Promise((resolve,reject)=>{
+          this.$set(this,prop,option)
+          this.$forceUpdate();
+          resolve("更新表格数据成功!");
+        });
     },
     // 查看物资详情
     detailclick(row) {
@@ -162,7 +229,6 @@ export default {
   .top {
     padding: 1.25rem 0.375rem;
 			.el-input {
-			width: 20%;
 			margin-right: 1.25rem;
 			}
   }

src/views/sale/components/transport_excute/grossWeightResult.vue

@@ -2,11 +2,50 @@
 <template>
     <div class="sale">
         <div class="top">
-            <!-- 框计算 -->
+            <el-date-picker
+            v-model="startTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:200px"
+            >
+            </el-date-picker>
+            <span class="text">至</span>
+            <el-date-picker
+            v-model="endTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:200px"
+            >
+            </el-date-picker>
+            <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+                <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+            </el-select>
             <el-input
                 placeholder="请输入内容"
-                v-model="inputText"
-                clearable>
+                v-model="input1"
+                style="width:200px"
+                clearable
+            >
+            </el-input>
+            <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+                <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+            </el-select>
+            <el-input
+                placeholder="请输入内容"
+                v-model="input2"
+                style="width:200px"
+                clearable
+            >
             </el-input>
             <el-button type="primary" class="btn" @click="onclick">
                 <i class="el-icon-search"></i>查询
@@ -18,9 +57,26 @@
     </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
     data(){
         return{
+            condition1:null,
+            condition2:null,
+            input1:null,
+            input2:null,
+            options:[
+                {
+                label:"车牌号",
+                value:"capacityNumber"
+                },
+                {
+                label:"物资",
+                value:"materialName"
+                }
+            ],
+            startTime:null,
+            endTime:null,
             inputText:'',
             option: {       
                 // 表格请求数据的地址
@@ -29,9 +85,39 @@ export default {
         }
     },
     methods:{
-        onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=2&con="+this.inputText;
+        async onclick() {
+        let startTime = null;
+        let endTime = null;
+        if (this.startTime && this.endTime) {
+            startTime = sjTime(this.startTime);
+            endTime = sjTime(this.endTime);
+        }
+        console.log("进入了查询")
+        console.log(startTime)
+        console.log(endTime)
+        let option = {       
+            requestQuery:{}
         }
+        option.requestQuery[this.condition1]=[];
+        option.requestQuery[this.condition2]=[];
+        if(this.condition1 == this.condition2){
+            option.requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            option.requestQuery[this.condition1]=[this.input1]
+            option.requestQuery[this.condition2]=[this.input2]
+        }
+        option.requestUrl =
+       "/api/v1/tms/getAllJiMaoResult?apiId=212&orderType=2"
+        +"&startTime="+startTime+"&endTime="+endTime+"&i="+new Date();
+        await this.setOption("option",option)
+    },
+    setOption(prop,option){
+        return new Promise((resolve,reject)=>{
+        this.$set(this,prop,option)
+        this.$forceUpdate();
+        resolve("更新表格数据成功!");
+        });
+    },
     }
 }
 </script>

src/views/sale/components/transport_excute/loadTruckResult.vue

@@ -2,8 +2,51 @@
 <template>
   <div class="sale">
     <div class="top">
-      <!-- 框计算 -->
-      <el-input placeholder="请输入内容" v-model="inputText" clearable></el-input>
+      <el-date-picker
+      v-model="startTime"
+      type="date"
+      placeholder="选择日期"
+      style="width:200px"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker
+      v-model="endTime"
+      type="date"
+      placeholder="选择日期"
+      style="width:200px"
+      >
+      </el-date-picker>
+      <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input1"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+          <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          </el-option>
+      </el-select>
+      <el-input
+          placeholder="请输入内容"
+          v-model="input2"
+          style="width:200px"
+          clearable
+      >
+      </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -16,9 +59,26 @@
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
+       condition1:null,
+            condition2:null,
+            input1:null,
+            input2:null,
+            options:[
+                {
+                label:"车牌号",
+                value:"capacityNumber"
+                },
+                {
+                label:"物资",
+                value:"materialName"
+                }
+            ],
+      startTime:null,
+      endTime:null,
       inputText: "",
       option: {
         // 表格请求数据的地址
@@ -29,10 +89,38 @@ export default {
     };
   },
   methods: {
-    onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=2&userId="+
-          getCookie("userId") + "&con=" + this.inputText;
+    async onclick() {
+        let startTime = null;
+        let endTime = null;
+        if (this.startTime && this.endTime) {
+            startTime = sjTime(this.startTime);
+            endTime = sjTime(this.endTime);
+        }
+        console.log("进入了查询")
+        console.log(startTime)
+        console.log(endTime)
+        let option = {       
+            requestQuery:{}
+        }
+        option.requestQuery[this.condition1]=[];
+        option.requestQuery[this.condition2]=[];
+        if(this.condition1 == this.condition2){
+            option.requestQuery[this.condition1]=[this.input1,this.input2]
+        }else{
+            option.requestQuery[this.condition1]=[this.input1]
+            option.requestQuery[this.condition2]=[this.input2]
+        }
+        option.requestUrl =
+       "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=2&userId="+ getCookie("userId") 
+        +"&startTime="+startTime+"&endTime="+endTime+"&i="+new Date();
+        await this.setOption("option",option)
+    },
+    setOption(prop,option){
+        return new Promise((resolve,reject)=>{
+        this.$set(this,prop,option)
+        this.$forceUpdate();
+        resolve("更新表格数据成功!");
+        });
     },
   },
 

src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue

@@ -14,6 +14,8 @@
       <span class="text1">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
+      <el-input placeholder="请输入车牌号" v-model="inputText" clearable>
+      </el-input>
        <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -104,14 +106,14 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=225&orderType=2&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=225&orderType=2&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date()+"&con="+this.inputText;
           }else{
           this.startTime = null;
           this.endTime = null;
           this.$message.warning('开始时间要比结束时间早')
         }
       }else{
-        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=225&orderType=2&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=225&orderType=2&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date()+"&con="+this.inputText;
       }
     },
     // 查看物资详情

src/views/sale/components/transport_excute/outFactory/smsResult.vue

@@ -3,8 +3,13 @@
     <div class="sale">
         <div class="top">
             <!-- 框计算 -->
+            <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+            </el-date-picker>
+            <span class="text1">至</span>
+            <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+            </el-date-picker>
             <el-input
-                placeholder="请输入内容"
+                placeholder="请输入车牌号"
                 v-model="inputText"
                 clearable>
             </el-input>
@@ -18,9 +23,12 @@
     </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
     data(){
         return{
+            startTime: null,
+            endTime: null,
             inputText:'',
             option: {       
                 // 表格请求数据的地址
@@ -30,7 +38,30 @@ export default {
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/tms/getSmsResult?apiId=175&orderType=1&con="+this.inputText;
+            let startTime = null;
+            let endTime = null;
+            if(this.startTime){
+                startTime = sjTime(this.startTime);
+            }
+            if(this.endTime){
+                endTime = sjTime(this.endTime);
+            }
+            let option = {       
+                requestQuery:{},
+                requestUrl : "/api/v1/tms/getSmsResult?apiId=175&orderType=1&con="+this.inputText+"&i=" +new Date()
+            }
+            if(startTime && endTime){
+                if(startTime >= endTime){
+                    this.startTime = null;
+                    this.endTime = null;
+                    this.$message.warning('开始时间要比结束时间早')
+                    return;
+                }
+            }
+            option.requestQuery.startTime=startTime;
+            option.requestQuery.endTime=endTime;
+            this.option=option;
+            this.$forceUpdate();
         }
     }
 }

src/views/sale/components/transport_excute/tareWeightResult.vue

@@ -2,12 +2,6 @@
 <template>
     <div class="sale">
         <div class="top">
-            <!-- 框计算 -->
-            <el-input
-                placeholder="请输入内容"
-                v-model="inputText"
-                clearable>
-            </el-input>
             <el-date-picker
             v-model="startTime"
             type="date"
@@ -23,6 +17,36 @@
             style="width:200px"
             >
             </el-date-picker>
+            <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+                <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+            </el-select>
+            <el-input
+                placeholder="请输入内容"
+                v-model="input1"
+                style="width:200px"
+                clearable
+            >
+            </el-input>
+            <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+                <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+            </el-select>
+            <el-input
+                placeholder="请输入内容"
+                v-model="input2"
+                style="width:200px"
+                clearable
+            >
+            </el-input>
             <el-button type="primary" class="btn" @click="onclick">
                 <i class="el-icon-search"></i>查询
             </el-button>
@@ -37,6 +61,29 @@ import { sjTime } from "@/utils/sharedJsFile";
 export default {
     data(){
         return{
+            condition1:null,
+            condition2:null,
+            input1:null,
+            input2:null,
+            options:[
+                {
+                label:"车牌号",
+                value:"capacityNumber"
+                },
+                {
+                label:"物资",
+                value:"materialName"
+                },
+                {
+                label:"发货单位",
+                value:"shipperName"
+                },
+                {
+                label:"收货单位",
+                value:"consigneeCompanyName"
+                },
+                
+            ],
             inputText:'',
             option: {       
                 // 表格请求数据的地址
@@ -47,7 +94,7 @@ export default {
         }
     },
     methods:{
-        onclick(){
+        async onclick(){
             let startTime = null;
             let endTime = null;
             if (this.startTime && this.endTime) {
@@ -57,9 +104,28 @@ export default {
             console.log("进入了查询")
             console.log(startTime)
             console.log(endTime)
-            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2&con="+this.inputText
-            +"&startTime="+startTime+"&endTime="+endTime;
-        }
+            let option = {       
+                requestQuery:{}
+            }
+            option.requestQuery[this.condition1]=[];
+            option.requestQuery[this.condition2]=[];
+            if(this.condition1 == this.condition2){
+                option.requestQuery[this.condition1]=[this.input1,this.input2]
+            }else{
+                option.requestQuery[this.condition1]=[this.input1]
+                option.requestQuery[this.condition2]=[this.input2]
+            }
+            option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2"
+            +"&startTime="+startTime+"&endTime="+endTime+"&i="+new Date();
+            await this.setOption("option",option)
+        },
+        setOption(prop,option){
+            return new Promise((resolve,reject)=>{
+            this.$set(this,prop,option)
+            this.$forceUpdate();
+            resolve("更新表格数据成功!");
+            });
+        },
     }
 }
 </script>

src/views/sale/components/transport_order/receiveOrder.vue

@@ -1,8 +1,36 @@
 // 接收运单
 <template>
-  <div class="steel_inbound">
-    <div class="sache">
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+  <div >
+    <div style="margin:10px">
+       <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input1"
+        style="width:200px"
+        clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input2"
+        style="width:200px"
+        clearable
+      >
       </el-input>
       <el-button type="primary" class="btn" @click="onClick">
         <i class="el-icon-search"></i>查询
@@ -104,7 +132,7 @@
           :shiyHeigth="shiyHeigth"
           :isKuang="isKuang"
         >
-          <el-table-column fixed="right" label="操作" width="50">
+          <el-table-column fixed="right" label="操作" width="80">
             <template slot-scope="scope">
               <el-button
                 @click="detailclick(scope.row)"
@@ -145,7 +173,7 @@
           :shiyHeigth="shiyHeigth"
           :isKuang="isKuang"
         >
-          <el-table-column fixed="right" label="操作" width="50">
+          <el-table-column fixed="right" label="操作" width="80">
             <template slot-scope="scope">
               <el-button
                 @click="detailclick1(scope.row)"
@@ -185,6 +213,24 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+        {
+          label:"车牌号",
+          value:"capacityNumber"
+        }, 
+        {
+          label:"发货单位",
+          value:"shipperName"
+        },
+         {
+          label:"收货单位",
+          value:"consigneeCompanyName"
+        },
+      ],
       shiyHeigth: 190,
       isHeigth: true,
       pageSize: 100,
@@ -451,49 +497,60 @@ export default {
           }
         });
     },
-    onClick() {
+        async onClick() {
+       let option={
+        requestQuery:{}
+      }
+      option.requestQuery[this.condition1]=[];
+      option.requestQuery[this.condition2]=[];
+      if(this.condition1 == this.condition2){
+         option.requestQuery[this.condition1]=[this.input1,this.input2]
+      }else{
+         option.requestQuery[this.condition1]=[this.input1]
+         option.requestQuery[this.condition2]=[this.input2]
+      }
       if (getCookie("orgCode") == "chengyunshang") {
         if (this.activeName == "first") {
-          this.option1.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.inputText;
+            getCookie("userId")
+          await this.setOption("option1",option);
         } else if (this.activeName == "second") {
-          this.option2.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.inputText;
+            getCookie("userId")
+          await this.setOption("option2",option);
         } else {
-          this.option3.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.inputText;
+            getCookie("userId") 
+            await this.setOption("option3",option);
         }
       } else {
         if (this.activeName == "first") {
-          this.option1.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
-            "" +
-            "&con=" +
-            this.inputText;
+            "" 
+            await this.setOption("option1",option);
         } else if (this.activeName == "second") {
-          this.option2.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
-            "" +
-            "&con=" +
-            this.inputText;
+            ""
+            await this.setOption("option2",option);
         } else {
-          this.option3.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
-            "" +
-            "&con=" +
-            this.inputText;
+            "" 
+           await this.setOption("option3",option);
         }
       }
     },
+    setOption(prop,option){
+        return new Promise((resolve,reject)=>{
+          this.$set(this,prop,option)
+          resolve("更新表格数据成功!");
+        });
+    },
     // -------查看物资详情 (已接收)
     detailclick(row) {
       // 记录重复点击次数
@@ -624,7 +681,6 @@ export default {
   .sache {
     padding: 1.25rem 0.375rem;
     .el-input {
-      width: 20%;
       margin-right: 1.25rem;
     }
   }

src/views/sale/components/transport_order/saleChemicalCokeOrder.vue

@@ -1,8 +1,36 @@
 // 接收化产焦炭运单
 <template>
-  <div class="steel_inbound">
-    <div class="sache">
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+  <div >
+    <div style="margin:10px">
+       <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input1"
+        style="width:200px"
+        clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input2"
+        style="width:200px"
+        clearable
+      >
       </el-input>
       <el-button type="primary" class="btn" @click="onClick">
         <i class="el-icon-search"></i>查询
@@ -104,7 +132,7 @@
           :shiyHeigth="shiyHeigth"
           :isKuang="isKuang"
         >
-          <el-table-column fixed="right" label="操作" width="50">
+          <el-table-column fixed="right" label="操作" width="80">
             <template slot-scope="scope">
               <el-button
                 @click="detailclick(scope.row)"
@@ -145,7 +173,7 @@
           :shiyHeigth="shiyHeigth"
           :isKuang="isKuang"
         >
-          <el-table-column fixed="right" label="操作" width="50">
+          <el-table-column fixed="right" label="操作" width="80">
             <template slot-scope="scope">
               <el-button
                 @click="detailclick1(scope.row)"
@@ -185,6 +213,24 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+        {
+          label:"车牌号",
+          value:"capacityNumber"
+        }, 
+        {
+          label:"发货单位",
+          value:"shipperName"
+        },
+         {
+          label:"收货单位",
+          value:"consigneeCompanyName"
+        },
+      ],
       shiyHeigth: 190,
       isHeigth: true,
       pageSize: 100,
@@ -459,49 +505,60 @@ export default {
           }
         });
     },
-    onClick() {
+    async onClick() {
+       let option={
+        requestQuery:{}
+      }
+      option.requestQuery[this.condition1]=[];
+      option.requestQuery[this.condition2]=[];
+      if(this.condition1 == this.condition2){
+         option.requestQuery[this.condition1]=[this.input1,this.input2]
+      }else{
+         option.requestQuery[this.condition1]=[this.input1]
+         option.requestQuery[this.condition2]=[this.input2]
+      }
       if (getCookie("orgCode") == "chengyunshang") {
         if (this.activeName == "first") {
-          this.option1.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=2&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.inputText;
+            getCookie("userId")
+          await this.setOption("option1",option);
         } else if (this.activeName == "second") {
-          this.option2.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=2&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.inputText;
+            getCookie("userId")
+          await this.setOption("option2",option);
         } else {
-          this.option3.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=2&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.inputText;
+            getCookie("userId") 
+            await this.setOption("option3",option);
         }
       } else {
         if (this.activeName == "first") {
-          this.option1.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=2&carrierSsoId=" +
-            "" +
-            "&con=" +
-            this.inputText;
+            "" 
+            await this.setOption("option1",option);
         } else if (this.activeName == "second") {
-          this.option2.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=2&carrierSsoId=" +
-            "" +
-            "&con=" +
-            this.inputText;
+            ""
+            await this.setOption("option2",option);
         } else {
-          this.option3.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=2&carrierSsoId=" +
-            "" +
-            "&con=" +
-            this.inputText;
+            "" 
+           await this.setOption("option3",option);
         }
       }
     },
+    setOption(prop,option){
+        return new Promise((resolve,reject)=>{
+          this.$set(this,prop,option)
+          resolve("更新表格数据成功!");
+        });
+    },
     // -------查看物资详情 (已接收)
     detailclick(row) {
       // 记录重复点击次数
@@ -632,7 +689,6 @@ export default {
   .sache {
     padding: 1.25rem 0.375rem;
     .el-input {
-      width: 20%;
       margin-right: 1.25rem;
     }
   }

src/views/sale/components/transport_order/saleCoproductOrder.vue

@@ -2,7 +2,35 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+             <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input1"
+        style="width:200px"
+        clearable
+      >
+      </el-input>
+      <el-select v-model="condition2" placeholder="请选择筛选条件" style="width:150px" clearable>
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input2"
+        style="width:200px"
+        clearable
+      >
       </el-input>
       <el-button type="primary" class="btn" @click="onClick">
         <i class="el-icon-search"></i>查询
@@ -104,7 +132,7 @@
           :shiyHeigth="shiyHeigth"
           :isKuang="isKuang"
         >
-          <el-table-column fixed="right" label="操作" width="50">
+          <el-table-column fixed="right" label="操作" width="80">
             <template slot-scope="scope">
               <el-button
                 @click="detailclick(scope.row)"
@@ -145,7 +173,7 @@
           :shiyHeigth="shiyHeigth"
           :isKuang="isKuang"
         >
-          <el-table-column fixed="right" label="操作" width="50">
+          <el-table-column fixed="right" label="操作" width="80">
             <template slot-scope="scope">
               <el-button
                 @click="detailclick1(scope.row)"
@@ -185,6 +213,24 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+            condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+        {
+          label:"车牌号",
+          value:"capacityNumber"
+        }, 
+        {
+          label:"发货单位",
+          value:"shipperName"
+        },
+         {
+          label:"收货单位",
+          value:"consigneeCompanyName"
+        },
+      ],
       shiyHeigth: 190,
       isHeigth: true,
       pageSize: 100,
@@ -459,49 +505,60 @@ export default {
           }
         });
     },
-    onClick() {
+    async onClick() {
+       let option={
+        requestQuery:{}
+      }
+      option.requestQuery[this.condition1]=[];
+      option.requestQuery[this.condition2]=[];
+      if(this.condition1 == this.condition2){
+         option.requestQuery[this.condition1]=[this.input1,this.input2]
+      }else{
+         option.requestQuery[this.condition1]=[this.input1]
+         option.requestQuery[this.condition2]=[this.input2]
+      }
       if (getCookie("orgCode") == "chengyunshang") {
         if (this.activeName == "first") {
-          this.option1.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.inputText;
+            getCookie("userId")
+          await this.setOption("option1",option);
         } else if (this.activeName == "second") {
-          this.option2.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.inputText;
+            getCookie("userId")
+          await this.setOption("option2",option);
         } else {
-          this.option3.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.inputText;
+            getCookie("userId") 
+            await this.setOption("option3",option);
         }
       } else {
         if (this.activeName == "first") {
-          this.option1.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
-            "" +
-            "&con=" +
-            this.inputText;
+            "" 
+            await this.setOption("option1",option);
         } else if (this.activeName == "second") {
-          this.option2.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
-            "" +
-            "&con=" +
-            this.inputText;
+            ""
+            await this.setOption("option2",option);
         } else {
-          this.option3.requestUrl =
+          option.requestUrl =
             "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
-            "" +
-            "&con=" +
-            this.inputText;
+            "" 
+           await this.setOption("option3",option);
         }
       }
     },
+    setOption(prop,option){
+        return new Promise((resolve,reject)=>{
+          this.$set(this,prop,option)
+          resolve("更新表格数据成功!");
+        });
+    },
     // -------查看物资详情 (已接收)
     detailclick(row) {
       // 记录重复点击次数
@@ -632,7 +689,6 @@ export default {
   .sache {
     padding: 1.25rem 0.375rem;
     .el-input {
-      width: 20%;
       margin-right: 1.25rem;
     }
   }

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -7,15 +7,14 @@
           v-model="endTime"
           @change="DateChange"
           type="datetime"
-          placeholder="选择截止时间"
-        >
+          placeholder="选择截止时间">
         </el-date-picker>
         <!-- <el-button type="primary" class="btn" @click="onclick">
           <i class="el-icon-search"></i>查询
         </el-button> -->
-        <el-button type="primary" class="btn" @click="reflush">
+        <!-- <el-button type="primary" class="btn" @click="reflush">
           <i class="el-icon-search"></i>刷新
-        </el-button>
+        </el-button> -->
         <el-button type="primary" class="btn" @click="getPdfs()">
           <i class="el-icon-download"></i>下载PDF
         </el-button>
@@ -23,7 +22,7 @@
           <i class="el-icon-download"></i>下载Excel
         </el-button>
       </div>
-      <table-item ref="ship" :tableData="tableData" :col="col" id="pdfDom">
+      <table-item ref="ship" v-bind.sync="option" id="pdfDom">
       </table-item>
     </div>
   </div>
@@ -40,117 +39,121 @@ export default {
   },
   data() {
     return {
+      endTime:null,
+      option:{
+        endTime:null,
+        deadline:null,
+           // 树型结构表头数据
+        col: [
+          {
+            prop: 'materialType',
+            label: '矿种'
+          },
+          {
+            prop: 'pm',
+            label: '品名'
+          },
+          {
+            prop: 'portName',
+            label: '港口名称'
+          },
+          {
+            prop: 'tonnage',
+            label: '下游港口吨位'
+          },
+          {
+            label: '未到闸船舶',
+            children: [
+              {
+                prop: 'capacity1',
+                label: '船名'
+              },
+              {
+                prop: 'capacityNumber1',
+                label: '吨位'
+              },
+              {
+                prop: 'locationValue1',
+                label: '位置'
+              },
+              {
+                prop: 'outPortTime1',
+                label: '离港时间'
+              }
+            ]
+          },
+          {
+            label: '等闸船舶',
+            children: [
+              {
+                prop: 'capacity2',
+                label: '船名'
+              },
+              {
+                prop: 'capacityNumber2',
+                label: '吨位'
+              },
+              {
+                prop: 'locationValue2',
+                label: '位置'
+              },
+              {
+                prop: 'outPortTime2',
+                label: '离港时间'
+              }
+            ]
+          },
+          {
+            label: '已过闸船舶',
+            children: [
+              {
+                prop: 'capacity3',
+                label: '船名'
+              },
+              {
+                prop: 'capacityNumber3',
+                label: '吨位'
+              },
+              {
+                prop: 'locationValue3',
+                label: '位置'
+              },
+              {
+                prop: 'outPortTime3',
+                label: '离港时间'
+              }
+            ]
+          },
+          {
+            label: '到港待卸船舶',
+            children: [
+              {
+                prop: 'capacity4',
+                label: '船名'
+              },
+              {
+                prop: 'capacityNumber4',
+                label: '吨位'
+              },
+              {
+                prop: 'locationValue4',
+                label: '位置'
+              },
+              {
+                prop: 'outPortTime4',
+                label: '离港时间'
+              },
+              {
+                prop: 'dgsj',
+                label: '到港时间'
+              }
+            ]
+          }
+        ],
+        // 表格数据
+        tableData: [],
+      },
       htmlTitle: '船舶动态表',
-      // 树型结构表头数据
-      col: [
-        {
-          prop: 'materialType',
-          label: '矿种'
-        },
-        {
-          prop: 'pm',
-          label: '品名'
-        },
-        {
-          prop: 'portName',
-          label: '港口名称'
-        },
-        {
-          prop: 'tonnage',
-          label: '下游港口吨位'
-        },
-        {
-          label: '未到闸船舶',
-          children: [
-            {
-              prop: 'capacity1',
-              label: '船名'
-            },
-            {
-              prop: 'capacityNumber1',
-              label: '吨位'
-            },
-            {
-              prop: 'locationValue1',
-              label: '位置'
-            },
-            {
-              prop: 'outPortTime1',
-              label: '离港时间'
-            }
-          ]
-        },
-        {
-          label: '等闸船舶',
-          children: [
-            {
-              prop: 'capacity2',
-              label: '船名'
-            },
-            {
-              prop: 'capacityNumber2',
-              label: '吨位'
-            },
-            {
-              prop: 'locationValue2',
-              label: '位置'
-            },
-            {
-              prop: 'outPortTime2',
-              label: '离港时间'
-            }
-          ]
-        },
-        {
-          label: '已过闸船舶',
-          children: [
-            {
-              prop: 'capacity3',
-              label: '船名'
-            },
-            {
-              prop: 'capacityNumber3',
-              label: '吨位'
-            },
-            {
-              prop: 'locationValue3',
-              label: '位置'
-            },
-            {
-              prop: 'outPortTime3',
-              label: '离港时间'
-            }
-          ]
-        },
-        {
-          label: '到港待卸船舶',
-          children: [
-            {
-              prop: 'capacity4',
-              label: '船名'
-            },
-            {
-              prop: 'capacityNumber4',
-              label: '吨位'
-            },
-            {
-              prop: 'locationValue4',
-              label: '位置'
-            },
-            {
-              prop: 'outPortTime4',
-              label: '离港时间'
-            },
-            {
-              prop: 'dgsj',
-              label: '到港时间'
-            }
-          ]
-        }
-      ],
-      // 表格数据
-
-      tableData: [],
       input: '',
       //万州港库存信息
       stockString: null,
@@ -162,7 +165,9 @@ export default {
       loadTable: []
     }
   },
-  created() {},
+  created() {
+    this.initialDate();
+  },
   mounted() {
     this.initialization()
     this.getStockString()
@@ -175,15 +180,42 @@ export default {
     reflush() {
       this.$router.go(0)
     },
+    initialDate(){
+      let now=new Date();
+      now.setMinutes(0);
+      now.setSeconds(0);
+      if(now.getHours() >=8 && now.getHours() < 18){
+        now.setHours(8);
+      }else if(now.getHours() >= 18){
+        now.setHours(18)
+      }else if(now.getHours() < 8 ){
+        now = new Date(now.getTime()-1000*60*60*24);
+        now.setHours(18)
+      }
+      this.endTime=now;
+      this.DateChange();
+    },
+    DateChange(){
+      this.option.deadline=this.endTime.getFullYear()+'年'+(this.endTime.getMonth()+1)+'月'+this.endTime.getDate()+'日（数据截止于'+this.endTime.getHours()+':'+this.perfix(this.endTime.getMinutes())+'）';
+      this.option.endTime=this.endTime.getTime();
+      this.onclick();
+    },
+    perfix(num){
+      let arr=new Array(2).fill('0');
+      return (arr.join()+num).slice(-2);
+    },
     onclick() {
+      let map={
+        oneDate:this.endTime.getTime()
+      }
       this.axios
-        .post('/api/v1/tms/selectAllShipDynamaics?con=' + this.input)
+        .post('/api/v1/tms/selectAllShipDynamaics?con=' + this.input,map)
         .then(res => {
           if (res.data.code == '200') {
-            this.tableData = res.data.data
+            this.option.tableData = res.data.data
             console.log('aaad' + res.data.data)
           } else if (res.data.data == '暂时没有船舶动态') {
-            this.tableData = []
+            this.option.tableData = []
           }
         })
     },
@@ -479,9 +511,9 @@ export default {
     initialization() {
       this.axios.post('/api/v1/tms/selectAllShipDynamaics').then(res => {
         if (res.data.code == '200') {
-          this.tableData = res.data.data
-          console.log('this.tableData:', this.tableData)
-          this.tableData.forEach(item => {
+          this.option.tableData = res.data.data
+          console.log('this.option.tableData:', this.option.tableData)
+          this.option.tableData.forEach(item => {
             try {
               item.tonnage = item.tonnage.toFixed(2)
             } catch (error) {}
@@ -519,7 +551,7 @@ export default {
               }
             } catch (error) {}
           })
-          console.log(this.tableData)
+          console.log(this.option.tableData)
         } else {
           this.$message({
             type: 'warning',

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

@@ -102,6 +102,7 @@
 import { shallowRef } from '@vue/reactivity'
 import { lazyAMapApiLoaderInstance } from 'vue-amap'
 import Slider from './slider.vue'
+import { getCookie } from "@/utils/util.js";
 Vue.use(Slider)
 import Vue from 'vue'
 var infoWindow
@@ -531,9 +532,7 @@ export default {
       that.geocoder.getAddress(lnglatXY, function(status, result) {
         if (status === 'complete' && result.info === 'OK') {
           that.currentPointName = result.regeocode.formattedAddress
-          that.initCustomMarkes(
-            that.capacityNumber,
-            that.statusCode+
+          let content= that.statusCode+
             '：' +
               that.currentPointName +
               '<br/>' +
@@ -543,8 +542,19 @@ export default {
               '时间范围：' +
               that.startTime +
               ' 至 ' +
-              that.endTime,
-
+              that.endTime;
+          if(getCookie('orgCode')!='wuliuyunshubu'){
+            content = that.statusCode +'：' +
+              that.currentPointName +
+              '<br/>' +
+              '时间范围：' +
+              that.startTime +
+              ' 至 ' +
+              that.endTime;
+          }
+          that.initCustomMarkes(
+            that.capacityNumber,
+            content,
             lnglatXY[0],
             lnglatXY[1]
           )