From 48c28a9b41999c3e97b1d30ee06fe2cb1a43a0dd Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Sat, 10 Aug 2024 18:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8=E5=92=8C?=
 =?UTF-8?q?=E6=A5=BC=E5=B1=82=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin/repair/repairDeviceType.js      |  7 ++++
 .../admin/repair/RepairDeviceTypeList.vue     | 35 ++++++++++---------
 .../repair/modules/RepairDeviceTypeModal.vue  | 21 +++++++----
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/api/admin/repair/repairDeviceType.js b/src/api/admin/repair/repairDeviceType.js
index 192d71e..3f8ac4e 100644
--- a/src/api/admin/repair/repairDeviceType.js
+++ b/src/api/admin/repair/repairDeviceType.js
@@ -31,4 +31,11 @@ export function delRepairType (parameter) {
   })
 }
 
+export function selectUserListByType (parameter) {
+  return axios({
+    url: api.repairType + '/selectUserListByType',
+    method: 'get'
+  })
+}
+
 export const repairTypeExport = api.repairType + '/export'
diff --git a/src/views/admin/repair/RepairDeviceTypeList.vue b/src/views/admin/repair/RepairDeviceTypeList.vue
index 56c5a15..5a6261d 100644
--- a/src/views/admin/repair/RepairDeviceTypeList.vue
+++ b/src/views/admin/repair/RepairDeviceTypeList.vue
@@ -5,7 +5,7 @@
         <a-row :gutter="48">
           <a-col :md="5" :sm="15">
             <a-form-item label="名称">
-              <a-input placeholder="请输入名称" v-model="queryParam.name"/>
+              <a-input placeholder="请输入名称" v-model="queryParam.name" />
             </a-form-item>
           </a-col>
 
@@ -32,8 +32,8 @@
       :columns="columns"
       :data="loadData"
     >
-     <span slot="worker" slot-scope="text, record">
-       <a @click="seeWorKerList(record.id,record.workerList)">{{record.workerNames}}</a>
+     <span slot="workers" slot-scope="text, record">
+       <a @click="seeWorKerList(record.id,record.workerName)">{{ record.worker }}</a>
       </span>
       <span slot="action" slot-scope="text, record">
         <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
@@ -41,21 +41,21 @@
         <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
       </span>
     </s-table>
-    <repairType-modal ref="modal" @ok="handleOk"/>
-    <a-modal v-model='workerVisible' title='维修人员' width='700px'  >
+    <repairType-modal ref="modal" @ok="handleOk" />
+    <a-modal v-model="workerVisible" title="维修人员" width="700px">
       <a-table :row-selection="rowSelection" :columns="workerColumns" :data-source="data" />
     </a-modal>
   </a-card>
 </template>
 
 <script>
-    import {STable} from '@/components'
+import { STable } from '@/components'
 
-    import {delRepairType,getRepairTypeList} from '@/api/admin/repair/repairDeviceType'
-    import RepairTypeModal from './modules/RepairDeviceTypeModal.vue'
-    import {checkPermission} from '@/utils/permissions'
+import { delRepairType, getRepairTypeList } from '@/api/admin/repair/repairDeviceType'
+import RepairTypeModal from './modules/RepairDeviceTypeModal.vue'
+import { checkPermission } from '@/utils/permissions'
 
-    export default {
+export default {
   name: 'TableList',
   components: {
     STable,
@@ -90,8 +90,8 @@
         },
         {
           title: '维修人员',
-          dataIndex: 'workerNames',
-          scopedSlots: { customRender: 'worker' }
+          dataIndex: 'worker',
+          scopedSlots: { customRender: 'workers' }
 
         },
         {
@@ -125,14 +125,17 @@
       removeEnable: checkPermission('RepairDeviceType:type:remove')
     }
   },
-  filters: {
-  },
+  filters: {},
   created () {
   },
   methods: {
-    seeWorKerList (id, list){
+    seeWorKerList (id, list) {
       this.workerVisible = true
-      this.data = list
+      this.data = list.map(item => {
+        return {
+          username: item
+        }
+      })
     },
 
     onSelectChange (selectedRowKeys, selectedRows) {
diff --git a/src/views/admin/repair/modules/RepairDeviceTypeModal.vue b/src/views/admin/repair/modules/RepairDeviceTypeModal.vue
index e81dc8a..8e494b5 100644
--- a/src/views/admin/repair/modules/RepairDeviceTypeModal.vue
+++ b/src/views/admin/repair/modules/RepairDeviceTypeModal.vue
@@ -19,12 +19,12 @@
       </a-form-item>
       <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='派单员'>
         <a-select v-decorator="['staffId', {rules: [{ required: true, message: '派单员' }]}]">
-          <a-select-option v-for='item in staffLists' :key='item.id'>{{ item.name }}--{{ item.mobile }}</a-select-option>
+          <a-select-option v-for='item in staffLists' :key='item.id'>{{ item.username }}--{{ item.mobile }}</a-select-option>
         </a-select>
       </a-form-item>
       <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='维修员'>
-        <a-select mode="multiple" v-decorator="['staffId', {rules: [{ required: true, message: '维修员' }]}]">
-          <a-select-option v-for='item in staffLists' :key='item.id'>{{ item.name }}--{{ item.mobile }}</a-select-option>
+        <a-select mode="multiple" v-decorator="['workerId', {rules: [{ required: true, message: '维修员' }]}]">
+          <a-select-option v-for='item in staffLists' :key='item.id'>{{ item.username }}--{{ item.mobile }}</a-select-option>
         </a-select>
       </a-form-item>
       <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='备注'>
@@ -34,7 +34,7 @@
   </a-modal>
 </template>
 <script>
-import { saveRepairType } from '@/api/admin/repair/repairDeviceType'
+import { saveRepairType, selectUserListByType } from '@/api/admin/repair/repairDeviceType'
 import pick from 'lodash.pick'
 
 export default {
@@ -59,20 +59,29 @@ export default {
     }
   },
   beforeCreate() {
+
   },
   created() {
   },
   methods: {
-
+    selectUserListByType (){
+      selectUserListByType().then(res =>{
+        this.staffLists =res.data
+      })
+    },
     add() {
+
       this.form.resetFields()
       this.edit({ id: 0 })
     },
     edit(record) {
+      this.selectUserListByType()
+
       this.mdl = Object.assign(record)
+      console.log(this.mdl)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'remark', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'tenantId', 'parkId'))
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'staffId', 'workerId', 'staffLists', 'remark', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'tenantId', 'parkId'))
       })
     },
     handleSubmit(e) {