update: update

src/components/allCustomers/components/customergradeDialog.vue

@@ -3,10 +3,6 @@
     <el-dialog title="修改等级" custom-class="customer-dailog" :visible.sync="dialogVisible"
       :close-on-click-modal="false" @close="cancel" width="600px">
       <el-form ref="form" :model="form" :rules="rules" label-width="133px">
-        <el-form-item v-if="showEditClique" label="等级类型：" prop="gradeType">
-          <el-radio v-model="form.isClique" :label="1" @change="form.gradeId = ''">集团等级</el-radio>
-          <el-radio v-model="form.isClique" :label="0" @change="form.gradeId = ''">商户等级</el-radio>
-        </el-form-item>
         <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">
@@ -28,7 +24,6 @@
 <script>
 import { doFetch } from "../../axios/api";
 import url from "../../axios/url";
-import { mapState } from "vuex";
 import { checkFalse, checkStatus, checkSuccess } from "../../../../static/js/checkStatus";
 export default {
   name: "customergradeDialog",
@@ -54,8 +49,7 @@ export default {
       form: {
         memberId: '',
         gradeId: "",
-        remark: "",
-        isClique: 1
+        remark: ""
       },
       rules: {
         gradeId: [
@@ -68,9 +62,6 @@ export default {
       btnLoading: false,
     };
   },
-  computed: {
-    ...mapState([ "showEditClique" ])
-  },
   methods: {
     cancel() {
       this.$refs[ 'form' ].resetFields();

src/components/allCustomers/customerDetail.vue

@@ -118,11 +118,14 @@
               </template>
               <el-descriptions-item label="商户会员卡号:">{{memberInfo.cardNum||'--'}}
               </el-descriptions-item>
-              <el-descriptions-item label="商户会员等级:">{{memberInfo.gradeName||'--'}}<el-tooltip
-                  class="item" effect="dark" open-delay="200" content="编辑商户会员等级"
-                  placement="top-start"><span class="edit-span" @click="gradeDialogVisible=true"><i
-                      class="el-icon-edit"></i></span>
-                </el-tooltip>
+              <el-descriptions-item label="商户会员等级:">{{memberInfo.gradeName||'--'}}
+                <el-popconfirm popper-class="grade-confirm-wrap" placement="top" width="184" @confirm="gradeDialogVisible=true"
+                  confirm-button-text="继续修改" title="等级由ERP计算，建议前往ERP修改等级，以确保双方等级一致">
+                  <el-tooltip slot="reference" class="item" effect="dark" open-delay="200"
+                    content="编辑商户会员等级" placement="top-start"><span class="edit-span"><i
+                        class="el-icon-edit"></i></span>
+                  </el-tooltip>
+                </el-popconfirm>
               </el-descriptions-item>
               <el-descriptions-item label="等级到期时间:">{{memberInfo.limitTime|formatTime}}
               </el-descriptions-item>
@@ -367,4 +370,14 @@ export default { ...action };
 </script>
 <style lang="less" scoped>
 @import './customerDetail.less';
+</style>
+<style lang="less">
+.grade-confirm-wrap {
+  .el-popconfirm__main {
+    align-items: flex-start;
+    .el-popconfirm__icon.el-icon-question {
+      margin-top: 2px !important;
+    }
+  }
+}
 </style>
\ No newline at end of file

src/components/allCustomers/info.js

@@ -72,6 +72,7 @@ export default {
       fullscreenLoading: false, // 全局loading
       tableLoading: false, // 用户日志列表loading
       imgLoading: false, // 刷新头像loading
+      popoverVisible: false, // 修改等级popover
       toggleTag: false, // 拓展信息展开按钮
       showFieldType: 1, // 1开卡拓展字段 2会员信息字段
       showClique: false, // 集团权限