diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index cc2e8170..604404f3 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -134,6 +134,7 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
+ :default-sort="{prop: 'sendDate', order: 'descending'}"
:row-style="tableRowClassName"
@@ -216,41 +217,46 @@
-
-
+
+
财务未确认,
业务未确认
+
+
+ {{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}
+
+
-
+
是
否
-
+
-
+
-
-
+
+
-
+
{{ scope.row.custNo }}
-
+
{{ scope.row.custName }}
@@ -263,48 +269,49 @@
-->
-
-
+
+
+
{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})
-
-
-
-
-
-
-
+
+
+
+
+
+
+
{{scope.row.waybillDetail.freight}}
{{scope.row.waybillDetail.freight}}
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
是
/
-
-
+
+
-
+
未确认
已确认
@@ -312,11 +319,11 @@
账单异常
-
-
-
+
+
+
-
+
未确认
已确认
@@ -324,9 +331,9 @@
账单异常
-
-
-
+
+
+
@@ -722,7 +729,7 @@ export default {
initQueryParams(){
- if(this.$store.getters.ownerSiteCode != '88888'){
+ if(this.$store.getters.ownerSiteCode != '88888'){
this.queryParams.params.salesmen=this.$store.getters.empName
}
@@ -736,20 +743,34 @@ export default {
}
this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate")
- },
+
+ let qParam=null;
+ if(this.queryParams.billCode){
+ qParam={
+ pageNum:this.queryParams.pageNum,
+ pageSize:this.queryParams.pageSize,
+ billCode:this.queryParams.billCode,
+ }
+ }else{
+ qParam=this.queryParams
+ }
+
+ return qParam;
+ },
+
+
getList() {
this.loading = true;
- this.initQueryParams();
-
- listEmisSettleSubBill(this.queryParams).then(response => {
+ let qParam=this.initQueryParams();
+ listEmisSettleSubBill(qParam).then(response => {
this.emisSettleSubBillList = response.rows;
this.total = response.total;
this.loading = false;
});
// 查询统计
- getQueryStatInfoMap(this.queryParams).then(response => {
+ getQueryStatInfoMap(qParam).then(response => {
this.queryStatInfoMap = response.data;
});
@@ -987,9 +1008,11 @@ export default {
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
- this.queryParams.orderByColumn = column.prop;
- this.queryParams.isAsc = column.order;
- this.getList();
+
+
+ // this.queryParams.orderByColumn = column.prop;
+ // this.queryParams.isAsc = column.order;
+ // this.getList();
},
/** 修改按钮操作 */
@@ -1112,11 +1135,11 @@ export default {
const loadingInstance = this.$loading({
text: '正在导出...'
})
- var qParam = {...this.queryParams};
+ let qParam=this.initQueryParams();
qParam.pageNum=1;
qParam.pageSize=5000;
- listEmisSettleSubBill(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+ listEmisSettleSubBill(qParam).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = response.rows