新增了对应地区接口

src/api/admin/repair.js

@@ -60,4 +60,12 @@ export function delRepair (parameter) {
   })
 }
 
+export function selectWorkerIdByTypeId (parameter) {
+  return axios({
+    url: api.repair + '/selectWorkerIdByTypeId',
+    method: 'get',
+    params: parameter
+  })
+}
+
 export const repairExport = api.repair + '/export'

src/api/admin/repair/repairAddress.js

@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+  repairAddress: '/repairAddress'
+}
+
+export function getRepairAddressList (parameter) {
+  return axios({
+    url: api.repairAddress + '/list',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function saveRepairAddress (parameter) {
+  return axios({
+    url: api.repairAddress + (parameter.id > 0 ? '/update' : '/save'),
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function delRepairAddress (parameter) {
+  return axios({
+    url: api.repairAddress + '/remove',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export const repairAddressExport = api.repairAddress + '/export'

src/api/admin/repair/repairRoom.js

@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+  repairRoom: '/repairRoom'
+}
+
+export function getRepairRoomList (parameter) {
+  return axios({
+    url: api.repairRoom + '/list',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function saveRepairRoom (parameter) {
+  return axios({
+    url: api.repairRoom + (parameter.id > 0 ? '/update' : '/save'),
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function delRepairRoom (parameter) {
+  return axios({
+    url: api.repairRoom + '/remove',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export const repairRoomExport = api.repairRoom + '/export'

src/views/admin/RepairList.vue

@@ -33,8 +33,8 @@
       <span slot="action" slot-scope="text, record">
         <a v-if="editEnabel" @click="handleView(record.id)">详情</a>
         <a-divider type="vertical" />
-        <a v-if="editEnabel" @click="handleEdit(record)">指派</a>
+<!--        <a v-if="editEnabel" @click="handleEdit(record)">指派</a>-->
-        <a-divider type="vertical" />
+<!--        <a-divider type="vertical" />-->
         <a v-if="editEnabel" @click="handleComplete(record)">完成</a>
       </span>
     </s-table>
@@ -78,20 +78,17 @@ export default {
         },
         {
           title: '报修名称',
-          dataIndex: 'park.name'
+          dataIndex: 'repairName'
-        },
-        {
-          title: '工单来源',
-          dataIndex: 'name'
-        },
-        {
-          title: '设备名称',
-          dataIndex: 'phone'
         },
         {
           title: '所属分类',
-          dataIndex: 'user.userName'
+          dataIndex: 'typeName'
         },
+        {
+          title: '设备名称',
+          dataIndex: 'repairDeviceName'
+        },
+
         {
           title: '工单状态',
           dataIndex: 'status',
@@ -99,13 +96,11 @@ export default {
         },
         {
           title: '故障等级',
-          dataIndex: 'status',
+          dataIndex: 'repairLevel'
-          scopedSlots: { customRender: 'status' }
         },
         {
           title: '提交人',
-          dataIndex: 'userName',
+          dataIndex: 'userName'
-          scopedSlots: { customRender: 'status' }
         },
         {
           title: '报修时间',

src/views/admin/RepairView.vue

@@ -52,43 +52,63 @@
     <!-- 维修信息 -->
     <a-card style="margin-top: 10px" :bordered="false" title="报修信息">
       <a-descriptions>
-        <a-descriptions-item label="报修人">{{ mdl.name }}</a-descriptions-item>
         <a-descriptions-item label="维修单号">{{ mdl.sn }}</a-descriptions-item>
-        <a-descriptions-item label="状态">{{ mdl.statusName }}</a-descriptions-item>
+        <a-descriptions-item label="工单名称">{{ mdl.repairName }}</a-descriptions-item>
-        <a-descriptions-item label="联系方式">{{ mdl.phone }}</a-descriptions-item>
+        <a-descriptions-item label="设备类型">{{ mdl.typeName }}</a-descriptions-item>
-        <a-descriptions-item label="公司">{{ mdl.customerVO===null?'':mdl.customerVO.name }}</a-descriptions-item>
+        <a-descriptions-item label="设备名称">{{ mdl.repairDeviceName }}</a-descriptions-item>
-        <a-descriptions-item label="园区">{{ mdl.parkVO===null?'':mdl.parkVO.name }}</a-descriptions-item>
+        <a-descriptions-item label="发起人">{{ mdl.userName }}</a-descriptions-item>
+        <a-descriptions-item label="电话">{{ mdl.phone }}</a-descriptions-item>
+        <a-descriptions-item label="故障等级">{{ mdl.repairLevel }}</a-descriptions-item>
+        <a-descriptions-item label="故障类型">{{ mdl.failureTypeName }}</a-descriptions-item>
+        <a-descriptions-item label="故障等级">{{ mdl.repairLevel }}</a-descriptions-item>
+        <a-descriptions-item label="故障地点">{{ mdl.repairLevel }}</a-descriptions-item>
+        <a-descriptions-item label="门牌号">{{ mdl.repairLevel }}</a-descriptions-item>
+        <a-descriptions-item label="派单员">{{ mdl.repairLevel }}</a-descriptions-item>
+        <a-descriptions-item label="维修人">{{ mdl.workerName }}</a-descriptions-item>
+        <a-descriptions-item label="故障时间">{{ mdl.failureDate }}</a-descriptions-item>
         <a-descriptions-item label="报修时间">{{ mdl.repairTime }}</a-descriptions-item>
-        <a-descriptions-item label="报修区域">{{ mdl.area }}</a-descriptions-item>
+        <a-descriptions-item label="状态">{{ mdl.statusName }}</a-descriptions-item>
+        <a-descriptions-item label="完成时间">{{ mdl.endDate }}</a-descriptions-item>
       </a-descriptions>
-      <a-divider />
+    </a-card>
-      <template>
+    <a-card style="margin-top: 10px" :bordered="false" title="维修信息">
-        <div class="clearfix">
+      <div style="display: flex;">
+          <span style="margin:40px">
+            报修图片
+          </span>
+        <div style="margin-bottom: 50px; margin-left: 30px"  class="clearfix">
           <a-upload list-type="picture-card" :file-list="fileList" @preview="handlePreview">
           </a-upload>
           <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
             <img alt="example" style="width: 100%" :src="previewImage" />
           </a-modal>
         </div>
-      </template>
+      </div>
-    </a-card>
+      <div>
-    <a-card style="margin-top: 10px" :bordered="false" title="维修信息">
+        <div>
-      <a-descriptions>
+          <a-descriptions  layout="vertical" bordered>
-        <a-descriptions-item label="维修员">{{ mdl.userVO===null?'':mdl.userVO.userName }}</a-descriptions-item>
+            <a-descriptions-item label="解决方案">
-        <a-descriptions-item label="联系电话">{{ mdl.userVO===null?'':mdl.userVO.mobile }}</a-descriptions-item>
+              更换空调滤芯
-        <a-descriptions-item label="维修费用">{{ mdl.repairFee===null?'0': mdl.repairFee }} 元</a-descriptions-item>
+            </a-descriptions-item>
-        <a-descriptions-item label="开始时间">{{ mdl.beginDate }}</a-descriptions-item>
-        <a-descriptions-item label="结束时间">{{ mdl.endDate }}</a-descriptions-item>
-        <a-descriptions-item label="维修材料">{{ mdl.repairMateriel }}</a-descriptions-item>
             </a-descriptions>
+          <a-descriptions  layout="vertical" bordered>
+            <a-descriptions-item label="故障原因">
+              空调使用时间长
+            </a-descriptions-item>
+          </a-descriptions>
+        </div>
+      </div>
     </a-card>
     <a-card style="margin-top: 10px" :bordered="false" title="评价">
       <a-descriptions >
-        <a-descriptions-item label="评价结果">
+        <a-descriptions-item label="维修速度">
-          <a-rate v-model="mdl.repairScore" disabled/>
+          <a-rate v-model="mdl.speed" disabled/>
         </a-descriptions-item>
-        <a-descriptions-item label="评价工人">
+        <a-descriptions-item label="服务评价">
-          <a-rate v-model="mdl.workerScore" disabled/>
+          <a-rate v-model="mdl.serve" disabled/>
+        </a-descriptions-item>
+        <a-descriptions-item label="效果评价">
+          <a-rate v-model="mdl.effect" disabled/>
         </a-descriptions-item>
         <a-descriptions-item label="意见建议">
           {{ mdl.remark }}
@@ -184,11 +204,20 @@ export default {
       if (repairId) {
         getRepair(repairId).then(record => {
           this.mdl = Object.assign(record)
-          console.log(this.mdl.user)
           // 维修记录
           if (this.mdl.repairLogs.length > 0) {
             this.dataSource = this.mdl.repairLogs
           }
+          if (this.mdl.repairImages) {
+            this.mdl.repairImages = JSON.parse(this.mdl.repairImages)
+            this.mdl.repairImages.forEach((item, i) => {
+              item.url = process.env.VUE_APP_API_BASE_URL + item.url
+              console.log(item.url)
+            })
+            this.fileList = this.mdl.repairImages
+          } else {
+            this.fileList = []
+          }
           // 报修图片
           this.fileList = this.mdl.repairImages
         })

src/views/admin/modules/RepairModal.vue

@@ -19,20 +19,12 @@
           </a-form-item>
         </a-col>
         <a-col :span='10'>
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修人">
-            <a-input placeholder="报修人" v-decorator="['userId', {rules: [{ required: true, message: '请选择报修人' }]}]"/>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row>
 
-        <a-col :span='10'>
+          <a-form-item label='故障时间' :labelCol='labelCol' :wrapperCol='wrapperCol'>
-
-            <a-form-item label='报修时间' :labelCol='labelCol' :wrapperCol='wrapperCol'>
             <a-date-picker
               format='YYYY-MM-DD HH:mm:ss'
               valueFormat='YYYY-MM-DD HH:mm:ss'
-                v-decorator="['repairTime',{rules: [{ required: true, message: '选择报修时间'}]}]"
+              v-decorator="['failureDate',{rules: [{ required: true, message: '选择报修时间'}]}]"
               :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
               type='date'
               placeholder='选择报修时间'
@@ -41,30 +33,6 @@
             />
           </a-form-item>
         </a-col>
-        <a-col :span='10'>
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="所属分类">
-            <a-select v-decorator="['typeId', {rules: [{ required: true, message: '请选择所属分类' }]}]"
-                      @change="selectDevice">
-              <a-select-option v-for="item in typeList" :key="item.id">{{ item.name }}</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row>
-
-        <a-col :span='10'>
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修设备">
-            <a-select v-decorator="['deviceId', {rules: [{ required: true, message: '请选择所属设备' }]}]"
-                      >
-              <a-select-option v-for="item in deviceList" :key="item.id">{{ item.name }}</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span='10'>
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="维修负责人">
-            <a-input placeholder="维修负责人" v-decorator="['workerId', {rules: [{ required: true, message: '请输入维修负责人' }]}]"/>
-          </a-form-item>
-        </a-col>
       </a-row>
       <a-row>
 
@@ -72,16 +40,16 @@
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="故障等级">
             <a-select v-decorator="['repairLevel',{rules: [{ required: true, message: '请选择故障等级'}]}]"
                       placeholder='请选择故障等级'>
-              <a-select-option :value='一级'>
+              <a-select-option value='一级'>
                 一级
               </a-select-option>
-              <a-select-option :value='二级'>
+              <a-select-option value="二级">
                 二级
               </a-select-option>
-              <a-select-option :value='三级'>
+              <a-select-option value='三级'>
                 三级
               </a-select-option>
-              <a-select-option :value='四级'>
+              <a-select-option value='四级'>
                 四级
               </a-select-option>
             </a-select>
@@ -89,14 +57,81 @@
         </a-col>
         <a-col :span='10'>
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="故障类型">
-            <a-input placeholder="故障类型" v-decorator="['sn']"/>
+            <a-select v-decorator="['failureTypeId', {rules: [{ required: true, message: '请选择所属设备' }]}]"
+            >
+              <a-select-option v-for="item in failureTypeList" :key="item.id">{{ item.name }}</a-select-option>
+            </a-select>
           </a-form-item>
         </a-col>
       </a-row>
+      <a-row>
+        <a-col :span='10'>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="所属分类">
+            <a-select v-decorator="['typeId', {rules: [{ required: true, message: '请选择所属分类' }]}]"
+                      @change="selectDevice">
+              <a-select-option v-for="item in typeList" :key="item.id">{{ item.name }}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span='10'>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修设备">
+            <a-select v-decorator="['repairDevice', {rules: [{ required: true, message: '请选择所属设备' }]}]"
+            >
+              <a-select-option v-for="item in deviceList" :key="item.id">{{ item.name }}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span='10'>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修人">
+            <a-input placeholder="报修人" v-decorator="['userId', {rules: [{ required: true, message: '请选择报修人' }]}]"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span='10'>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
+            <a-input placeholder="联系电话" v-decorator="['phone', {rules: [{ required: true, message: '请输入联系电话' }]}]"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span='10'>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="维修负责人">
+            <a-select v-decorator="['workerId', {rules: [{ required: true, message: '请输入维修负责人' }]}]"
+            >
+              <a-select-option v-for="item in userList" :key="item.id">{{ item.username }}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span='10'>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修地点">
+            <a-select v-decorator="['addressId', {rules: [{ required: true, message: '请选择报修地点' }]}]"
+                      @change="selectRoomList">
+              <a-select-option v-for="item in addressList" :key="item.id">{{ item.name }}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span='10'>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="详细地址">
+            <a-select v-decorator="['roomId', {rules: [{ required: true, message: '请选择详细地址' }]}]"
+            >
+              <a-select-option v-for="item in roomList" :key="item.id">{{ item.name }}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span='10'>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="门牌号">
+            <a-input placeholder="门牌号" v-decorator="['area', {rules: [{ required: true, message: '请输入门牌号' }]}]"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+
       <a-row>
         <a-col :span='10'>
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修内容">
-            <a-input placeholder="报修内容" v-decorator="['repairName']"/>
+            <a-textarea placeholder="报修内容" v-decorator="['content']"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -104,7 +139,7 @@
         <a-col :span='10'>
           <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='报修图片'>
             <a-upload
-              v-decorator="['indoorPicUrl', {rules: [{ required: true, message: '上传室内图片' }]}]"
+              v-decorator="['repairImages', {rules: [{ required: true, message: '上传室内图片' }]}]"
               list-type='picture-card'
               class='avatar-uploader'
               :file-list='fileList'
@@ -124,33 +159,19 @@
           </a-form-item>
         </a-col>
       </a-row>
-
-<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="维修员">-->
-<!--        <a-select v-decorator="['workerId', {rules: [{ required: true, message: '请选择维修员' }]}]">-->
-<!--          <a-select-option v-for="item in workerData" :key="item.value">{{ item.text }}</a-select-option>-->
-<!--        </a-select>-->
-<!--      </a-form-item>-->
-<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="维修时间">-->
-<!--        <a-range-picker-->
-<!--          style="width: 100%"-->
-<!--          showTime-->
-<!--          format="YYYY-MM-DD HH:mm:ss"-->
-<!--          :value="dateValue"-->
-<!--          @change="onChange"-->
-<!--        />-->
-<!--      </a-form-item>-->
-<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="维修材料">-->
-<!--        <a-input placeholder="维修材料" v-decorator="['repairMateriel']"/>-->
-<!--      </a-form-item>-->
     </a-form>
   </a-modal>
 </template>
 <script>
-import { review } from '@/api/admin/repair'
+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 { 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 moment from 'moment'
@@ -193,22 +214,28 @@ export default {
       previewImage: '',
       form: this.$form.createForm(this),
       typeList: [],
-      deviceList:[]
+      deviceList: [],
+      failureTypeList: [],
+      userList: [],
+      addressList: [],
+      roomList: []
     }
   },
   beforeCreate () {
   },
   created () {
     // 工人列表
-    getUserList({ dtype: 'Admin' }).then(res => {
+    // getUserList({ dtype: 'Admin' }).then(res => {
-      if (res.code === 0) {
+    //   if (res.code === 0) {
-        const result = res.rows
+    //     const result = res.rows
-        result.forEach(r => {
+    //     result.forEach(r => {
-          this.workerData.push({ value: r.id, text: r.username + '(' + r.mobile + ')' })
+    //       this.workerData.push({ value: r.id, text: r.username + '(' + r.mobile + ')' })
-        })
+    //     })
-      }
+    //   }
-    })
+    // })
     this.selectType()
+    this.selectFailureType()
+    this.getRepairAddressList()
   },
   methods: {
     moment,
@@ -222,7 +249,27 @@ export default {
       getRepairDeviceList({"typeId":id}).then(res =>{
         this.deviceList = res.rows
       })
+      selectWorkerIdByTypeId({"typeId":id}).then(res =>{
+        this.userList =res.data
+      })
     },
+    selectFailureType(){
+      getRepairFailureTypeList().then(res =>{
+        this.failureTypeList = res.rows
+      })
+    },
+    getRepairAddressList(){
+      getRepairAddressList().then(res =>{
+        this.addressList = res.rows
+      })
+    },
+
+    selectRoomList(id){
+      getRepairRoomList({"addressId":id}).then(res =>{
+        this.roomList = res.rows
+      })
+    },
+
 
     async handlePreview(file) {
       if (!file.url && !file.preview) {
@@ -240,18 +287,30 @@ export default {
     },
     add () {
       this.form.resetFields()
+      this.mdl.repairImages = null
       this.edit({ id: 0 })
     },
     edit (record) {
       this.mdl = Object.assign(record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'workerId', 'repairMateriel'))
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'repairImages', 'workerId', 'repairMateriel'))
       })
       // 处理日期
       if (this.mdl.beginDate !== null && this.mdl.beginDate !== undefined && this.mdl.endDate !== null && this.mdl.endDate !== undefined) {
         this.dateValue = [moment(this.mdl.beginDate, dateFormat), moment(this.mdl.endDate, dateFormat)]
       }
+      // 图片
+      if (this.mdl.repairImages) {
+        console.log("1111111111111111111111")
+        this.mdl.repairImages = JSON.parse(this.mdl.repairImages)
+        this.mdl.repairImages.forEach((item, i) => {
+          item.url = process.env.VUE_APP_API_BASE_URL + item.url
+        })
+        this.fileList = this.mdl.repairImages
+      } else {
+        this.fileList = []
+      }
     },
     onChange (dates, dateStrings) {
       console.log('From: ', dateStrings[0], ', to: ', dateStrings[1])
@@ -267,6 +326,20 @@ export default {
           this.confirmLoading = true
           values.beginDate = this.beginDate
           values.endDate = this.endDate
+
+          const repairImages = []
+          this.fileList.forEach((file, index) => {
+            // 添加原来的
+            if (file.hasOwnProperty('name') && file.hasOwnProperty('url') && file.hasOwnProperty('uid')) {
+              repairImages.push({ 'name': file.name, 'url': file.name, 'uid': index })
+            }
+            if (file.status === 'done' && file.response.code === 0) {
+              const data = file.response
+              repairImages.push({ 'name': data.fileName, 'url': data.fileName, 'uid': index })
+            }
+          })
+          // 多个图片
+          values.repairImages = JSON.stringify(repairImages)
           review(values).then(res => {
             if (res.code === 0) {
               this.$message.success('保存成功')

src/views/admin/repair/RepairAddressList.vue

@@ -0,0 +1,150 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="48">
+          <a-col :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <a-button v-if="addEnable" type="primary" icon="plus" @click="$refs.modal.add()">新建</a-button>
+      <a-dropdown v-if="removeEnable&&selectedRowKeys.length > 0">
+        <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
+      </a-dropdown>
+    </div>
+    <s-table
+      size="default"
+      ref="table"
+      rowKey="id"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      :columns="columns"
+      :data="loadData"
+    >
+      <span slot="action" slot-scope="text, record">
+        <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
+        <a-divider type="vertical" />
+        <a v-if="editEnabel" @click="dataModal(record.id)"><a-icon type="bars" />门牌</a>
+        <a-divider type="vertical" />
+        <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
+      </span>
+    </s-table>
+    <repairAddress-modal ref="modal" @ok="handleOk"/>
+    <repair-room-modal-list ref="datamodal" @ok="handleOk" />
+  </a-card>
+</template>
+
+<script>
+    import {STable} from '@/components'
+    import RepairRoomModalList from './modules/RepairRoomModalList'
+    import {delRepairAddress,getRepairAddressList} from '@/api/admin/repair/repairAddress'
+    import RepairAddressModal from './modules/RepairAddressModal.vue'
+    import {checkPermission} from '@/utils/permissions'
+
+    export default {
+  name: 'TableList',
+  components: {
+    STable,
+    RepairAddressModal,
+    RepairRoomModalList
+  },
+  data () {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      form: this.$form.createForm(this),
+      mdl: {},
+      // 高级搜索 展开/关闭
+      advanced: false,
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        {
+          title: '地区',
+          dataIndex: 'name'
+        },
+        {
+          title: '备注',
+          dataIndex: 'remark'
+        },
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getRepairAddressList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      addEnable: checkPermission('repair:address:add'),
+      editEnabel: checkPermission('repair:address:edit'),
+      removeEnable: checkPermission('repair:address:remove')
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  methods: {
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    },
+    dataModal (addressId) {
+      this.$refs.datamodal.show(addressId)
+    },
+    handleAdd () {
+      this.$refs.modal.add()
+    },
+    handleEdit (record) {
+      this.$refs.modal.edit(record)
+    },
+    handleOk () {
+      this.$refs.table.refresh(true)
+      console.log('handleSaveOk')
+    },
+
+    delByIds (ids) {
+      delRepairAddress({ ids: ids.join(',') }).then(res => {
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          this.handleOk()
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.selectedRowKeys = []
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>

src/views/admin/repair/RepairFailureTypeList.vue

@@ -80,10 +80,6 @@
           title: '备注',
           dataIndex: 'remark'
         },
-        {
-          title: '园区ID',
-          dataIndex: 'parkId'
-        },
         {
           title: '操作',
           width: '200px',
@@ -97,9 +93,9 @@
       },
       selectedRowKeys: [],
       selectedRows: [],
-      addEnable: checkPermission('RepairFailureType:repairFailureType:add'),
+      addEnable: checkPermission('RepairFailureType:repairType:add'),
-      editEnabel: checkPermission('RepairFailureType:repairFailureType:edit'),
+      editEnabel: checkPermission('RepairFailureType:repairType:edit'),
-      removeEnable: checkPermission('RepairFailureType:repairFailureType:remove')
+      removeEnable: checkPermission('RepairFailureType:repairType:remove')
     }
   },
   filters: {

src/views/admin/repair/RepairRoomList.vue

@@ -0,0 +1,147 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="48">
+          <a-col :md="5" :sm="15">
+            <a-form-item label="门牌号">
+              <a-input placeholder="请输入门牌号" v-model="queryParam.name"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <a-button v-if="addEnable" type="primary" icon="plus" @click="$refs.modal.add()">新建</a-button>
+      <a-dropdown v-if="removeEnable&&selectedRowKeys.length > 0">
+        <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
+      </a-dropdown>
+    </div>
+    <s-table
+      size="default"
+      ref="table"
+      rowKey="id"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      :columns="columns"
+      :data="loadData"
+    >
+      <span slot="action" slot-scope="text, record">
+        <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
+        <a-divider type="vertical" />
+        <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
+      </span>
+    </s-table>
+    <repairRoom-modal ref="modal" @ok="handleOk"/>
+  </a-card>
+</template>
+
+<script>
+    import {STable} from '@/components'
+
+    import {delRepairRoom,getRepairRoomList} from '@/api/admin/repair/repairRoom'
+    import RepairRoomModal from './modules/RepairRoomModalList.vue'
+    import {checkPermission} from '@/utils/permissions'
+
+    export default {
+  name: 'TableList',
+  components: {
+    STable,
+    RepairRoomModal
+  },
+  data () {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      form: this.$form.createForm(this),
+      mdl: {},
+      // 高级搜索 展开/关闭
+      advanced: false,
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        {
+          title: '门牌号',
+          dataIndex: 'name'
+        },
+        {
+          title: '备注',
+          dataIndex: 'remark'
+        },
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getRepairRoomList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      addEnable: checkPermission('repair:repairRoom:add'),
+      editEnabel: checkPermission('repair:repairRoom:edit'),
+      removeEnable: checkPermission('repair:repairRoom:remove')
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  methods: {
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    },
+    handleAdd () {
+      this.$refs.modal.add()
+    },
+    handleEdit (record) {
+      this.$refs.modal.edit(record)
+    },
+    handleOk () {
+      this.$refs.table.refresh(true)
+      console.log('handleSaveOk')
+    },
+    delByIds (ids) {
+      delRepairRoom({ ids: ids.join(',') }).then(res => {
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          this.handleOk()
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.selectedRowKeys = []
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>

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

@@ -0,0 +1,106 @@
+<template>
+  <a-modal
+    title="操作"
+    style="top: 20px;"
+    :width="800"
+    v-model="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+  >
+    <a-form :form="form">
+      <a-form-item style="display:none">
+        <a-input v-decorator="['id']"/>
+      </a-form-item>
+      <a-form-item style="display:none">
+        <a-input v-decorator="['version']"/>
+      </a-form-item>
+      <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-input placeholder="备注" v-decorator="['remark']"/>
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+    import {saveRepairAddress} from '@/api/admin/repair/repairAddress'
+    import pick from 'lodash.pick'
+
+    export default {
+  name: 'RepairAddressModal',
+  props: {
+  },
+  components: {
+  },
+  data () {
+    return {
+      visible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      confirmLoading: false,
+      mdl: {},
+      form: this.$form.createForm(this)
+    }
+  },
+  beforeCreate () {
+  },
+  created () {
+  },
+  methods: {
+    add () {
+      this.form.resetFields()
+      this.edit({ id: 0 })
+    },
+    edit (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'))
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+          this.confirmLoading = true
+          saveRepairAddress(values).then(res => {
+            if (res.code === 0) {
+              this.$message.success('保存成功')
+              this.$emit('ok')
+              this.visible = false
+            } else {
+              this.$message.error(res.msg)
+            }
+          }).catch(() => {
+            this.$message.error('系统错误，请稍后再试')
+          }).finally(() => {
+            this.confirmLoading = false
+          })
+        }
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>

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

@@ -0,0 +1,114 @@
+<template>
+  <a-modal
+    title="操作"
+    style="top: 20px;"
+    :width="800"
+    v-model="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+  >
+    <a-form :form="form">
+      <a-form-item style="display:none">
+        <a-input v-decorator="['id']"/>
+      </a-form-item>
+      <a-form-item style="display:none">
+        <a-input v-decorator="['version']"/>
+      </a-form-item>
+      <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-input placeholder="备注" v-decorator="['remark']"/>
+      </a-form-item>
+
+    </a-form>
+  </a-modal>
+</template>
+<script>
+    import {saveRepairRoom} from '@/api/admin/repair/repairRoom'
+    import pick from 'lodash.pick'
+
+    export default {
+  name: 'RepairRoomModal',
+  props: {
+  },
+  components: {
+  },
+  data () {
+    return {
+      visible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      addressId: "",
+      confirmLoading: false,
+      mdl: {},
+      form: this.$form.createForm(this)
+    }
+  },
+  beforeCreate () {
+  },
+  created () {
+  },
+  methods: {
+    show (addressId) {
+      this.visible = true
+      this.addressId = addressId
+      this.$refs.table && this.$refs.table.refresh(true)
+    },
+    add (addressId) {
+      this.form.resetFields()
+      console.log(addressId)
+      this.edit({ addressId: addressId })
+    },
+    edit (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'))
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+          this.confirmLoading = true
+          saveRepairRoom(values).then(res => {
+            if (res.code === 0) {
+              this.$message.success('保存成功')
+              this.$emit('ok')
+              this.visible = false
+            } else {
+              this.$message.error(res.msg)
+            }
+          }).catch(() => {
+            this.$message.error('系统错误，请稍后再试')
+          }).finally(() => {
+            this.confirmLoading = false
+          })
+        }
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>

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

@@ -0,0 +1,145 @@
+<template>
+  <a-modal
+    title="门牌管理"
+    style="top: 20px;"
+    :width="1100"
+    v-model="visible"
+    :footer="null"
+
+  >
+    <div class="table-operator">
+      <a-button type="primary" icon="plus" @click="$refs.modal.add(addressId)">新建</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
+      </a-dropdown>
+    </div>
+    <s-table
+      size="default"
+      ref="table"
+      rowKey="id"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      :columns="columns"
+      :data="loadData"
+    >
+      <span slot="action" slot-scope="text, record">
+        <a @click="handleEdit(record)">编辑</a>
+        <a-divider type="vertical" />
+        <a @click="delByIds([record.id])">删除</a>
+      </span>
+    </s-table>
+    <repairRoom-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 { checkPermission } from '@/utils/permissions'
+
+    export default {
+  name: 'RepairRoomListModal',
+  props: {
+  },
+  components: {
+    STable,
+    RepairRoomModal
+  },
+  data () {
+    return {
+      visible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      form: this.$form.createForm(this),
+      mdl: {},
+      // 高级搜索 展开/关闭
+      advanced: false,
+      // 查询参数
+      queryParam: {},
+      addressId: '',
+      // 表头
+      columns: [
+        {
+          title: '楼层',
+          dataIndex: 'name'
+        },
+        {
+          title: '备注',
+          dataIndex: 'remark'
+        },
+
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getRepairRoomList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      addEnable: checkPermission('repair:repairRoom:add'),
+      editEnabel: checkPermission('repair:repairRoom:edit'),
+      removeEnable: checkPermission('repair:repairRoom:remove')
+    }
+  },
+  beforeCreate () {
+  },
+  created () {
+  },
+  methods: {
+    show (addressId) {
+      this.visible = true
+      this.addressId = addressId
+      this.$refs.table && this.$refs.table.refresh(true)
+    },
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    },
+    handleAdd () {
+      this.$refs.modal.add()
+    },
+    handleEdit (record) {
+      this.$refs.modal.edit(record)
+    },
+    handleOk () {
+      this.$refs.table.refresh(true)
+      console.log('handleSaveOk')
+    },
+    delByIds (ids) {
+      delRepairRoom({ ids: ids.join(',') }).then(res => {
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          this.handleOk()
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.selectedRowKeys = []
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>

vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     port: 8000,
     proxy: {
       '/api': {
-        target: 'https://www.chuangzhikj.com/saas-ics',
+        target: 'http://localhost:9227',
         pathRewrite: { '^/api': '' },
         ws: false,
         changeOrigin: true