修改了报修页面

src/api/admin/repair.js

@@ -68,4 +68,11 @@ export function selectWorkerIdByTypeId (parameter) {
   })
 }
 
+export function selectDispatcher () {
+  return axios({
+    url: api.repair + '/selectDispatcher',
+    method: 'get'
+  })
+}
+
 export const repairExport = api.repair + '/export'

src/views/admin/IcsCustomerStaffList.vue

@@ -38,10 +38,13 @@
     >
     <span slot='dataType' slot-scope='text,record'>
       <a-tag v-if='record.dataType == 1' color='pink'>
-        企业员工
+        维修员
       </a-tag>
       <a-tag v-if='record.dataType == 2' color='green'>
-        临时访客
+        派单员
+      </a-tag>
+            <a-tag v-if='record.dataType == 3' color='green'>
+        网格长
       </a-tag>
       </span>
       <span slot='action' slot-scope='text, record'>
@@ -94,10 +97,14 @@ export default {
           dataIndex: 'mobile'
         },
         {
-          title: '数据类型',
+          title: '角色类型',
           dataIndex: 'dataType',
           scopedSlots: { customRender: 'dataType' }
         },
+        {
+          title: '创建时间',
+          dataIndex: 'createTime'
+        },
         {
           title: '操作',
           width: '200px',

src/views/admin/repair/RepairTypeList.vue

@@ -32,6 +32,9 @@
       :columns="columns"
       :data="loadData"
     >
+     <span slot="worker" slot-scope="text, record">
+       <a @click="seeWorKerList(record.id,record.workerList)">{{record.workerNames}}</a>
+      </span>
       <span slot="action" slot-scope="text, record">
         <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
         <a-divider type="vertical" />
@@ -39,6 +42,9 @@
       </span>
     </s-table>
     <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>
 
@@ -71,12 +77,23 @@
       advanced: false,
       // 查询参数
       queryParam: {},
+      workerVisible: false,
       // 表头
       columns: [
         {
           title: '名称',
           dataIndex: 'name'
         },
+        {
+          title: '负责人',
+          dataIndex: 'staffName'
+        },
+        {
+          title: '维修人员',
+          dataIndex: 'workerNames',
+          scopedSlots: { customRender: 'worker' }
+
+        },
         {
           title: '备注',
           dataIndex: 'remark'
@@ -88,6 +105,15 @@
           scopedSlots: { customRender: 'action' }
         }
       ],
+      workerColumns: [
+        {
+          title: '人员名称',
+          dataIndex: 'username'
+        }
+
+      ],
+      data: [],
+      rowSelection: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return getRepairTypeList(Object.assign(parameter, this.queryParam))
@@ -104,6 +130,11 @@
   created () {
   },
   methods: {
+    seeWorKerList (id, list){
+      this.workerVisible = true
+      this.data = list
+    },
+
     onSelectChange (selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows

src/views/admin/repair/modules/RepairRoomModal.vue

@@ -14,6 +14,9 @@
       <a-form-item style="display:none">
         <a-input v-decorator="['version']"/>
       </a-form-item>
+      <a-form-item style="display:none">
+        <a-input v-decorator="['addressId']"/>
+      </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="楼层">
         <a-input placeholder="楼层" v-decorator="['name']"/>
       </a-form-item>
@@ -67,7 +70,7 @@
       this.edit({ addressId: addressId })
     },
     edit (record) {
-      this.mdl = Object.assign(record)
+      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'))

src/views/admin/repair/modules/RepairRoomModalList.vue

@@ -99,6 +99,8 @@ import { checkPermission } from '@/utils/permissions'
     show (addressId) {
       this.visible = true
       this.addressId = addressId
+      this.queryParam.addressId = addressId
+
       this.$refs.table && this.$refs.table.refresh(true)
     },
     onSelectChange (selectedRowKeys, selectedRows) {

src/views/admin/repair/modules/RepairTypeModal.vue

@@ -14,33 +14,25 @@
       <a-form-item style="display:none">
         <a-input v-decorator="['version']"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
+      <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="['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>
+      </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
         <a-input placeholder="备注" v-decorator="['remark']"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="删除标志">
-        <a-input placeholder="删除标志" v-decorator="['deleteFlag']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建者">
-        <a-input placeholder="创建者" v-decorator="['createBy']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="更新者">
-        <a-input placeholder="更新者" v-decorator="['updateBy']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="租户ID">
-        <a-input placeholder="租户ID" v-decorator="['tenantId']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="园区ID">
-        <a-input placeholder="园区ID" v-decorator="['parkId']"/>
-      </a-form-item>
     </a-form>
   </a-modal>
 </template>
 <script>
     import {saveRepairType} from '@/api/admin/repair/repairType'
     import pick from 'lodash.pick'
+    import { selectDispatcher } from '@/api/admin/repair'
 
     export default {
   name: 'RepairTypeModal',
@@ -61,14 +53,22 @@
       },
       confirmLoading: false,
       mdl: {},
-      form: this.$form.createForm(this)
+      form: this.$form.createForm(this),
+      staffLists: []
     }
   },
   beforeCreate () {
   },
   created () {
+    this.staffList()
   },
   methods: {
+    staffList(){
+      // 获取派单员id
+      selectDispatcher().then(res =>{
+        this.staffLists =res.data
+      })
+    },
     add () {
       this.form.resetFields()
       this.edit({ id: 0 })