修改

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,26 @@ 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:{}
+      }
+      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 +271,9 @@ export default {
           endTime +
           '&i=' +
           new Date()
+        await this.setOption("option4",option)
       } else {
-        this.option.requestUrl =
+        option.requestUrl =
           '/api/v1/ams/getFuSaleOrderList?apiId=481&con=' +
           this.input +
           '&deleted=' +
@@ -235,8 +284,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/sale/components/transport_appointment/openDistribution.vue

@@ -2,7 +2,35 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <el-input placeholder="请输入内容" v-model="input" 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="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,60 @@ 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:{}
+        }
+        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:{}
+        }
+        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 +582,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,14 @@ 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)
+          resolve("更新表格数据成功!");
+        });
     },
     // 查看物资详情
     detailclick(row) {
@@ -162,7 +228,6 @@ export default {
   .top {
     padding: 1.25rem 0.375rem;
 			.el-input {
-			width: 20%;
 			margin-right: 1.25rem;
 			}
   }

src/views/sale/components/transport_order/receiveOrder.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,
@@ -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

@@ -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=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

@@ -165,9 +165,11 @@ export default {
       loadTable: []
     }
   },
-  created() {},
-  mounted() {
+  created() {
     this.initialDate()
+  },
+  mounted() {
+    
     this.initialization()
     this.getStockString()
     this.getDownStockString()