Skip to content

J
jiedao-app-operator-master
Commit 0c8c339d authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

Merge remote-tracking branch 'origin/release2.2' into release2.2

parents 86164cf2 bf74d34f
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 25 deletions
src/views/ecw/exchangeRate/index.vue
View file @ 0c8c339d
......@@ -75,7 +75,8 @@
{{parseTime(row.expireDate)}}
</el-table-column>
<el-table-column label="状态" v-slot="{row}" >
{{new Date(row.expireDate).getTime() >= new Date().getTime() ? '正常' : '已过期'}}
<span v-if="new Date(row.expireDate).getTime() >= new Date().getTime()">正常</span>
<span v-else style="color: red" >已过期</span>
</el-table-column>
<el-table-column :label="$t('备注')" prop="note"></el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
......@@ -96,13 +97,13 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item :label="$t('币种1')" prop="sourceCurrencyId">
<el-select v-model="form.sourceCurrencyId" :placeholder="$t('请选择币种')">
<el-option :disabled="dict.status === 1" @click.native="() => form.sourceCurrencyCode = dict.fuhao" v-for="dict in currencyList"
<el-option :disabled="dict.status === 1 || form.targetCurrencyId === dict.id" @click.native="() => form.sourceCurrencyCode = dict.fuhao" v-for="dict in currencyList"
:key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" />
</el-select>
</el-form-item>
<el-form-item :label="$t('币种2')" prop="targetCurrencyId">
<el-select v-model="form.targetCurrencyId" :placeholder="$t('请选择币种')">
<el-option :disabled="dict.status === 1" @click.native="() => form.targetCurrencyCode = dict.fuhao" v-for="dict in currencyList"
<el-option :disabled="dict.status === 1 || form.sourceCurrencyId === dict.id" @click.native="() => form.targetCurrencyCode = dict.fuhao" v-for="dict in currencyList"
:key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" />
</el-select>
</el-form-item>
......
src/views/ecw/order/exception/index.vue
View file @ 0c8c339d
......@@ -42,7 +42,7 @@
@keyup.enter.native="handleQuery" clearable />
</el-form-item>
<el-form-item :label="$t('跟进客服')" prop="salesmanId">
<el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择')">
<el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择')" clearable>
<el-option v-for="dict in followUpList" :key="parseInt(dict.id)" :label="dict.nickname" :value="parseInt(dict.id)"/>
</el-select>
</el-form-item>
......
src/views/ecw/region/index.vue
View file @ 0c8c339d
......@@ -108,26 +108,26 @@
<el-form-item :label="$t('显示顺序')" prop="sort">
<el-input v-model="form.sort" :placeholder="$t('请输入显示顺序')" />
</el-form-item>
<div v-if="(form.type==2||form.type==3)&&isSecond">
<el-form-item :label="$t('出口运费/全包价币种')" prop="exportCurrency1">
<el-select v-model="form.exportCurrency1" :placeholder="$t('请选择')">
<el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('出口清关费币种')" prop="exportCurrency2">
<el-select v-model="form.exportCurrency2" :placeholder="$t('请选择')">
<el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('出口额外费用币种')" prop="出口额外费用币种">
<el-select v-model="form.exportCurrency3" :placeholder="$t('请选择')">
<el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select>
</el-form-item>
</div>
<!-- <div v-if="(form.type==2||form.type==3)&&isSecond">-->
<!-- <el-form-item :label="$t('出口运费/全包价币种')" prop="exportCurrency1">-->
<!-- <el-select v-model="form.exportCurrency1" :placeholder="$t('请选择')">-->
<!-- <el-option v-for="dict in currencyList "-->
<!-- :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('出口清关费币种')" prop="exportCurrency2">-->
<!-- <el-select v-model="form.exportCurrency2" :placeholder="$t('请选择')">-->
<!-- <el-option v-for="dict in currencyList "-->
<!-- :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('出口额外费用币种')" prop="出口额外费用币种">-->
<!-- <el-select v-model="form.exportCurrency3" :placeholder="$t('请选择')">-->
<!-- <el-option v-for="dict in currencyList "-->
<!-- :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </div>-->
<div v-if="(form.type==1||form.type==3)&&isSecond">
<el-form-item :label="$t('进口运费/全包价币种')" prop="importCurrency1">
<el-select v-model="form.importCurrency1" :placeholder="$t('请选择')">
......@@ -141,12 +141,18 @@
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('进口额外费用币种')" prop="importCurrency3">
<el-form-item :label="$t('进口额外费用主币种')" prop="importCurrency3">
<el-select v-model="form.importCurrency3" :placeholder="$t('请选择')">
<el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('进口额外费用副币种')" prop="importCurrency4">
<el-select v-model="form.importCurrency4" :placeholder="$t('请选择')">
<el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select>
</el-form-item>
</div>
<!-- <el-col :span="12">-->
<!-- <el-form-item :label="$t('部门状态')" prop="status">-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment