修改了对应设备类型列表和楼层列表

2025-06-21 13:49:37 +08:00 · 2024-08-10 16:42:56 +08:00 · 2024-08-10 16:42:56 +08:00 · 3e8418c0d8
commit 3e8418c0d8
parent 805300cfa6
11 changed files with 60 additions and 39 deletions
--- a/src/api/admin/repair/repairAddressFloor.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'
--- a/src/api/admin/repair/repairDeviceType.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) {
--- 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'
--- a/src/views/admin/repair/RepairAddressFloorList.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: {
--- 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'
--- 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: {},
--- a/src/views/admin/repair/RepairDeviceTypeList.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: {
--- a/src/views/admin/repair/modules/RepairAddressFloorModal.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) {
--- a/src/views/admin/repair/modules/RepairAddressFloorModalList.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 () {
--- 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) {
--- a/src/views/admin/repair/modules/RepairDeviceTypeModal.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 })