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 @@
+
@@ -628,6 +631,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
@@ -664,6 +668,7 @@ export default {
TransLinePicker,TransProductPicker,
EmpNamePicker1,
EmpNamePicker2,
+ EmpNamePicker3,
EmisUserSimplePicker0,
EmisUserSimplePicker1,
EmisUserSimplePicker2,
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index b9bbb99b..84213c77 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -267,7 +267,9 @@
-
+
+
+
@@ -457,9 +459,10 @@
{{scope.row.custName}}
-
+
+
@@ -608,6 +611,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
@@ -641,6 +645,8 @@ export default {
TransLinePicker,TransProductPicker,
EmpNamePicker1,
EmpNamePicker2,
+ EmpNamePicker3,
+
EmisUserSimplePicker0,
EmisUserSimplePicker1,
EmisUserSimplePicker2,
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 201093b0..11f1cd57 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -270,7 +270,9 @@
-
+
+
+
@@ -451,7 +453,7 @@
-
+
是
@@ -596,6 +598,7 @@ import TransProductMultipleAllPicker from '../EmisBaseTools/TransProductMultiple
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
@@ -639,6 +642,7 @@ export default {
TransLinePicker,TransProductPicker,
EmpNamePicker1,
EmpNamePicker2,
+ EmpNamePicker3,
EmisUserSimplePicker0,
EmisUserSimplePicker1,
EmisUserSimplePicker2,
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index ba793694..a8a35aac 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -277,7 +277,9 @@
-
+
+
+
@@ -456,6 +458,7 @@
+
@@ -606,7 +609,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
-
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
@@ -655,6 +658,7 @@ export default {
TransLinePicker,TransProductPicker,
EmpNamePicker1,
EmpNamePicker2,
+ EmpNamePicker3,
EmisUserSimplePicker0,
EmisUserSimplePicker1,
EmisUserSimplePicker2,
diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index 23eb8e2c..ca1f0231 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -35,6 +35,7 @@
{{ form.custName }}
{{ form.payee }}
{{ form.salesmen }}
+ {{ form.salesSupport }}
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index b75c5a80..32689de2 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -142,20 +142,25 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
@@ -631,21 +636,27 @@
-
+
-
+
+
+
+
+
+
+
@@ -885,6 +896,7 @@ import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import SalesSupportPicker from '@/views/emis/EmisBaseTools/SalesSupportPicker.vue';
import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue';
@@ -908,6 +920,7 @@ export default {
// name: "WaybillModify",
components: {
SalemanPicker,
+ SalesSupportPicker,
PayeePicker,
TanexPrinterPanel,
feeItemForm,
@@ -1578,6 +1591,7 @@ methods: {
if(item!=null){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
+ this.form.salesSupport=item.salesSupport;
this.form.paymentType= '2';
// 企业名称
this.form.sender.enterpriseName=item.enterpriseName;
@@ -2843,6 +2857,10 @@ methods: {
}
});
return true;
+ },
+ // 销售联系人改变事件
+ onSalesmenChange(val) {
+ this.form.salesSupport = null;
}
}
};
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index c55390c2..a6187902 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -142,20 +142,25 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
@@ -633,21 +638,27 @@
-
+
-
+
+
+
+
+
+
+
@@ -885,6 +896,7 @@ import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import SalesSupportPicker from '@/views/emis/EmisBaseTools/SalesSupportPicker.vue';
import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue';
@@ -905,6 +917,7 @@ export default {
name: "WaybillModify",
components: {
SalemanPicker,
+ SalesSupportPicker,
PayeePicker,
TanexPrinterPanel,
feeItemForm,
@@ -1583,6 +1596,7 @@ methods: {
if(item!=null){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
+ this.form.salesSupport=item.salesSupport;
this.form.paymentType= '2';
// 企业名称
this.form.sender.enterpriseName=item.enterpriseName;
@@ -2848,6 +2862,10 @@ methods: {
}
});
return true;
+ },
+ // 销售联系人改变事件
+ onSalesmenChange(val) {
+ this.form.salesSupport = null;
}
}
};
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 1794629e..9a8c17bf 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -143,20 +143,26 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
@@ -633,20 +639,27 @@
-
+
-
+
+
+
+
+
+
+
+
@@ -885,6 +898,7 @@ import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import SalesSupportPicker from '@/views/emis/EmisBaseTools/SalesSupportPicker.vue';
import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue';
@@ -905,6 +919,7 @@ export default {
// name: "WaybillModify",
components: {
SalemanPicker,
+ SalesSupportPicker,
PayeePicker,
TanexPrinterPanel,
feeItemForm,
@@ -1198,6 +1213,9 @@ data() {
salesmen: [
{ required: true, message: "销售联系人不能为空", trigger: ["blur",'change'] }
],
+ // salesSupport: [
+ // { required: true, message: "销售支持不能为空", trigger: ["blur",'change'] }
+ // ],
takePieceEmployeeCode: [
{ required: true, message: "取件员不能为空", trigger: ["blur",'change'] }
],
@@ -1586,10 +1604,11 @@ methods: {
this.calcBillFee();
},
- onSelectMonthUser(item){
+ onSelectMonthUser(item){
if(item!=null){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
+ this.form.salesSupport=item.salesSupport;
this.form.paymentType= '2';
// 企业名称
this.form.sender.enterpriseName=item.enterpriseName;
@@ -2846,6 +2865,10 @@ methods: {
}
}
}
+ },
+ // 销售联系人改变事件
+ onSalesmenChange(val) {
+ this.form.salesSupport = null;
}
}
}
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index c01302df..3b5e1319 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -409,6 +409,21 @@
+
+
+
+ 销售支持
+
+
+ {{ billDetail.salesSupport }}
+
+
+
+
+
+
+
+
@@ -1240,6 +1255,7 @@ import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import SalesSupportPicker from '@/views/emis/EmisBaseTools/SalesSupportPicker.vue';
import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
import MasterBillCodePicker from '@/views/emis/EmisBaseTools/MasterBillCodePicker.vue';
@@ -1273,6 +1289,7 @@ export default {
},
components: {
SalemanPicker,
+ SalesSupportPicker,
PayeePicker,
EmisUserSimplePicker0,
TransProductCasPicker,