Merge branch 'shoot-hand-html' of gitee.com:elegant_wings/dbd-meeting-html into shoot-hand-html

This commit is contained in:
SelfRidicule 2024-08-29 18:46:27 +08:00
commit 0c5e39ddcb
3 changed files with 193 additions and 163 deletions

View File

@ -11,3 +11,11 @@ export function getRepairRemindList (parameter) {
params: parameter params: parameter
}) })
} }
export function delRepairRemind (parameter) {
return axios({
url: api.repairRemind + '/remove',
method: 'post',
data: parameter
})
}

View File

@ -1,122 +1,122 @@
<template> <template>
<a-modal <a-modal
title='指派维修员' title="指派维修员"
style='top: 20px;' style="top: 20px;"
:width='1200' :width="1200"
v-model='visible' v-model="visible"
:confirmLoading='confirmLoading' :confirmLoading="confirmLoading"
@ok='handleSubmit' @ok="handleSubmit"
> >
<a-form :form='form'> <a-form :form="form">
<a-form-item style='display:none'> <a-form-item style="display:none">
<a-input v-decorator="['id']" /> <a-input v-decorator="['id']" />
</a-form-item> </a-form-item>
<a-row> <a-row>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='所属分类'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="所属分类">
<a-select v-decorator="['typeId', {rules: [{ required: true, message: '请选择所属分类' }]}]" <a-select v-decorator="['typeId', {rules: [{ required: true, message: '请选择所属分类' }]}]"
@change='selectDevice'> @change="selectDevice">
<a-select-option v-for='item in typeList' :key='item.id' :value='item.id'>{{ item.name }} <a-select-option v-for="item in typeList" :key="item.id" :value="item.id">{{ item.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='报修设备'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修设备">
<a-select v-decorator="['deviceId', {rules: [{ required: true, message: '请选择所属设备' }]}]" <a-select v-decorator="['deviceId', {rules: [{ required: true, message: '请选择所属设备' }]}]"
@change='getDeviceName'> @change="getDeviceName">
<a-select-option v-for='item in deviceList' :key='item.id' :value='item.id'>{{ item.name }} <a-select-option v-for="item in deviceList" :key="item.id" :value="item.id">{{ item.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='报修人'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修人">
<a-input placeholder='报修人' <a-input placeholder="报修人"
v-decorator="['name', {rules: [{ required: true, message: '请选择报修人' }]}]" /> v-decorator="['name', {rules: [{ required: true, message: '请选择报修人' }]}]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='联系电话'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
<a-input placeholder='联系电话' <a-input placeholder="联系电话"
v-decorator="['phone', {rules: [{ required: true, message: '请输入联系电话' }]}]" /> v-decorator="['phone', {rules: [{ required: true, message: '请输入联系电话' }]}]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='维修负责人'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="维修负责人">
<a-select v-decorator="['repairUserId']" <a-select v-decorator="['repairUserId']"
@change='selectUser'> @change="selectUser">
<a-select-option v-for='item in userList' :key='item.userId'>{{ item.userName }}</a-select-option> <a-select-option v-for="item in userList" :key="item.userId">{{ item.userName }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='报修地点'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修地点">
<a-select v-decorator="['addressId', {rules: [{ required: true, message: '请选择报修地点' }]}]" <a-select v-decorator="['addressId', {rules: [{ required: true, message: '请选择报修地点' }]}]"
@change='selectRoomList'> @change="selectRoomList">
<a-select-option v-for='item in addressList' :key='item.id' :value='item.id'>{{ item.name }} <a-select-option v-for="item in addressList" :key="item.id" :value="item.id">{{ item.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='楼层'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="楼层">
<a-select v-decorator="['floorId', {rules: [{ required: true, message: '请选择详细地址' }]}]" <a-select v-decorator="['floorId', {rules: [{ required: true, message: '请选择详细地址' }]}]"
@change='selectFloorName'> @change="selectFloorName">
<a-select-option v-for='item in roomList' :key='item.id' :value='item.id'>{{ item.name }} <a-select-option v-for="item in roomList" :key="item.id" :value="item.id">{{ item.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='门牌号(地点)'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="门牌号(地点)">
<a-input placeholder='门牌号' <a-input placeholder="门牌号"
v-decorator="['room' ]" /> v-decorator="['room' ]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='故障类型'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="故障类型">
<a-select v-decorator="['failureTypeId' ]" <a-select v-decorator="['failureTypeId' ]"
> >
<a-select-option v-for='item in failureTypeList' :key='item.id'>{{ item.name }}</a-select-option> <a-select-option v-for="item in failureTypeList" :key="item.id">{{ item.name }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='故障描述'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="故障描述">
<a-textarea placeholder='故障描述' v-decorator="['explain']" /> <a-textarea placeholder="故障描述" v-decorator="['explain']" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span='10'> <a-col :span="10">
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='报修图片'> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修图片">
<a-upload <a-upload
v-decorator="['repairImages']" v-decorator="['repairImages']"
list-type='picture-card' list-type="picture-card"
class='avatar-uploader' class="avatar-uploader"
:file-list='fileList' :file-list="fileList"
:action='uploadUrl' :action="uploadUrl"
:headers='headers' :headers="headers"
@preview='handlePreview' @preview="handlePreview"
@change='handleChangeFileList' @change="handleChangeFileList"
> >
<div v-if='fileList.length < 4'> <div v-if="fileList.length < 4">
<a-icon type='plus' /> <a-icon type="plus" />
<div class='ant-upload-text'> 上传</div> <div class="ant-upload-text"> 上传</div>
</div> </div>
</a-upload> </a-upload>
<a-modal :visible='previewVisible' :footer='null' @cancel='handleCancel'> <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
<img style='width: 100%' :src='previewImage' /> <img style="width: 100%" :src="previewImage" />
</a-modal> </a-modal>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -145,7 +145,7 @@ export default {
name: 'RepairModal', name: 'RepairModal',
props: {}, props: {},
components: {}, components: {},
data() { data () {
return { return {
visible: false, visible: false,
labelCol: { labelCol: {
@ -190,28 +190,27 @@ export default {
files: [] files: []
} }
}, },
beforeCreate() { beforeCreate () {
}, },
created() { created () {
this.selectType() this.selectType()
this.selectFailureType() this.selectFailureType()
this.getRepairAddressList() this.getRepairAddressList()
}, },
methods: { methods: {
moment, moment,
selectType() { selectType () {
getRepairTypeList().then(res => { getRepairTypeList().then(res => {
this.typeList = res.rows this.typeList = res.rows
}) })
}, },
selectUser(id) { selectUser (id) {
}, },
// id // id
selectDevice(typeId) { selectDevice (typeId) {
let type = this.typeList.find(item => item.id == typeId) let type = this.typeList.find(item => item.id == typeId)
this.typeId = type.id this.typeId = type.id
this.typeName = type.name this.typeName = type.name
console.log('selectDevice', type)
getRepairDeviceList({ getRepairDeviceList({
typeId typeId
}).then(res => { }).then(res => {
@ -219,49 +218,57 @@ export default {
}) })
selectWorkerIdByTypeId({ typeId }).then(res => { selectWorkerIdByTypeId({ typeId }).then(res => {
this.userList = res.data this.userList = res.data
this.userList = this.userList.map(item => {
item.repairUserId = item.userId
return item
})
}) })
}, },
getDeviceName(item) { getDeviceName (deviceId) {
console.log(item) let device = this.deviceList.find(item => item.id == deviceId)
this.deviceName = item.label console.log(device)
this.deviceId = item.key this.deviceName = device.label
this.deviceId = device.key
}, },
selectFailureType() { selectFailureType () {
getRepairFailureTypeList().then(res => { getRepairFailureTypeList().then(res => {
this.failureTypeList = res.rows this.failureTypeList = res.rows
}) })
}, },
getRepairAddressList() { getRepairAddressList () {
getRepairAddressList().then(res => { getRepairAddressList().then(res => {
this.addressList = res.rows this.addressList = res.rows
}) })
}, },
selectRoomList(item) { selectRoomList (roomId) {
console.log(item) console.log('selectRoomList', roomId)
getRepairRoomList({ 'addressId': item.key }).then(res => { let room = this.addressList.find(item => item.id == roomId)
getRepairRoomList({ 'addressId': roomId }).then(res => {
this.roomList = res.rows this.roomList = res.rows
}) })
this.address = item.label this.address = room.label
this.addressId = item.key this.addressId = room.key
}, },
selectFloorName(item) { selectFloorName (floorId) {
this.floor = item.label let floor = this.roomList.find(item => item.id == floorId)
this.floorId = item.key
this.floor = floor.label
this.floorId = floor.key
}, },
async handlePreview(file) { async handlePreview (file) {
if (!file.url && !file.preview) { if (!file.url && !file.preview) {
file.preview = await getBase64FileList(file.originFileObj) file.preview = await getBase64FileList(file.originFileObj)
} }
this.previewImage = file.url || file.preview this.previewImage = file.url || file.preview
this.previewVisible = true this.previewVisible = true
}, },
handleCancel() { handleCancel () {
this.previewVisible = false this.previewVisible = false
}, },
// banner // banner
handleChangeFileList({ fileList }) { handleChangeFileList ({ fileList }) {
fileList.forEach(item => { fileList.forEach(item => {
if (item.response !== undefined) { if (item.response !== undefined) {
this.files.push(item.response.id) this.files.push(item.response.id)
@ -269,43 +276,31 @@ export default {
}) })
this.fileList = fileList this.fileList = fileList
}, },
add() { add () {
this.form.resetFields() this.form.resetFields()
this.mdl.repairImages = null this.mdl.repairImages = null
this.edit({ id: 0 }) this.edit({ id: 0 })
}, },
edit(record) { edit (record) {
console.log(this.typeList) this.selectDevice(record.typeId)
this.selectRoomList(record.addressId)
this.mdl = Object.assign(record) this.mdl = Object.assign(record)
this.mdl.typeList = this.typeList this.mdl.typeList = this.typeList
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.mdl, 'id', 'sn', 'repairName', 'typeList', 'repairLevel', 'typeId', 'typeName', 'deviceId', 'deviceName', this.form.setFieldsValue(pick(this.mdl, 'id', 'sn', 'repairName', 'typeList', 'repairLevel', 'typeId', 'typeName', 'deviceId', 'deviceName',
'name', 'phone', 'addressId', 'address', 'floorId', 'floor', 'room', 'explain', 'perUserId', 'perUserName', 'preDate', 'cause', 'name', 'phone', 'addressId', 'address', 'floorId', 'floor', 'repairUserId', 'room', 'explain', 'perUserId', 'perUserName', 'preDate', 'cause',
'solution', 'failureTypeId', 'failureTypeName')) 'solution', 'failureTypeId', 'failureTypeName'))
}) })
//
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) {
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) { onChange (dates, dateStrings) {
console.log('From: ', dateStrings[0], ', to: ', dateStrings[1]) console.log('From: ', dateStrings[0], ', to: ', dateStrings[1])
this.beginDate = dateStrings[0] this.beginDate = dateStrings[0]
this.endDate = dateStrings[1] this.endDate = dateStrings[1]
this.dateValue = [moment(this.beginDate, dateFormat), moment(this.endDate, dateFormat)] this.dateValue = [moment(this.beginDate, dateFormat), moment(this.endDate, dateFormat)]
}, },
handleSubmit(e) { handleSubmit (e) {
e.preventDefault() e.preventDefault()
console.log(this.files) console.log(this.files)
@ -360,7 +355,7 @@ export default {
watch: {} watch: {}
} }
function getBase64(img, callback) { function getBase64 (img, callback) {
const reader = new FileReader() const reader = new FileReader()
reader.addEventListener('load', () => callback(reader.result)) reader.addEventListener('load', () => callback(reader.result))
reader.readAsDataURL(img) reader.readAsDataURL(img)

View File

@ -1,83 +1,80 @@
<template> <template>
<a-card :bordered='false'> <a-card :bordered="false">
<div class='table-page-search-wrapper'> <div class="table-page-search-wrapper">
<a-form layout='inline'> <a-form layout="inline">
<a-row :gutter='48'> <a-row :gutter="48">
<a-col :md='5' :sm='15'> <a-col :md="5" :sm="15">
<a-form-item label='报修单号'> <a-form-item label="报修单号">
<a-input placeholder='请输入报修单号' v-model='queryParam.sn' /> <a-input placeholder="请输入报修单号" v-model="queryParam.sn" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md='8' :sm='24'> <a-col :md="8" :sm="24">
<span class='table-page-search-submitButtons'> <span class="table-page-search-submitButtons">
<a-button type='primary' @click='$refs.table.refresh(true)'>查询</a-button> <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
<a-button style='margin-left: 8px' @click='() => queryParam = {}'>重置</a-button> <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<a-tabs :default-active-key='tabKey' @change='callback'> <a-tabs :default-active-key="tabKey" @change="callback">
<a-tab-pane key='1' tab='全部信息'> <a-tab-pane key="1" tab="全部信息">
<a-table <a-table
size='default' size="default"
rowKey='id' rowKey="id"
:columns='columns' :columns="columns"
:data-source='workerData' :data-source="workerData"
> >
<span slot='name' slot-scope='text, record'> <span slot="name" slot-scope="text, record">
<a-tag color='blue'> <a-tag color="blue">
消息提示 消息提示
</a-tag> </a-tag>
</span> </span>
<span slot='content' slot-scope='text, record'> <span slot="content" slot-scope="text, record">
<a @click='toRepair(record.repairId)'>{{ record.content }}</a> <a @click="toRepair(record.repairId)">{{ record.content }}</a>
</span> </span>
<span slot='action' slot-scope='text, record'> <span slot="action" slot-scope="text, record">
<a v-if='editEnabel' @click='handleView(record.id)'>详情</a> <a v-if="editEnabel" @click="hanleDelete(record.id)">删除</a>
<a-divider type='vertical' />
</span> </span>
</a-table> </a-table>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key='2' tab='未读通知' force-render> <a-tab-pane key="2" tab="未读通知" force-render>
<a-table <a-table
size='default' size="default"
rowKey='id' rowKey="id"
:columns='columns' :columns="columns"
:data-source='noReadData' :data-source="noReadData"
> >
<span slot='name' slot-scope='text, record'> <span slot="name" slot-scope="text, record">
<a-tag color='blue'> <a-tag color="blue">
消息提示 消息提示
</a-tag> </a-tag>
</span> </span>
<span slot='content' slot-scope='text, record'> <span slot="content" slot-scope="text, record">
<a @click='toRepair(record.repairId)'>{{ record.content }}</a> <a @click="toRepair(record.repairId)">{{ record.content }}</a>
</span> </span>
<span slot='action' slot-scope='text, record'> <span slot="action" slot-scope="text, record">
<a v-if='editEnabel' @click='handleView(record.id)'>详情</a> <a v-if="editEnabel" @click="hanleDelete(record.id)">删除</a>
<a-divider type='vertical' />
</span> </span>
</a-table> </a-table>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key='3' tab='已读通知' force-render> <a-tab-pane key="3" tab="已读通知" force-render>
<a-table <a-table
size='default' size="default"
rowKey='id' rowKey="id"
:columns='columns' :columns="columns"
:data-source='readData' :data-source="readData"
> >
<span slot='name' slot-scope='text, record'> <span slot="name" slot-scope="text, record">
<a-tag color='blue'> <a-tag color="blue">
消息提示 消息提示
</a-tag> </a-tag>
</span> </span>
<span slot='content' slot-scope='text, record'> <span slot="content" slot-scope="text, record">
<a @click='toRepair(record.repairId)'>{{ record.content }}</a> <a @click="toRepair(record.repairId)">{{ record.content }}</a>
</span> </span>
<span slot='action' slot-scope='text, record'> <span slot="action" slot-scope="text, record">
<a v-if='editEnabel' @click='handleView(record.id)'>详情</a> <a v-if="editEnabel" @click="hanleDelete(record.id)">删除</a>
<a-divider type='vertical' />
</span> </span>
</a-table> </a-table>
</a-tab-pane> </a-tab-pane>
@ -87,7 +84,7 @@
<script> <script>
import { STable } from '@/components' import { STable } from '@/components'
import { getRepairRemindList } from '@/api/admin/repair/repairRemind' import { delRepairRemind, getRepairRemindList } from '@/api/admin/repair/repairRemind'
import { checkPermission } from '@/utils/permissions' import { checkPermission } from '@/utils/permissions'
export default { export default {
@ -95,7 +92,7 @@ export default {
components: { components: {
STable STable
}, },
data() { data () {
return { return {
tabKey: '1', tabKey: '1',
labelCol: { labelCol: {
@ -128,6 +125,12 @@ export default {
{ {
title: '时间', title: '时间',
dataIndex: 'createTime' dataIndex: 'createTime'
},
{
title: '操作',
width: '200px',
dataIndex: 'action',
scopedSlots: { customRender: 'action' }
} }
], ],
// Promise // Promise
@ -143,13 +146,13 @@ export default {
} }
}, },
created() { created () {
this.tabKey = this.$route.query.tabKey this.tabKey = this.$route.query.tabKey
this.workerList() this.workerList()
}, },
methods: { methods: {
// admin/repair/stats/workerList // admin/repair/stats/workerList
workerList() { workerList () {
getRepairRemindList().then(res => { getRepairRemindList().then(res => {
this.workerData = res.rows this.workerData = res.rows
@ -159,29 +162,53 @@ export default {
}) })
}, },
callback() { callback () {
}, },
handleAdd() { handleAdd () {
this.$refs.modal.add() this.$refs.modal.add()
}, },
handleView(workerId) { handleView (workerId) {
this.$router.push({ name: 'repair', query: { repairUserId: workerId } }) this.$router.push({ name: 'repair', query: { repairUserId: workerId } })
}, },
toRepair(repairId) { toRepair (repairId) {
this.$router.push({ name: 'repairView', query: { repairId: repairId } }) this.$router.push({ name: 'repairView', query: { repairId: repairId } })
}, },
handleEdit(record) { handleEdit (record) {
this.$refs.modal.edit(record) this.$refs.modal.edit(record)
}, },
handleOk() { handleOk () {
this.$refs.table.refresh(true) this.$refs.table.refresh(true)
console.log('handleSaveOk') console.log('handleSaveOk')
}, },
handleComplete(id) { hanleDelete (id) {
const _this = this
this.$confirm({
title: '警告',
content: '确认要删除工单吗?',
okText: '是',
okType: 'warning',
cancelText: '否',
onOk () {
delRepairRemind({ id: id }).then(res => {
if (res.code === 0) {
_this.$message.success('操作成功')
_this.workerList()
} else {
_this.$message.error(res.msg)
}
}).catch(() => {
this.$message.error('系统错误,请稍后再试')
})
},
onCancel () {
}
})
},
handleComplete (id) {
const _this = this const _this = this
this.$confirm({ this.$confirm({
title: '警告', title: '警告',
@ -189,7 +216,7 @@ export default {
okText: '是', okText: '是',
okType: 'warning', okType: 'warning',
cancelText: '否', cancelText: '否',
onOk() { onOk () {
complete(id).then(res => { complete(id).then(res => {
if (res.code === 0) { if (res.code === 0) {
_this.$message.success('操作成功') _this.$message.success('操作成功')
@ -201,7 +228,7 @@ export default {
this.$message.error('系统错误,请稍后再试') this.$message.error('系统错误,请稍后再试')
}) })
}, },
onCancel() { onCancel () {
} }
}) })
} }