diff --git a/src/views/emis/EmisBaseTools/PaymentTypeMultipleAllPicker.vue b/src/views/emis/EmisBaseTools/PaymentTypeMultipleAllPicker.vue new file mode 100644 index 00000000..2e0c0f65 --- /dev/null +++ b/src/views/emis/EmisBaseTools/PaymentTypeMultipleAllPicker.vue @@ -0,0 +1,122 @@ + + + diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index 068cb8d9..2fc5c653 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -38,14 +38,15 @@ - + + @@ -680,7 +681,7 @@ import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vu import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue' import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue'; import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue'; - +import PaymentTypeMultipleAllPicker from '@/views/emis/EmisBaseTools/PaymentTypeMultipleAllPicker.vue'; export default { name: "CenterWaybillList", // name: "DispatchWaybillList", @@ -709,7 +710,7 @@ export default { TransProductAllPicker, AllMonthpayAccountPicker, EmisMoneyUserPicker, - + PaymentTypeMultipleAllPicker, }, dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type', diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index 72a520f1..bf88dae3 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -54,14 +54,15 @@ - + + @@ -648,6 +649,7 @@ import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vu import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue' import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue'; import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue'; +import PaymentTypeMultipleAllPicker from '@/views/emis/EmisBaseTools/PaymentTypeMultipleAllPicker.vue'; export default { // name: "SendWaybillList", @@ -677,6 +679,7 @@ export default { TransProductAllPicker, AllMonthpayAccountPicker, EmisMoneyUserPicker, + PaymentTypeMultipleAllPicker }, dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type', diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index 89adb4ad..d1df6f19 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -57,14 +57,15 @@ - + + @@ -662,7 +663,7 @@ import {timeDiffTime,timeFormat} from '@/utils/dateUtils' import { formatSearchStr,deepClone } from '@/utils/index' import clip from '@/utils/clipboard' import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue'; - +import PaymentTypeMultipleAllPicker from '@/views/emis/EmisBaseTools/PaymentTypeMultipleAllPicker.vue'; export default { name: "SendWaybillList", // name: "DispatchWaybillList", @@ -697,6 +698,7 @@ export default { AllMonthpayAccountPicker, TransProductMultipleAllPicker, EmisMoneyUserPicker, + PaymentTypeMultipleAllPicker }, dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type', diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index 6164bb41..b14cf42f 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -60,14 +60,15 @@ - + + @@ -667,7 +668,7 @@ import TransProductMultipleAllPicker from "../EmisBaseTools/TransProductMultiple import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue'; import EmisMoneyUserPicker from '@/views/emis/EmisBaseTools/EmisMoneyUserPicker.vue'; - +import PaymentTypeMultipleAllPicker from '@/views/emis/EmisBaseTools/PaymentTypeMultipleAllPicker.vue'; export default { name: "SendWaybillListNew", // name: "DispatchWaybillList", @@ -700,7 +701,8 @@ export default { TransProductAllPicker, AllMonthpayAccountPicker, TransProductMultipleAllPicker - ,EmisMoneyUserPicker + ,EmisMoneyUserPicker, + PaymentTypeMultipleAllPicker }, dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',