diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls
index 84b7fe4c..d4b1c6b6 100644
Binary files a/public/static/tpl/batch_import_order.xls and b/public/static/tpl/batch_import_order.xls differ
diff --git a/src/api/emis/emisMoneyUser.js b/src/api/emis/emisMoneyUser.js
index 633fe0c9..c8c3c788 100644
--- a/src/api/emis/emisMoneyUser.js
+++ b/src/api/emis/emisMoneyUser.js
@@ -48,3 +48,12 @@ export function moneyUserShipmentStat(query) {
params: query
})
}
+
+//现金客户下来列表
+export function listMoneyUserAll(query){
+ return request({
+ url: '/emis/emisMoneyUser/listMoneyUserAll',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue b/src/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue
index 7002ce09..289acc87 100644
--- a/src/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue
@@ -6,7 +6,7 @@
+
+
diff --git a/src/views/emis/emisCustomerUser/moneyUserShipmentStat.vue b/src/views/emis/emisCustomerUser/moneyUserShipmentStat.vue
new file mode 100644
index 00000000..95af884c
--- /dev/null
+++ b/src/views/emis/emisCustomerUser/moneyUserShipmentStat.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
{{ scope.row.totalTickets }}
+
+
+
+
+
+
+
{{ scope.row.totalWeight }}
+
+
+
+
+
+
+
{{ scope.row.expressTickets }}
+
+
+
+
+
+
+
{{ scope.row.expressWeight }}
+
+
+
+
+
+
+
{{ scope.row.airTickets }}
+
+
+
+
+
+
+
{{ scope.row.airWeight }}
+
+
+
+
+
+
+
{{ scope.row.landTickets }}
+
+
+
+
+
+
+
{{ scope.row.landWeight }}
+
+
+
+
+
+
+
{{ scope.row.importTickets }}
+
+
+
+
+
+
+
{{ scope.row.importWeight }}
+
+
+
+
+
+
+
{{ scope.row.seaTickets }}
+
+
+
+
+
+
+
{{ scope.row.seaWeight }}
+
+
+
+
+
+
+
{{ scope.row.otherTickets }}
+
+
+
+
+
+
+
{{ scope.row.otherWeight }}
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
{{ scope.row.totalTickets }}
+
+
+
+
+
+
+
{{ scope.row.totalWeight }}
+
+
+
+
+
+
+
{{ scope.row.chinaTickets }}
+
+
+
+
+
+
+
{{ scope.row.chinaWeight }}
+
+
+
+
+
+
+
{{ scope.row.vietnamTickets }}
+
+
+
+
+
+
+
{{ scope.row.vietnamWeight }}
+
+
+
+
+
+
+
{{ scope.row.cambodiaTickets }}
+
+
+
+
+
+
+
{{ scope.row.cambodiaWeight }}
+
+
+
+
+
+
+
{{ scope.row.myanmarTickets }}
+
+
+
+
+
+
+
{{ scope.row.myanmarWeight }}
+
+
+
+
+
+
+
{{ scope.row.bangladeshTickets }}
+
+
+
+
+
+
+
{{ scope.row.bangladeshWeight }}
+
+
+
+
+
+
+
{{ scope.row.laosTickets }}
+
+
+
+
+
+
+
{{ scope.row.laosWeight }}
+
+
+
+
+
+
+
{{ scope.row.thailandTickets }}
+
+
+
+
+
+
+
{{ scope.row.thailandWeight }}
+
+
+
+
+
+
+
{{ scope.row.otherTickets }}
+
+
+
+
+
+
+
{{ scope.row.otherWeight }}
+
+
+
+
+
+
+
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
-
-
+
+
{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
-
+
@@ -476,8 +478,12 @@
-
-
+
+
+ {{scope.row.waybillOther?.moneyCompany}}
+
+
+
{{scope.row.custName}}
@@ -485,8 +491,11 @@
-
-
+
+
+ {{ scope.row.waybillOther?.salesSupport }}
+
+
是
@@ -661,6 +670,7 @@ import { formatSearchStr,deepClone } from '@/utils/index'
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
+import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue';
export default {
name: "CenterWaybillList",
@@ -688,7 +698,8 @@ export default {
TraceWaybillDetailView,
TransLineAllPicker,
TransProductAllPicker,
- AllMonthpayAccountPicker
+ AllMonthpayAccountPicker,
+ EmisMoneyUserPicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
@@ -918,7 +929,8 @@ export default {
expireNotSign:null,
problemQueryType:null,
problemQueryIds:null,
- blUploadGoodsPic:null
+ blUploadGoodsPic:null,
+ moneyUserId:null,
}
},
};
@@ -1213,6 +1225,12 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
+ if(j === 'waybillOther.salesSupport'){
+ return v['waybillOther']['salesSupport'];
+ }
+ if(j === 'waybillOther.moneyCompany'){
+ return v['waybillOther']['moneyCompany'];
+ }
return v[j]
}))
},
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 945fd292..e7d7f4c9 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -245,7 +245,9 @@
-
+
+
+
@@ -388,12 +390,12 @@
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
-
-
+
+
{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
-
+
+
-
@@ -458,8 +460,12 @@
-
-
+
+
+ {{scope.row.waybillOther?.moneyCompany}}
+
+
+
{{scope.row.custName}}
@@ -467,8 +473,11 @@
-
-
+
+
+ {{ scope.row.waybillOther?.salesSupport }}
+
+
是
@@ -638,6 +647,7 @@ import { formatSearchStr,deepClone } from '@/utils/index'
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
+import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue';
export default {
// name: "SendWaybillList",
@@ -665,7 +675,8 @@ export default {
TraceWaybillDetailView,
TransLineAllPicker,
TransProductAllPicker,
- AllMonthpayAccountPicker
+ AllMonthpayAccountPicker,
+ EmisMoneyUserPicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@@ -875,7 +886,8 @@ export default {
expireNotSign:null,
problemQueryType:null,
problemQueryIds:null,
- blUploadGoodsPic:null
+ blUploadGoodsPic:null,
+ moneyUserId:null,
}
},
};
@@ -1176,6 +1188,12 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
+ if(j === 'waybillOther.salesSupport'){
+ return v['waybillOther']['salesSupport'];
+ }
+ if(j === 'waybillOther.moneyCompany'){
+ return v['waybillOther']['moneyCompany'];
+ }
return v[j]
}))
},
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index da414acd..a63ba65d 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -248,7 +248,9 @@
>
-
+
+
+
@@ -390,15 +392,15 @@
{{ scope.row.problemTypeName }}
-
- 轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
-
-
- {{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
-
+
+ 轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
+
+
+ {{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
+
+
-
@@ -459,16 +461,24 @@
-
-
-
- {{scope.row.custName}}
-
+
+
+ {{scope.row.waybillOther?.moneyCompany}}
+
+
+
+
+ {{scope.row.custName}}
+
-
+
+
+ {{ scope.row.waybillOther?.salesSupport }}
+
+
是
@@ -589,7 +599,7 @@
-