From 3e8418c0d83d912e0b7e3050fd2a6f3e1027ef62 Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Sat, 10 Aug 2024 16:42:56 +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

---
 .../{repairRoom.js => repairAddressFloor.js}  |  9 ++++++++-
 .../{repairType.js => repairDeviceType.js}    |  2 +-
 src/views/admin/modules/RepairModal.vue       |  4 ++--
 ...oomList.vue => RepairAddressFloorList.vue} | 11 +++++-----
 src/views/admin/repair/RepairAddressList.vue  |  2 +-
 src/views/admin/repair/RepairDeviceList.vue   |  6 +++---
 ...rTypeList.vue => RepairDeviceTypeList.vue} | 10 +++++-----
 ...mModal.vue => RepairAddressFloorModal.vue} | 20 ++++++++++++++++---
 ...st.vue => RepairAddressFloorModalList.vue} | 20 ++++++++++++-------
 .../repair/modules/RepairDeviceModal.vue      |  4 ++--
 ...ypeModal.vue => RepairDeviceTypeModal.vue} | 11 ++--------
 11 files changed, 60 insertions(+), 39 deletions(-)
 rename src/api/admin/repair/{repairRoom.js => repairAddressFloor.js} (79%)
 rename src/api/admin/repair/{repairType.js => repairDeviceType.js} (95%)
 rename src/views/admin/repair/{RepairRoomList.vue => RepairAddressFloorList.vue} (93%)
 rename src/views/admin/repair/{RepairTypeList.vue => RepairDeviceTypeList.vue} (94%)
 rename src/views/admin/repair/modules/{RepairRoomModal.vue => RepairAddressFloorModal.vue} (78%)
 rename src/views/admin/repair/modules/{RepairRoomModalList.vue => RepairAddressFloorModalList.vue} (86%)
 rename src/views/admin/repair/modules/{RepairTypeModal.vue => RepairDeviceTypeModal.vue} (91%)

diff --git a/src/api/admin/repair/repairRoom.js b/src/api/admin/repair/repairAddressFloor.js
similarity index 79%
rename from src/api/admin/repair/repairRoom.js
rename to src/api/admin/repair/repairAddressFloor.js
index b8b3f06..dfb9f25 100644
--- a/src/api/admin/repair/repairRoom.js
+++ b/src/api/admin/repair/repairAddressFloor.js
@@ -1,7 +1,7 @@
 import { axios } from '@/utils/request'
 
 const api = {
-  repairRoom: '/repairRoom'
+  repairRoom: '/repairAddressFloor'
 }
 
 export function getRepairRoomList (parameter) {
@@ -31,4 +31,11 @@ export function delRepairRoom (parameter) {
   })
 }
 
+export function selectDispatcher (parameter) {
+  return axios({
+    url: api.repairRoom + '/selectDispatcher',
+    method: 'get'
+  })
+}
+
 export const repairRoomExport = api.repairRoom + '/export'
