diff --git a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
index 9a356b86..def2f262 100644
--- a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
+++ b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
@@ -60,30 +60,34 @@
部分开票
不开票
-
+
-
-
+
+ -->
-
+
+ -->
diff --git a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue
index 54d1080f..964e08fe 100644
--- a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue
@@ -44,6 +44,7 @@
+
diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index 65bd055c..71ab3a0e 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -991,7 +991,7 @@ export default {
var qParam = {...this.queryParams};
// 增加导出记录
let postExportRecord={
- menuName: '中心运单查询',
+ menuName: '中心问题件导出',
dateRange: qParam.params.beginSendDate+"~"+qParam.params.endSendDate,
}
@@ -1001,11 +1001,11 @@ export default {
this.exportData(this.selectionList,loadingInstance);
}
else{
- this.initQueryParams();
+ let qExportParam=this.initQueryParams();
+ qExportParam.pageNum=1;
+ qExportParam.pageSize=20000;
- qParam.pageNum=1;
- qParam.pageSize=20000;
- listEmisWaybill(qParam).then(response => {
+ listEmisWaybill(qExportParam).then(response => {
if (response.code === 200) {
this.exportData(response.rows,loadingInstance);
}
@@ -1022,7 +1022,7 @@ export default {
excel.export_json_to_excel({
header: tHeader,
data,
- filename: '中心运单列表',
+ filename: '寄件运单列表',
autoWidth: true
})
loadingInstance.close()
@@ -1041,6 +1041,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 "";
}
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index e918f1b3..d520430c 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -967,8 +967,6 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
-
- /** 导出按钮操作 */
/** 导出按钮操作 */
handleExport() {
const loadingInstance = this.$loading({
@@ -978,7 +976,7 @@ export default {
var qParam = {...this.queryParams};
// 增加导出记录
let postExportRecord={
- menuName: '派件运单查询',
+ menuName: '派件运单查询导出',
dateRange: qParam.params.beginSendDate+"~"+qParam.params.endSendDate,
}
@@ -988,11 +986,11 @@ export default {
this.exportData(this.selectionList,loadingInstance);
}
else{
- this.initQueryParams();
+ let qExportParam=this.initQueryParams();
+ qExportParam.pageNum=1;
+ qExportParam.pageSize=20000;
- qParam.pageNum=1;
- qParam.pageSize=20000;
- listEmisWaybill(qParam).then(response => {
+ listEmisWaybill(qExportParam).then(response => {
if (response.code === 200) {
this.exportData(response.rows,loadingInstance);
}
@@ -1009,7 +1007,7 @@ export default {
excel.export_json_to_excel({
header: tHeader,
data,
- filename: '派件运单列表',
+ filename: '寄件运单列表',
autoWidth: true
})
loadingInstance.close()
@@ -1028,6 +1026,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 "";
}
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index 818ce3ab..b43a049c 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -985,8 +985,8 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
- /** 导出按钮操作 */
- handleExport() {
+ /** 导出按钮操作 */
+ handleExport() {
const loadingInstance = this.$loading({
text: '正在导出...'
})
@@ -1004,11 +1004,11 @@ export default {
this.exportData(this.selectionList,loadingInstance);
}
else{
- this.initQueryParams();
+ let qExportParam=this.initQueryParams();
+ qExportParam.pageNum=1;
+ qExportParam.pageSize=20000;
- qParam.pageNum=1;
- qParam.pageSize=20000;
- listEmisWaybill(qParam).then(response => {
+ listEmisWaybill(qExportParam).then(response => {
if (response.code === 200) {
this.exportData(response.rows,loadingInstance);
}
@@ -1019,7 +1019,6 @@ export default {
const curList =selData
import('@/vendor/Export2Excel').then(excel => {
const exportParam=this.$refs.refTable.getExportParam();
-
const tHeader = exportParam.header;
const filterVal = exportParam.filter;
const data = this.formatJson(filterVal, curList, selData)
@@ -1035,6 +1034,7 @@ export default {
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
+
if (j === 'index') {
return ++index
}
@@ -1044,6 +1044,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 "";
}
@@ -1098,6 +1107,7 @@ export default {
return v[j]
}))
},
+
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 4e589b99..5c87439c 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -1004,6 +1004,9 @@ data() {
// sendDate: [
// { required: true, message: "发货时间不能为空", trigger: "blur" }
// ],
+ destinationCode: [
+ { required: true, message: "目的地不能为空", trigger: ["blur",'change'] }
+ ],
dispatchUnderlingSiteCode: [
{ required: true, message: "目的地网点代码不能为空", trigger: "blur" }
],
@@ -1021,7 +1024,7 @@ data() {
],
operateEmployeeCode: [
{ required: true, message: "操作员代码不能为空", trigger: ["blur",'change'] }
- ],
+ ]
}
};
},