Skip to content

J
jiedao-app-operator-master
Commit 7cd4ffb5 authored by 我在何方's avatar 我在何方
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 71a9e8be ab42e26c
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 53 deletions
src/views/ecw/exchangeRate/index.vue
View file @ 7cd4ffb5
...@@ -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 @ 7cd4ffb5
...@@ -153,13 +153,10 @@ import { getCurrencyPage } from "@/api/ecw/currency"; ...@@ -153,13 +153,10 @@ import { getCurrencyPage } from "@/api/ecw/currency";
import {getWarehouseList} from '@/api/ecw/warehouse' import {getWarehouseList} from '@/api/ecw/warehouse'
import store from "@/store"; import store from "@/store";
import {boxSettlementPage, exportSettlementExcel} from "@/api/ecw/box"; import {boxSettlementPage, exportSettlementExcel} from "@/api/ecw/box";
import {DICT_TYPE} from "@/utils/dict";
import {getCountryListAll} from "@/api/ecw/country";
import {getListTree} from "@/api/ecw/region"; import {getListTree} from "@/api/ecw/region";
import Template from "@/views/cms/template/index.vue";
export default { export default {
components: {Template}, name: 'EcwFinancialSelfnoreport',
data() { data() {
return { return {
loading: false, // 是否加载中 loading: false, // 是否加载中
...@@ -199,9 +196,6 @@ export default { ...@@ -199,9 +196,6 @@ export default {
} }
}, },
computed: { computed: {
DICT_TYPE() {
return DICT_TYPE
},
permissions(){ permissions(){
return store.getters.permissions return store.getters.permissions
}, },
...@@ -255,16 +249,8 @@ export default { ...@@ -255,16 +249,8 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.$refs.queryForm.validate((valid) => { this.$refs.queryForm.validate().then(() => {
console.log({valid})
if(!valid) return
this.queryParams.page = 1; this.queryParams.page = 1;
if(!this.queryParams.destCountryId){
return this.$message.error(this.$t('请选择目的国'))
}
if(!this.queryParams.startWarehouseIdList || !this.queryParams.startWarehouseIdList.length){
return this.$message.error(this.$t('请选择始发仓'))
}
this.getList(); this.getList();
}) })
...@@ -276,13 +262,15 @@ export default { ...@@ -276,13 +262,15 @@ export default {
}, },
// 导出搜索 // 导出搜索
handleExport(){ handleExport(){
this.exporting = true this.$refs.queryForm.validate().then(() => {
let params = {...this.queryParams} this.exporting = true
this.addBeginAndEndTime(params, this.dateFilter, "JsDate", false); let params = {...this.queryParams}
exportSettlementExcel(params).then(res => { this.addBeginAndEndTime(params, this.dateFilter, "JsDate", false);
this.$download.excel(res, 'shipment-summary.xls'); exportSettlementExcel(params).then(res => {
}).finally(() => { this.$download.excel(res, 'shipment-summary.xls');
this.exporting = false }).finally(() => {
this.exporting = false
})
}) })
} }
}, },
......
src/views/ecw/region/index.vue
View file @ 7cd4ffb5
...@@ -108,26 +108,26 @@ ...@@ -108,26 +108,26 @@
<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 " <!-- <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="出口额外费用币种">-->
<el-select v-model="form.exportCurrency3" :placeholder="$t('请选择')"> <!-- <el-select v-model="form.exportCurrency3" :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> <!-- </div>-->
<div v-if="(form.type==1||form.type==3)&&isSecond"> <div v-if="(form.type==1||form.type==3)&&isSecond">
<el-form-item :label="$t('进口运费/全包价币种')" prop="importCurrency1"> <el-form-item :label="$t('进口运费/全包价币种')" prop="importCurrency1">
<el-select v-model="form.importCurrency1" :placeholder="$t('请选择')"> <el-select v-model="form.importCurrency1" :placeholder="$t('请选择')">
...@@ -141,12 +141,18 @@ ...@@ -141,12 +141,18 @@
: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="importCurrency3">
<el-select v-model="form.importCurrency3" :placeholder="$t('请选择')"> <el-select v-model="form.importCurrency3" :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="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> </div>
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
<!-- <el-form-item :label="$t('部门状态')" prop="status">--> <!-- <el-form-item :label="$t('部门状态')" prop="status">-->
......
src/views/ecw/warehouse/index.vue
View file @ 7cd4ffb5
...@@ -302,8 +302,8 @@ ...@@ -302,8 +302,8 @@
</el-checkbox-group> </el-checkbox-group>
</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