保洁增加短信和公众号的设定

src/views/system/equityMembersOrderConfig/index.vue

@@ -100,10 +100,11 @@
     <el-table v-loading="loading" :data="equityMembersOrderConfigList" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="55"/>
       <!--      <el-table-column align="center" label="ID" prop="id"/>-->
-      <el-table-column align="center" label="默认会员等级" prop="defaultLevel"/>
+      <el-table-column align="center" label="配置名称" prop="name"/>
       <!--      <el-table-column align="center" label="会员配置id" prop="memberConfigId"/>-->
       <el-table-column align="center" label="所需金额" prop="requiredAmount"/>
       <el-table-column align="center" label="会员有效期" prop="validityPeriod"/>
+      <el-table-column align="center" label="赠送积分" prop="giftPoints"/>
       <!--      <el-table-column align="center" label="是否删除" prop="isDelete"/>-->
       <el-table-column align="center" label="备注" prop="remark"/>
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
@@ -139,13 +140,10 @@
     <!-- 添加或修改权益会员订单配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="默认会员等级" prop="defaultLevel">
-          <el-input-number v-model="form.defaultLevel" :max="100" :min="0"/>
-          <!--          <el-input v-model="form.defaultLevel" placeholder="请输入默认会员等级"/>-->
+
+        <el-form-item label="会员配置名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入会员配置名称"/>
         </el-form-item>
-        <!--        <el-form-item label="会员配置id" prop="memberConfigId">-->
-        <!--          <el-input v-model="form.memberConfigId" placeholder="请输入会员配置id"/>-->
-        <!--        </el-form-item>-->
         <el-form-item label="所需金额" prop="requiredAmount">
           <el-input-number v-model="form.requiredAmount" :max="100" :min="0"/>
           <!--          <el-input v-model="form.requiredAmount" placeholder="请输入所需金额"/>-->
@@ -154,9 +152,13 @@
           <el-input-number v-model="form.validityPeriod" :max="100" :min="1"/>
           <!--          <el-input v-model="form.validityPeriod" placeholder="请输入会员有效期"/>-->
         </el-form-item>
-        <el-form-item label="是否删除" prop="isDelete">
-          <el-input v-model="form.isDelete" placeholder="请输入是否删除"/>
+        <el-form-item label="赠送积分" prop="giftPoints">
+          <el-input-number v-model="form.giftPoints" :max="100" :min="0"/>
+          <!--          <el-input v-model="form.defaultLevel" placeholder="请输入默认会员等级"/>-->
         </el-form-item>
+        <!--        <el-form-item label="是否删除" prop="isDelete">-->
+        <!--          <el-input v-model="form.isDelete" placeholder="请输入是否删除"/>-->
+        <!--        </el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
         </el-form-item>
