订单列表重置，提货状态改用字典

src/i18n/languages/en_US.json

@@ -4706,9 +4706,6 @@
   "下次跟进时间": "Next follow-up time",
   "提交结果": "Submit result",
   "增加计划": "add plan",
-  "提货状态": "pickup status",
-  "未提货": "not pickup",
-  "部分提货": "portion pickup",
   "是否确认导出客户跟进记录数据项?": "Are you sure to export all customer follow-up record data items?",
   "请选择需要核销的收款明细": "Please select the collection details that need to be written off"
 }

src/utils/dict.js

@@ -220,6 +220,7 @@ export const DICT_TYPE = {
   TARGET_TYPE: "target_type", //部门业绩目标类型
   CEBE_UNIT: "cube_unit", //目标单位
   RECEIPT_ITEM_STATE: "receipt_item_state", //收款单明细状态
+  PICK_STATE: "pick_state", //提货状态
   // ========== 出货模块 ==========
   BOX_SHIPPING_TRAILER_STATUS: "shipping_trailer_status", // 拖车状态
   BOX_SHIPPING_CUSTOMS_TYPE: "shipping_customs_type", // 报关方式

src/views/ecw/customer/components/customerFollow.vue

@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('跟进类型')" required>
-            <el-select v-model="form.followType" :placeholder="$t('请选择')" @change="handleFollowType" :disabled="isView">
+            <el-select v-model="form.followType" clearable :placeholder="$t('请选择')" @change="handleFollowType" :disabled="isView">
               <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_TYPE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
             </el-select>
           </el-form-item>
@@ -36,12 +36,12 @@
         -->
         <el-col :span="12">
           <el-form-item :label="$t('跟进时间')" required>
-            <el-date-picker v-model="form.followTime" type="datetime" :placeholder="$t('请选择')" :disabled="isView"></el-date-picker>
+            <el-date-picker v-model="form.followTime" clearable type="datetime" :placeholder="$t('请选择')" :disabled="isView" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('联系人')" required>
-            <el-select v-model="form.contactName" :placeholder="$t('请选择')" :disabled="isView">
+            <el-select v-model="form.contactName" clearable :placeholder="$t('请选择')" :disabled="isView">
               <el-option v-for="(item, index) in customerContactsList" :key="index" :label="item.name" :value="item.name">
               </el-option>
             </el-select>
@@ -49,15 +49,15 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('客户经理')" required>
-            <el-select v-model="form.followUserId" :placeholder="$t('请选择')" :disabled="isView">
+            <el-select v-model="form.followUserId" clearable :placeholder="$t('请选择')" :disabled="isView">
               <el-option v-for="item in serviceUserList" :key="item.id" :label="item.nickname" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label="$t('跟进方式')" required >
-            <dict-selector ref="dictMethod" v-model="form.followMethod" :disabled="isView" :type="DICT_TYPE.CUSTOMER_FOLLOWUP_METHOD"></dict-selector>
+          <el-form-item :label="$t('跟进方式')" required>
+            <dict-selector ref="dictMethod" v-model="form.followMethod" clearable :disabled="isView" :type="DICT_TYPE.CUSTOMER_FOLLOWUP_METHOD"></dict-selector>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -67,7 +67,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('跟进结果')" prop="followMethod">
-            <el-select v-model="form.resultType" :placeholder="$t('请选择')" :disabled="isView">
+            <el-select v-model="form.resultType" clearable :placeholder="$t('请选择')" :disabled="isView">
               <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_RESULT_TYPE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
             </el-select>
           </el-form-item>

src/views/ecw/customer/query.vue

@@ -155,14 +155,16 @@
                 <el-descriptions-item :label="$t('已出货订单')">{{orderStatisticsObj.shipmentTotal  || 0}}</el-descriptions-item>
               </el-descriptions>
               <el-table :data="orderList">
-                <el-table-column :label="$t('订单编号')" width="120px" align="center" prop="orderNo" >
-                  <template slot-scope="scope">
-                    <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
-                      <span>{{ scope.row.orderNo }}</span>
-                    </router-link>
+                <el-table-column :label="$t('订单编号')" width="120px" align="center">
+                  <template slot-scope="{row}">
+                    <el-link type="primary" @click.native="$router.push('/order/detail?orderId=' + row.orderId)">{{row.orderNo}}</el-link>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('报价单号')" align="center" width="120px">
+                  <template slot-scope="{row}">
+                    <el-link type="primary" @click.native="$router.push('/offer/detail?offerId=' + row.offerId)">{{row.offerNo}}</el-link>
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('报价单号')" align="center" prop="offerNumbers" />
                 <el-table-column :label="$t('唛头')" align="center" prop="marks" />
                 <el-table-column :label="$t('总箱数/入仓箱数')" align="center" prop="sumNum">
                   <template slot-scope="{row}">

src/views/ecw/order/cargoControl.vue

@@ -170,11 +170,13 @@
 
       </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>
+        <dict-selector
+          :type="DICT_TYPE.PICK_STATE"
+          multiple
+          v-model="queryParams.pickStateList"
+          clearable
+          @change="handleQuery"
+        />
       </el-form-item>
       <el-form-item :label="$t('提货率')" v-show="showSearch">
         <el-input

src/views/ecw/order/exception/index.vue

@@ -1060,6 +1060,11 @@ export default {
         marksKey: "in",
         goodsNameKey: "in",
       };
+      this.destCountryId = null
+      this.destWarehouseId = null
+      this.objectiveId = null
+
+      this.queryParams.channelIds = null
       this.getList();
     },
     importCityName(id) {

src/views/ecw/order/index.vue

@@ -339,11 +339,13 @@
         </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>
+        <dict-selector
+          :type="DICT_TYPE.PICK_STATE"
+          multiple
+          v-model="queryParams.pickStateList"
+          clearable
+          @change="handleQuery"
+        />
       </el-form-item>
       <el-form-item :label="$t('提货率')" v-show="showSearch">
         <el-input
@@ -2052,7 +2054,7 @@ export default {
       this.destWarehouseId = null
       this.objectiveId = null
 
-      this.queryParams.channelId = "";
+      this.queryParams.channelIds = null;
       this.noParam.value = "";
       this.prodParam.value = "";
       this.dateFilter = [];

src/views/ecw/order/penddingList.vue

@@ -562,7 +562,11 @@ export default {
         rows: 10
       }
       this.dateFilter = []
-      // this.queryParams.channelId = ''
+      this.destCountryId = null
+      this.destWarehouseId = null
+      this.objectiveId = null
+
+      this.queryParams.channelIds = null
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/ecw/order/stockingList.vue

@@ -727,7 +727,12 @@ export default {
         page: 1,
         rows: 10,
       };
-      this.dateFilter = [];
+      this.dateFilter = []
+      this.destCountryId = null
+      this.destWarehouseId = null
+      this.objectiveId = null
+
+      this.queryParams.channelIds = null
       this.handleQuery();
     },
     /** 新增按钮操作 */