diff --git a/src/api/admin/repair/repairType.js b/src/api/admin/repair/repairDeviceType.js
similarity index 95%
rename from src/api/admin/repair/repairType.js
rename to src/api/admin/repair/repairDeviceType.js
index 03e505d..192d71e 100644
--- a/src/api/admin/repair/repairType.js
+++ b/src/api/admin/repair/repairDeviceType.js
@@ -1,7 +1,7 @@
 import { axios } from '@/utils/request'
 
 const api = {
-  repairType: '/repairType'
+  repairType: '/repairDeviceType'
 }
 
 export function getRepairTypeList (parameter) {
diff --git a/src/views/admin/modules/RepairModal.vue b/src/views/admin/modules/RepairModal.vue
index d170e81..c77c80a 100644
--- a/src/views/admin/modules/RepairModal.vue
+++ b/src/views/admin/modules/RepairModal.vue
@@ -166,12 +166,12 @@
 import { review,selectWorkerIdByTypeId } from '@/api/admin/repair'
 import pick from 'lodash.pick'
 import { getUserList } from '@/api/system'
-import {getRepairTypeList} from '@/api/admin/repair/repairType'
+import {getRepairTypeList} from '@/api/admin/repair/repairDeviceType'
 import { getRepairDeviceList } from '@/api/admin/repair/repairDevice'
 import {getRepairFailureTypeList} from '@/api/admin/repair/repairFailureType'
 
 import {getRepairAddressList} from '@/api/admin/repair/repairAddress'
-import {getRepairRoomList} from '@/api/admin/repair/repairRoom'
+import {getRepairRoomList} from '@/api/admin/repair/repairAddressFloor'
 
 
 import moment from 'moment'
diff --git a/src/views/admin/repair/RepairRoomList.vue b/src/views/admin/repair/RepairAddressFloorList.vue
similarity index 93%
rename from src/views/admin/repair/RepairRoomList.vue
rename to src/views/admin/repair/RepairAddressFloorList.vue
index 9364dd1..dd2c307 100644
--- a/src/views/admin/repair/RepairRoomList.vue
+++ b/src/views/admin/repair/RepairAddressFloorList.vue
@@ -44,8 +44,8 @@
 <script>
     import {STable} from '@/components'
 
-    import {delRepairRoom,getRepairRoomList} from '@/api/admin/repair/repairRoom'
-    import RepairRoomModal from './modules/RepairRoomModalList.vue'
+    import {delRepairRoom,getRepairRoomList} from '@/api/admin/repair/repairAddressFloor'
+    import RepairRoomModal from './modules/RepairAddressFloorModalList.vue'
     import {checkPermission} from '@/utils/permissions'
 
     export default {
@@ -76,6 +76,7 @@
           title: '门牌号',
           dataIndex: 'name'
         },
+
         {
           title: '备注',
           dataIndex: 'remark'
@@ -93,9 +94,9 @@
       },
       selectedRowKeys: [],
       selectedRows: [],
-      addEnable: checkPermission('repair:repairRoom:add'),
-      editEnabel: checkPermission('repair:repairRoom:edit'),
-      removeEnable: checkPermission('repair:repairRoom:remove')
+      addEnable: checkPermission('floor:floor:add'),
+      editEnabel: checkPermission('floor:floor:edit'),
+      removeEnable: checkPermission('floor:floor:remove')
     }
   },
   filters: {
diff --git a/src/views/admin/repair/RepairAddressList.vue b/src/views/admin/repair/RepairAddressList.vue
index f9f7347..56755ae 100644
--- a/src/views/admin/repair/RepairAddressList.vue
+++ b/src/views/admin/repair/RepairAddressList.vue
@@ -41,7 +41,7 @@
 
 <script>
     import {STable} from '@/components'
-    import RepairRoomModalList from './modules/RepairRoomModalList'
+    import RepairRoomModalList from './modules/RepairAddressFloorModalList'
     import {delRepairAddress,getRepairAddressList} from '@/api/admin/repair/repairAddress'
     import RepairAddressModal from './modules/RepairAddressModal.vue'
     import {checkPermission} from '@/utils/permissions'
diff --git a/src/views/admin/repair/RepairDeviceList.vue b/src/views/admin/repair/RepairDeviceList.vue
index 10586a1..e2c595f 100644
--- a/src/views/admin/repair/RepairDeviceList.vue
+++ b/src/views/admin/repair/RepairDeviceList.vue
@@ -95,9 +95,9 @@ export default {
       },
       selectedRowKeys: [],
       selectedRows: [],
-      addEnable: checkPermission('core:repairDevice:add'),
-      editEnabel: checkPermission('core:repairDevice:edit'),
-      removeEnable: checkPermission('core:repairDevice:remove')
+      addEnable: checkPermission('RepairDevice:device:add'),
+      editEnabel: checkPermission('RepairDevice:device:edit'),
+      removeEnable: checkPermission('RepairDevice:device:remove')
     }
   },
   filters: {},
