From 5356b9bbe6b4b7a03dd8a59d3aac366deb9f1b57 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Sat, 6 Jul 2024 17:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BA=BA=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/business/sale.js         |  43 +++++--
 ruoyi-ui/src/views/market/slave/index.vue | 146 +++-------------------
 2 files changed, 48 insertions(+), 141 deletions(-)

diff --git a/ruoyi-ui/src/api/business/sale.js b/ruoyi-ui/src/api/business/sale.js
index 74aea7c..d68cd24 100644
--- a/ruoyi-ui/src/api/business/sale.js
+++ b/ruoyi-ui/src/api/business/sale.js
@@ -3,19 +3,38 @@ import request from '@/utils/request'
 
 // 查询归属销售列表
 export function listSale(query) {
-    return request({
-      url: '/business/sale/list',
-      method: 'get',
-      params: query
-    })
-  }
+  return request({
+    url: '/business/sale/list',
+    method: 'get',
+    params: query
+  })
+}
 
 
 // 查询归属销售列表
 export function listSaleA(query) {
-    return request({
-      url: '/business/sale/listA',
-      method: 'get',
-      params: query
-    })
-  }
+  return request({
+    url: '/business/sale/listA',
+    method: 'get',
+    params: query
+  })
+}
+
+  
+// 查询店铺配置详细
+export function getSale(id) {
+  return request({
+    url: '/business/sale/' + id,
+    method: 'get'
+  })
+}
+
+
+// 新增、修改店铺配置
+export function saveOrUpdateSale(data) {
+  return request({
+    url: '/business/sale/saveOrUpdateSale',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/ruoyi-ui/src/views/market/slave/index.vue b/ruoyi-ui/src/views/market/slave/index.vue
index ed12a5b..394422d 100644
--- a/ruoyi-ui/src/views/market/slave/index.vue
+++ b/ruoyi-ui/src/views/market/slave/index.vue
@@ -21,9 +21,9 @@
         <el-button
           type="primary"
           plain
-          icon="el-icon-bicycle"
+          icon="el-icon-plus"
           size="mini"
-          @click="handleExport"
+          @click="handleUpdate"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -57,14 +57,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:role:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:role:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -82,11 +80,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
-        </el-form-item>
-        
-        <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="form.saleName" placeholder="请输入角色名称" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -98,7 +92,7 @@
   </div>
 </template>
 
-<script>import { listSale} from "@/api/business/sale";
+<script>import { listSale, getSale, saveOrUpdateSale} from "@/api/business/sale";
 
 export default {
   name: "Role",
@@ -254,147 +248,41 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleDataScope":
-          this.handleDataScope(row);
-          break;
-        case "handleAuthUser":
-          this.handleAuthUser(row);
-          break;
-        default:
-          break;
-      }
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type == 'menu') {
-        let treeList = this.menuOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      } else if (type == 'dept') {
-        let treeList = this.deptOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type == 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
-      } else if (type == 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
-      }
-    },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type == 'menu') {
-        this.form.menuCheckStrictly = value ? true: false;
-      } else if (type == 'dept') {
-        this.form.deptCheckStrictly = value ? true: false;
-      }
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.getMenuTreeselect();
       this.open = true;
-      this.title = "添加角色";
+      this.title = "添加销售人";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const roleId = row.roleId || this.ids
-      const roleMenu = this.getRoleMenuTreeselect(roleId);
-      getRole(roleId).then(response => {
+      getSale(row.id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.$nextTick(() => {
-          roleMenu.then(res => {
-            let checkedKeys = res.checkedKeys
-            checkedKeys.forEach((v) => {
-                this.$nextTick(()=>{
-                    this.$refs.menu.setChecked(v, true ,false);
-                })
-            })
-          });
-        });
-        this.title = "修改角色";
+        this.title = "修改销售人";
       });
     },
-    /** 选择角色权限范围触发 */
-    dataScopeSelectChange(value) {
-      if(value !== '2') {
-        this.$refs.dept.setCheckedKeys([]);
-      }
-    },
-    /** 分配数据权限操作 */
-    handleDataScope(row) {
-      this.reset();
-      const deptTreeSelect = this.getDeptTree(row.roleId);
-      getRole(row.roleId).then(response => {
-        this.form = response.data;
-        this.openDataScope = true;
-        this.$nextTick(() => {
-          deptTreeSelect.then(res => {
-            this.$refs.dept.setCheckedKeys(res.checkedKeys);
-          });
-        });
-        this.title = "分配数据权限";
-      });
-    },
-    /** 分配用户操作 */
-    handleAuthUser: function(row) {
-      const roleId = row.roleId;
-      this.$router.push("/system/role-auth/user/" + roleId);
-    },
+    
     /** 提交按钮 */
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.roleId != undefined) {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            updateRole(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            addRole(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
+          this.form.menuIds = this.getMenuAllCheckedKeys();
+          saveOrUpdateSale(this.form).then(response => {
+            this.$modal.msgSuccess("操作成功");
+            this.open = false;
+            this.getList();
+          });
         }
       });
     },
-    /** 提交按钮（数据权限） */
-    submitDataScope: function() {
-      if (this.form.roleId != undefined) {
-        this.form.deptIds = this.getDeptAllCheckedKeys();
-        dataScope(this.form).then(response => {
-          this.$modal.msgSuccess("修改成功");
-          this.openDataScope = false;
-          this.getList();
-        });
-      }
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const roleIds = row.roleId || this.ids;
-      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
-        return delRole(roleIds);
+      const id = row.id ;
+      this.$modal.confirm('是否确认删除角色编号为"' + id + '"的数据项？').then(function() {
+        return saveOrUpdateSale(this.form);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");