Merge remote-tracking branch 'origin/pre-release' into pre-release

42c087ab · dragondean@qq.com · 41520827 · a2a784e5 · 42c087ab · 42c087ab
Commit 42c087ab authored Oct 23, 2024 by dragondean@qq.com
14 changed files
--- a/src/components/QuickCreateCustomer/index.vue
+++ b/src/components/QuickCreateCustomer/index.vue
@@ -60,6 +60,7 @@

 <script>
 import {createCustomer} from '@/api/ecw/customer'
+import {DICT_TYPE} from "@/utils/dict";
 import {listServiceUser} from "@/api/system/user"
 import { getCountryListAll } from '@/api/ecw/country'
 import {getCustomerContactsSelect} from '@/api/ecw/customerContacts'
@@ -74,7 +75,7 @@ export default {
  data(){
    return {
      show: true,
-
+      DICT_TYPE,
      // 表单参数
      form: {
        customerContacts:[{isDefault: 1}]

--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -10,7 +10,7 @@

 <script>
 export default {
-  name: 'AppMain',
+  name: "AppMain",
  computed: {
    cachedViews() {
      return this.$store.state.tagsView.cachedViews
@@ -31,7 +31,7 @@ export default {
  overflow: hidden;
 }

-.fixed-header+.app-main {
+.fixed-header + .app-main {
  padding-top: 50px;
 }

@@ -41,7 +41,7 @@ export default {
    min-height: calc(100vh - 84px);
  }

-  .fixed-header+.app-main {
+  .fixed-header + .app-main {
    padding-top: 84px;
  }
 }

--- a/src/views/ecw/customer/components/contacts.vue
+++ b/src/views/ecw/customer/components/contacts.vue
 <template>
 <div style="display: inline-block">
-   <span @click="visible = true"> <slot></slot></span>
-  <el-dialog title="更多联系人" :visible.sync="visible">
+  <span @click="visible = true"> <slot></slot></span>
+  <el-dialog title="更多联系人" :visible.sync="visible" append-to-body>
    <div v-if="info">
      <div style="text-align: center;margin-bottom: 20px;" v-for="(item, index) in info" :key="index">
        联系人{{index + 1}}：{{$l(item, 'name')}} &ensp;&ensp;&ensp; 联系方式{{index + 1}}：+{{item.areaCode}} {{item.phoneNew}}<br/>

--- a/src/views/ecw/customer/components/customerMerge.vue
+++ b/src/views/ecw/customer/components/customerMerge.vue
--- a/src/views/ecw/customer/index.vue
+++ b/src/views/ecw/customer/index.vue
--- a/src/views/ecw/customer/indirectCustomer.vue
+++ b/src/views/ecw/customer/indirectCustomer.vue
@@ -40,7 +40,7 @@
                    clearable
                    v-model.number="queryParams.memberMobile"
                    :placeholder="$t('请输入会员电话')"/>
-        </el-col>    
+        </el-col>
      </el-form-item>
      <el-form-item :label="$t('会员编号')" prop="number">
        <el-input
@@ -101,7 +101,8 @@
         </el-table-column>
       <el-table-column :label="$t('客户类别')" align="center" prop="sourse">
        <template v-slot="{row}">
-           <dict-tag :value="row.type" :type="DICT_TYPE.CUSTOMER_TYPE" />
+            {{ getDictDatas2(DICT_TYPE.CUSTOMER_TYPE, (row.type||'').split(',')).map(e => isChinese ? e.label : e.labelEn).join(', ')}}
+<!--           <dict-tag :value="row.type" :type="DICT_TYPE.CUSTOMER_TYPE" />-->
         </template>
       </el-table-column>
      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
@@ -130,16 +131,18 @@
 <script>
 import {updateCustomer, getCustomer,
  getCustomerPage, exportCustomerExcel } from "@/api/ecw/indirectCustomer";
-import { getDictDatas, DICT_TYPE } from '@/utils/dict';
+import { getDictDatas, DICT_TYPE, getDictDatas2 } from '@/utils/dict';

 import {listServiceUser} from "@/api/system/user";
 import {exportCustomerComplaintExcel} from "@/api/ecw/customerComplaint";
 import {indirectCustomerExportExcel} from "@/api/ecw/customer";
 import AreaCodeSelector from "@/components/AreaCodeSelector/index.vue";
+import Template from "@/views/cms/template/index.vue";

 export default {
  name: "EcwCustomerIndirectcustomer",
  components: {
+    Template,
    AreaCodeSelector
  },
  activated() {
@@ -149,6 +152,7 @@ export default {
    return {
      exportLoading:false,
      getDictDatas,
+      getDictDatas2,
      DICT_TYPE,
      // 遮罩层
      loading: true,

--- a/src/views/ecw/customer/query.vue
+++ b/src/views/ecw/customer/query.vue
--- a/src/views/ecw/customerConfirm/index.vue
+++ b/src/views/ecw/customerConfirm/index.vue
@@ -454,11 +454,12 @@
        </template>
      </el-table-column>
      <el-table-column :label="$t('客户类别')" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag
-            :type="DICT_TYPE.CUSTOMER_TYPE"
-            :value="scope.row.type"
-          />
+        <template slot-scope="{ row }">
+          {{ getDictDatas2(DICT_TYPE.CUSTOMER_TYPE, (row.type||'').split(',')).map(e => isChinese ? e.label : e.labelEn).join(', ')}}
+<!--          <dict-tag-->
+<!--            :type="DICT_TYPE.CUSTOMER_TYPE"-->
+<!--            :value="scope.row.type"-->
+<!--          />-->
        </template>
      </el-table-column>
      <el-table-column :label="$t('角色')" align="center" prop="status">

--- a/src/views/ecw/customerToBeAssigned/index.vue
+++ b/src/views/ecw/customerToBeAssigned/index.vue
@@ -451,11 +451,12 @@
        </template>
      </el-table-column>
      <el-table-column :label="$t('客户类别')" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag
-            :type="DICT_TYPE.CUSTOMER_TYPE"
-            :value="scope.row.type"
-          />
+        <template slot-scope="{ row }">
+          {{ getDictDatas2(DICT_TYPE.CUSTOMER_TYPE, (row.type||'').split(',')).map(e => isChinese ? e.label : e.labelEn).join(', ')}}
+<!--          <dict-tag-->
+<!--            :type="DICT_TYPE.CUSTOMER_TYPE"-->
+<!--            :value="scope.row.type"-->
+<!--          />-->
        </template>
      </el-table-column>
      <el-table-column :label="$t('角色')" align="center" prop="status">

--- a/src/views/ecw/myCustomerService/index.vue
+++ b/src/views/ecw/myCustomerService/index.vue
--- a/src/views/ecw/oceanCustomer/index.vue
+++ b/src/views/ecw/oceanCustomer/index.vue
@@ -503,11 +503,12 @@
        </template>
      </el-table-column>
      <el-table-column :label="$t('客户类别')" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag
-            :type="DICT_TYPE.CUSTOMER_TYPE"
-            :value="scope.row.type"
-          />
+        <template slot-scope="{ row }">
+          {{ getDictDatas2(DICT_TYPE.CUSTOMER_TYPE, (row.type||'').split(',')).map(e => isChinese ? e.label : e.labelEn).join(', ')}}
+<!--          <dict-tag-->
+<!--            :type="DICT_TYPE.CUSTOMER_TYPE"-->
+<!--            :value="scope.row.type"-->
+<!--          />-->
        </template>
      </el-table-column>
      <el-table-column :label="$t('角色')" align="center" prop="status">

--- a/src/views/ecw/offer/edit.vue
+++ b/src/views/ecw/offer/edit.vue
--- a/src/views/ecw/order/edit.vue
+++ b/src/views/ecw/order/edit.vue
@@ -1625,7 +1625,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))
          }
        }


--- a/src/views/report/customer_analysis/index.vue
+++ b/src/views/report/customer_analysis/index.vue
@@ -397,10 +397,11 @@
    />
  </div>
 </template>
-  
+
  <script>
 //国家列表接口
 import { getCountryListAll } from "@/api/ecw/country";
+import { DICT_TYPE, getDictDatas, getDictDatas2 } from '@/utils/dict'
 import UserSelector from "@/components/UserSelector";
 import { listServiceUser2 } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
@@ -482,6 +483,9 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      getDictDatas2,
+      getDictDatas,
+      DICT_TYPE,
      // 导出遮罩层
      exportLoading: false,
      // 显示搜索条件
@@ -849,4 +853,3 @@ export default {
  },
 };
 </script>
-  
\ No newline at end of file