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

Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

Browse Source
This commit is contained in:
liuyp 2024-06-19 19:24:55 +08:00
commit 287e768219
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
View File

@ -2,19 +2,20 @@
<div >
<el-row :gutter="0">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<!-- <el-col :span="12">
<el-col :span="12">
<el-form-item label="所属国家" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属线路" prop="lineCode">
<TransLinePicker v-model="form.lineCode" :countryCode="form.country"></TransLinePicker>
<TransLinePicker v-model="form.transLineCode" :countryCode="form.country"></TransLinePicker>
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="12">
<el-form-item label="产品类型" prop="prodCode">
<TransProductCasPicker placeholder="产品类型" v-model="form.prodCodeSelArr" @onChange="onProductChange" ></TransProductCasPicker>
<!-- <TransProductCasPicker placeholder="产品类型" v-model="form.prodCodeSelArr" @onChange="onProductChange" ></TransProductCasPicker> -->
<TransProductPicker placeholder="产品类型" v-model="form.prodCode" :transLineCode="form.transLineCode"></TransProductPicker>
</el-form-item>
</el-col>
<el-col :span="12">
@ -91,6 +92,10 @@ import { listEmisSpecialCalcWeight, getEmisSpecialCalcWeight, delEmisSpecialCalc
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
import {addDateTimeByDay,dateToStr} from '@/utils/custom'
export default {
@ -100,7 +105,7 @@ export default {
type:Number,
}
},
components: { CountryPicker,TransLinePicker,TransProductCasPicker },
components: { CountryPicker,TransLinePicker,TransProductCasPicker,TransProductPicker },
dicts: [
'sys_normal_disable',
'emis_take_weight_method',
@ -182,7 +187,7 @@ export default {
this.form = {
id: null,
country: null,
lineCode: null,
transLineCode: null,
prodCodeSelArr:null,
prodCode: null,
prodName: null,

28
src/views/emis/emisSpecialCalcWeight/index.vue
View File

@ -1,19 +1,21 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="country">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="8" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="所属国家" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" ></CountryPicker>
</el-form-item>
<!-- <el-form-item label="" prop="lineCode">
<TransLinePicker :placeholder="$t('所属线路')" v-model="queryParams.lineCode" :countryCode="queryParams.country"></TransLinePicker>
</el-form-item> -->
<!-- @onChange="handleQuery" -->
<!-- @change="handleQuery" -->
<el-form-item :label="$t('所属线路')" prop="transLineCode">
<TransLinePicker :placeholder="$t('所属线路')" v-model="queryParams.transLineCode" :countryCode="queryParams.country" @onChange="handleQuery"></TransLinePicker>
</el-form-item>
<el-form-item label="产品类型" prop="prodCodeSelArr">
<!-- <el-form-item label="产品类型" prop="prodCodeSelArr">
<TransProductCasPicker placeholder="产品类型" v-model="queryParams.prodCodeSelArr" :countryCode="queryParams.country" ></TransProductCasPicker>
</el-form-item> -->
<el-form-item label="产品类型" prop="prodCode">
<TransProductPicker placeholder="产品类型" v-model="queryParams.prodCode" :transLineCode="queryParams.transLineCode" @onChange="handleQuery"></TransProductPicker>
</el-form-item>
<el-form-item label="取重方式" prop="carryType">
<el-select v-model="queryParams.carryType" :placeholder="$t('取重方式')" clearable >
<el-option
@ -27,14 +29,14 @@
</SearchForm>
<XdTable
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border stripe
size="small"
size="mini"
:data="emisSpecialCalcWeightList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
@ -100,11 +102,13 @@
</template>
</el-table-column>
<el-table-column :label="$t('产品类型')" align="left" prop="prodName" min-width="100" >
<el-table-column :label="$t('产品类型')" align="left" prop="prodName" min-width="100" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.lineName}}/{{scope.row.prodName}}</div>
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.prodName}}</div>
</template>
</el-table-column>
<el-table-column label="所属路线" align="center" prop="lineName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column label="所属国家" align="center" prop="countryName" min-width="100" />
<el-table-column :label="$t('取重方式')" align="center" prop="carryType" width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_take_weight_method" :value="scope.row.carryType"/>

5
src/views/system/updater/appUpdater.vue
View File

@ -132,7 +132,10 @@ export default {
let str=postData.whiteDeviceIds;
str = str.replace(/[ ]/g,"")
str = str.replace(/[\r\n]/g,"");
let wdis=str.split(",");
let wdisTmp=str.split(",");
const wdis = wdisTmp.filter(el => {
return el != null && el != '';
});
if(wdis&&wdis.length>0) {
postData.whiteDeviceIds=wdis;
}