diff --git a/src/views/admin/RepairList.vue b/src/views/admin/RepairList.vue index dafdcaf..6891ad5 100644 --- a/src/views/admin/RepairList.vue +++ b/src/views/admin/RepairList.vue @@ -46,7 +46,7 @@ - {{ item.label }} @@ -65,6 +65,16 @@ + + + + + {{ item.label }} + + + + @@ -73,7 +83,7 @@ 查询 - 重置 + 重置 导出工单模版 导入 导出工单数据 @@ -192,34 +202,45 @@ export default { label: '五级' } ], + evalOptions: [{ + value: '1', + label: '好评' + }, { + value: '2', + label: '中评' + }, { + value: '3', + label: '差评' + } + ], remarkOption: [{ - value: '', + value: 'no', label: '普通报修' }, { - value: '5110', + value: 'yes', label: '5110' } ], options: [{ - value: '1', - label: '待分配' + value: 'wait', + label: '待派单' }, { - value: '3', + value: 'anew', label: '重新派单' }, { - value: '5', + value: 'already', label: '已派单' }, { - value: '7', + value: 'process', label: '处理中' }, { - value: '9', + value: 'evaling', label: '已完成,待评价' }, { - value: '11', - label: '已关闭' + value: 'invalid', + label: '无效申请' }, { - value: '13', + value: 'evaled', label: '已评价' } ], @@ -292,14 +313,19 @@ export default { } }, created () { - console.log('this.$route.query', this.$route.query) - this.queryParam.status = this.$route.query.status + console.log('this.$route.query', this.$route.query.evalService) + this.queryParam.evalService = this.$route.query.evalService + this.queryParam.timeout = this.$route.query.timeout this.selectRepairList() this.selectType() }, methods: { customChange () { + }, + reset () { + this.queryParam = {} + this.selectRepairList() }, customRequest (file) { // file 是上传的文件 其内容会在放在下面截图中 @@ -381,12 +407,19 @@ export default { console.log(this.queryParam.typeId) }, getDeviceName (item) { - console.log(item) this.deviceName = item.label this.queryParam.deviceId = item.key }, // 查询工单列表 selectRepairList () { + let type = 'all' + if (this.queryParam.type != null) { + type = this.queryParam.type + } + if (this.$route.query.status != null) { + type = this.$route.query.status + } + if (this.$route.query.repairUserId != null) { oneWorkerList({ workerId: this.$route.query.repairUserId }).then(res => { this.loadData = res.rows @@ -400,10 +433,10 @@ export default { this.loadData = res.rows }) } else { - console.log(this.deviceId) + let datas = { 'role': 7, - 'type': 'all', + 'type': type, 'repair': { 'explain': this.queryParam.explain, 'typeId': this.queryParam.typeId, @@ -411,7 +444,10 @@ export default { 'status': this.queryParam.status, 'repairLevel': this.queryParam.repairLevel, 'beginTime': this.queryParam.startTime, - 'endTime': this.queryParam.endTime + 'endTime': this.queryParam.endTime, + 'evalService': this.queryParam.evalService, + 'timeout': this.queryParam.timeout, + 'remark': this.queryParam.remark } } getRepairList(datas).then(res => { diff --git a/src/views/admin/repair/MeesageNoticeList.vue b/src/views/admin/repair/MeesageNoticeList.vue index 2847d54..4a6ca68 100644 --- a/src/views/admin/repair/MeesageNoticeList.vue +++ b/src/views/admin/repair/MeesageNoticeList.vue @@ -17,7 +17,7 @@ - + - -
- - - - - + +
+ + + + + - - - + + + - - - 查询 - 重置 + + + 查询 + 重置
- - + + - + {{ text | statusFilter }} - - 详情 + + 详情 - + - + {{ text | statusFilter }} - - 详情 + + 详情 - + - + {{ text | statusFilter }} - - 详情 + + 详情 @@ -85,7 +85,7 @@ export default { components: { STable }, - data() { + data () { return { labelCol: { xs: { span: 24 }, @@ -241,13 +241,14 @@ export default { editEnabel: checkPermission('admin:repair:edit'), removeEnable: checkPermission('admin:repair:list'), loadData: [], + timeRange: '', workerData: [], floorData: [], floorCreateData: [] } }, filters: { - statusFilter(status) { + statusFilter (status) { const statusMap = { 'PENDING_ASSIGN': '待分配', 'PENDING_PROCESS': '待处理', @@ -258,59 +259,64 @@ export default { return statusMap[status] } }, - created() { + created () { this.workerList() this.floorList() this.floorCreateList() }, methods: { + selectList () { + this.workerList(this.queryParam) + this.floorList(this.queryParam) + this.floorCreateList(this.queryParam) + }, // 切换时间 - selectTime(value, dateString) { - this.queryParam.startTime = dateString[0] - this.queryParam.endTime = dateString[1] + selectTime (value, dateString) { + this.queryParam.startDate = dateString[0] + this.queryParam.endDate = dateString[1] console.log('this.queryParam', this.queryParam) }, // admin/repair/stats/workerList - workerList() { - getWorkerList().then(res => { + workerList (query) { + getWorkerList(query).then(res => { this.workerData = res.rows }) }, - floorList() { - getFloorList().then(res => { + floorList (query) { + getFloorList(query).then(res => { this.floorData = res.rows }) }, - floorCreateList() { - getFloorCreateList().then(res => { + floorCreateList (query) { + getFloorCreateList(query).then(res => { this.floorCreateData = res.rows }) }, - callback() { + callback () { }, - handleAdd() { + handleAdd () { this.$refs.modal.add() }, - handleView(workerId) { + handleView (workerId) { this.$router.push({ name: 'repair', query: { repairUserId: workerId } }) }, - handleFloorView(floorId) { + handleFloorView (floorId) { console.log(floorId) this.$router.push({ name: 'repair', query: { floorId: floorId } }) }, - handleFloorCreateView(floorId) { + handleFloorCreateView (floorId) { this.$router.push({ name: 'repair', query: { floorCreateId: floorId } }) }, - handleEdit(record) { + handleEdit (record) { this.$refs.modal.edit(record) }, - handleOk() { + handleOk () { this.$refs.table.refresh(true) console.log('handleSaveOk') }, - handleComplete(id) { + handleComplete (id) { const _this = this this.$confirm({ title: '警告', @@ -318,7 +324,7 @@ export default { okText: '是', okType: 'warning', cancelText: '否', - onOk() { + onOk () { complete(id).then(res => { if (res.code === 0) { _this.$message.success('操作成功') @@ -330,7 +336,7 @@ export default { this.$message.error('系统错误,请稍后再试') }) }, - onCancel() { + onCancel () { } }) } diff --git a/src/views/admin/repair/RepairStatistics.vue b/src/views/admin/repair/RepairStatistics.vue index 602c1ad..06d9bf4 100644 --- a/src/views/admin/repair/RepairStatistics.vue +++ b/src/views/admin/repair/RepairStatistics.vue @@ -1,152 +1,152 @@