diff --git a/src/api/repair/tickets/TWItem.js b/src/api/repair/tickets/TWItem.js new file mode 100644 index 0000000..cc11a64 --- /dev/null +++ b/src/api/repair/tickets/TWItem.js @@ -0,0 +1,21 @@ +import request from '@/utils/request' + +const preUrl = '/repair/twi' + +// 根据主表ID查看全部 +export function listTwItem(params){ + return request({ + url: preUrl + '/list', + method: 'get', + params + }) +} + +// 配件客户是否可见 +export function updateIsShow(params){ + return request({ + url: preUrl + '/isShow', + method: 'get', + params + }) +} diff --git a/src/api/repair/tickets/TicketWares.js b/src/api/repair/tickets/TicketWares.js new file mode 100644 index 0000000..3f1d86c --- /dev/null +++ b/src/api/repair/tickets/TicketWares.js @@ -0,0 +1,29 @@ +import request from '@/utils/request' + +const preUrl = '/repair/tw' + +// 分页查询 +export function getPage(params){ + return request({ + url: preUrl + "/page", + method: 'get', + params + }) +} + +// 新增、修改 +export function updateTicketWares(data){ + return request({ + url: preUrl + "/update", + method: 'post', + data + }) +} + +// 删除 +export function removeTicketWares(id){ + return request({ + url: preUrl + "/remove?id=" + id, + method: 'delete' + }) +} diff --git a/src/utils/dict.js b/src/utils/dict.js index 4326514..a5009c8 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -214,6 +214,12 @@ export const DICT_TYPE = { REPAIR_WORK_TYPE: 'repair_work_type', // 维修工单进行状态 REPAIR_TICKETS_WORK_STATUS: 'repair_tickets_work_status', + // 领料、退料类型 + TICKET_WARES_TYPE: 'ticket_wares_type', + // 领料、退料状态 + TICKET_WARES_STATUS: 'ticket_wares_status', + // 领料、退料配件状态 + TW_ITEM_STATUS: 'tw_item_status', // ---------会员相关---------member_coupon_type,member_coupon_out_rule,member_car,member_active //卡券类型 diff --git a/src/views/repair/tickets/Components/TicketItem.vue b/src/views/repair/tickets/Components/TicketItem.vue index 0555d50..8641527 100644 --- a/src/views/repair/tickets/Components/TicketItem.vue +++ b/src/views/repair/tickets/Components/TicketItem.vue @@ -42,45 +42,45 @@ - +
{{ scope.row.price }}
- +
{{ scope.row.discount }}
- +
{{ scope.row.totalPrice }}
- +
{{ scope.row.repair ? getRepairName(scope.row.repair) : scope.row.repair }}
- +
{{ scope.row.sale ? scope.row.sale.name : scope.row.sale }}
- +
{{ scope.row.type }}
- +
- + @@ -102,7 +102,7 @@ @@ -80,10 +81,11 @@ import {getPageType, updateTake} from "@/api/repair/tickets/Tickets"; import TicketsShow from "@/views/repair/tickets/Components/TicketsShow.vue"; import UpdateRepair from "@/views/repair/tickets/form/UpdateRepair.vue"; +import TWOperate from "@/views/repair/tickets/form/TWOperate.vue"; export default { name: "TicketManagerItem", - components: {UpdateRepair, TicketsShow}, + components: {TWOperate, UpdateRepair, TicketsShow}, props: { isFinish: { type: Boolean, @@ -141,7 +143,11 @@ export default { }, // 配件申请 handleGet(row) { - + row = { + ...row, + type: true + } + this.$refs.twOperate.open(row) }, // 接单 async handleTake(row) { @@ -177,6 +183,9 @@ export default { case 'handleReTake': this.handleReTake(row) break + case 'handleGet': + this.handleGet(row) + break default: break } diff --git a/src/views/repair/tickets/Components/TicketWares.vue b/src/views/repair/tickets/Components/TicketWares.vue new file mode 100644 index 0000000..6c4cbcd --- /dev/null +++ b/src/views/repair/tickets/Components/TicketWares.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/repair/tickets/Components/TicketWaresShow.vue b/src/views/repair/tickets/Components/TicketWaresShow.vue new file mode 100644 index 0000000..dc682f5 --- /dev/null +++ b/src/views/repair/tickets/Components/TicketWaresShow.vue @@ -0,0 +1,245 @@ + + + + + diff --git a/src/views/repair/tickets/TicketManager.vue b/src/views/repair/tickets/TicketManager.vue index af7ee7c..91aecb7 100644 --- a/src/views/repair/tickets/TicketManager.vue +++ b/src/views/repair/tickets/TicketManager.vue @@ -8,8 +8,10 @@ + + @@ -18,14 +20,16 @@ + +