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

Merge pull request 'master-dev' (#153) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/153
This commit is contained in:
wuteng 2025-12-01 15:19:47 +08:00
commit 1c9a18e6b9
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
View File

@ -91,9 +91,9 @@
<EmisTmsSiteBatchSupplierPicker :placeholder="$t('请选择')" :startSiteCode="form.startSiteCode" :nextSiteCode="form.nextSiteCode" @onChange="onSupplierSelect" v-model="form.supplierCode" ></EmisTmsSiteBatchSupplierPicker> <EmisTmsSiteBatchSupplierPicker :placeholder="$t('请选择')" :startSiteCode="form.startSiteCode" :nextSiteCode="form.nextSiteCode" @onChange="onSupplierSelect" v-model="form.supplierCode" ></EmisTmsSiteBatchSupplierPicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item :label="$t('运输号')" prop="carNo"> <el-form-item :label="$t('运输号')" prop="carNo">
<el-input v-model="form.carNo" clearable="" placeholder="车牌号/船次号/提单号" @change="calcBatchName"></el-input> <el-input v-model="form.carNo" clearable="" placeholder="同行单号/订单号/车牌号/船次号/提单号" @change="calcBatchName"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

17
src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
View File

@ -8,6 +8,7 @@
<el-radio-group class="query-label" v-model="queryOrderType"> <el-radio-group class="query-label" v-model="queryOrderType">
<el-radio label="1">运单号</el-radio> <el-radio label="1">运单号</el-radio>
<el-radio label="0">批次号</el-radio> <el-radio label="0">批次号</el-radio>
<el-radio label="2">运输号</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<XdTextareaInput <XdTextareaInput
@ -52,13 +53,13 @@
<el-form-item label="下一网点" prop="nextSiteCode"> <el-form-item label="下一网点" prop="nextSiteCode">
<EmisSiteSimplePicker :placeholder="$t('请选择')" v-model="queryParams.nextSiteCode" ></EmisSiteSimplePicker> <EmisSiteSimplePicker :placeholder="$t('请选择')" v-model="queryParams.nextSiteCode" ></EmisSiteSimplePicker>
</el-form-item> </el-form-item>
<el-form-item label="运输号" prop="carNo"> <!-- <el-form-item label="运输号" prop="carNo">
<el-input <el-input
v-model="queryParams.carNo" v-model="queryParams.carNo"
:placeholder="$t('运输号')" :placeholder="$t('运输号')"
clearable clearable
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="目的国" prop="destCountry"> <el-form-item label="目的国" prop="destCountry">
<CountryPicker :placeholder="$t('目的国')" v-model="queryParams.destCountry" ></CountryPicker> <CountryPicker :placeholder="$t('目的国')" v-model="queryParams.destCountry" ></CountryPicker>
</el-form-item> </el-form-item>
@ -467,9 +468,15 @@ export default {
if(this.queryOrderType=='1'){ if(this.queryOrderType=='1'){
rqParams.params.billCode=this.queryParams.queryKey; rqParams.params.billCode=this.queryParams.queryKey;
rqParams.batchNo=null; rqParams.batchNo=null;
rqParams.carNo=null;
}else if(this.queryOrderType=='2'){
rqParams.carNo=this.queryParams.queryKey;
rqParams.batchNo=null;
rqParams.params.billCode=null;
}else{ }else{
rqParams.batchNo=this.queryParams.queryKey; rqParams.batchNo=this.queryParams.queryKey;
rqParams.params.billCode=null; rqParams.params.billCode=null;
rqParams.carNo=null;
} }
}else{ }else{
if(this.queryETDType=='2'){ if(this.queryETDType=='2'){
@ -492,9 +499,15 @@ export default {
if(this.queryOrderType=='1'){ if(this.queryOrderType=='1'){
this.queryParams.params.billCode=this.queryParams.queryKey; this.queryParams.params.billCode=this.queryParams.queryKey;
this.queryParams.batchNo=null; this.queryParams.batchNo=null;
this.queryParams.carNo=null;
}else if(this.queryOrderType=='2'){
this.queryParams.carNo=this.queryParams.queryKey;
this.queryParams.batchNo=null;
this.queryParams.params.billCode=null;
}else{ }else{
this.queryParams.batchNo=this.queryParams.queryKey; this.queryParams.batchNo=this.queryParams.queryKey;
this.queryParams.params.billCode=null; this.queryParams.params.billCode=null;
this.queryParams.carNo=null;
} }