diff --git a/src/api/emis/emisSettleSubBill.js b/src/api/emis/emisSettleSubBill.js index 8a57252b..69178cd4 100644 --- a/src/api/emis/emisSettleSubBill.js +++ b/src/api/emis/emisSettleSubBill.js @@ -139,6 +139,15 @@ export function setBillErrorBySite(id,note) { } +// 站点设置账单异常 +export function setNoNeedOpenBill(id) { + return request({ + url: '/emis/emisSettleSubBill/setNoNeedOpenBill/' + id, + method: 'post', + }) +} + + // 删除结算子账单 export function delEmisSettleSubBill(id) { diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue index 7896f6a2..6bfae3a6 100644 --- a/src/views/emis/emisCustomerAddress/senderAddress.vue +++ b/src/views/emis/emisCustomerAddress/senderAddress.vue @@ -119,12 +119,12 @@ --> - + - + @@ -138,18 +138,18 @@ - + - + - + - + @@ -299,12 +299,41 @@ export default { this.single = selection.length!==1 this.multiple = !selection.length }, - // 排序 查询字段是表格中字段名字 动态取值排序顺序 - handleSortChange(column) { - this.queryParams.orderByColumn = column.prop; - this.queryParams.isAsc = column.order; - this.getList(); + getProperty(obj, str) { + str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标 + let arr = str.split("."); + for (let i in arr) { + obj = obj[arr[i]] || ""; + } + return obj; }, + sortFun: function (attr, rev) { + //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序 + if (rev == undefined||rev==null) { + rev = 1; + } else { + rev = (rev) ? 1 : -1; + } + let that=this; + return function (a, b) { + a = that.getProperty(a,attr); + b = that.getProperty(b,attr); + if (a < b) { + return rev * -1; + } + if (a > b) { + return rev * 1; + } + return 0; + } + }, + // 排序 查询字段是表格中字段名字 动态取值排序顺序 + handleSortChange(column) { + this.emisSettleSubBillList = this.emisSettleSubBillList.sort( + this.sortFun(column.prop, column.order === 'ascending') + ); + }, + /** 新增按钮操作 */ handleAdd(row) { this.currentId=null; diff --git a/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue b/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue index d94d0f38..b4e2e0d9 100644 --- a/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue +++ b/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue @@ -4,17 +4,20 @@
- + - + - - + + +
@@ -25,7 +28,7 @@ import InvoiceRecordApplyListPanel from '@/views/emis/emisSettleInvoiceRecord/pa import InvoiceDetailPanel from '@/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue'; import SiteWaitOpenBillPanel from '@/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue'; import EmisSettleInvoiceRecordForm from '@/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm'; - +import SiteConfirmSubBillListPanel from '@/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue'; export default { name: "SiteInvoiceRecordApply", @@ -33,7 +36,8 @@ export default { InvoiceRecordApplyListPanel, InvoiceDetailPanel, SiteWaitOpenBillPanel, - EmisSettleInvoiceRecordForm + EmisSettleInvoiceRecordForm, + SiteConfirmSubBillListPanel }, dicts: [ ], @@ -41,7 +45,12 @@ export default { return { activeTab:'billList', billTabs:[], + + showApply:false, selectBillList:null, + + curSettleBillNo:null, + showBillDetail:false }; }, created() { @@ -49,6 +58,11 @@ export default { methods: { handleTabsClick(){ + }, + onSelectShowBill(item) { + this.curSettleBillNo=item.settleBillNo; + this.showBillDetail=true; + this.activeTab="billDetail"; }, onSelectApply(item) { let old=this.billTabs.find(mItem=>mItem.applySeqNo==item.applySeqNo); @@ -61,28 +75,31 @@ export default { }, onApply(billList){ + this.showApply=true; this.selectBillList=billList; this.activeTab="applyPanel"; }, handleFormChanged(){ + this.showApply=false; this.selectBillList=null; this.activeTab="waitOpenBillList"; }, cancelForm(){ + this.showApply=false; this.selectBillList=null; this.activeTab="waitOpenBillList"; }, removeTab(targetName) { - - var self=this; - let tabs = self.billTabs; - self.billTabs = tabs.filter(tab => tab.applySeqNo !== targetName); - if(self.billTabs.length>0){ - this.activeTab=self.billTabs[self.billTabs.length-1].applySeqNo; - }else{ - this.activeTab="billList"; - } - + if(targetName=='applyPanel'){ + this.showApply=false; + this.selectBillList=null; + this.activeTab="waitOpenBillList"; + } + else if(targetName=='billDetail'){ + this.curSettleBillNo=null; + this.showBillDetail=false; + this.activeTab="waitOpenBillList"; + } }, } diff --git a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue index 85f235a2..8c5b02bb 100644 --- a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue @@ -62,14 +62,21 @@
- 置账单异常 + >置账单异常 --> + 确认不开票
@@ -275,7 +282,7 @@ import BillFeeListPanel from '@/views/emis/emisSettleSubBill/panel/BillFeeListPa import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue'; import { getInfoBySettleBillNo,addSubBillToSettleBill,removeSubBillFromSettleBill } from "@/api/emis/emisSettleBill"; -import {setBillErrorBySite, listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill"; +import {setBillErrorBySite, setNoNeedOpenBill,listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill"; export default { name: "SubBillListPanel", @@ -565,6 +572,14 @@ export default { }); }).catch(() => {}); }, + handleSetNoNeedOpenBill(row){ + const ids = row.id || this.ids; + this.$modal.confirm('确认不开票?').then(function() { + return setNoNeedOpenBill(ids); + }).then(() => { + this.getList(); + }).catch(() => {}); + }, // 移除运单 handleRemovceBillCode(){ let postData={ diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue index 9962229d..c6e88712 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue @@ -241,6 +241,17 @@ @click="handleExport" >导出 + + + 确认不开票 + + @@ -439,7 +450,9 @@ import { listEmisSettleSubBill, confirmBillBySite, cancelConfirmBillBySite, confirmNoBillBySite, - setBillErrorBySite + setBillErrorBySite, + + setNoNeedOpenBill, } from "@/api/emis/emisSettleSubBill"; import { listEmisSettleBill, addEmisSettleBill } from "@/api/emis/emisSettleBill"; @@ -1187,6 +1200,17 @@ export default { }); }).catch(() => {}); }, + handleSetNoNeedOpenBill(row){ + + const ids = row.id || this.ids; + this.$modal.confirm('是否确认').then(function() { + return setNoNeedOpenBill(ids); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("操作成功"); + }).catch(() => {}); + + }, handleConfirmBySite(row) { const ids = row.id || this.ids; diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index 2b3c1148..3e8fd999 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -1880,9 +1880,12 @@ methods: { totalVolume=totalVolume+item.volume; }); - this.form.totalVolume = parseFloat(totalVolume.toFixed(4)); + if(totalVolume>0.0){ + this.form.totalVolume = parseFloat(totalVolume.toFixed(4)); + this.handleCalcVolumeWeight(); + } + - this.handleCalcVolumeWeight(); }, diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index 3d07d63c..11633d7f 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -1880,9 +1880,12 @@ methods: { totalVolume=totalVolume+item.volume; }); - this.form.totalVolume = parseFloat(totalVolume.toFixed(4)); + if(totalVolume>0.0){ + this.form.totalVolume = parseFloat(totalVolume.toFixed(4)); + this.handleCalcVolumeWeight(); + } + - this.handleCalcVolumeWeight(); }, diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index 3b2f86b8..e38cc158 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -1747,9 +1747,11 @@ export default { totalVolume=totalVolume+item.volume; }); - this.form.totalVolume = parseFloat(totalVolume.toFixed(5)); + if(totalVolume>0.0){ + this.form.totalVolume = parseFloat(totalVolume.toFixed(4)); + this.handleCalcVolumeWeight(); + } - this.handleCalcVolumeWeight(); },