From 375823ecac7cab77ed8854bfd66fe51216a1f77d Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Thu, 29 Aug 2024 13:36:34 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=B7=A5=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/admin/repair.js | 2 +-
src/views/admin/RepairList.vue | 80 +++++++++++++++----
src/views/admin/RepairView.vue | 6 --
src/views/admin/modules/RepairModal.vue | 20 +++--
.../repair/modules/RepairFailureTypeModal.vue | 1 +
5 files changed, 79 insertions(+), 30 deletions(-)
diff --git a/src/api/admin/repair.js b/src/api/admin/repair.js
index 161eece..f585004 100644
--- a/src/api/admin/repair.js
+++ b/src/api/admin/repair.js
@@ -58,7 +58,7 @@ export function complete (parameter) {
export function delRepair (parameter) {
return axios({
- url: api.repair + '/remove',
+ url: api.repair + '/delete',
method: 'post',
params: parameter
})
diff --git a/src/views/admin/RepairList.vue b/src/views/admin/RepairList.vue
index e2abc24..1dcfb7a 100644
--- a/src/views/admin/RepairList.vue
+++ b/src/views/admin/RepairList.vue
@@ -3,15 +3,31 @@
-
+
维修工单
{{ repairStatsCount.zs }}
@@ -46,19 +46,19 @@
处理中工单
{{ repairStatsCount.wait }}
-
+
超时量
{{ repairStatsCount.timeout }}
-
+
差评量
{{ repairStatsCount.l }}
-
+
中评量
{{ repairStatsCount.m }}
-
+
好评量
{{ repairStatsCount.h }}
@@ -278,7 +278,7 @@ export default {
},
// 跳转通知
jumpInfo(tabKey) {
- this.$router.push({ name: 'messageNotice', query: {tabKey} })
+ this.$router.push({ name: 'messageNotice', query: { tabKey } })
},
onChange2() {
this.repairCount2()
From a4b31a2c6751eed590031722849823e4baf4a3b0 Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Thu, 29 Aug 2024 17:39:35 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=B7=A5=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/admin/modules/RepairModal.vue | 199 ++++++++++++------------
1 file changed, 97 insertions(+), 102 deletions(-)
diff --git a/src/views/admin/modules/RepairModal.vue b/src/views/admin/modules/RepairModal.vue
index 2326015..cdf9103 100644
--- a/src/views/admin/modules/RepairModal.vue
+++ b/src/views/admin/modules/RepairModal.vue
@@ -1,122 +1,122 @@
-
-
+
+
-
-
+
+
- {{ item.name }}
+ @change="selectDevice">
+ {{ item.name }}
-
-
+
+
- {{ item.name }}
+ @change="getDeviceName">
+ {{ item.name }}
-
-
-
+
+
-
-
-
+
+
-
-
+
+
- {{ item.userName }}
+ @change="selectUser">
+ {{ item.userName }}
-
-
+
+
- {{ item.name }}
+ @change="selectRoomList">
+ {{ item.name }}
-
-
+
+
- {{ item.name }}
+ @change="selectFloorName">
+ {{ item.name }}
-
-
-
+
+
-
-
+
+
- {{ item.name }}
+ {{ item.name }}
-
-
-
+
+
+
-
-
+
+
-
-
-
上传
+
-
-
+
+
@@ -145,7 +145,7 @@ export default {
name: 'RepairModal',
props: {},
components: {},
- data() {
+ data () {
return {
visible: false,
labelCol: {
@@ -190,28 +190,27 @@ export default {
files: []
}
},
- beforeCreate() {
+ beforeCreate () {
},
- created() {
+ created () {
this.selectType()
this.selectFailureType()
this.getRepairAddressList()
},
methods: {
moment,
- selectType() {
+ selectType () {
getRepairTypeList().then(res => {
this.typeList = res.rows
})
},
- selectUser(id) {
+ selectUser (id) {
},
// 根据分类id 查询对应设备
- selectDevice(typeId) {
+ selectDevice (typeId) {
let type = this.typeList.find(item => item.id == typeId)
this.typeId = type.id
this.typeName = type.name
- console.log('selectDevice', type)
getRepairDeviceList({
typeId
}).then(res => {
@@ -219,49 +218,57 @@ export default {
})
selectWorkerIdByTypeId({ typeId }).then(res => {
this.userList = res.data
+ this.userList = this.userList.map(item => {
+ item.repairUserId = item.userId
+ return item
+ })
})
},
- getDeviceName(item) {
- console.log(item)
- this.deviceName = item.label
- this.deviceId = item.key
+ getDeviceName (deviceId) {
+ let device = this.deviceList.find(item => item.id == deviceId)
+ console.log(device)
+ this.deviceName = device.label
+ this.deviceId = device.key
},
- selectFailureType() {
+ selectFailureType () {
getRepairFailureTypeList().then(res => {
this.failureTypeList = res.rows
})
},
- getRepairAddressList() {
+ getRepairAddressList () {
getRepairAddressList().then(res => {
this.addressList = res.rows
})
},
- selectRoomList(item) {
- console.log(item)
- getRepairRoomList({ 'addressId': item.key }).then(res => {
+ selectRoomList (roomId) {
+ console.log('selectRoomList', roomId)
+ let room = this.addressList.find(item => item.id == roomId)
+ getRepairRoomList({ 'addressId': roomId }).then(res => {
this.roomList = res.rows
})
- this.address = item.label
- this.addressId = item.key
+ this.address = room.label
+ this.addressId = room.key
},
- selectFloorName(item) {
- this.floor = item.label
- this.floorId = item.key
+ selectFloorName (floorId) {
+ let floor = this.roomList.find(item => item.id == floorId)
+
+ this.floor = floor.label
+ this.floorId = floor.key
},
- async handlePreview(file) {
+ async handlePreview (file) {
if (!file.url && !file.preview) {
file.preview = await getBase64FileList(file.originFileObj)
}
this.previewImage = file.url || file.preview
this.previewVisible = true
},
- handleCancel() {
+ handleCancel () {
this.previewVisible = false
},
// 上传banner
- handleChangeFileList({ fileList }) {
+ handleChangeFileList ({ fileList }) {
fileList.forEach(item => {
if (item.response !== undefined) {
this.files.push(item.response.id)
@@ -269,43 +276,31 @@ export default {
})
this.fileList = fileList
},
- add() {
+ add () {
this.form.resetFields()
this.mdl.repairImages = null
this.edit({ id: 0 })
},
- edit(record) {
- console.log(this.typeList)
+ edit (record) {
+ this.selectDevice(record.typeId)
+ this.selectRoomList(record.addressId)
this.mdl = Object.assign(record)
this.mdl.typeList = this.typeList
+
this.visible = true
this.$nextTick(() => {
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'))
})
- // 处理日期
- 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])
this.beginDate = dateStrings[0]
this.endDate = dateStrings[1]
this.dateValue = [moment(this.beginDate, dateFormat), moment(this.endDate, dateFormat)]
},
- handleSubmit(e) {
+ handleSubmit (e) {
e.preventDefault()
console.log(this.files)
@@ -360,7 +355,7 @@ export default {
watch: {}
}
-function getBase64(img, callback) {
+function getBase64 (img, callback) {
const reader = new FileReader()
reader.addEventListener('load', () => callback(reader.result))
reader.readAsDataURL(img)