update: 品牌会员等级列表修改

src/view/companyGroup/membershipSystem/addMemberGrade.vue

@@ -18,8 +18,8 @@
               <label class="input-label">{{ inputNumObj.gradeCode }}/6</label>
             </el-form-item>
             <el-form-item label="等级类型" prop="gradeType">
-              <el-radio v-model="ruleForm.gradeType" label="1">常规卡</el-radio>
-              <el-radio v-model="ruleForm.gradeType" label="2">特殊卡</el-radio>
+              <el-radio :value="ruleForm.gradeType" :disabled="ruleForm.gradeType == 2" label="1">常规卡</el-radio>
+              <el-radio :value="ruleForm.gradeType" :disabled="ruleForm.gradeType == 1" label="2">特殊卡</el-radio>
             </el-form-item>
             <!-- 自动升级 -->
             <!-- 自动升级 -->
@@ -481,6 +481,7 @@ export default {
     that.navpath[3].path = '/memberGrade?enterpriseId=' + that.cliqueId + '&name=' + that.cliqueName;
     that.navpath[4].name = '新增【' + that.cliqueName + '】等级';
     that.enterpId = sessionStorage.getItem('enterpriseId');
+    this.ruleForm.gradeType = this.$route.query.type + '';
   }
 };
 </script>

src/view/companyGroup/membershipSystem/components/MemberCardTable.vue

@@ -94,6 +94,11 @@ export default {
       typeL: String,
       default: '1' // type 1 常规卡   2 特殊卡   3 付费卡
     },
+    // 企业id，不传时查集团数据，否则查该id的商户数据
+    enterpriseId: {
+      type: String,
+      default: ''
+    }
   },
   watch: {
     tableData: {
@@ -139,13 +144,7 @@ export default {
   methods: {
     // 编辑集团
     editCliqueLevel(index, row, obj) {
-      this.$router.push({
-        path: '/editGroupGrade',
-        query: {
-          gradeId: row.gradeId
-        }
-      });
-
+      this.$emit('edit', row);
     },
     // 删除
     delCliqueLevel(index, row, obj) {
@@ -169,12 +168,7 @@ export default {
     },
     addCard(type) {
       if (this.tableData.length===10) return this.$message.warning('每个卡类型最多可创建10张会员卡')
-      this.$router.push({
-        path: '/addGroupGrade',
-        query: {
-          type
-        }
-      });
+      this.$emit('add', type);
     },
     editSort() {
       if (!this.list.length) return this.$message.warning(`暂无${this.$options.filters.typeFilter(this.type)}！`);
@@ -194,6 +188,9 @@ export default {
         gradeIds: this.list.map(el => (el.gradeId)),
         gradeType: this.type
       };
+      if (this.enterpriseId) {
+        data.enterpriseId = this.enterpriseId;
+      }
       postJson('/api-admin/sort-member-grade', data)
         .then((res) => {
           let resData = res.data;
@@ -220,10 +217,6 @@ export default {
         }
       });
     },
-    // 取消删除
-    cancelPop(index, row, obj) {
-      row.popVisible = false;
-    },
   }
 }
 </script>
@@ -264,11 +257,11 @@ export default {
   }
 }
 .card-cell {
-  display: flex;
+  display: inline-flex;
   align-items: center;
-  width: 120px;
+  padding: 0 15px;
+  max-width: 150px;
   height: 40px;
-  padding-left: 10px;
   border-radius: 4px;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;

src/view/companyGroup/membershipSystem/editMemberGrade.vue

@@ -18,8 +18,8 @@
               <label class="input-label">{{ inputNumObj.gradeCode }}/6</label>
             </el-form-item>
             <el-form-item label="等级类型" prop="gradeType">
-              <el-radio v-model="ruleForm.gradeType" label="1">常规卡</el-radio>
-              <el-radio v-model="ruleForm.gradeType" label="2">特殊卡</el-radio>
+              <el-radio :value="ruleForm.gradeType" :disabled="ruleForm.gradeType == 2" label="1">常规卡</el-radio>
+              <el-radio :value="ruleForm.gradeType" :disabled="ruleForm.gradeType == 1" label="2">特殊卡</el-radio>
             </el-form-item>
             <!-- 自动升级 -->
             <!-- 自动升级 -->

src/view/companyGroup/membershipSystem/memberCardSet.vue

@@ -276,8 +276,8 @@
                 </el-form-item>
               </el-form>
                <!-- type 1 常规卡   2 特殊卡  3 付费卡(集团不展示) -->
-              <member-card-table :tableData="generalCardList" type="1" :logoImg="logoImg"/>
-              <member-card-table :tableData="specialCardList" type="2" :logoImg="logoImg"/>
+              <member-card-table :tableData="generalCardList" type="1" :logoImg="logoImg" @add="onAdd" @edit="onEdit"/>
+              <member-card-table :tableData="specialCardList" type="2" :logoImg="logoImg" @add="onAdd" @edit="onEdit"/>
             </div>
           </div>
           <!-- end -->
@@ -506,10 +506,23 @@ export default {
       that.changeRoute('/memberGrade');
     },
 
+    // 新增
+    onAdd(type) {
+      this.$router.push({
+        path: '/addGroupGrade',
+        query: {
+          type
+        }
+      });
+    },
     // 编辑集团
-    editCliqueLevel(index, row, obj) {
-      let that = this;
-      that.changeRoute('/editGroupGrade');
+    onEdit(row) {
+      this.$router.push({
+        path: '/editGroupGrade',
+        query: {
+          gradeId: row.gradeId
+        }
+      });
     },
 
     // 取消删除