update: update

src/components/allCustomers/allCustomersList.vue

@@ -273,7 +273,8 @@
     <grade-dailog
       :dialogVisible.sync="dialogGradeVisible"
       @refresh="batchRefresh"
-      :gradeList="showEditClique?cliqueMemberGrade:memberGrade"
+      :gradeList="memberGrade"
+      :cliqueGradeList="cliqueMemberGrade"
       :ajaxObj="{...ajaxObj}"
       :selectObj="{...selectObj}"
     />

src/components/allCustomers/components/batchgradeDialog.vue

@@ -28,12 +28,22 @@
         </el-form-item>
         <el-form-item label="修改后等级：" prop="gradeId">
           <el-select v-model="form.gradeId" placeholder="请选择" style="width: 400px;">
-            <el-option
-              v-for="item in gradeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
+            <template v-if="form.isClique===1">
+              <el-option
+                v-for="item in cliqueGradeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </template>
+            <template v-else>
+              <el-option
+                v-for="item in gradeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </template>
           </el-select>
         </el-form-item>
         <el-form-item label="原因备注：" prop="remark">
@@ -72,6 +82,12 @@ export default {
         return [];
       },
     },
+    cliqueGradeList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
     ajaxObj: {
       type: Object,
       default: () => {

src/components/allCustomers/components/customergradeDialog.vue

@@ -16,12 +16,22 @@
       >
         <el-form-item label="修改后等级：" prop="gradeId">
           <el-select v-model="form.gradeId" placeholder="请选择" style="width: 386px;">
-            <el-option
-              v-for="item in gradeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
+            <template v-if="isClique">
+              <el-option
+                v-for="item in cliqueGradeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </template>
+            <template v-else>
+              <el-option
+                v-for="item in gradeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </template>
           </el-select>
         </el-form-item>
         <el-form-item label="原因备注：" prop="remark">
@@ -53,16 +63,30 @@ export default {
       type: Boolean,
       default: false,
     },
+    isClique: {
+      type: Boolean,
+      default: false,
+    },
     gradeId: {
       type: String,
       default: '',
     },
+    cliqueGradeId: {
+      type: String,
+      default: '',
+    },
     gradeList: {
       type: Array,
       default: () => {
         return [];
       },
     },
+    cliqueGradeList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
     memberId: {
       type: String,
       default: '',
@@ -76,6 +100,7 @@ export default {
         gradeId: '',
         remark: '',
       },
+      gradeList: [], // 等级列表
       rules: {
         gradeId: [
           { required: true, message: '请选择修改后等级', trigger: 'change' },
@@ -91,7 +116,8 @@ export default {
     dialogVisible (n, o) {
       this.visible = n;
       if (n) {
-        this.form = { ...this.form, gradeId: this.gradeId, memberId: this.memberId };
+        const gradeId=this.isClique?this.cliqueGradeId:this.gradeId;
+        this.form=Object.assign({},...this.form,{gradeId, memberId: this.memberId })
       }
     },
   },
@@ -104,7 +130,11 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           this.btnLoading = true;
-          doFetch(url.memberGrade, Object.assign({}, this.form))
+          let param={
+            ...this.form,
+            isClique:Number(this.isClique)
+          }
+          doFetch(url.memberGrade, Object.assign({}, param))
             .then(res => {
               if (res.data.errorCode === 0) {
                 setTimeout(() => {

src/components/allCustomers/customerDetail.vue

@@ -149,6 +149,11 @@
                 </el-descriptions-item>
                 <el-descriptions-item label="集团会员等级:">
                   {{ memberInfo.cliqueGradeName||'--' }}
+                  <el-tooltip class="item" effect="dark" open-delay="200" content="编辑集团会员等级"
+                    placement="top-start">
+                    <span class="edit-span" @click="showGradeDialog(true)"><i
+                        class="el-icon-edit" /></span>
+                  </el-tooltip>
                 </el-descriptions-item>
                 <el-descriptions-item label="集团会员积分:">
                   {{ memberInfo.cliqueMemberIntegral||'--' }}
@@ -161,7 +166,7 @@
                 {{ memberInfo.gradeName||'--' }}
                 <template v-if="memberInfo.gradeName">
                   <el-popconfirm v-if="memberInfo.erpCalcGrade" popper-class="grade-confirm-wrap"
-                    placement="top" width="184" @confirm="gradeDialogVisible=true"
+                    placement="top" width="184" @confirm="showGradeDialog(false)"
                     confirm-button-text="继续修改" title="等级由ERP计算，建议前往ERP修改等级，以确保双方等级一致">
                     <el-tooltip slot="reference" class="item" effect="dark" open-delay="200"
                       content="编辑商户会员等级" placement="top-start">
@@ -170,7 +175,7 @@
                   </el-popconfirm>
                   <el-tooltip v-else class="item" effect="dark" open-delay="200" content="编辑商户会员等级"
                     placement="top-start">
-                    <span class="edit-span" @click="gradeDialogVisible=true"><i
+                    <span class="edit-span" @click="showGradeDialog(false)"><i
                         class="el-icon-edit" /></span>
                   </el-tooltip>
                 </template>
@@ -401,8 +406,8 @@
                         <div v-if="item.imageUrl" class="img-wrap">
                          <el-image
                           style="width: 68px; height: 68px"
-                          :src="require(`../../../static/img/body-shape-${member.memberGender===1?'man':'woman'}/${item.imageUrl}`)"
-                          fit="contain"></el-image>
+                          :src="require(`../../../static/img/body-shape-woman/${item.imageUrl}`)"
+                          fit="contain"><div slot="error" class="image-slot"><img style="width:100%;height:100%;" :src="require('../../../static/img/failed-load_img.png')" alt=""></div></el-image>
                         </div>
                         <div class="right">
                           <p class="dict-name">
@@ -460,8 +465,8 @@
     <babyinfo-dialog :dialogVisible.sync="babyDialogVisible"
       :childFieldsList="extendInfo.openChildrenField||[]" />
     <!-- 等级修改弹窗 -->
-    <customergrade-dialog :dialogVisible.sync="gradeDialogVisible" :memberId="memberId"
-      :gradeId="memberInfo.gradeId" :gradeList="gradeList" @refresh="initData" />
+    <customergrade-dialog :dialogVisible.sync="gradeDialogVisible" :memberId="memberId" :isClique="isClique"
+      :gradeId="memberInfo.gradeId" :cliqueGradeId="memberInfo.cliqueGradeId" :gradeList="gradeList" :cliqueGradeList="cliqueGradeList" @refresh="initData" />
     <!-- 服务门店、专属导购修改弹窗 -->
     <customermainstore-dialog :dialogVisible.sync="mainStoreDialogVisible" @refresh="initData"
       :obj="{...member}" />

src/components/allCustomers/info.js

@@ -85,6 +85,7 @@ export default {
       babyDialogVisible: false, // 宝宝信息弹窗
       nationCodeList: [], // 手机区号列表
       gradeList: [], // 等级列表
+      cliqueGradeList: [], // 集团等级列表
       count: 0,
       // 模块列表
       customerInfoItemList: [
@@ -229,6 +230,7 @@ export default {
     this.getEnterpriseInfo();
     this.getcodeList();
     this.getGradeList();
+    this.getCliqueGradeList();
   },
   methods: {
     initData () {
@@ -398,6 +400,10 @@ export default {
           checkStatus(err);
         });
     },
+    showGradeDialog(type){
+      this.isClique=type
+      this.gradeDialogVisible=true;
+    },
     // 等级列表
     getGradeList () {
       doFetch(url.gradeList)
@@ -413,6 +419,21 @@ export default {
           checkStatus(err);
         });
     },
+    // 集团等级列表
+    getCliqueGradeList() {
+      doFetch(url.cliqueGradeList)
+        .then(res => {
+          if (res.data.errorCode === 0) {
+            this.cliqueGradeList = res.data.result || [];
+          } else {
+            checkFalse(res.data.message);
+            return false;
+          }
+        })
+        .catch(err => {
+          checkStatus(err);
+        });
+    },
   },
   components: {
     'v-nav': nav,