diff --git a/src/views/admin/repair/RepairTypeList.vue b/src/views/admin/repair/RepairDeviceTypeList.vue
similarity index 94%
rename from src/views/admin/repair/RepairTypeList.vue
rename to src/views/admin/repair/RepairDeviceTypeList.vue
index 33044fc..56c5a15 100644
--- a/src/views/admin/repair/RepairTypeList.vue
+++ b/src/views/admin/repair/RepairDeviceTypeList.vue
@@ -51,8 +51,8 @@
 <script>
     import {STable} from '@/components'
 
-    import {delRepairType,getRepairTypeList} from '@/api/admin/repair/repairType'
-    import RepairTypeModal from './modules/RepairTypeModal.vue'
+    import {delRepairType,getRepairTypeList} from '@/api/admin/repair/repairDeviceType'
+    import RepairTypeModal from './modules/RepairDeviceTypeModal.vue'
     import {checkPermission} from '@/utils/permissions'
 
     export default {
@@ -120,9 +120,9 @@
       },
       selectedRowKeys: [],
       selectedRows: [],
-      addEnable: checkPermission('RepairType:repairType:add'),
-      editEnabel: checkPermission('RepairType:repairType:edit'),
-      removeEnable: checkPermission('RepairType:repairType:remove')
+      addEnable: checkPermission('RepairDeviceType:type:add'),
+      editEnabel: checkPermission('RepairDeviceType:type:edit'),
+      removeEnable: checkPermission('RepairDeviceType:type:remove')
     }
   },
   filters: {
diff --git a/src/views/admin/repair/modules/RepairRoomModal.vue b/src/views/admin/repair/modules/RepairAddressFloorModal.vue
similarity index 78%
rename from src/views/admin/repair/modules/RepairRoomModal.vue
rename to src/views/admin/repair/modules/RepairAddressFloorModal.vue
index 45f47cc..0671de4 100644
--- a/src/views/admin/repair/modules/RepairRoomModal.vue
+++ b/src/views/admin/repair/modules/RepairAddressFloorModal.vue
@@ -20,6 +20,12 @@
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="楼层">
         <a-input placeholder="楼层" v-decorator="['name']"/>
       </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="楼层管理员">
+        <a-select v-decorator="['adminId', {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="备注">
         <a-input placeholder="备注" v-decorator="['remark']"/>
       </a-form-item>
@@ -28,7 +34,7 @@
   </a-modal>
 </template>
 <script>
-    import {saveRepairRoom} from '@/api/admin/repair/repairRoom'
+    import {saveRepairRoom,selectDispatcher} from '@/api/admin/repair/repairAddressFloor'
     import pick from 'lodash.pick'
 
     export default {
@@ -48,7 +54,8 @@
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      addressId: "",
+      addressId: '',
+      staffLists: [],
       confirmLoading: false,
       mdl: {},
       form: this.$form.createForm(this)
@@ -57,8 +64,15 @@
   beforeCreate () {
   },
   created () {
+    this.staffList()
   },
   methods: {
+    staffList (){
+      // 获取派单员id
+      selectDispatcher().then(res =>{
+        this.staffLists =res.data
+      })
+    },
     show (addressId) {
       this.visible = true
       this.addressId = addressId
@@ -73,7 +87,7 @@
       this.mdl = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'remark', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'tenantId', 'parkId', 'addressId'))
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'remark', 'adminId', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'tenantId', 'parkId', 'addressId'))
       })
     },
     handleSubmit (e) {
diff --git a/src/views/admin/repair/modules/RepairRoomModalList.vue b/src/views/admin/repair/modules/RepairAddressFloorModalList.vue
similarity index 86%
rename from src/views/admin/repair/modules/RepairRoomModalList.vue
rename to src/views/admin/repair/modules/RepairAddressFloorModalList.vue
index df0087f..ea52e72 100644
--- a/src/views/admin/repair/modules/RepairRoomModalList.vue
+++ b/src/views/admin/repair/modules/RepairAddressFloorModalList.vue
@@ -27,22 +27,24 @@
         <a @click="delByIds([record.id])">删除</a>
       </span>
     </s-table>
-    <repairRoom-modal ref="modal" @ok="handleOk"/>
+    <repair-address-floor-modal ref="modal" @ok="handleOk"/>
   </a-modal>
 </template>
 <script>
 import { STable } from '@/components'
-import { delRepairRoom, getRepairRoomList } from '@/api/admin/repair/repairRoom'
-import RepairRoomModal from './RepairRoomModal.vue'
+import { delRepairRoom, getRepairRoomList } from '@/api/admin/repair/repairAddressFloor'
+import RepairAddressFloorModal from './RepairAddressFloorModal.vue'
 import { checkPermission } from '@/utils/permissions'
+import RepairAddressModal from '@/views/admin/repair/modules/RepairAddressModal'
 
     export default {
   name: 'RepairRoomListModal',
   props: {
   },
   components: {
+    RepairAddressModal,
     STable,
-    RepairRoomModal
+    RepairAddressFloorModal
   },
   data () {
     return {
@@ -68,6 +70,10 @@ import { checkPermission } from '@/utils/permissions'
           title: '楼层',
           dataIndex: 'name'
         },
+        {
+          title: '楼层管理员',
+          dataIndex: 'adminName'
+        },
         {
           title: '备注',
           dataIndex: 'remark'
@@ -86,9 +92,9 @@ import { checkPermission } from '@/utils/permissions'
       },
       selectedRowKeys: [],
       selectedRows: [],
-      addEnable: checkPermission('repair:repairRoom:add'),
-      editEnabel: checkPermission('repair:repairRoom:edit'),
-      removeEnable: checkPermission('repair:repairRoom:remove')
+      addEnable: checkPermission('floor:floor:add'),
+      editEnabel: checkPermission('floor:floor:edit'),
+      removeEnable: checkPermission('floor:floor:remove')
     }
   },
   beforeCreate () {
diff --git a/src/views/admin/repair/modules/RepairDeviceModal.vue b/src/views/admin/repair/modules/RepairDeviceModal.vue
index 687d9ca..73bbaa7 100644
--- a/src/views/admin/repair/modules/RepairDeviceModal.vue
+++ b/src/views/admin/repair/modules/RepairDeviceModal.vue
@@ -34,7 +34,7 @@
 </template>
 <script>
 import { saveRepairDevice } from '@/api/admin/repair/repairDevice'
-import {getRepairTypeList} from '@/api/admin/repair/repairType'
+import {getRepairTypeList} from '@/api/admin/repair/repairDeviceType'
 
 import pick from 'lodash.pick'
 
@@ -79,7 +79,7 @@ export default {
       this.mdl = Object.assign(record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'brand', 'specification', 'picUrl', 'fileUrl', 'remark', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'tenantId', 'parkId'))
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'typeId', 'name', 'brand', 'specification', 'picUrl', 'fileUrl', 'remark', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'tenantId', 'parkId'))
       })
     },
     handleSubmit (e) {
diff --git a/src/views/admin/repair/modules/RepairTypeModal.vue b/src/views/admin/repair/modules/RepairDeviceTypeModal.vue
similarity index 91%
rename from src/views/admin/repair/modules/RepairTypeModal.vue
rename to src/views/admin/repair/modules/RepairDeviceTypeModal.vue
index 9dd42ed..26985d2 100644
--- a/src/views/admin/repair/modules/RepairTypeModal.vue
+++ b/src/views/admin/repair/modules/RepairDeviceTypeModal.vue
@@ -30,9 +30,8 @@
   </a-modal>
 </template>
 <script>
-    import {saveRepairType} from '@/api/admin/repair/repairType'
+    import {saveRepairType} from '@/api/admin/repair/repairDeviceType'
     import pick from 'lodash.pick'
-    import { selectDispatcher } from '@/api/admin/repair'
 
     export default {
   name: 'RepairTypeModal',
@@ -60,15 +59,9 @@
   beforeCreate () {
   },
   created () {
-    this.staffList()
   },
   methods: {
-    staffList(){
-      // 获取派单员id
-      selectDispatcher().then(res =>{
-        this.staffLists =res.data
-      })
-    },
+
     add () {
       this.form.resetFields()
       this.edit({ id: 0 })