Merge pull request 'master-客户管理' (#43) from master-客户管理 into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/43
This commit is contained in:
wuteng
commit
dfbdf2c126
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<XdPageContainer >
|
||||
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
|
||||
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<el-col :span="9">
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
@ -107,6 +107,19 @@
|
||||
<el-form-item label="进仓仓库" prop="intoWarehouseCode">
|
||||
<EmisSiteSimplePicker1 v-model="queryParams.params.intoWarehouseCode"></EmisSiteSimplePicker1>
|
||||
</el-form-item>
|
||||
<el-form-item label="目的国" prop="receiveCountry">
|
||||
<CountryPicker0 v-model="queryParams.params.receiveCountry" :placeholder="$t('目的国')" @onChange="handleQuery"></CountryPicker0>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="寄件国" prop="sendCountry">
|
||||
<CountryPicker1 v-model="queryParams.params.sendCountry" :placeholder="$t('目的国')" ></CountryPicker1>
|
||||
</el-form-item>
|
||||
<el-form-item label="线路" prop="transLineType">
|
||||
<TransLineAllPicker v-model="queryParams.params.transLineType" isInitiated="true" ></TransLineAllPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品类型" prop="productType">
|
||||
<TransProductAllPicker placeholder="产品类型" v-model="queryParams.params.productType" :transLineCode="queryParams.params.transLineType" ></TransProductAllPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
@ -221,6 +234,17 @@
|
||||
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" :show-overflow-tooltip="true"/>
|
||||
<!-- <el-table-column :label="$t('预计进仓日期')" align="center" prop="entryDate" min-width="170" :show-overflow-tooltip="true"/> -->
|
||||
<!-- <el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="150" /> -->
|
||||
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope" v-if="scope.row.waybillDetail.transLineTypeName">
|
||||
{{scope.row.waybillDetail.transLineTypeName}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{scope.row.waybillDetail.productTypeName}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('确认状态')" align="center" prop="confirmStatus" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.confirmStatus=='0'" type="info">未确认</el-tag>
|
||||
@ -301,11 +325,14 @@ import emisWarehouseInForm from '@/views/emis/emisWarehouseIn/emisWarehouseInFor
|
||||
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
|
||||
|
||||
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
|
||||
|
||||
import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
|
||||
import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
|
||||
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
|
||||
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
|
||||
|
||||
export default {
|
||||
name: "emisWarehouseIn",
|
||||
components: { elDateSimplePicker,elDateAdvPicker,emisWarehouseInForm,EmpNamePicker1,EmisSiteSimplePicker1 },
|
||||
components: { elDateSimplePicker,elDateAdvPicker,emisWarehouseInForm,EmpNamePicker1,EmisSiteSimplePicker1,CountryPicker0,CountryPicker1,TransLineAllPicker,TransProductAllPicker },
|
||||
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear','emis_order_status',
|
||||
'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'
|
||||
@ -376,7 +403,11 @@ export default {
|
||||
orderStatus:null,
|
||||
sendSiteCode:null,
|
||||
blUploadGoodsPic:null,
|
||||
intoWarehouseCode:null
|
||||
intoWarehouseCode:null,
|
||||
receiveCountry:null,
|
||||
sendCountry:null,
|
||||
transLineType:null,
|
||||
productType:null,
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
@ -26,6 +26,12 @@
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="下单时间" prop="createTime" label-width="100px" >
|
||||
<div slot="label" style="text-align: left;">
|
||||
<el-radio-group class="query-label" v-model="queryParams.params.queryDateType">
|
||||
<el-radio :key="1" label="1">下单时间</el-radio>
|
||||
<el-radio :key="2" label="2">预计入仓时间</el-radio>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -160,11 +166,6 @@
|
||||
<el-option key="oms" label="oms" value="oms"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="预计入仓时间" prop="beginPickRange" label-width="100px" >
|
||||
<elDateAdvPicker1 clearable v-model="beginPickRange" ></elDateAdvPicker1>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</SearchForm>
|
||||
@ -776,7 +777,8 @@ export default {
|
||||
dataFrom:null,
|
||||
params:{
|
||||
queryOrderType:1,
|
||||
queryOrderDateType:1
|
||||
queryOrderDateType:1,
|
||||
queryDateType:'1',
|
||||
}
|
||||
},
|
||||
};
|
||||
@ -834,8 +836,14 @@ export default {
|
||||
this.queryParams.orderSn= null;
|
||||
this.queryParams.intoWarehouseBillCode=this.queryParams.queryKey;
|
||||
}
|
||||
let qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate");
|
||||
qParam = this.addDateRange(qParam, this.beginPickRange,"PickStartDate");
|
||||
let qParam ={...this.queryParams};
|
||||
if(this.queryParams.params.queryDateType=='1'){
|
||||
qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate");
|
||||
qParam = this.addDateRange(this.queryParams,[],'PickStartDate')
|
||||
}else{
|
||||
qParam = this.addDateRange(qParam, this.dateTimeRange,"PickStartDate");
|
||||
qParam = this.addDateRange(qParam, [],"orderDate");
|
||||
}
|
||||
listEmisOrder(qParam).then(response => {
|
||||
this.emisWaybillList = response.rows;
|
||||
this.total = response.total;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user