Skip to content

J
jiedao-app-operator-master
Commit 248257b9 authored by zhoutong's avatar zhoutong
Browse files
Options

Merge branch 'release2.2' of... 

Merge branch 'release2.2' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2
parents a1a0d1a2 a63f4f2c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 213 additions and 100 deletions
src/views/ecw/exchangeRate/index.vue
View file @ 248257b9
...@@ -75,7 +75,8 @@ ...@@ -75,7 +75,8 @@
{{parseTime(row.expireDate)}} {{parseTime(row.expireDate)}}
</el-table-column> </el-table-column>
<el-table-column label="状态" v-slot="{row}" > <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>
<el-table-column :label="$t('备注')" prop="note"></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"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
...@@ -96,13 +97,13 @@ ...@@ -96,13 +97,13 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item :label="$t('币种1')" prop="sourceCurrencyId"> <el-form-item :label="$t('币种1')" prop="sourceCurrencyId">
<el-select v-model="form.sourceCurrencyId" :placeholder="$t('请选择币种')"> <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" /> :key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('币种2')" prop="targetCurrencyId"> <el-form-item :label="$t('币种2')" prop="targetCurrencyId">
<el-select v-model="form.targetCurrencyId" :placeholder="$t('请选择币种')"> <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" /> :key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
......
src/views/ecw/financial/selfNoReport.vue
View file @ 248257b9
This diff is collapsed.
src/views/ecw/financial/selfNoReportDetail.vue
View file @ 248257b9
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的仓')"> <el-form-item :label="$t('目的仓')">
<el-select v-model="queryParams.dstWarehouseId" :placeholder="$t('请选择')" clearable> <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择')" clearable>
<el-option <el-option
v-for="item in importWarehouseList" v-for="item in importWarehouseList"
:key="item.id" :key="item.id"
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<el-table-column :label="$t('运输方式') + '/' + $t('目的地')"> <el-table-column :label="$t('运输方式') + '/' + $t('目的地')">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
/{{row.objectiveName}} /{{row.dstWarehouseName}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('仓库实测')"> <el-table-column :label="$t('仓库实测')">
......
src/views/ecw/order/exception/index.vue
View file @ 248257b9
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
@keyup.enter.native="handleQuery" clearable /> @keyup.enter.native="handleQuery" clearable />
</el-form-item> </el-form-item>
<el-form-item :label="$t('跟进客服')" prop="salesmanId"> <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-option v-for="dict in followUpList" :key="parseInt(dict.id)" :label="dict.nickname" :value="parseInt(dict.id)"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -112,30 +112,34 @@ ...@@ -112,30 +112,34 @@
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="4"> <el-col :span="1.5">
<el-button type="primary" size="mini" @click="exportSearch" v-hasPermi="['ecw:exception:export']">导出</el-button> <el-button type="primary" size="mini" @click="exportSearch" v-hasPermi="['ecw:exception:export']">导出</el-button>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="17.5">
<el-descriptions :column="4"> <div class="total" v-if="totalData">
<el-descriptions-item :label="$t('箱数')"> <div :label="$t('箱数')">
<div>{{$t('箱数')}}:</div>
<span v-if="totalData.totalNum">{{totalData.totalNum+$t('箱')}}</span> <span v-if="totalData.totalNum">{{totalData.totalNum+$t('箱')}}</span>
<span v-else></span> <span v-else></span>
</el-descriptions-item> </div>
<el-descriptions-item :label="$t('测量方数汇总')"> <div>
<div>{{$t('测量方数汇总')}}:</div>
<span v-if="totalData.totalVolume">{{totalData.totalVolume}}m³</span> <span v-if="totalData.totalVolume">{{totalData.totalVolume}}m³</span>
<span v-else></span> <span v-else></span>
</el-descriptions-item> </div>
<el-descriptions-item :label="$t('收费方数汇总')"> <div>
<div>{{$t('收费方数汇总')}}:</div>
<span v-if="totalData.totalChargeVolume">{{totalData.totalChargeVolume}}m³</span> <span v-if="totalData.totalChargeVolume">{{totalData.totalChargeVolume}}m³</span>
<span v-else></span> <span v-else></span>
</el-descriptions-item> </div>
<el-descriptions-item :label="$t('重量汇总')"> <div>
<div>{{$t('重量汇总')}}:</div>
<span v-if="totalData.totalWeight">{{totalData.totalWeight}}KG</span> <span v-if="totalData.totalWeight">{{totalData.totalWeight}}KG</span>
<span v-else></span> <span v-else></span>
</el-descriptions-item> </div>
</el-descriptions> </div>
</el-col> </el-col>
<el-col :span="4"><right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar></el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
...@@ -389,3 +393,15 @@ export default { ...@@ -389,3 +393,15 @@ export default {
} }
} }
</script> </script>
<style scoped>
.total{
display:flex;
align-items: center;
}
.total div{
margin-right:10px;
font-size:14px;
display:flex;
align-items: center;
}
</style>
src/views/ecw/pickupLoc/index.vue
View file @ 248257b9
...@@ -47,7 +47,11 @@ ...@@ -47,7 +47,11 @@
<el-table v-loading="loading" :data="list" @sort-change="sortChange"> <el-table v-loading="loading" :data="list" @sort-change="sortChange">
<el-table-column :label="$t('序号')" type="index" width="50" /> <el-table-column :label="$t('序号')" type="index" width="50" />
<el-table-column :label="$t('提货点名称')" align="center" :prop="$l('title')" /> <el-table-column :label="$t('提货点名称')" align="center" >
<template v-slot="{row}">
{{$l(row,'title')}}
</template>
</el-table-column>
<el-table-column :label="$t('排序')" sortable="custom" align="center" prop="sort" /> <el-table-column :label="$t('排序')" sortable="custom" align="center" prop="sort" />
<el-table-column :label="$t('地区')" align="center" prop="countryId"> <el-table-column :label="$t('地区')" align="center" prop="countryId">
...@@ -132,10 +136,12 @@ import { createPickupLoc, updatePickupLoc, deletePickupLoc, getPickupLoc, getPic ...@@ -132,10 +136,12 @@ import { createPickupLoc, updatePickupLoc, deletePickupLoc, getPickupLoc, getPic
import {CommonStatusEnum} from '@/utils/constants' import {CommonStatusEnum} from '@/utils/constants'
import { getDictDatas, DICT_TYPE } from '@/utils/dict' import { getDictDatas, DICT_TYPE } from '@/utils/dict'
import { getListTree } from "@/api/ecw/region"; import { getListTree } from "@/api/ecw/region";
import Template from "@/views/cms/template/index.vue";
export default { export default {
name: "PickupLoc", name: "PickupLoc",
components: { components: {
Template
}, },
data() { data() {
return { return {
...@@ -229,7 +235,7 @@ export default { ...@@ -229,7 +235,7 @@ export default {
getCountryName(countryId) { getCountryName(countryId) {
for(let index in this.countryList) { for(let index in this.countryList) {
let country = this.countryList[index]; let country = this.countryList[index];
if(country.id == countryId) return $l(country, 'title'); if(country.id == countryId) return this.$l(country, 'title');
} }
}, },
......
src/views/ecw/region/index.vue
View file @ 248257b9
...@@ -108,41 +108,53 @@ ...@@ -108,41 +108,53 @@
<el-form-item :label="$t('显示顺序')" prop="sort"> <el-form-item :label="$t('显示顺序')" prop="sort">
<el-input v-model="form.sort" :placeholder="$t('请输入显示顺序')" /> <el-input v-model="form.sort" :placeholder="$t('请输入显示顺序')" />
</el-form-item> </el-form-item>
<div v-if="(form.type==2||form.type==3)&&isSecond"> <!-- <div v-if="(form.type==2||form.type==3)&&isSecond">-->
<el-form-item :label="$t('出口运费/全包价币种')" prop="exportCurrency1"> <!-- <el-form-item :label="$t('出口运费/全包价币种')" prop="exportCurrency1">-->
<el-select v-model="form.exportCurrency1" :placeholder="$t('请选择')"> <!-- <el-select v-model="form.exportCurrency1" :placeholder="$t('请选择')">-->
<el-option v-for="dict in currencyList " <!-- <el-option v-for="dict in currencyList "-->
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/> <!-- :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('出口清关费币种')" prop="exportCurrency2"> <!-- <el-form-item :label="$t('出口清关费币种')" prop="exportCurrency2">-->
<el-select v-model="form.exportCurrency2" :placeholder="$t('请选择')"> <!-- <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('请选择')">
<el-option v-for="dict in currencyList " <el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/> :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('出口额外费用币种')" prop="出口额外费用币种"> <el-form-item :label="$t('进口清关费币种')" prop="importCurrency2">
<el-select v-model="form.exportCurrency3" :placeholder="$t('请选择')"> <el-select v-model="form.importCurrency2" :placeholder="$t('请选择')">
<el-option v-for="dict in currencyList " <el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/> :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> <el-form-item :label="$t('进口额外费用主币种')" prop="importCurrency3">
<div v-if="(form.type==1||form.type==3)&&isSecond"> <el-select v-model="form.importCurrency3" :placeholder="$t('请选择')">
<el-form-item :label="$t('进口运费/全包价币种')" prop="importCurrency1">
<el-select v-model="form.importCurrency1" :placeholder="$t('请选择')">
<el-option v-for="dict in currencyList " <el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/> :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('进口清关费币种')" prop="importCurrency2"> <el-form-item :label="$t('进口额外费用副币种')" prop="importCurrency4">
<el-select v-model="form.importCurrency2" :placeholder="$t('请选择')"> <el-select v-model="form.importCurrency4" :placeholder="$t('请选择')">
<el-option v-for="dict in currencyList " <el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/> :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('进口额外费用币种')" prop="importCurrency3"> <el-form-item :label="$t('应收额币种')" prop="importCurrency5">
<el-select v-model="form.importCurrency3" :placeholder="$t('请选择')"> <el-select v-model="form.importCurrency5" :placeholder="$t('请选择')">
<el-option v-for="dict in currencyList " <el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/> :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
</el-select> </el-select>
......
src/views/ecw/warehouse/index.vue
View file @ 248257b9
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的港服务')"> <el-form-item :label="$t('目的港服务')">
<el-checkbox-group v-model="lineform.otherService"> <el-checkbox-group v-model="lineform.otherService">
<el-checkbox v-for="item in endServiceGroup" :label="item.id" :key="item.id" :value="item.id" v-show="isShowError(item)"> {{item.text}}</el-checkbox> <el-checkbox @click.native="changeOtherService(item.id)" :checked="lineform.otherService.includes(item.id)" v-for="item in endServiceGroup" :label="item.id " :key="item.id" :value="item.id" v-show="isShowError(item)"> {{item.text}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item v-if="['3','4'].includes(lineform.transportType)" label="空运提单制作节点"> <el-form-item v-if="['3','4'].includes(lineform.transportType)" label="空运提单制作节点">
...@@ -436,7 +436,6 @@ export default { ...@@ -436,7 +436,6 @@ export default {
RoutersSelectorWithoutChannel RoutersSelectorWithoutChannel
}, },
data() { data() {
var areaCheck = (rule, value, callback) => { var areaCheck = (rule, value, callback) => {
if(!this.form.zhou) { if(!this.form.zhou) {
callback(new Error(this.$t('请选择大洲'))); callback(new Error(this.$t('请选择大洲')));
...@@ -548,7 +547,7 @@ export default { ...@@ -548,7 +547,7 @@ export default {
// 表单参数 // 表单参数
form: {checkList:[],}, form: {checkList:[],},
ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[]}, ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[]},
lineform: {otherService:[],isClientShow:1,makeBillNode:'2',controlStatus:'',currencyUnit:''}, lineform: {otherService:[],isClientShow:1,makeBillNode:'2',controlStatus:'0',currencyUnit:1},
startName:'', startName:'',
destName:'', destName:'',
...@@ -685,6 +684,14 @@ export default { ...@@ -685,6 +684,14 @@ export default {
this.getContinentsList(); this.getContinentsList();
}, },
methods: { methods: {
changeOtherService(val){
console.log(val,'val')
if(val === '2' && !this.lineform.otherService.includes('10')){
this.lineform.otherService.push('10');
}
},
getDictDatas,
getDictDataLabel, getDictDataLabel,
setTpl(type){ setTpl(type){
this.ladingform.titleZh = tpl[type] this.ladingform.titleZh = tpl[type]
...@@ -861,8 +868,9 @@ export default { ...@@ -861,8 +868,9 @@ export default {
this.serviceOpen = true; this.serviceOpen = true;
this.lineform.lineId = row.lineId; this.lineform.lineId = row.lineId;
this.lineform.transportType = row.transportType; this.lineform.transportType = row.transportType;
this.lineform.currencyUnit = row.currencyUnit === 0 ? '' : row.currencyUnit this.lineform.currencyUnit = row.currencyUnit ? row.currencyUnit : 1
this.lineform.controlStatus = row.controlStatus this.lineform.controlStatus = row.controlStatus ? row.controlStatus : 0
console.log(row,'row')
}, },
submitLineForm() { submitLineForm() {
......
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