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

Merge pull request '数据来源查询' (#207) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/207
This commit is contained in:
wuteng 2026-02-28 15:12:29 +08:00
commit 5f5311710f
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -270,7 +270,16 @@
<el-form-item :label="$t('现金客户')" prop="moneyUserId">
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" ></EmisMoneyUserPicker>
</el-form-item>
<el-form-item label="数据来源" prop="dataFrom">
<el-select v-model="queryParams.dataFrom" clearable placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_order_data_from"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
@ -704,7 +713,7 @@ export default {
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode','emis_order_data_from'
],
data() {
return {
@ -924,6 +933,7 @@ export default {
remark: null,
paymentStatus:null,
blVirtual:null,
dataFrom:null,
params:{
blSign:null,
expireNotSign:null,

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

@ -252,6 +252,16 @@
<el-form-item :label="$t('现金客户')" prop="moneyUserId">
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" @onChange="onMoneyUserChange"></EmisMoneyUserPicker>
</el-form-item>
<el-form-item label="数据来源" prop="dataFrom">
<el-select v-model="queryParams.dataFrom" clearable placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_order_data_from"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
@ -690,7 +700,7 @@ export default {
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode','emis_order_data_from'
],
data() {
return {
@ -892,6 +902,7 @@ export default {
delFlag: null,
remark: null,
blSign:null,
dataFrom:null,
params:{
expireNotSign:null,
problemQueryType:null,

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

@ -257,6 +257,16 @@
<el-form-item :label="$t('现金客户')" prop="moneyUserId">
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" @onChange="onMoneyUserChange"></EmisMoneyUserPicker>
</el-form-item>
<el-form-item label="数据来源" prop="dataFrom">
<el-select v-model="queryParams.dataFrom" clearable placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_order_data_from"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
@ -694,7 +704,7 @@ export default {
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode','emis_order_data_from'
],
data() {
return {
@ -898,6 +908,7 @@ export default {
delFlag: null,
remark: null,
blSign:null,
dataFrom:null,
params:{
expireNotSign:null,
problemQueryType:null,