diff --git a/src/api/modular/main/SendCar.js b/src/api/modular/main/SendCar.js index 61805b3..e104838 100644 --- a/src/api/modular/main/SendCar.js +++ b/src/api/modular/main/SendCar.js @@ -126,6 +126,30 @@ export function BookingTruckPrint(parameter) { params: parameter }) } +/** + * 获取订舱打印模板列表（带有当前用户打印历史排序） + * + * @author Myshipping + */ +export function TaskManageTruckPrintTemplateWithHistoryList(parameter) { + return axios({ + url: '/TaskManageTruck/PrintTemplateWithHistoryList', + method: 'get', + params: parameter + }) +} +/** + * 打印派车 + * + * @author Myshipping + */ +export function TaskManageTruckPrint(parameter) { + return axios({ + url: '/TaskManageTruck/Print', + method: 'get', + params: parameter + }) +} /** * 订舱主键获取相关派车列表 * @@ -168,16 +192,6 @@ export function TaskManageTruckSave(parameter) { data: parameter }) } -/** - * 打印派车 - */ -export function TaskManageTruckPrint(parameter) { - return axios({ - url: '/TaskManageTruck/Print', - method: 'get', - params: parameter - }) -} /** * 取消派车 */ @@ -198,6 +212,17 @@ export function TaskManageTruckSendDispatchBatch(parameter) { data: parameter }) } +/** + * 订舱生成派车初始信息 + */ +export function BookingTruckInitFromBookingOrder(parameter) { + return axios({ + url: '/BookingTruck/InitFromBookingOrder', + method: 'get', + params: parameter + }) +} + /** * 添加订舱模板 * diff --git a/src/views/main/SendCar/addForm.vue b/src/views/main/SendCar/addForm.vue index b26463e..d41161e 100644 --- a/src/views/main/SendCar/addForm.vue +++ b/src/views/main/SendCar/addForm.vue @@ -55,14 +55,14 @@
保存
-
+
提交派车
派车
-
发单
+
取消派车
@@ -95,6 +95,7 @@ @focus="gettruckIdData" @change="ChangetruckId" allowClear + :disabled="taskPKId ? false : true" > {{ item.shortName }} @@ -106,22 +107,28 @@ - + {{ item.name }} - + - + - + @@ -298,7 +305,7 @@ - + @@ -369,12 +376,12 @@ - + - + @@ -551,7 +558,9 @@ import { TaskManageTruckPrint, TaskManageTruckCancelDispatch, TaskManageTruckSendDispatchBatch, - BookingTruckPrintTemplateWithHistoryList + BookingTruckPrintTemplateWithHistoryList, + TaskManageTruckPrintTemplateWithHistoryList, + BookingTruckInitFromBookingOrder } from '@/api/modular/main/SendCar' import { GetCtn } from '@/api/modular/main/BookingLedger' import { GetSysUserPage } from '@/api/modular/main/BookingLedger' @@ -720,22 +729,44 @@ export default { printType } this.spinning = true - BookingTruckPrintTemplateWithHistoryList(Data).then(res => { - this.templateType = res.data - this.spinning = false - this.PrintModalVisible = true - }) + if (this.taskPKId) { + TaskManageTruckPrintTemplateWithHistoryList(Data).then(res => { + this.templateType = res.data + this.spinning = false + this.PrintModalVisible = true + }) + } else { + BookingTruckPrintTemplateWithHistoryList(Data).then(res => { + this.templateType = res.data + this.spinning = false + this.PrintModalVisible = true + }) + } }, // 打印 FnCilckTemplateType(templateId) { this.$message.success(`搜索文件中...`) let printType = this.PrintType == 4 ? 20 : 10 if (this.taskPKId) { - TaskManageTruckPrint({ pkId: this.WebData.pK_ID }).then(res => { - if (res.data.succ) { - this.$message.success('打印成功') + TaskManageTruckPrint({ + taskPKId: this.WebData.pK_ID, + templateId, + cateCode: 'truckBill', + type: this.PrintType, + printType + }).then(res => { + if (!res.success) { + this.$message.error(res.message) } else { - this.$message.error(`打印失败,${res.data.msg}`) + // this.$message.success(res.data) + if (this.PrintType == 1) { + window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${res.data}`, '_blank') + } else { + window.open( + ` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`, + '_blank' + ) + } } }) } else { @@ -861,23 +892,6 @@ export default { } this.PrintType = '1' this.GetPrintData('truckBill', printType) - // if (this.taskPKId) { - // TaskManageTruckPrint({ pkId: this.WebData.pK_ID }).then(res => { - // if (res.data.succ) { - // this.$message.success('打印成功') - // } else { - // this.$message.error(`打印失败,${res.data.msg}`) - // } - // }) - // } else { - // BookingTruckPrint({ id: this.WebData.id }).then(res => { - // if (res.data.succ) { - // this.$message.success('打印成功') - // } else { - // this.$message.error(`打印失败,${res.data.msg}`) - // } - // }) - // } }, FnCancel() { BookingTruckCancel({ id: this.WebData.id }).then(res => { @@ -923,6 +937,19 @@ export default { console.log('init') this.ContactsData = [] this.form = this.$form.createForm(this) + if (this.BookingId) { + BookingTruckInitFromBookingOrder({ bookingId: this.BookingId }).then(res => { + console.log(res, 'BookingTruckInitFromBookingOrder') + this.form.setFieldsValue({ ...res.data.ext }) + if (res.data.ext.contaList) { + res.data.ext.contaList.forEach((item, index) => { + item.WebKey = index + 1 + }) + this.ContactsData = res.data.ext.contaList + } + }) + } + if (this.BookingId && this.type == 'Edit') { BookingTruckGetTruckListByBooking({ bookingId: this.BookingId }).then(res => { this.Bookingdata = res.data @@ -986,7 +1013,7 @@ export default { this.confirmLoading = false }) } - + console.log(this.BookingId, this.type) // this.$data = this.$options.data() DjyCustomerQuerytDjyCustomerInfo({ queryType: 'fleet' }).then(res => { @@ -1178,7 +1205,14 @@ export default { }, // 补全数据Name FnCompleteName(data) { - console.log('11') + if (data.dispatcherId) { + this.dispatcherIdData.forEach(item => { + console.log(item) + if (data.dispatcherId == item.sysEmpId) { + data['dispatcherName'] = item.sysEmpName + } + }) + } if (data.contaList) { data.contaList.forEach(item => { this.ctnList.forEach(item2 => { @@ -1188,7 +1222,6 @@ export default { }) }) } - console.log('12') if (data.truckId) { this.truckIdData.forEach(item => { if (data.truckId == item.id) { diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue index 2340bdf..6952c00 100644 --- a/src/views/main/Taskmanage/TaskmanageList/index.vue +++ b/src/views/main/Taskmanage/TaskmanageList/index.vue @@ -183,9 +183,9 @@ > 完成 - 打印 - 发送派车 - 撤销派车 + 打印 + 派车 + 取消派车