diff --git a/src/api/emis/emisSettleCancelAccount.js b/src/api/emis/emisSettleCancelAccount.js index c823235a..b578ac47 100644 --- a/src/api/emis/emisSettleCancelAccount.js +++ b/src/api/emis/emisSettleCancelAccount.js @@ -51,11 +51,10 @@ export function queryByBillCodes(query) { }) } //财务销账审核通过 -export function auditCenterPass(params) { +export function auditCenterPass(ids) { return request({ - url: '/emis/writeoffApply/auditCenterPass/' + params.ids, + url: '/emis/writeoffApply/auditCenterPass/' + ids, method: 'post', - data: params }) } @@ -69,11 +68,10 @@ export function auditCenterReject(params) { } //总部销账审核通过 -export function auditHeadquartersConfirm(params) { +export function auditHeadquartersConfirm(ids) { return request({ - url: '/emis/writeoffApply/auditHeadquartersConfirm/' + params.ids, - method: 'post', - data: params + url: '/emis/writeoffApply/auditHeadquartersConfirm/' + ids, + method: 'post' }) } diff --git a/src/views/emis/emisSettleBill/WriteoffApplyApplicationList.vue b/src/views/emis/emisSettleBill/WriteoffApplyApplicationList.vue index 69021300..9408825c 100644 --- a/src/views/emis/emisSettleBill/WriteoffApplyApplicationList.vue +++ b/src/views/emis/emisSettleBill/WriteoffApplyApplicationList.vue @@ -3,7 +3,7 @@
- + @@ -49,10 +49,10 @@ methods:{ }else{ this.activeTab="billList"; } - if(targetName=='newApply'){ //关闭新增/编辑 - this.showForm=false; - this.activeTab='billList'; - } + if(targetName=='newApply'){ //关闭新增/编辑 + this.showForm=false; + this.activeTab='billList'; + } }, onCreate(){ this.formTitle='新增申请'; @@ -60,7 +60,6 @@ methods:{ this.activeTab='newApply'; }, onUpdate(applyId){ - console.log('onUpdate', applyId); this.applyId=applyId[0]; this.formTitle='编辑申请'; this.showForm=true; @@ -69,13 +68,14 @@ methods:{ handleFormChanged(){ this.activeTab='billList'; this.showForm=false; + //刷新列表 父组件刷新列表 + this.$refs.refWriteoffApplyList.handleQuery(); }, handleFormCancel(){ this.activeTab='billList'; this.showForm=false; }, onView(item){ - console.log('onView--------', item); this.showDetail=true; let old=this.billTabs.find(mItem=>mItem.applyNo==item.applyNo); if(old){ diff --git a/src/views/emis/emisSettleBill/WriteoffApplyCheckList.vue b/src/views/emis/emisSettleBill/WriteoffApplyCheckList.vue index b2843d9b..ad651f1f 100644 --- a/src/views/emis/emisSettleBill/WriteoffApplyCheckList.vue +++ b/src/views/emis/emisSettleBill/WriteoffApplyCheckList.vue @@ -2,7 +2,7 @@
- + diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue index 4724b026..058ff9f6 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue @@ -36,6 +36,11 @@ + + + + +
@@ -73,7 +78,7 @@ - + @@ -81,7 +86,7 @@ - + @@ -476,7 +481,6 @@ export default { this.waitBatchDtlList.push(item); }) } - console.log('addBillToBatch', this.waitBatchDtlList); this.titleBatch = ""; this.openBatch = false; this.inputBatchBillCode = ""; diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue index fd79f183..f9946d9f 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue @@ -1,7 +1,8 @@ diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue b/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue index 5af7172f..00b84bd7 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue @@ -23,7 +23,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue index 6eab70d9..9143b9b4 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue @@ -26,23 +26,23 @@ - - + + - - - - + + + - - + + - - + + - - + + @@ -55,36 +55,39 @@ @row-dblclick="handleShowBatchInfo">
- 财务中心通过 - 财务中心驳回 - 总部确认 - 总部驳回 - 导出 + 财务中心通过 + 财务中心驳回 + 总部确认 + 总部驳回 + 导出
- + - + - + + + - + @@ -127,7 +130,7 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue'; import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue'; import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import CancelAccountApplicationFormPanel from '@/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue'; -import { getWriteoffApplyList } from "@/api/emis/emisSettleCancelAccount"; +import { getWriteoffApplyList, auditCenterPass, auditCenterReject, auditHeadquartersConfirm, auditHeadquartersReject } from "@/api/emis/emisSettleCancelAccount"; export default { name: "CancelAccountApplicationListPanel", @@ -137,9 +140,7 @@ export default { TransProductPicker, PackListView, SysUserSimplePicker, EmisSupplierPicker, BatchImportSiteBatch, BatchSiteBatchUpdateForm, PayeePicker, SalemanPicker, EmpNamePicker, CancelAccountApplicationFormPanel }, - dicts: [ - 'emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status', 'emis_declare_mode', 'emis_customs_clear', 'emis_big_batch_type' - ], + dicts: [ 'center_confirme_status'], data() { return { @@ -236,21 +237,23 @@ export default { daterangeUpdateTime: [], // 查询参数 - queryParams: { - pageNum: 1, - pageSize: 20, - queryKey:null, - applyDate:null, - settleBillName:null, - applyManName:null, - blCenterConfirmed:null, - blHeadquartersConfirmed:null, - payee:null, - salesmen:null, - params:{ - queryParams:null, - } - }, + queryParams: { + pageNum: 1, + pageSize: 20, + queryKey: null, + applyDate: null, + settleBillName: null, + applyManName: null, + blCenterConfirmed: null, + blHeadquartersConfirmed: null, + payee: null, + salesmen: null, + applyDateStart: null, + applyDateEnd: null, + params: { + queryParams: null, + } + }, }; }, created() { @@ -263,44 +266,40 @@ export default { getList() { - this.loading = true; + this.loading = true; - let rqParams = {...this.queryParams}; + let rqParams = { ...this.queryParams }; - if(this.queryParams.queryKey){ - rqParams.params.queryParams=this.queryParams.queryKey; - } - if( this.dateTimeRange ){ - rqParams=this.addDateRange(rqParams, this.dateTimeRange,"applyDate"); - rqParams.applyDateStart = this.dateTimeRange[0]; - rqParams.applyDateEnd = this.dateTimeRange[1]; - this.removeDateRange(rqParams,"etd"); - } - - getWriteoffApplyList(rqParams).then(response => { - this.emisTmsBatchList = response.rows; - this.total = response.total; - this.loading = false; - }); - }, - - initQueryParams() { - - if (this.queryOrderType == '1') { - this.queryParams.params.billCode = this.queryParams.queryKey; - this.queryParams.batchNo = null; - } else { - this.queryParams.batchNo = this.queryParams.queryKey; - this.queryParams.params.billCode = null; + if (this.queryParams.queryKey) { + rqParams.params.queryParams = this.queryParams.queryKey; + }else{ + rqParams.params.queryParams = null; + } + if (this.dateTimeRange) { + rqParams = this.addDateRange(rqParams, this.dateTimeRange, "applyDate"); + rqParams.applyDateStart = this.dateTimeRange[0]; + rqParams.applyDateEnd = this.dateTimeRange[1]; + this.removeDateRange(rqParams, "etd"); } + getWriteoffApplyList(rqParams).then(response => { + this.emisTmsBatchList = response.rows; + this.total = response.total; + this.loading = false; + }); + }, - if (this.queryETDType == '2') { - this.removeDateRange(this.queryParams, "createTime"); - this.queryParams = this.addDateRange(this.queryParams, this.dateTimeRange, "etd"); - } else { + initQueryParams() { + if (this.queryParams.queryKey) { + this.queryParams.params.queryParams = this.queryParams.queryKey; + }else{ + this.queryParams.params.queryParams = null; + } + if (this.dateTimeRange) { + this.queryParams = this.addDateRange(this.queryParams, this.dateTimeRange, "applyDate"); + this.queryParams.applyDateStart = this.dateTimeRange[0]; + this.queryParams.applyDateEnd = this.dateTimeRange[1]; this.removeDateRange(this.queryParams, "etd"); - this.queryParams = this.addDateRange(this.queryParams, this.dateTimeRange, "createTime"); } return this.queryParams; }, @@ -339,13 +338,46 @@ export default { inputPattern: /^.{5,30}$/, inputErrorMessage: "驳回原因长度必须介于 5 和 30 之间" }).then(({ value }) => { - auditCenterNoPass(ids, value).then(response => { + auditCenterReject({ids:ids, centerRejectReason: value}).then(response => { this.$modal.msgSuccess("操作成功"); this.getList(); }); }).catch(() => { }); }, - handleFinancialCenterPass(){}, + handleauditHeadNoPass(row) { + const ids = row.id || this.ids; + this.$prompt('请输入总部驳回原因', "操作确认", { + confirmButtonText: "确定", + cancelButtonText: "取消", + closeOnClickModal: false, + inputPattern: /^.{5,30}$/, + inputErrorMessage: "驳回原因长度必须介于 5 和 30 之间" + }).then(({ value }) => { + auditHeadquartersReject({ids:ids, headquartersRejectReason: value}).then(response => { + this.$modal.msgSuccess("操作成功"); + this.getList(); + }); + }).catch(() => { }); + }, + handleFinancialCenterPass(row) { + const ids = row.id || this.ids; + this.$modal.confirm('是否财务中心审核通过').then(function () { + return auditCenterPass(ids); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("操作成功"); + }).catch(() => { }); + }, + handleauditHeadPass(row) { + const ids = row.id || this.ids; + this.$modal.confirm('是否总部审核通过').then(function () { + console.log('总部审核通过', ids); + return auditHeadquartersConfirm(ids); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("操作成功"); + }).catch(() => { }); + }, handleBatchAdd() { this.openForm = true; this.titleForm = "批量导入"; @@ -407,7 +439,7 @@ export default { qExportParam.pageNum = 1; qExportParam.pageSize = 20000; - listEmisTmsSiteBatch(qExportParam).then(response => { + getWriteoffApplyList(qExportParam).then(response => { if (response.code === 200) { this.exportData(response.rows, loadingInstance); } @@ -424,338 +456,21 @@ export default { excel.export_json_to_excel({ header: tHeader, data, - filename: '批次列表', + filename: '销账列表', autoWidth: true }) loadingInstance.close() }) }, formatJson(filterVal, jsonData, resData) { - let index = 0 return jsonData.map(v => filterVal.map(j => { - - if (j === 'index') { - return ++index - } - if (j === 'kjlx') { - return v['sendSiteName'] + '--' + v['dispatchUnderlingSiteName']; - } - if (j === 'fjr') { - return v['sendName'] + '--' + v['receiveName']; - } - if (j === 'custName') { - let paymentType = v['paymentType']; - if (paymentType == 2 || paymentType == 4 || paymentType == 5) { - return v['custName']; - } else { - return ""; - } - } - - if (j === 'sendMobile') { - return ""; - } - if (j === 'batchType') { - return this.selectDictLabel(this.dict.type.emis_big_batch_type, v[j]); - } - if (j === 'transType') { - return this.selectDictLabel(this.dict.type.emis_biz_shipping_method, v[j]); - } - if (j === 'paymentStatus') { - return this.selectDictLabel(this.dict.type.emis_payment_status, v[j]); - } - - if (j === 'pickupMethod') { - return this.selectDictLabel(this.dict.type.emis_qujian_fangshi, v[j]); - } - if (j === 'customsEclaration') { - return this.selectDictLabel(this.dict.type.emis_declare_mode, v[j]); - } - if (j === 'customsClear') { - return this.selectDictLabel(this.dict.type.emis_customs_clear, v[j]); - } - if (j === 'packType') { - return this.selectDictLabels(this.dict.type.emis_tab_packing_type, v[j]); - } - - - - if (j === 'dispatchMethod') { - if (v[j] == 1) { - return '派送'; - } else { - return '自提'; - } - } - if (j === 'blMessage') { - if (v[j] == 1) { - return '发送'; - } else { - return '不发送'; - } - } - if (j === 'blAcceptMessage') { - if (v[j] == 1) { - return '发送'; - } else { - return '不发送'; - } - } - if (j === 'blSign') { - if (v[j] == 1) { - return '已签收'; - } else { - return '未签收'; - } - } - if (j === 'paymentType') { - return this.selectDictLabel(this.dict.type.emis_payment_type, v[j]); + if (j === 'blCenterConfirmed') { + return this.selectDictLabel(this.dict.type.center_confirme_status, v[j]); } return v[j] })) }, - handleDownBatchDtl(batchName) { - const loadingInstance = this.$loading({ - text: '正在导出...' - }) - - if (this.selectionList && this.selectionList.length > 0) { - this.selectionList.forEach(item => { - let qExportParam = { - pageNum: 1, - pageSize: 20000, - batchNo: item.batchNo - }; - let batchName = item.batchNo; - listEmisTmsSiteBatchDtl(qExportParam).then(response => { - if (response.code === 200) { - this.exportDataDtl(batchName, response.rows, loadingInstance); - } - }); - - }); - } - }, - exportDataDtl(batchName, selData, loadingInstance) { - const curList = selData - import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['运单号', '寄件国家', '目的国家', '线路', '产品类型', '预计到达时间', '总件数', '实际重量', '总体积', '体积重量', '结算重量', '收件人', '收件公司', '取件方式', '付款方式', '运费', '寄件人', '寄件公司', '录单备注', '寄件网点', '清关方式', '报关方式']; - const filterVal = [ - "billCode", - "sendCountryName", - "receiveCountryName", - "transLineTypeName", - "productTypeName", - "estimateDate", - "parcelQty", - "billWeight", - "totalVolume", - "volumeWeight", - "settlementWeight", - "receiveName", - "receiveCompany", - "pickupMethod", - "paymentType", - "freight", - "sendName", - "sendCompany", - "remark", - "sendSiteName", - "customsEclaration", - "customsClear" - ]; - - const data = this.formatJsonDtl(filterVal, curList, selData) - excel.export_json_to_excel({ - header: tHeader, - data, - filename: batchName + '批次明细表', - autoWidth: true - }) - loadingInstance.close() - }) - }, - formatJsonDtl(filterVal, jsonData, resData) { - let index = 0 - return jsonData.map(v => filterVal.map(j => { - - - if (j === 'index') { - return ++index - } - if (j === 'kjlx') { - return v['waybillDetail']['sendSiteName'] + '--' + v['waybillDetail']['dispatchUnderlingSiteName']; - } - if (j === 'fjr') { - return v['sendName'] + '--' + v['receiveName']; - } - - if (j === 'receiveCountryName') { - return v['waybillDetail']['receiveCountryName']; - } - - if (j === 'sendCountryName') { - return v['waybillDetail']['sendCountryName']; - } - - - if (j === 'estimateDate') { - return v['waybillDetail']['estimateDate']; - } - - if (j === 'sendSiteName') { - return v['waybillDetail']['sendSiteName']; - } - - if (j === 'sendName') { - return v['waybillDetail']['sendName']; - } - - if (j === 'receiveName') { - return v['waybillDetail']['receiveName']; - } - - if (j === 'sendDate') { - return v['waybillDetail']['sendDate']; - } - - if (j === 'sendCompany') { - return v['waybillDetail']['sendCompany']; - } - - if (j === 'receiveCompany') { - return v['waybillDetail']['receiveCompany']; - } - - if (j === 'transLineTypeName') { - return v['waybillDetail']['transLineTypeName']; - } - - if (j === 'productTypeName') { - return v['waybillDetail']['productTypeName']; - } - - - if (j === 'sendName') { - return v['waybillDetail']['sendName']; - } - - if (j === 'parcelQty') { - return v['waybillDetail']['parcelQty']; - } - - if (j === 'billWeight') { - return v['waybillDetail']['billWeight']; - } - - if (j === 'volumeWeight') { - return v['waybillDetail']['volumeWeight']; - } - - if (j === 'totalVolume') { - return v['waybillDetail']['totalVolume']; - } - - if (j === 'settlementWeight') { - return v['waybillDetail']['settlementWeight']; - } - - if (j === 'freight') { - return v['waybillDetail']['freight']; - } - - if (j === 'realFee') { - return v['waybillDetail']['realFee']; - } - - if (j === 'remark') { - return v['waybillDetail']['remark']; - } - - if (j === 'feeRemark') { - return v['waybillDetail']['feeRemark']; - } - - if (j === 'salesmen') { - return v['waybillDetail']['salesmen']; - } - - if (j === 'payee') { - return v['waybillDetail']['payee']; - } - - if (j === 'payee') { - return v['waybillDetail']['payee']; - } - - if (j === 'problemTypeName') { - return v['waybillDetail']['problemTypeName']; - } - - if (j === 'problemCause') { - return v['waybillDetail']['problemCause']; - } - - if (j === 'sendMobile') { - return ""; - } - - if (j === 'calcFeeType') { - return this.selectDictLabel(this.dict.type.emis_calc_fee_type, v['waybillDetail']['calcFeeType']); - } - - if (j === 'waybillDetail.paymentStatus') { - return this.selectDictLabel(this.dict.type.emis_payment_status, v['waybillDetail']['paymentStatus']); - } - - if (j === 'pickupMethod') { - return this.selectDictLabel(this.dict.type.emis_qujian_fangshi, v['waybillDetail']['pickupMethod']); - } - if (j === 'customsEclaration') { - return this.selectDictLabel(this.dict.type.emis_declare_mode, v['waybillDetail']['customsEclaration']); - } - if (j === 'customsClear') { - return this.selectDictLabel(this.dict.type.emis_customs_clear, v['waybillDetail']['customsClear']); - } - if (j === 'packType') { - return this.selectDictLabels(this.dict.type.emis_tab_packing_type, v['waybillDetail']['packType']); - } - - if (j === 'dispatchMethod') { - if (v['waybillDetail']['dispatchMethod'] == 1) { - return '派送'; - } else { - return '自提'; - } - } - if (j === 'blMessage') { - if (v['waybillDetail']['blMessage'] == 1) { - return '发送'; - } else { - return '不发送'; - } - } - if (j === 'blAcceptMessage') { - if (v['waybillDetail']['blAcceptMessage'] == 1) { - return '发送'; - } else { - return '不发送'; - } - } - if (j === 'blSign') { - if (v['waybillDetail']['blSign'] == 1) { - return '已签收'; - } else { - return '未签收'; - } - } - if (j === 'paymentType') { - return this.selectDictLabel(this.dict.type.emis_payment_type, v['waybillDetail']['paymentType']); - } - return v[j] - })) - }, /** 列索引函数 */ getIndex($index) { return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1 diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue b/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue index 674e4a87..1c638262 100644 --- a/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue +++ b/src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue @@ -11,6 +11,7 @@ ￥{{ settleBillItem.tradeDate }} + {{ settleBillItem.applyMemo }}