diff --git a/src/views/emis/EmisBaseTools/TransLineMultipleAllPicker.vue b/src/views/emis/EmisBaseTools/TransLineMultipleAllPicker.vue
new file mode 100644
index 00000000..93a10974
--- /dev/null
+++ b/src/views/emis/EmisBaseTools/TransLineMultipleAllPicker.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+ {{item.lineName+((item.status==0)?'-已停用':'')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emis/EmisBaseTools/TransProductMultipleAllPicker2.vue b/src/views/emis/EmisBaseTools/TransProductMultipleAllPicker2.vue
new file mode 100644
index 00000000..f763cdbb
--- /dev/null
+++ b/src/views/emis/EmisBaseTools/TransProductMultipleAllPicker2.vue
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+ {{item.prodName}}({{item.transLine}})
+ {{item.prodName}}({{item.transLine}})(停用)
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue b/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
index 9971ee94..97c9f1a5 100644
--- a/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
+++ b/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
@@ -32,12 +32,12 @@
-
+
-
+
@@ -243,8 +243,9 @@ import CountryMutiSelectPicker from '@/views/emis/EmisBaseTools/CountryMutiSelec
import CountryMutiSelectPicker1 from '@/views/emis/EmisBaseTools/CountryMutiSelectPicker.vue';
-import TransLineMultiplePicker from '@/views/emis/EmisBaseTools/TransLineMultiplePicker.vue';
-import TransProductMultiplePicker from '@/views/emis/EmisBaseTools/TransProductMultiplePicker.vue';
+import TransLineMultipleAllPicker from '@/views/emis/EmisBaseTools/TransLineMultipleAllPicker.vue';
+import TransProductMultipleAllPicker from '@/views/emis/EmisBaseTools/TransProductMultipleAllPicker.vue';
+import TransProductMultipleAllPicker2 from '@/views/emis/EmisBaseTools/TransProductMultipleAllPicker2.vue';
import EmisSiteMutiSelectPicker from '@/views/emis/EmisBaseTools/EmisSiteMutiSelectPicker.vue';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
@@ -271,7 +272,7 @@ export default {
},
components: {
EmisSiteSimplePicker,EmisSiteMutiSelectPicker,CountryMutiSelectPicker,CountryMutiSelectPicker1,EcqExpressionPanel,
- EmisStaffSimpleListPicker,TransLineMultiplePicker,TransProductMultiplePicker
+ EmisStaffSimpleListPicker,TransLineMultipleAllPicker,TransProductMultipleAllPicker,TransProductMultipleAllPicker2
},
dicts: ['emis_price_type','emis_fee_type','sys_currency_type',
'emis_commission_post','emis_biz_shipping_method','emis_commission_fee_type'],