diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls index dab07786..84b7fe4c 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/emisSalesCommissionRatio.js b/src/api/emis/emisSalesCommissionRatio.js index 45d8d7a2..e442cc51 100644 --- a/src/api/emis/emisSalesCommissionRatio.js +++ b/src/api/emis/emisSalesCommissionRatio.js @@ -39,3 +39,12 @@ export function getSalesCommissionRatio(id) { method: 'get' }) } + +// 销售支持列表 +export function getSalesmanSupportList(query) { + return request({ + url: '/emis/salesCommissionRatio/listSimple', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/views/emis/EmisBaseTools/SalesSupportPicker.vue b/src/views/emis/EmisBaseTools/SalesSupportPicker.vue new file mode 100644 index 00000000..de0ef562 --- /dev/null +++ b/src/views/emis/EmisBaseTools/SalesSupportPicker.vue @@ -0,0 +1,111 @@ + + diff --git a/src/views/emis/emisWaybill/batchWaybillRecord.vue b/src/views/emis/emisWaybill/batchWaybillRecord.vue index a9249585..24d9d05b 100644 --- a/src/views/emis/emisWaybill/batchWaybillRecord.vue +++ b/src/views/emis/emisWaybill/batchWaybillRecord.vue @@ -76,6 +76,7 @@ + @@ -510,6 +511,7 @@ export default { feeRemark:element['费用备注'], payee: element['回款联系人'], salesmen: element['销售联系人'], + salesSupport: element['销售支持'], operateEmployeeCode: element['取件员/操作员'], remark: element['录单备注'], blMessage: element['寄件/签收短信'], diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index 0cd5cc31..0611faf1 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -290,8 +290,10 @@ - - + + + + @@ -478,6 +480,7 @@ + - + +