diff --git a/src/api/emis/emisCommissionDtl.js b/src/api/emis/emisCommissionDtl.js
index 271dd68f..97e117d4 100644
--- a/src/api/emis/emisCommissionDtl.js
+++ b/src/api/emis/emisCommissionDtl.js
@@ -9,6 +9,14 @@ export function listEmisCommissionDtl(query) {
})
}
+export function mapDtlList(query) {
+ return request({
+ url: '/emis/emisCommissionDtl/mapDtlList',
+ method: 'get',
+ params: query
+ })
+}
+
// 查询组批次提成明细列表
export function listBatchEmisCommissionDtl(query) {
return request({
diff --git a/src/views/emis/emisCommissionDtl/index.vue b/src/views/emis/emisCommissionDtl/index.vue
index 7ae68856..50ee768e 100644
--- a/src/views/emis/emisCommissionDtl/index.vue
+++ b/src/views/emis/emisCommissionDtl/index.vue
@@ -144,74 +144,62 @@
- {{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}
+ {{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}
-
-
+
- 现金
- 月结
+ 现金
+ 月结
-
-
-
-
-
-
+
+
+
+
+
+
-
+
- {{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})
+ {{scope.row.productTypeName}}({{scope.row.timeType}})
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- {{scope.row.waybillDetail.freight}}
- {{scope.row.waybillDetail.freight}}
+ {{scope.row.freight}}
+ {{scope.row.freight}}
-
+
- 未收款
- 已收款
- 部分收款
+ 未收款
+ 已收款
+ 部分收款
-
-
+
+
-
-
-
+
+
+
-
-
-
@@ -256,7 +244,7 @@ import { reCalcByBillCode,reCalcByBillMonth } from "@/api/emis/emisCommissionPr
import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
-import { listEmisCommissionDtl, getEmisCommissionDtl, delEmisCommissionDtl, addEmisCommissionDtl, updateEmisCommissionDtl } from "@/api/emis/emisCommissionDtl";
+import { mapDtlList,listEmisCommissionDtl, getEmisCommissionDtl, delEmisCommissionDtl, addEmisCommissionDtl, updateEmisCommissionDtl } from "@/api/emis/emisCommissionDtl";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import emisCommissionDtlForm from '@/views/emis/emisCommissionDtl/emisCommissionDtlForm';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
@@ -351,7 +339,7 @@ export default {
/** 查询员工提成明细表列表 */
getList() {
this.loading = true;
- listEmisCommissionDtl(this.queryParams).then(response => {
+ mapDtlList(this.queryParams).then(response => {
this.emisCommissionDtlList = response.rows;
this.total = response.total;
this.loading = false;
@@ -507,7 +495,7 @@ export default {
qExportParam.pageNum=1;
qExportParam.pageSize=100000;
- listEmisCommissionDtl(qExportParam).then(response => {
+ mapDtlList(qExportParam).then(response => {
if (response.code === 200) {
this.exportData(response.rows,loadingInstance);
}
@@ -540,111 +528,111 @@ export default {
return ++index
}
if (j === 'kjlx') {
- // return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
+ return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
}
- if (j === 'fjr') {
- return v['sendName']+'--'+v['receiveName'];
+ // if (j === 'fjr') {
+ // return v['sendName']+'--'+v['receiveName'];
+ // }
+
+ if (j === 'sendSiteName') {
+ return v['sendSiteName'];
}
- if (j === 'waybillDetail.sendSiteName') {
- return v['waybillDetail']['sendSiteName'];
+ if (j === 'sendCountryName') {
+ return v['sendCountryName'];
}
- if (j === 'waybillDetail.sendCountryName') {
- return v['waybillDetail']['sendCountryName'];
+ if (j === 'receiveCountryName') {
+ return v['receiveCountryName'];
}
- if (j === 'waybillDetail.receiveCountryName') {
- return v['waybillDetail']['receiveCountryName'];
+ if (j === 'sendDate') {
+ return v['sendDate'];
}
- if (j === 'waybillDetail.sendDate') {
- return v['waybillDetail']['sendDate'];
+ if (j === 'sendCompany') {
+ return v['sendCompany'];
}
- if (j === 'waybillDetail.sendCompany') {
- return v['waybillDetail']['sendCompany'];
+ if (j === 'transLineTypeName') {
+ return v['transLineTypeName'];
}
- if (j === 'waybillDetail.transLineTypeName') {
- return v['waybillDetail']['transLineTypeName'];
- }
-
- if (j === 'waybillDetail.productTypeName') {
- return v['waybillDetail']['productTypeName'];
+ if (j === 'productTypeName') {
+ return v['productTypeName'];
}
- if (j === 'waybillDetail.sendName') {
- return v['waybillDetail']['sendName'];
+ if (j === 'sendName') {
+ return v['sendName'];
}
- if (j === 'waybillDetail.parcelQty') {
- return v['waybillDetail']['parcelQty'];
+ if (j === 'parcelQty') {
+ return v['parcelQty'];
}
- if (j === 'waybillDetail.billWeight') {
- return v['waybillDetail']['billWeight'];
+ if (j === 'billWeight') {
+ return v['billWeight'];
}
- if (j === 'waybillDetail.volumeWeight') {
- return v['waybillDetail']['volumeWeight'];
+ if (j === 'volumeWeight') {
+ return v['volumeWeight'];
}
- if (j === 'waybillDetail.totalVolume') {
- return v['waybillDetail']['totalVolume'];
+ if (j === 'totalVolume') {
+ return v['totalVolume'];
}
- if (j === 'waybillDetail.settlementWeight') {
- return v['waybillDetail']['settlementWeight'];
+ if (j === 'settlementWeight') {
+ return v['settlementWeight'];
}
- if (j === 'waybillDetail.freight') {
- return v['waybillDetail']['freight'];
+ if (j === 'freight') {
+ return v['freight'];
}
- if (j === 'waybillDetail.realFee') {
- return v['waybillDetail']['realFee'];
+ if (j === 'realFee') {
+ return v['realFee'];
}
- if (j === 'waybillDetail.remark') {
- return v['waybillDetail']['remark'];
+ if (j === 'waybillRemark') {
+ return v['waybillRemark'];
}
- if (j === 'waybillDetail.feeRemark') {
- return v['waybillDetail']['feeRemark'];
+ if (j === 'waybillFeeRemark') {
+ return v['waybillFeeRemark'];
}
- if (j === 'waybillDetail.salesmen') {
- return v['waybillDetail']['salesmen'];
+ if (j === 'salesmen') {
+ return v['salesmen'];
}
- if (j === 'waybillDetail.payee') {
- return v['waybillDetail']['payee'];
+ if (j === 'payee') {
+ return v['payee'];
}
- if (j === 'waybillDetail.payee') {
- return v['waybillDetail']['payee'];
+ if (j === 'payee') {
+ return v['payee'];
}
- if (j === 'waybillDetail.problemTypeName') {
- return v['waybillDetail']['problemTypeName'];
+ if (j === 'problemTypeName') {
+ return v['problemTypeName'];
}
- if (j === 'waybillDetail.problemCause') {
- return v['waybillDetail']['problemCause'];
+ if (j === 'problemCause') {
+ return v['problemCause'];
}
- if (j === 'waybillDetail.sendMobile') {
+ if (j === 'sendMobile') {
return "";
}
- if (j === 'waybillDetail.calcFeeType') {
- return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
+ if (j === 'calcFeeType') {
+ return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['calcFeeType']);
}
- if (j === 'waybillDetail.paymentType') {
- let paymentType=v['waybillDetail']['paymentType'];
+ if (j === 'paymentType') {
+ let paymentType=v['paymentType'];
if(paymentType == 1 || paymentType==3 || paymentType==6){
return '现金';
}
@@ -653,25 +641,25 @@ export default {
}
}
- if (j === 'waybillDetail.paymentStatus') {
- return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
+ if (j === 'paymentStatus') {
+ return this.selectDictLabel(this.dict.type.emis_payment_status,v['paymentStatus']);
}
- if (j === 'waybillDetail.pickupMethod') {
- return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['waybillDetail']['pickupMethod']);
+ if (j === 'pickupMethod') {
+ return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['pickupMethod']);
}
- if (j === 'waybillDetail.customsEclaration') {
- return this.selectDictLabel(this.dict.type.emis_declare_mode,v['waybillDetail']['customsEclaration']);
+ if (j === 'customsEclaration') {
+ return this.selectDictLabel(this.dict.type.emis_declare_mode,v['customsEclaration']);
}
- if (j === 'waybillDetail.customsClear') {
- return this.selectDictLabel(this.dict.type.emis_customs_clear,v['waybillDetail']['customsClear']);
+ if (j === 'customsClear') {
+ return this.selectDictLabel(this.dict.type.emis_customs_clear,v['customsClear']);
}
- if (j === 'waybillDetail.packType') {
- return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['waybillDetail']['packType']);
+ if (j === 'packType') {
+ return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['packType']);
}
- if (j === 'waybillDetail.dispatchMethod') {
- if(v['waybillDetail']['dispatchMethod'] == 1){
+ if (j === 'dispatchMethod') {
+ if(v['dispatchMethod'] == 1){
return '派送';
}else{
return '自提';
@@ -682,29 +670,29 @@ export default {
- if (j === 'waybillDetail.blMessage') {
- if(v['waybillDetail']['blMessage'] == 1){
+ if (j === 'blMessage') {
+ if(v['blMessage'] == 1){
return '发送';
}else{
return '不发送';
}
}
- if (j === 'waybillDetail.blAcceptMessage') {
- if(v['waybillDetail']['blAcceptMessage'] == 1){
+ if (j === 'blAcceptMessage') {
+ if(v['blAcceptMessage'] == 1){
return '发送';
}else{
return '不发送';
}
}
- if (j === 'waybillDetail.blSign') {
- if(v['waybillDetail']['blSign'] == 1){
+ if (j === 'blSign') {
+ if(v['blSign'] == 1){
return '已签收';
}else{
return '未签收';
}
}
- if (j === 'waybillDetail.paymentType') {
- return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
+ if (j === 'paymentType') {
+ return this.selectDictLabel(this.dict.type.emis_payment_type,v['paymentType']);
}
return v[j]
}))