diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index a09d082e..2dd6e63f 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -90,6 +90,7 @@
+
@@ -112,6 +113,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emis/emisSettleBill/EmisSettleBillQuery.vue b/src/views/emis/emisSettleBill/EmisSettleBillQuery.vue
index 4c7f73d1..e443eda6 100644
--- a/src/views/emis/emisSettleBill/EmisSettleBillQuery.vue
+++ b/src/views/emis/emisSettleBill/EmisSettleBillQuery.vue
@@ -294,6 +294,7 @@ export default {
emisSettleSubBillList: [],
currentSettleBillNo:null,
+ selectList: [],
queryOrderType:null,
@@ -536,10 +537,13 @@ export default {
},
handleExportToBill() {
- this.download('emis/emisSettleBill/exportBill', {
- settleBillNo:this.currentSettleBillNo
- }, `账单${new Date().getTime()}.xlsx`)
-
+ if(this.selectList&&this.selectList.length>0){
+ this.selectList.forEach(item=>{
+ this.download('emis/emisSettleBill/exportBill', {
+ settleBillNo:item.settleBillNo
+ }, `账单${item.settleBillName}.xlsx`)
+ });
+ }
},
/** 搜索按钮操作 */
handleQuery() {
@@ -554,11 +558,14 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
+
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
- if(selection&&selection.length>0){
+ this.selectList=selection;
+
+ if(this.selectList&&this.selectList.length>0){
this.currentSettleBillNo=selection[0].settleBillNo;
}
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
index fbbbcfe7..b10bd3f8 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@@ -301,6 +301,8 @@ export default {
// 结算总账单表格数据
emisSettleBillList: [],
+ selectList: [],
+
currentId:null,
openForm: false,
titleForm: "",
@@ -558,11 +560,14 @@ export default {
handleRemovceBillCode(){
},
- handleExportToBill() {
- this.download('emis/emisSettleBill/exportBill', {
- settleBillNo:this.currentSettleBillNo
- }, `账单${new Date().getTime()}.xlsx`)
-
+ handleExportToBill() {
+ if(this.selectList&&this.selectList.length>0){
+ this.selectList.forEach(item=>{
+ this.download('emis/emisSettleBill/exportBill', {
+ settleBillNo:item.settleBillNo
+ }, `${item.settleBillName}.xlsx`)
+ });
+ }
},
/** 搜索按钮操作 */
handleQuery() {
@@ -579,9 +584,11 @@ export default {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
- this.multiple = !selection.length
+ this.multiple = !selection.length;
- if(selection&&selection.length>0){
+ this.selectList=selection;
+
+ if(this.selectList&&this.selectList.length>0){
this.currentSettleBillNo=selection[0].settleBillNo;
this.settleType==selection[0].settleType;
}
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 75569856..bda246e5 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -1033,6 +1033,15 @@ export default {
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 "";
}