Merge branch 'repair'

src/views/base/file/api/file.js

@@ -58,8 +58,9 @@ export function jyListStaff(query) {
 }
 
 export function wxListStaff(query) {
+  query.servicePackageId = 'weixiu'
   return request({
-    url: '/repair/worker/page',
+    url: '/system/role/selectListByRoleIdRepair',
     method: 'get',
     params: query
   })

src/views/base/file/file.vue

@@ -711,6 +711,13 @@ export default {
         console.log('234', 234)
         wxListStaff(data).then(res => {
           this.staffList = res.data.records
+          this.staffList = this.staffList.map(item => {
+            return {
+              ...item,
+              userId: item.id,
+              userName: item.nickname
+            }
+          })
           console.log('staffList1', this.staffList)
           this.getUserIdsByFileId(this.fileId)
         })

src/views/repair/staff/api/staff.js

@@ -44,7 +44,7 @@ export function addUser(data) {
 // 新增用户
 export function addFolder(data) {
   return request({
-    url: '/inspectionStaff/addFolder',
+    url: '/base/repair-staff/addFolder',
     method: 'post',
     data: data
   })
@@ -71,11 +71,13 @@ export function updateUser(data) {
 // 删除用户
 export function delUser(userId) {
   return request({
-    url: '/base/repair-staff/deleteStaff?id=' + userId,
+    url: '/base/repair-staff/deleteStaff',
-    method: 'delete'
+    method: 'delete',
+    data: Array.isArray(userId) ? userId : [userId] // 保证是数组
   })
 }
 
+
 // 导出用户
 export function exportUser(query) {
   return request({

src/views/repair/staff/index.vue

@@ -647,10 +647,10 @@ export default {
       if (!this.form.folderId) {
         addFolder(this.form.id).then(response => {
           this.form.folderId = response.data
-          this.$router.push({path: '/jc/shop/nbgl/partner/file/file', query: {"folderId": this.form.folderId}})
+          this.$router.push({path: '/repair/manage/file/weixiu', query: {"folderId": this.form.folderId}})
         })
       } else {
-        this.$router.push({path: '/jc/shop/nbgl/partner/file/file', query: {"folderId": this.form.folderId}})
+        this.$router.push({path: '/repair/manage/file/weixiu', query: {"folderId": this.form.folderId}})
       }
     },
     // 查询驾驶证类型

src/views/system/role/index.vue

@@ -85,7 +85,7 @@
           <el-input v-model="form.code" placeholder="请输入角色标识" />
         </el-form-item>
         <el-form-item label="所属服务" prop="servicePackageId">
-          <el-select v-model="form.servicePackageId" placeholder="请选择服务">
+          <el-select v-model="form.servicePackageId" clearable placeholder="请选择服务">
             <el-option
               v-for="item in servicePackages"
               :key="item.id"
@@ -252,7 +252,6 @@ export default {
         sort: [
           { required: true, message: "角色顺序不能为空", trigger: "blur" }
         ],
-        servicePackageId: [{ required: true, message: '所属服务不能为空', trigger: 'change' }]
       },
 
       // 枚举
@@ -381,6 +380,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.getServicePackage()
       this.reset();
       const id = row.id
       getRole(id).then(response => {