bugfix

src/api/store/index.js

@@ -7,3 +7,21 @@ export function getAllStoreList() {
     method: "get",
   });
 }
+
+// 重置密码
+export function restorePwd(data) {
+  return request({
+    url: "/store/system/user/restorePwd",
+    method: "post",
+    data,
+  });
+}
+
+// 店铺列表
+export function getStoreList(query) {
+  return request({
+    url: "/store/list",
+    method: "get",
+    params: query,
+  });
+}

src/components/BaseDialog.vue

@@ -51,7 +51,7 @@ export default {
     },
     confirmName: {
       type: String,
-      default: "确 定",
+      default: "保 存",
     },
     isShowFooter: {
       type: Boolean,
@@ -133,11 +133,11 @@ export default {
   }
   .el-dialog__footer {
     padding: 0;
-    margin-top: 50px;
+    margin-top: 30px;
     .dialog-footer {
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
+      .el-button {
+        margin-left: 14px;
+      }
     }
   }
 }

src/components/pagination.vue

@@ -25,10 +25,17 @@ export default {
   methods: {
     //切换X条/页触发
     handleSizeChange(val) {
+      this.$emit("update:currentPage", 1);
+      this.$emit("update:pageSize", val);
+      this.$emit("search");
+
       this.$emit("handleSizeChange", val);
     },
     //跳转页触发
     handleCurrentChange(val) {
+      this.$emit("update:currentPage", val);
+      this.$emit("search");
+      
       this.$emit("handleCurrentChange", val);
     },
   },

src/components/searchBoxNew.vue

@@ -22,8 +22,8 @@
             <el-option
               v-for="(items, indexs) in storeList"
               :key="indexs"
-              :label="items.projectName"
-              :value="items.id"
+              :label="items.storeName"
+              :value="items.storeId"
             ></el-option>
           </el-select>
           <el-select
@@ -36,8 +36,8 @@
             <el-option
               v-for="(items, indexs) in item.options"
               :key="indexs"
-              :label="items.label"
-              :value="items.value"
+              :label="items[item.label1 || 'label']"
+              :value="items[item.value || 'value']"
               :disabled="items.disable"
             ></el-option>
           </el-select>
@@ -187,6 +187,7 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
 export default {
   props: ["formList", "formData", "advanced", "advancedName"], //参考文档 component.md
   data() {
@@ -224,7 +225,6 @@ export default {
           },
         ],
       },
-      storeList: [],
     };
   },
   computed: {
@@ -241,6 +241,7 @@ export default {
         return arrsy;
       };
     },
