diff --git a/src/api/Assembly/DeliveryConfirmation.js b/src/api/Assembly/DeliveryConfirmation.js new file mode 100644 index 00000000..25cb1df2 --- /dev/null +++ b/src/api/Assembly/DeliveryConfirmation.js @@ -0,0 +1,46 @@ +import request from '@/utils/request' +export function InvoiceListSearch() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货确认_发货单_发货单列表_查询', + param: '发货单名=' + arguments[0] + '\\&发货单号=' + arguments[1] + '\\&收货单位=' + arguments[2] + '\\&车辆牌号=' + arguments[3] + '\\&司机姓名=' + arguments[4] + '\\&司机电话=' + arguments[5] + '\\&制单人=' + arguments[6] + '\\&核准人=' + arguments[7] + '\\&执行人=' + arguments[8] + '\\&开始制单日期=' + arguments[9] + '\\&结束制单日期=' + arguments[10] + '\\&开始核准日期=' + arguments[11] + '\\&结束核准日期=' + arguments[12] + '\\&开始发货日期=' + arguments[13] + '\\&结束发货日期=' + arguments[14] + '\\&发货单名_check=' + arguments[15] + '\\&发货单号_check=' + arguments[16] + '\\&收货单位_check=' + arguments[17] + '\\&车辆牌号_check=' + arguments[18] + '\\&司机姓名_check=' + arguments[19] + '\\&司机电话_check=' + arguments[20] + '\\&制单人_check=' + arguments[21] + '\\&核准人_check=' + arguments[22] + '\\&执行人_check=' + arguments[23] + '\\&开始制单日期_check=' + arguments[24] + '\\&结束制单日期_check=' + arguments[25] + '\\&开始核准日期_check=' + arguments[26] + '\\&结束核准日期_check=' + arguments[27] + '\\&开始发货日期_check=' + arguments[28] + '\\&结束发货日期_check=' + arguments[29] + '\\&是否发出_check=' + arguments[30] + '\\&是否发出=' + arguments[31], + Pagination: arguments[32] + '&' + arguments[33] + } + }) +} +export function DetailsFeach() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单明细_查询', + param: '发货单流水号=' + arguments[0] + } + }) +} +export function confirmation() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '发货管理_发货确认_发货单_发货确认', + param: '发货单流水号=' + arguments[0] + '&司机姓名=' + arguments[1] + '&司机电话=' + arguments[2] + '&车辆牌号=' + arguments[3] + '&执行人=' + arguments[4] + '&备注=' + arguments[5] + } + }) +} +export function reconfirmation() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '发货管理_发货确认_发货单_打回确认', + param: '发货单流水号=' + arguments[0] + } + }) +} diff --git a/src/api/MarketingCenter/DeliveryApplication.js b/src/api/MarketingCenter/DeliveryApplication.js index 49a982ba..a13a6315 100644 --- a/src/api/MarketingCenter/DeliveryApplication.js +++ b/src/api/MarketingCenter/DeliveryApplication.js @@ -126,7 +126,7 @@ export function InvoiceAbandoningTrial() { url: '', method: 'post', data: { - type: '2', + type: '1', name: '发货管理_发货申请_发货单_弃审', param: '发货单流水号=' + arguments[0] } diff --git a/src/icons/svg/DeliveryConfirmation.svg b/src/icons/svg/DeliveryConfirmation.svg new file mode 100644 index 00000000..d63ab201 --- /dev/null +++ b/src/icons/svg/DeliveryConfirmation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/Assembly/DeliveryConfirmation/index.vue b/src/views/Assembly/DeliveryConfirmation/index.vue new file mode 100644 index 00000000..ebb3398b --- /dev/null +++ b/src/views/Assembly/DeliveryConfirmation/index.vue @@ -0,0 +1,673 @@ + + + + + + + + + + + + + + + diff --git a/src/views/MarketingCenter/DeliveryApplication/index.vue b/src/views/MarketingCenter/DeliveryApplication/index.vue index ba794946..10890ce4 100644 --- a/src/views/MarketingCenter/DeliveryApplication/index.vue +++ b/src/views/MarketingCenter/DeliveryApplication/index.vue @@ -267,6 +267,15 @@ style="width: 200px;margin-right: 10px" clearable/> +
+ 备注： + +
选货 - + @@ -301,7 +310,7 @@ {{ scope.row.货品型号 }} - + - + @@ -578,7 +587,7 @@ @@ -597,6 +606,7 @@ import { mapGetters } from 'vuex' export default { data() { return { + input_Record: '', disabled: true, disabledAdd: false, // 增加按钮启用状态 disabledEdit: true, // 编辑按钮启用状态 @@ -780,6 +790,7 @@ export default { if (this.invoiceNum !== '' && this.invoiceNum !== null) { InvoiceFeach(this.invoiceNum).then(response => { if (response.data.length !== 0) { + this.input_Record = response.data[0].备注 this.input_Adress = response.data[0].收货地址 this.input_People = response.data[0].收货人员 this.input_Mobile = response.data[0].联系电话 @@ -927,11 +938,11 @@ export default { type: 'warning' }).then(() => { InvoiceAbandoningTrial(this.invoiceNum).then(response => { - if (response.data[0].result === '1') { + if (response.data[0].弃审是否成功 === '成功') { this.$message.success('放弃核准成功！') this.function_InvoiceFeach() } else { - this.$message.error('放弃核准失败') + this.$message.error('放弃核准失败,可能原因是装配部门已经确认发货,如需调整请联系装配部门打回！') } }) }) diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index c9e6c520..e8da85f2 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,23 +1,126 @@