Merge branch 'pre-release' into dev

src/views/ecw/customer/query.vue

@@ -338,18 +338,22 @@
               <div slot="header" class="clearfix">
                 <el-form size="small" :inline="true" label-width="100px">
                   <el-form-item :label="$t('跟进类型')">
-                    <dict-selector clearable :type="DICT_TYPE.CUSTOMER_FOLLOWUP_TYPE" v-model="followForm.followType" @change="handleQuery"></dict-selector>
+                    <el-select clearable multiple v-model="followForm.followTypes" :placeholder="$t('请选择')" size="small" @change="handleQuery">
+                      <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_TYPE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
+                    </el-select>
                   </el-form-item>
                   <el-form-item :label="$t('跟进方式')">
-                    <dict-selector clearable :type="DICT_TYPE.CUSTOMER_FOLLOWUP_METHOD" v-model="followForm.followMethod" @change="handleQuery"></dict-selector>
+                    <el-select clearable multiple v-model="followForm.followMethods" :placeholder="$t('请选择')" size="small" @change="handleQuery">
+                      <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_METHOD)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
+                    </el-select>
                   </el-form-item>
                   <el-form-item :label="$t('跟进结果')">
-                    <el-select clearable v-model="followForm.resultType" :placeholder="$t('请选择')" size="small" @change="handleQuery">
+                    <el-select clearable multiple v-model="followForm.resultTypes" :placeholder="$t('请选择')" size="small" @change="handleQuery">
                       <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_RESULT_TYPE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
                     </el-select>
                   </el-form-item>
                   <el-form-item :label="$t('跟进状态')">
-                    <el-select clearable v-model="followForm.status" :placeholder="$t('请选择')" size="small" @change="handleQuery">
+                    <el-select clearable multiple v-model="followForm.statuses" :placeholder="$t('请选择')" size="small" @change="handleQuery">
                       <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_STATUS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
                     </el-select>
                   </el-form-item>
@@ -1298,6 +1302,9 @@ export default {
       } else if (this.activeName == "quote") {
         this.infoListOfferFrom.pageNo = 1
         this.getInfoListOfferPage()
+      } else if (this.activeName == "follow") {
+        this.followForm.pageNo = 1
+        this.getCustomerFollowList()
       }
     },
     getWarehouseList() {

src/views/ecw/order/edit.vue

@@ -1624,7 +1624,7 @@ export default {
         for(const i in this.form.orderItemVOList){
           const item = this.form.orderItemVOList[i]
           if(!item.prodId){
-            return this.$message.error(this.$t(`第{index}行未选择商品`, i+1))
+            return this.$message.error(this.$t(`第${Number(i) + 1}行未选择商品`, i+1))
           }
         }