+    ...mapGetters(["storeList"]),
   },
   watch: {},
   methods: {

src/store/getters.js

@@ -17,6 +17,7 @@ const getters = {
   topbarRouters: (state) => state.permission.topbarRouters,
   defaultRoutes: (state) => state.permission.defaultRoutes,
   sidebarRouters: (state) => state.permission.sidebarRouters,
+  isAdmin: (state) => state.user.isAdmin,
   indexnum(state) {
     if (!state.dict.indexnum) {
       api

src/store/modules/user.js

@@ -11,6 +11,7 @@ const user = {
     roles: [],
     permissions: [],
     userId: "",
+    isAdmin: false,
   },
 
   mutations: {
@@ -32,6 +33,9 @@ const user = {
     SET_USERID: (state, userId) => {
       state.userId = userId;
     },
+    SET_ISADMIN: (state, administrator) => {
+      state.isAdmin = administrator === 1;
+    },
   },
 
   actions: {
@@ -78,6 +82,7 @@ const user = {
             commit("SET_NAME", user.userName);
             commit("SET_AVATAR", avatar);
             commit("SET_USERID", user.userId);
+            commit("SET_ISADMIN", user.administrator);
             resolve(res);
           })
           .catch((error) => {

src/views/storeMag/components/StaffSetDlg.vue

@@ -4,7 +4,7 @@
     :isShow.sync="isShow"
     @close="close"
     @open="open"
-    :isShowFooter="false"
+    @submit="submitForm"
     width="450px"
   >
     <el-form
@@ -61,18 +61,13 @@
         <el-input disabled v-model="form.password" placeholder="请输入密码">
         </el-input>
       </el-form-item>
-      <!-- <el-form-item label="启动状态:" prop="status">
+      <el-form-item label="启动状态:" prop="status">
         <el-radio-group v-model="form.status">
           <el-radio :label="1">启动</el-radio>
-          <el-radio :label="2">暂停</el-radio>
+          <el-radio :label="0">停用</el-radio>
         </el-radio-group>
-      </el-form-item> -->
+      </el-form-item>
     </el-form>
-    <div class="btns clearfix">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="submitForm(1)">启用</el-button>
-      <el-button type="info" @click="submitForm(0)">保存</el-button>
-    </div>
   </Base-dialog>
 </template>
 
@@ -148,7 +143,7 @@ export default {
     resetForm() {
       this.form = {
         userId: undefined,
-        status: 0,
+        status: 1,
         telphone: undefined,
         userName: undefined,
         realname: undefined,
@@ -167,10 +162,9 @@ export default {
         console.log(this.form, 666);
       });
     },
-    submitForm(status) {
+    submitForm() {
       this.$refs.form.validate(async (valid) => {
         if (valid) {
-          this.form.status = this.form.status || status;
           if (this.userId) {
             this.$api
               .editUser(this.form)
@@ -216,12 +210,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-.btns {
-  .el-button {
-    margin-top: 20px;
-    float: right;
-    margin-left: 14px;
-  }
-}
-</style>
+<style lang="scss" scoped></style>

src/views/storeMag/components/StoreSetDlg.vue

@@ -1,9 +1,10 @@
 <template>
   <Base-dialog
-    :title="form.id ? '编辑店铺' : '添加店铺'"
+    :title="storeId ? '编辑店铺' : '添加店铺'"
     :isShow.sync="isShow"
     @close="close"
-    :isShowFooter="false"
+    @open="open"
+    @submit="submitForm"
     width="450px"
   >
     <el-form
@@ -13,62 +14,74 @@
       label-position="right"
       ref="form"
     >
-      <el-form-item label="店铺简称:" prop="userName">
-        <el-input v-model="form.userName" placeholder="请输入店铺简称">
+      <el-form-item label="店铺简称:" prop="storeName">
+        <el-input v-model="form.storeName" placeholder="请输入店铺简称">
         </el-input>
       </el-form-item>
       <el-form-item label="店铺地址:">
-        <el-input v-model="form.password" placeholder="请输入店铺地址">
+        <el-input v-model="form.address" placeholder="请输入店铺地址">
         </el-input>
       </el-form-item>
     </el-form>
-    <div class="btns clearfix">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="submitForm">启用</el-button>
-      <el-button type="info">保存</el-button>
-    </div>
   </Base-dialog>
 </template>
 
 <script>
-import { mapGetters } from "vuex";
 export default {
   props: {
     dialogVisible: {
       type: Boolean,
       default: false,
     },
+    storeId: {
+      type: [Number || String],
+    },
   },
   data() {
     return {
       form: {},
       rules: {
-        userName: [
+        storeName: [
           { required: true, message: "请输入店铺简称", trigger: "blur" },
         ],
       },
     };
   },
   methods: {
+    open() {
+      this.resetForm();
+    },
     resetForm() {
       this.form = {
-        id: undefined,
+        storeId: undefined,
         status: undefined,
-        userName: undefined,
-        password: undefined,
+        storeName: undefined,
+        address: undefined,
       };
       this.clearForm("form");
     },
     submitForm() {
       this.$refs.form.validate(async (valid) => {
         if (valid) {
-          withdrawal(this.form).then((res) => {
-            if (res.code == 200) {
-              this.$message.success("提现申请成功");
-              this.isShow = false;
-              this.$emit("getSellerInfo");
-            }
-          });
+          if (this.userId) {
+            this.$api
+              .editUser(this.form)
+              .then((res) => {
+                this.$message.success("修改成功");
+                this.$emit("search");
+                this.isShow = false;
+              })
+              .catch(() => {});
+          } else {
+            this.$api
+              .addUser(this.form)
+              .then((res) => {
+                this.$message.success("新增成功");
+                this.$emit("search");
+                this.isShow = false;
+              })
+              .catch(() => {});
+          }
         } else {
           return false;
         }
@@ -88,21 +101,9 @@ export default {
         this.$emit("update:dialogVisible", false);
       },
     },
-    ...mapGetters(["roleList", "storeList"]),
   },
   created() {},
   components: {},
-  watch: {
-    dialogVisible: {
-      handler(val) {
-        if (val) {
-          console.log(this.storeList, 666);
-          this.resetForm();
-        }
-      },
-      immediate: true,
-    },
-  },
 };
 </script>
 

src/views/storeMag/index.vue

@@ -1,7 +1,7 @@
 <template>
   <container title="店铺管理">
     <template v-slot:btn>
-      <el-button type="primary" @click="dialogVisible = true"
+      <el-button type="primary" @click="handelEdit('')"
         >添加店铺</el-button
       >
       <el-button @click="batchDel">批量删除</el-button>
@@ -32,10 +32,10 @@
         </el-switch>
       </template>
       <template slot="btn" slot-scope="props">
-        <el-button type="text" @click="handelClick(2, props.scope.row.tpId)"
+        <el-button type="text" @click="handelEdit(props.scope.row.storeId)"
           >编辑</el-button
         >
-        <el-button type="text" @click="handelDel(props.scope.row.tpId)"
+        <el-button type="text" @click="handelDel(props.scope.row.storeId)"
           >删除</el-button
         >
       </template>
@@ -46,12 +46,16 @@
       :currentPage.sync="formData.pageNum"
       @search="search"
     />
-    <Store-set-dlg :dialogVisible.sync="dialogVisible"></Store-set-dlg>
+    <Store-set-dlg
+      :storeId="storeId"
+      :dialogVisible.sync="dialogVisible"
+    ></Store-set-dlg>
   </container>
 </template>
 
 <script>
 import StoreSetDlg from "./components/StoreSetDlg.vue";
+import { getStoreList } from "../../api/store/index";
 export default {
   name: "SaasMemberRecord",
 
@@ -70,43 +74,62 @@ export default {
       tableSet: [
         {
           label: "店铺简称",
-          prop: "tpName",
+          prop: "storeName",
         },
         {
           label: "店铺地址",
-          prop: "tpName",
+          prop: "address",
         },
         {
           label: "启动状态",
-          prop: "tpName",
+          prop: "status",
           scope: "solt",
           soltName: "status",
         },
         {
           label: "创建时间",
-          prop: "tpName",
+          prop: "createTime",
+          scope: "aTimeList",
         },
       ],
-      tableData: [{}],
+      tableData: [],
       total: 0,
       formList: [
         {
-          prop: "name",
-          placeholder: "请输店铺简称",
+          prop: "storeName",
+          placeholder: "请输入店铺简称",
         },
       ],
       dialogVisible: false,
+      storeId: "",
     };
   },
 
-  mounted() {},
+  mounted() {
+    this.init();
+  },
 
   methods: {
-    search(v) {
-      console.log(this.formData, 789);
-    },
     init() {
-      this.search();
+      this.search(2);
+    },
+    search(v) {
+      if (v === 2) {
+        this.formData = {
+          pageSize: 10,
+          pageNum: 1,
+          storeName: undefined,
+        };
+      }
+      this.loading = true;
+      getStoreList(this.formData)
+        .then((res) => {
+          this.tableData = res.rows;
+          this.total = res.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     del(id) {
       this.$confirm("确定删除吗?", "提示", {
@@ -117,14 +140,9 @@ export default {
         .then(() => {})
         .catch(() => {});
     },
-    resetPass(id) {
-      this.$confirm("确定恢复为初始密码吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {})
-        .catch(() => {});
+    handelEdit(storeId) {
+      this.storeId = storeId;
+      this.dialogVisible = true;
     },
     batchDel() {
       let len = this.$refs.tableList.allCheckData.length;

src/views/storeMag/staff.vue

@@ -36,7 +36,7 @@
         <el-button type="text" @click="handelEdit(props.scope.row.userId)"
           >编辑</el-button
         >
-        <el-button type="text" @click="resetPass(props.scope.row.tpId)"
+        <el-button type="text" @click="resetPass(props.scope.row.userId)"
           >密码恢复</el-button
         >
         <el-button type="text" @click="del(props.scope.row)">删除</el-button>
@@ -57,7 +57,9 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
 import StaffSetDlg from "./components/StaffSetDlg";
+import { restorePwd } from "../../api/store/index";
 export default {
   name: "SaasMemberRecord",
 
@@ -65,7 +67,6 @@ export default {
     return {
       loading: false,
       navText: {
-        index: 0,
         num: true,
         choice: true,
         addHide: true,
@@ -74,6 +75,10 @@ export default {
       },
       formData: {},
       tableSet: [
+        {
+          label: "所属店铺",
+          prop: "storeName",
+        },
         {
           label: "真实姓名",
           prop: "userName",
@@ -95,23 +100,18 @@ export default {
       ],
       tableData: [],
       total: 0,
-      formList: [
-        {
-          prop: "name",
-          placeholder: "请输入手机号码",
-        },
-      ],
       dialogVisible: false,
+      userId: 0,
     };
   },
 
   mounted() {
-    this.search();
+    this.init();
   },
 
   methods: {
     init() {
-      this.search();
+      this.search(2);
     },
     del(row) {
       this.$confirm("确定删除吗?", "提示", {
@@ -145,7 +145,11 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(() => {})
+        .then(() => {
+          restorePwd({ userId: id }).then((res) => {
+            this.$message.success("重置密码成功");
+          });
+        })
         .catch(() => {});
     },
     batchDel() {
@@ -177,14 +181,16 @@ export default {
       this.editUser(e, row);
     },
     search(v) {
+      if (v === 2) {
+        this.formData = {
+          statusArray: "0,1",
+          pageSize: 10,
+          pageNum: 1,
+        };
+      }
       this.loading = true;
-      var data = {
-        statusArray: "0,1",
-        pageSize: this.pageSize,
-        pageNum: this.currentPage,
-      };
       this.$api
-        .obtainUserList(data)
+        .obtainUserList(this.formData)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -195,6 +201,28 @@ export default {
     },
   },
   components: { StaffSetDlg },
+  computed: {
+    ...mapGetters(["roleList"]),
+    formList() {
+      return [
+        {
+          scope: "select",
+          prop: "roleId",
+          options: this.roleList,
+          label1: "roleName",
+          value: "roleId",
+        },
+        {
+          scope: "store",
+          prop: "storeId",
+        },
+        {
+          prop: "telphone",
+          placeholder: "请输入手机号码",
+        },
+      ];
+    },
+  },
 };
 </script>
 

src/views/systemManagement/accountManagement/index.vue

@@ -1,482 +0,0 @@
-<template>
-  <div id="accountManagement">
-    <table-list
-      :tableSets="tableSet"
-      :tableData="tableData"
-      :navText="navText"
-      :loading="loading"
-      @addClick="addClick"
-    >
-      <template slot="btn" slot-scope="props">
-        <el-button type="text" @click="addClick(props.scope.row, 0)"
-          >修改</el-button
-        >
-        <el-button type="text" @click="del(props.scope.row)">删除</el-button>
-      </template>
-    </table-list>
-    <pagination
-      :total="total"
-      :pageSize="pageSize"
-      :currentPage="currentPage"
-      @handleSizeChange="handleSizeChange"
-      @handleCurrentChange="handleCurrentChange"
-    />
-    <el-dialog
-      :visible.sync="dialogVisible"
-      width="560px"
-      :show-close="false"
-      :close-on-click-modal="false"
-      @close="onClose"
-      @closed="loadingClose"
-    >
-      <div slot="title" class="hearders">
-        <div class="leftTitle">
-          {{ statusPop === 1 ? "添加" : statusPop === 0 ? "修改" : "详情" }}
-        </div>
-        <div class="rightBoxs">
-          <img src="@/assets/images/Close@2x.png" alt="" @click="close" />
-        </div>
-      </div>
-      <div>
-        <el-form
-          label-position="right"
-          label-width="110px"
-          :model="listData"
-          :rules="rules"
-          ref="listData"
-        >
-          <el-form-item label="账号名称" prop="userName">
-            <el-input
-              v-model="listData.userName"
-              placeholder="请输入账号名称"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            label="账号密码"
-            :prop="statusPop === 1 ? 'password' : ''"
-          >
-            <el-input
-              v-model="listData.password"
-              placeholder="请输入账号密码"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="真实姓名" prop="nickName">
-            <el-input
-              v-model="listData.nickName"
-              placeholder="请输入真实姓名"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
-              v-model="listData.phonenumber"
-              placeholder="请输入手机号码"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="邮箱" prop="email">
-            <el-input
-              v-model="listData.email"
-              placeholder="请输入邮箱"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="角色名称" prop="roleIds">
-            <el-select
-              multiple
-              v-model="listData.roleIds"
-              placeholder="请选择角色名称"
-              clearable
-              :style="{ width: '100%' }"
-            >
-              <el-option
-                v-for="(item, index) in roleList"
-                :key="index"
-                :label="item.roleName"
-                :value="item.roleId"
-                :disabled="item.disabled"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="状态" prop="status">
-            <el-radio-group v-model="listData.status" size="medium">
-              <el-radio
-                v-for="(item, index) in statusOptions"
-                :key="index"
-                :label="item.value"
-                :disabled="item.disabled"
-                >{{ item.label }}</el-radio
-              >
-            </el-radio-group>
-          </el-form-item>
-        </el-form>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="close">取 消</el-button>
-        <el-button
-          type="primary"
-          v-if="statusPop !== 2"
-          :loading="disabledBtn"
-          @click="submit('listData')"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from "vuex";
-import searchBox from "@/components/searchBox";
-import tableList from "@/components/tableList";
-import pagination from "@/components/pagination";
-export default {
-  name: "AccountManagement",
-  components: { searchBox, tableList, pagination },
-  data() {
-    return {
-      disabledBtn: false,
-      loading: false, //当前表单加载是否加载动画
-      navText: {
-        title: "账号管理",
-        index: 0,
-        ch: "条",
-        num: false,
-        choice: true,
-        addHide: false,
-        backFatherBtn: {
-          status: false,
-          title: "未定义",
-        },
-      },
-      // 表单
-      tableSet: [
-        {
-          label: "角色名称",
-          prop: "roleName",
-          hidden: true,
-        },
-        {
-          label: "真实姓名",
-          prop: "userName",
-          hidden: true,
-        },
-        {
-          label: "手机号码",
-          prop: "telphone",
-          hidden: true,
-        },
-        // {
-        //   label: "邮箱",
-        //   prop: "email",
-        //   hidden: true,
-        // },
-        {
-          label: "状态",
-          prop: "status",
-          hidden: true,
-          scope: "status",
-        },
-      ],
-      listData: {},
-      rules: {
-        userName: [
-          {
-            required: true,
-            message: "请输入账号名称",
-            trigger: "blur",
-          },
-        ],
-        password: [
-          {
-            required: true,
-            message: "请输入账号密码",
-            trigger: "blur",
-          },
-        ],
-        nickName: [
-          {
-            required: true,
-            message: "请输入真实姓名",
-            trigger: "blur",
-          },
-        ],
-        phonenumber: [
-          {
-            required: false,
-            message: "请输入手机号码",
-            trigger: "blur",
-          },
-          {
-            pattern: /^1[34578]\d{9}$/,
-            message: "请输入正确手机号",
-            trigger: "blur",
-          },
-        ],
-        email: [
-          {
-            required: false,
-            message: "请输入邮箱",
-            trigger: "blur",
-          },
-        ],
-        roleIds: [
-          {
-            required: true,
-            message: "请选择角色名称",
-            trigger: "change",
-          },
-        ],
-        status: [
-          {
-            required: true,
-            message: "状态不能为空",
-            trigger: "change",
-          },
-        ],
-      },
-      statusOptions: [
-        {
-          label: "启用",
-          value: 1,
-        },
-        {
-          label: "关闭",
-          value: 0,
-        },
-      ],
-      statusPop: 1,
-      dialogVisible: false,
-      listData: {},
-      tableData: [], //表单数据
-      total: 0, //一共多少条
-      pageSize: 10, //每页多少条数据
-      currentPage: 1, //当前页码
-    };
-  },
-  computed: { ...mapGetters(["roleList"]) },
-  mounted() {
-    this.search();
-  },
-  methods: {
-    loadingClose() {
-      this.disabledBtn = false;
-    },
-    search(v) {
-      this.loading = true;
-      var data = {
-        statusArray: "0,1",
-        pageSize: this.pageSize,
-        pageNum: this.currentPage,
-      };
-      this.$api
-        .obtainUserList(data)
-        .then((res) => {
-          this.tableData = res.rows;
-          this.total = res.total;
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    },
-    init() {
-      this.search();
-    },
-    addClick(v, int) {
-      if (v === undefined) {
-        this.statusPop = 1;
-        this.listData = {
-          status: 1,
-        };
-      } else {
-        this.statusPop = int;
-        this.listData = JSON.parse(JSON.stringify(v));
-      }
-      this.$nextTick(() => {
-        this.$refs.listData.clearValidate();
-      });
-      this.dialogVisible = true;
-    },
-    del(v) {
-      this.$confirm("此操作将删除该岗位, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          // var data = JSON.parse(JSON.stringify(v));
-          // data.menuIds = [];
-          // data.status = "-1";
-          var data = {
-            userId: v.userId,
-            status: -1,
-            userName: v.userName,
-            roleIds: [],
-          };
-          this.$api.editUser(data).then((res) => {
-            if (res.code === 200) {
-              this.$message.success("删除成功");
-              this.search();
-              this.dialogVisible = false;
-            }
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    onClose() {
-      this.$refs["listData"].resetFields();
-    },
-    close() {
-      this.dialogVisible = false;
-    },
-    submit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (!valid) return;
-        this.disabledBtn = true;
-        if (this.listData.userId) {
-          this.$api
-            .editUser(this.listData)
-            .then((res) => {
-              this.$message.success("修改成功");
-              this.search();
-              this.close();
-            })
-            .catch(() => {
-              this.disabledBtn = false;
-            });
-        } else {
-          this.$api
-            .addUser(this.listData)
-            .then((res) => {
-              this.$message.success("新增成功");
-              this.search();
-              this.close();
-            })
-            .catch(() => {
-              this.disabledBtn = false;
-            });
-        }
-      });
-    },
-    handleSizeChange(v) {
-      this.pageSize = v;
-      this.currentPage = 1;
-      this.search();
-    },
-    handleCurrentChange(v) {
-      this.currentPage = v;
-      this.search();
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-/deep/.el-button {
-  border-radius: 8px;
-}
-/deep/.el-dialog {
-  border-radius: 8px;
-  .el-dialog__header {
-    padding: 0;
-    .hearders {
-      height: 40px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 0px 18px 0px 20px;
-      border-bottom: 1px solid #e2e2e2;
-      .leftTitle {
-        font-size: 14px;
-        font-weight: bold;
-        color: #2f4378;
-      }
-      .rightBoxs {
-        display: flex;
-        align-items: center;
-        img {
-          width: 14px;
-          height: 14px;
-          margin-left: 13px;
-          cursor: pointer;
-        }
-      }
-    }
-  }
-  .el-dialog__footer {
-    padding: 0;
-    .dialog-footer {
-      padding: 0px 40px;
-      height: 70px;
-      border-top: 1px solid #e2e2e2;
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-    }
-  }
-}
-.imgBox {
-  width: 100%;
-  // height: 210px;
-  border: 1px solid #e2e2e2;
-  border-radius: 8px;
-  padding: 8px 8px 3px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  .imgLabel {
-    flex: 1;
-    width: 100%;
-    border: 1px dotted #e2e2e2;
-    color: #999;
-    font-size: 14px;
-    cursor: pointer;
-    border-radius: 8px;
-    .msPhoto {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      max-width: 100%;
-      max-height: 270px;
-      img {
-        max-width: 100%;
-        max-height: 270px;
-      }
-    }
-    .imgbbx {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      width: 100%;
-      height: 100%;
-      i {
-        font-weight: bold;
-        margin: 14px 0;
-        font-size: 24px;
-      }
-    }
-  }
-  p {
-    margin: 5px 0px;
-  }
-}
-</style>
-

src/views/systemManagement/roleManagement/index.vue

@@ -337,7 +337,7 @@ export default {
       this.search();
     },
     del(v) {
-      this.$confirm("此操作将删除该岗位, 是否继续?", "提示", {
+      this.$confirm("此操作将删除该角色, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",