订单列表加提货率和提货状态搜索

src/i18n/languages/en_US.json

@@ -4684,7 +4684,7 @@
   "请重新选择主要竞争对手": "Please again select customer major competitors",
   "装柜/出仓时间": "Loading/Exit Time",
   "卸柜/到仓时间": "Unloading/Arrival Time",
-  "提货率": "Delivery rate",
+  "提货率": "pickup rate",
   "业绩归属客户方": "Performance belonging customers",
   "报价有效期": "Quotation validity period",
   "发货评估": "Delivery evaluation",
@@ -4703,5 +4703,8 @@
   "跟进情况": "Follow-up situation",
   "下次跟进时间": "Next follow-up time",
   "提交结果": "Submit result",
-  "增加计划": "add plan"
+  "增加计划": "add plan",
+  "提货状态": "pickup status",
+  "未提货": "not pickup",
+  "部分提货": "portion pickup"
 }

src/views/ecw/order/index.vue

@@ -338,6 +338,31 @@
           </template>
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('提货状态')" v-show="showSearch">
+        <el-select multiple clearable v-model="queryParams.pickStateList">
+          <el-option :label="$t('未提货')" :value="0" />
+          <el-option :label="$t('部分提货')" :value="1" />
+          <el-option :label="$t('已提货')" :value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('提货率')" v-show="showSearch">
+        <el-input
+          type="number"
+          v-model.trim="pickRatio.value"
+          :placeholder="$t('请输入数字')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        >
+          <template slot="prepend">
+            <dict-selector
+              :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD"
+              defaultable
+              v-model="pickRatio.key"
+              class="w-50"
+            />
+          </template>
+        </el-input>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -1332,7 +1357,7 @@ export default {
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // 订单列表
@@ -1394,7 +1419,11 @@ export default {
         value: "",
       },
       // 当前操作转异的订单
-      tureExceptionOrder: null
+      tureExceptionOrder: null,
+      pickRatio: {
+        key: "eqNumberKey",
+        value: "",
+      }
     };
   },
   watch: {
@@ -1639,7 +1668,16 @@ export default {
       if (this.destWarehouseId != null && this.destWarehouseId != "") {
         queryParams.destWarehouseIds = this.destWarehouseId;
       }
-
+      // 提货率
+      if (this.pickRatio.value) {
+        let key = 'eqPickRatio'
+        if (this.pickRatio.key == 'leNumberKey') {
+          key = 'lePickRatio'
+        } else if (this.pickRatio.key == 'geNumberKey') {
+          key = 'gePickRatio'
+        }
+        queryParams[key] = this.pickRatio.value
+      }
       return queryParams;
     },
     /*batchWarehouseAdjustment(){