@@ -245,10 +247,12 @@ export default {
     reset() {
       this.form = {
         id: null,
+        name: null,
         defaultLevel: null,
         memberConfigId: null,
         requiredAmount: null,
         validityPeriod: null,
+        giftPoints: null,
         isDelete: null,
         createBy: null,
         createTime: null,

src/views/system/store/cleanConsumer.vue

@@ -91,10 +91,55 @@
             @click="cancelAuthUser(scope.row)"
             v-hasPermi="['system:store:remove']"
           >取消分配</el-button>
+          <el-button v-if="scope.row.position ==1"
+                     v-hasPermi="['system:store:edit']"
+                     icon="el-icon-edit"
+                     size="mini"
+                     type="text"
+                     @click="handleUpdate(scope.row)"
+          >修改
+          </el-button>
         </template>
+
       </el-table-column>
     </el-table>
+    <!-- 添加或修改房间对话框 -->
+    <el-dialog :title="title" :visible.sync="open" append-to-body width="20%">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="账号" prop="account">
+          <el-input v-model="form.account" disabled/>
+        </el-form-item>
+        <el-form-item label="用户昵称" prop="nickName">
+          <el-input v-model="form.nickName" disabled/>
+        </el-form-item>
+        <el-form-item label="是否接收公众号" prop="officialAccount">
+          <el-radio-group v-model="form.officialAccount">
+            <el-radio
+              v-for="dict in dict.type.store_is_use_coupon"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否接收短信" prop="textMessage">
+          <el-radio-group v-model="form.textMessage">
+            <el-radio
+              v-for="dict in dict.type.store_is_use_coupon"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
 
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
     <pagination
       v-show="total>0"
       :total="total"
@@ -107,12 +152,12 @@
 </template>
 
 <script>
-import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/store";
+import {allocatedUserList, authUserCancel, authUserCancelAll, query, update} from "@/api/system/store";
 import selectConsumer from "./selectConsumer";
 
 export default {
   name: "CleanConsumer",
-  dicts: ['sys_user_sex', 'wechat_role_type'],
+  dicts: ['sys_user_sex', 'wechat_role_type', 'store_is_use_coupon'],
   components: { selectConsumer },
   data() {
     return {
@@ -126,6 +171,11 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      title: '',
+      open: false,
+      form: {},
+      query: {},
+      rules: {},
       // 用户表格数据
       consumerList: [],
       // 查询参数
@@ -158,6 +208,26 @@ export default {
         }
       );
     },
+    cancel() {
+      this.open = false;
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$confirm('确认提交吗？').then(() => {
+            this.query.consumerId = this.form.id;
+            this.query.position = 1;
+            this.query.officialAccount = this.form.officialAccount;
+            this.query.textMessage = this.form.textMessage;
+            update(this.query).then(() => {
+              this.open = false;
+              this.getList();
+              this.$modal.msgSuccess("操作成功");
+            });
+          });
+        }
+      });
+    },
     // 返回按钮
     handleClose() {
       const obj = { path: "/share/store" };
@@ -202,7 +272,18 @@ export default {
         this.getList();
         this.$modal.msgSuccess("取消成功");
       }).catch(() => {});
-    }
+    },
+    handleUpdate(row) {
+      const storeId = this.$route.params && this.$route.params.storeId;
+      this.query.storeId = storeId;
+      this.query.consumerId = row.id;
+      this.query.position = 1;
+      query(this.query).then(response => {
+        this.form = response.data;
+        this.open = true
+        this.title = '修改权限'
+      })
+    },
   }
 };
 </script>

src/views/system/store/consumerService.vue

@@ -115,8 +115,8 @@
         <el-form-item label="用户昵称" prop="nickName">
           <el-input v-model="form.nickName" disabled/>
         </el-form-item>
-        <el-form-item label="是否接收公众号" prop="controller">
-          <el-radio-group v-model="form.controller">
+        <el-form-item label="是否接收公众号" prop="officialAccount">
+          <el-radio-group v-model="form.officialAccount">
             <el-radio
               v-for="dict in dict.type.store_is_use_coupon"
               :key="dict.value"
@@ -125,8 +125,8 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="是否接收短信" prop="gating">
-          <el-radio-group v-model="form.gating">
+        <el-form-item label="是否接收短信" prop="textMessage">
+          <el-radio-group v-model="form.textMessage">
             <el-radio
               v-for="dict in dict.type.store_is_use_coupon"
               :key="dict.value"
@@ -233,8 +233,8 @@ export default {
           this.$confirm('确认提交吗？').then(() => {
             this.query.consumerId = this.form.id;
             this.query.position = 3;
-            this.query.controller = this.form.controller;
-            this.query.gating = this.form.gating;
+            this.query.officialAccount = this.form.officialAccount;
+            this.query.textMessage = this.form.textMessage;
             update(this.query).then(() => {
               this.open = false;
               this.getList();

src/views/system/store/positionConsumer.vue

@@ -135,7 +135,26 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-
+        <el-form-item label="是否接收公众号" prop="officialAccount">
+          <el-radio-group v-model="form.officialAccount">
+            <el-radio
+              v-for="dict in dict.type.store_is_use_coupon"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否接收短信" prop="textMessage">
+          <el-radio-group v-model="form.textMessage">
+            <el-radio
+              v-for="dict in dict.type.store_is_use_coupon"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
 
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -230,6 +249,9 @@ export default {
             this.query.position = 2;
             this.query.controller = this.form.controller;
             this.query.gating = this.form.gating;
+            this.query.officialAccount = this.form.officialAccount;
+            this.query.textMessage = this.form.textMessage;
+
             update(this.query).then(() => {
               this.open = false;
               this.getList();