From 20490a39202bf88de261f4089274614a4f11f09b Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Fri, 25 Oct 2024 12:04:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A1=BE=E9=97=AE?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=93=AA=E4=BA=9B=E7=BB=B4=E4=BF=AE=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=8F=AF=E4=BB=A5=E7=BB=99=E5=AE=A2=E6=88=B7=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/repair/repairRecord/index.js | 18 ++ src/utils/dict.js | 2 + .../tickets/Components/TicketManagerItem.vue | 16 +- .../repair/tickets/form/RecordSetting.vue | 188 ++++++++++++++++++ .../tickets/form/TicketFinishManager.vue | 13 +- 5 files changed, 230 insertions(+), 7 deletions(-) create mode 100644 src/api/repair/repairRecord/index.js create mode 100644 src/views/repair/tickets/form/RecordSetting.vue diff --git a/src/api/repair/repairRecord/index.js b/src/api/repair/repairRecord/index.js new file mode 100644 index 0000000..38d7675 --- /dev/null +++ b/src/api/repair/repairRecord/index.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +// 根据条件查询维修记录 +export function queryList(params){ + return request({ + url: '/dl/repair-records/list', + method: 'get', + params + }) +} + +// 设置图片是否开放给用户 +export function updateOpen(ids, isOpen){ + return request({ + url: '/dl/repair-records-item/updateOpen?ids=' + ids + '&isOpen=' + isOpen, + method: 'get', + }) +} diff --git a/src/utils/dict.js b/src/utils/dict.js index a5009c8..bebda61 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -220,6 +220,8 @@ export const DICT_TYPE = { TICKET_WARES_STATUS: 'ticket_wares_status', // 领料、退料配件状态 TW_ITEM_STATUS: 'tw_item_status', + // 维修记录类型 + REPAIR_RECORDS_TYPE: 'repair_records_type', // ---------会员相关---------member_coupon_type，member_coupon_out_rule，member_car，member_active //卡券类型 diff --git a/src/views/repair/tickets/Components/TicketManagerItem.vue b/src/views/repair/tickets/Components/TicketManagerItem.vue index ca74263..c898b0a 100644 --- a/src/views/repair/tickets/Components/TicketManagerItem.vue +++ b/src/views/repair/tickets/Components/TicketManagerItem.vue @@ -44,6 +44,9 @@ 查看 + + 维修记录设置 + @@ -143,6 +146,8 @@ 退料全部 + + @@ -156,10 +161,11 @@ import {updateTicketWares} from "@/api/repair/tickets/TicketWares"; import {getIfLeader} from "@/api/repair/repairworker"; import UpdateRecord from "@/views/repair/tickets/form/UpdateRecord.vue"; import {getUserProfile} from "@/api/system/user"; +import RecordSetting from "@/views/repair/tickets/form/RecordSetting.vue"; export default { name: "TicketManagerItem", - components: {UpdateRecord, TWOperate, UpdateRepair, TicketsShow}, + components: {RecordSetting, UpdateRecord, TWOperate, UpdateRepair, TicketsShow}, props: { isFinish: { type: Boolean, @@ -197,7 +203,7 @@ export default { formData: {}, remark: null, leader: false, - nowUser: null + nowUser: null, } }, mounted() { @@ -389,9 +395,9 @@ export default { this.$refs.updateRecord.open(row) }, // 设置维修图片可不可见 - async handleEditRecord(row){ - console.log(row) - } + handleEditRecord(row){ + this.$refs.recordSet.open(row.id) + }, } } diff --git a/src/views/repair/tickets/form/RecordSetting.vue b/src/views/repair/tickets/form/RecordSetting.vue new file mode 100644 index 0000000..1b3192e --- /dev/null +++ b/src/views/repair/tickets/form/RecordSetting.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/src/views/repair/tickets/form/TicketFinishManager.vue b/src/views/repair/tickets/form/TicketFinishManager.vue index 9aed402..be84783 100644 --- a/src/views/repair/tickets/form/TicketFinishManager.vue +++ b/src/views/repair/tickets/form/TicketFinishManager.vue @@ -47,6 +47,9 @@ 编辑工单 + + 维修记录设置 + 处理 @@ -127,6 +130,7 @@ + @@ -136,10 +140,11 @@ import TicketsShow from "@/views/repair/tickets/Components/TicketsShow.vue"; import UpdateRepair from "@/views/repair/tickets/form/UpdateRepair.vue"; import {getUserProfile} from "@/api/system/user"; import EditTickets from "@/views/repair/tickets/form/EditTickets.vue"; +import RecordSetting from "@/views/repair/tickets/form/RecordSetting.vue"; export default { name: "TicketFinishManager", - components: {EditTickets, UpdateRepair, TicketsShow}, + components: {RecordSetting, EditTickets, UpdateRepair, TicketsShow}, props:{ userRole: String }, @@ -272,7 +277,11 @@ export default { }, handleEdit(row){ this.$refs.editTickets.open(row) - } + }, + // 设置维修图片可不可见 + handleEditRecord(row){ + this.$refs.recordSet.open(row.id) + }, } } From 49af6d9fdb73e828176c9bdbae925e880cdd3612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Fri, 25 Oct 2024 14:13:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=91=E6=8F=B4=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/rescue/rescueIndex.vue | 491 +++++++++++++++++++++++++++++++ 1 file changed, 491 insertions(+) create mode 100644 src/views/rescue/rescueIndex.vue diff --git a/src/views/rescue/rescueIndex.vue b/src/views/rescue/rescueIndex.vue new file mode 100644 index 0000000..0f60685 --- /dev/null +++ b/src/views/rescue/rescueIndex.vue @@ -0,0 +1,491 @@ + + + + + From fc2b573fe6ec700eac77c05fa76699c1ddaa59c7 Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Fri, 25 Oct 2024 17:13:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tickets/Components/TicketManagerItem.vue | 4 ++-- .../repair/tickets/Components/TicketWaresShow.vue | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/repair/tickets/Components/TicketManagerItem.vue b/src/views/repair/tickets/Components/TicketManagerItem.vue index c898b0a..768d910 100644 --- a/src/views/repair/tickets/Components/TicketManagerItem.vue +++ b/src/views/repair/tickets/Components/TicketManagerItem.vue @@ -63,7 +63,7 @@ - 过程记录 + 过程记录{{scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)}} 更多 diff --git a/src/views/repair/tickets/Components/TicketWaresShow.vue b/src/views/repair/tickets/Components/TicketWaresShow.vue index 112e9d0..a65565d 100644 --- a/src/views/repair/tickets/Components/TicketWaresShow.vue +++ b/src/views/repair/tickets/Components/TicketWaresShow.vue @@ -168,12 +168,12 @@ -
- - - {{ scope.row.itemDiscount === 1 ? "无折扣" : scope.row.itemDiscount }} -
-
+ + + + + +
{{ scope.row.itemDiscount === 1 ? "无折扣" : scope.row.itemDiscount }}
@@ -221,7 +221,7 @@ export default { loading: false, formData: {}, clickCellMap: {}, - editProp: ['itemDiscount'], + editProp: [], } }, methods:{