常用提货网点问题修复

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

@@ -190,9 +190,11 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('常用提货网点')">
-          <template slot-scope="{ row }">
-            {{ getPickupPointNames(row.pickupPoints) }}
-          </template>
+          {{
+            getDictDatas2(DICT_TYPE.PICKUP_POINTS, (row.pickupPoints || "").split(","))
+              .map((e) => (isChinese ? e.label : e.labelEn))
+              .join(", ")
+          }}
         </el-table-column>
         <el-table-column :label="$t('年度发货量')" align="center">
           <template slot-scope="{ row }">

src/views/ecw/customer/edit.vue

@@ -198,10 +198,9 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('常用提货网点')" prop="pickupPoints">
-                <dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
-<!--                <el-select filterable multiple v-model="form.pickupPoints">-->
-<!--                  <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
-<!--                </el-select>-->
+                <el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
+                  <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
+                </el-select>>
               </el-form-item>
             </el-col>
 

src/views/ecw/customer/editIndirect.vue

@@ -37,10 +37,9 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
-                <el-select v-model="form.pickupPoint" :placeholder="$t('请输入常用提货网点')">
-                  <el-option v-for="node in nodeList"
-                             :key="node.id" :label="isChinese ? node.titleZh : node.titleEn" :value="node.id" />
-                </el-select>
+                <el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
+                  <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
+                </el-select>>
               </el-form-item>
             </el-col>
             <el-col :span="13" v-show="form.type && form.type.indexOf('2') !== -1">

src/views/ecw/customer/index.vue

@@ -57,10 +57,9 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
-          <dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
-<!--          <el-select filterable multiple v-model="queryParams.pickupPoints">-->
-<!--            <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
-<!--          </el-select>-->
+          <el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
+          </el-select>>
         </el-form-item>
         <el-form-item :label="$t('创建人')" v-show="showSearch">
           <el-select filterable v-model="queryParams.founder">
@@ -460,9 +459,9 @@
           <!--          </el-col>-->
           <el-col :span="12">
             <el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
-              <el-select v-model="form.pickupPoint" :placeholder="$t('请输入常用提货网点')">
-                <el-option v-for="node in nodeList" :key="node.value" :label="node.label" :value="node.value" />
-              </el-select>
+              <el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
+                <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
+              </el-select>>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/ecw/customerConfirm/index.vue

@@ -58,10 +58,9 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
-          <dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
-<!--          <el-select multiple v-model="queryParams.pickupPoints">-->
-<!--            <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
-<!--          </el-select>-->
+          <el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
+          </el-select>>
         </el-form-item>
         <el-form-item :label="$t('创建人')" v-show="showSearch">
           <el-select v-model="queryParams.founder">
@@ -439,10 +438,9 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
-            <dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
-<!--            <el-select v-model="form.pickupPoint" :placeholder="$t('请输入常用提货网点')">-->
-<!--              <el-option :label="$t('请选择字典生成')" value="" />-->
-<!--            </el-select>-->
+            <el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
+              <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
+            </el-select>>
           </el-form-item>
         </el-col>
         <el-col :span="12">

src/views/ecw/customerToBeAssigned/index.vue

@@ -58,10 +58,9 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
-          <dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
-<!--          <el-select multiple v-model="queryParams.pickupPoints">-->
-<!--            <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
-<!--          </el-select>-->
+          <el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
+          </el-select>>
         </el-form-item>
         <el-form-item :label="$t('创建人')" v-show="showSearch">
           <el-select v-model="queryParams.founder">

src/views/ecw/myCustomerService/index.vue

@@ -58,10 +58,9 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
-          <dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
-<!--          <el-select multiple v-model="queryParams.pickupPoints">-->
-<!--            <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
-<!--          </el-select>-->
+          <el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
+          </el-select>>
         </el-form-item>
         <el-form-item :label="$t('创建人')" v-show="showSearch">
           <el-select v-model="queryParams.founder">

src/views/ecw/oceanCustomer/index.vue

@@ -59,10 +59,9 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
-          <dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
-<!--          <el-select multiple v-model="queryParams.pickupPoints">-->
-<!--            <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
-<!--          </el-select>-->
+          <el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
+          </el-select>
         </el-form-item>
         <el-form-item :label="$t('创建人')" v-show="showSearch">
           <el-select v-model="queryParams.founder">