aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '寄件运单查询、产品类型多选' (#57) from master-客户管理 into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/57
This commit is contained in:
wuteng 2025-08-14 15:09:17 +08:00
commit 50e6557836
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -72,7 +72,8 @@
<TransLineAllPicker v-model="queryParams.transLineType" isInitiated="true" ></TransLineAllPicker> <TransLineAllPicker v-model="queryParams.transLineType" isInitiated="true" ></TransLineAllPicker>
</el-form-item> </el-form-item>
<el-form-item label="产品类型" prop="productType"> <el-form-item label="产品类型" prop="productType">
<TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker> <!-- <TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker> -->
<TransProductMultipleAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductMultipleAllPicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -571,6 +572,8 @@ import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue' import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue'; import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue' import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
import TransProductMultipleAllPicker from '../EmisBaseTools/TransProductMultipleAllPicker.vue';
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
@ -628,7 +631,8 @@ export default {
WaybillDetailReadOnly, WaybillDetailReadOnly,
TransLineAllPicker, TransLineAllPicker,
TransProductAllPicker, TransProductAllPicker,
AllMonthpayAccountPicker AllMonthpayAccountPicker,
TransProductMultipleAllPicker,
}, },
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

9
src/views/emis/emisWaybill/sendWaybillListNew.vue
View File

@ -75,7 +75,8 @@
<TransLineAllPicker v-model="queryParams.transLineType" isInitiated="true" ></TransLineAllPicker> <TransLineAllPicker v-model="queryParams.transLineType" isInitiated="true" ></TransLineAllPicker>
</el-form-item> </el-form-item>
<el-form-item label="产品类型" prop="productType"> <el-form-item label="产品类型" prop="productType">
<TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker> <!-- <TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker> -->
<TransProductMultipleAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductMultipleAllPicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -613,6 +614,8 @@ import { formatSearchStr,deepClone } from '@/utils/index'
import clip from '@/utils/clipboard' import clip from '@/utils/clipboard'
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue' import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue' import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
import TransProductMultipleAllPicker from "../EmisBaseTools/TransProductMultipleAllPicker.vue";
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue'; import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
export default { export default {
@ -643,7 +646,9 @@ export default {
WaybillDetailReadOnly, WaybillDetailReadOnly,
TransLineAllPicker, TransLineAllPicker,
TransProductAllPicker, TransProductAllPicker,
AllMonthpayAccountPicker AllMonthpayAccountPicker,
TransProductMultipleAllPicker
}, },
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',