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

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

@@ -21,30 +21,38 @@
           >
           </el-date-picker>
           <el-form-item>
-            <el-input
-              v-model="inputReceiveName"
-              style="width:200px"
-              placeholder="输入收货单位"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-input
-              v-model="inputMaterial"
-              style="width:200px"
-              placeholder="可输入条件查询"
-              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>
           </el-form-item>
         </el-form-item>
-        <el-form-item>
-          <el-input
-            v-model="wareHouse"
-            style="width:200px"
-            placeholder="查询仓库"
-            clearable
-          ></el-input>
-        </el-form-item>
         <el-button type="primary" class="btn" @click="onclick">
           <i class="el-icon-search"></i>
         </el-button>
@@ -271,6 +279,28 @@ export default {
   },
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"车牌号",
+          value:"capacityNumber"
+          },
+          {
+          label:"收货单位",
+          value:"receivName"
+          },
+          {
+          label:"物资名称/备注",
+          value:"remark"
+          },
+          {
+          label:"装货地点",
+          value:"wareHouse"
+          }
+      ],
       orderNumber: null,
       orderId:null,
       disabled: false,
@@ -284,7 +314,8 @@ export default {
       isKuang: false,
       option: {
         requestUrl: "",
-        selectionType:"radio"
+        selectionType:"radio",
+        requestQuery:null
       },
       startTime: null,
       endTime: null,
@@ -737,6 +768,10 @@ export default {
     onclick() {
       let startTime = null;
       let endTime = null;
+      let requestQuery={}
+      requestQuery[this.condition1]=this.input1+''
+      requestQuery[this.condition2]=this.input2+''
+      this.option.requestQuery=requestQuery;
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
         endTime = sjTime(this.endTime);
@@ -754,13 +789,7 @@ export default {
             "&carrierSsoId=" +
             getCookie("userId") +
             "&i=" +
-            new Date() +
-            "&receiveName=" +
-            this.inputReceiveName +
-            "&materialName=" +
-            this.inputMaterial +
-            "&wareHouse=" +
-            this.wareHouse;
+            new Date();
         } else {
           this.option.requestUrl =
             "/api/v1/tms/getAllSaleReport?apiId=526&startTime=" +
@@ -771,13 +800,7 @@ export default {
             "&carrierSsoId=" +
             null +
             "&i=" +
-            new Date() +
-            "&receiveName=" +
-            this.inputReceiveName +
-            "&materialName=" +
-            this.inputMaterial +
-            "&wareHouse=" +
-            this.wareHouse;
+            new Date();
         }
       } else {
         if (this.startTime) {
@@ -796,13 +819,7 @@ export default {
             "&carrierSsoId=" +
             getCookie("userId") +
             "&i=" +
-            new Date() +
-            "&receiveName=" +
-            this.inputReceiveName +
-            "&materialName=" +
-            this.inputMaterial +
-            "&wareHouse=" +
-            this.wareHouse;
+            new Date();
         } else {
           this.option.requestUrl =
             "/api/v1/tms/getAllSaleReport?apiId=526&startTime=" +
@@ -813,13 +830,7 @@ export default {
             "&carrierSsoId=" +
             null +
             "&i=" +
-            new Date() +
-            "&receiveName=" +
-            this.inputReceiveName +
-            "&materialName=" +
-            this.inputMaterial +
-            "&wareHouse=" +
-            this.wareHouse;
+            new Date();
         }
       }
     },

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

@@ -20,30 +20,36 @@
             placeholder="选择日期时间"
           >
           </el-date-picker>
-          <el-form-item>
-            <el-input
-              v-model="inputReceiveName"
-              style="width:200px"
-              placeholder="输入收货单位"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-input
-              v-model="wareHouse"
+          <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"
-              placeholder="输入装货地点"
               clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-input
-              v-model="inputMaterial"
+          >
+          </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"
-              placeholder="输入物资名称或备注"
               clearable
-            ></el-input>
-          </el-form-item>
+          >
+          </el-input>
           <el-button type="primary" class="btn" @click="onclick">
             <i class="el-icon-search"></i>
           </el-button>
@@ -269,6 +275,28 @@ export default {
   },
   data() {
     return {
+      condition1:null,
+      condition2:null,
+      input1:null,
+      input2:null,
+      options:[
+          {
+          label:"车牌号",
+          value:"capacityNumber"
+          },
+          {
+          label:"收货单位",
+          value:"receivName"
+          },
+          {
+          label:"物资名称/备注",
+          value:"remark"
+          },
+          {
+          label:"装货地点",
+          value:"wareHouse"
+          }
+      ],
       orderNumber: null,
       orderId:null,
       disabled: false,
@@ -280,7 +308,8 @@ export default {
       isKuang: false,
       option: {
         requestUrl: "",
-        selectionType:"radio"
+        selectionType:"radio",
+        requestQuery:null
       },
       startTime: null,
       endTime: null,
@@ -686,6 +715,10 @@ export default {
     onclick() {
       let startTime = null;
       let endTime = null;
+      let requestQuery={}
+      requestQuery[this.condition1]=this.input1+''
+      requestQuery[this.condition2]=this.input2+''
+      this.option.requestQuery=requestQuery;
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
         endTime = sjTime(this.endTime);
@@ -703,13 +736,7 @@ export default {
             "&carrierSsoId=" +
             getCookie("userId") +
             "&i=" +
-            new Date() +
-            "&receiveName=" +
-            this.inputReceiveName +
-            "&materialName=" +
-            this.inputMaterial
-            +"&wareHouse="+
-            this.wareHouse;
+            new Date();
         } else {
           this.option.requestUrl =
             "/api/v1/tms/getAllSaleReport?apiId=526&startTime=" +
@@ -720,13 +747,7 @@ export default {
             "&carrierSsoId=" +
             null +
             "&i=" +
-            new Date() +
-            "&receiveName=" +
-            this.inputReceiveName +
-            "&materialName=" +
-            this.inputMaterial
-            +"&wareHouse="+
-            this.wareHouse;
+            new Date();
         }
       } else {
         if (this.startTime) {
@@ -745,12 +766,7 @@ export default {
             "&carrierSsoId=" +
             getCookie("userId") +
             "&i=" +
-            new Date() +
-            "&receiveName=" +
-            this.inputReceiveName +
-            "&materialName=" +
-            this.inputMaterial +"&wareHouse="+
-            this.wareHouse;
+            new Date();
         } else {
           this.option.requestUrl =
             "/api/v1/tms/getAllSaleReport?apiId=526&startTime=" +
@@ -761,12 +777,7 @@ export default {
             "&carrierSsoId=" +
             null +
             "&i=" +
-            new Date() +
-            "&receiveName=" +
-            this.inputReceiveName +
-            "&materialName=" +
-            this.inputMaterial +"&wareHouse="+
-            this.wareHouse;
+            new Date();
         }
       }
     },