Skip to content

J
jiedao-app-operator-master
Commit bf74d34f authored by 邓春圆's avatar 邓春圆
Browse files
Options

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

parents 486f4d8f 8976bc17
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 48 deletions
src/views/ecw/financial/selfNoReport.vue
View file @ bf74d34f
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
inline inline
class="card" class="card"
> >
<el-form-item :label="$t('自编号')"> <el-form-item :label="$t('自编号')" prop="selfNo">
<el-input v-model="queryParams.selfNo" clearable></el-input> <el-input v-model="queryParams.selfNo" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('始发仓')"> <el-form-item :label="$t('始发仓')" :rules="{required: true, message: $t('请选择始发仓')}" prop="startWarehouseIdList">
<el-select v-model="queryParams.startWarehouseIdList" :placeholder="$t('请选择')" clearable> <el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择')" clearable>
<el-option <el-option
v-for="item in exportWarehouseList" v-for="item in exportWarehouseList"
:key="item.id" :key="item.id"
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的国')" :rules="{required: true}"> <el-form-item :label="$t('目的国')" :rules="{required: true, message: $t('请选择目的国')}" prop="destCountryId">
<el-select v-model="queryParams.destCountryId" :placeholder="$t('请选择')" filterable default-first-option> <el-select v-model="queryParams.destCountryId" :placeholder="$t('请选择')" filterable default-first-option>
<el-option <el-option
v-for="item in countryList" v-for="item in countryList"
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的仓')"> <el-form-item :label="$t('目的仓')" prop="destWarehouseIdList">
<el-select v-model="queryParams.destWarehouseId" :placeholder="queryParams.destCountryId ? $t('请选择') : $t('请先选择目的国')" clearable> <el-select v-model="queryParams.destWarehouseIdList" multiple :placeholder="queryParams.destCountryId ? $t('请选择') : $t('请先选择目的国')" clearable>
<el-option <el-option
v-for="item in importWarehouseList" v-for="item in importWarehouseList"
:key="item.id" :key="item.id"
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('自编号状态')"> <el-form-item :label="$t('自编号状态')" prop="status">
<dict-selector :type="DICT_TYPE.BOX_ORDER_SHIPMENT_STATE" v-model="queryParams.status" clearable></dict-selector> <dict-selector :type="DICT_TYPE.BOX_ORDER_SHIPMENT_STATE" v-model="queryParams.status" clearable></dict-selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('结算时间')" > <el-form-item :label="$t('结算时间')" prop="dateFilter">
<el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-"
:start-placeholder="$t('开始日期')" :start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')" :end-placeholder="$t('结束日期')"
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('是否结算')"> <el-form-item :label="$t('是否结算')" prop="slStatus">
<dict-selector :type="DICT_TYPE.SETTLEMENT_STATUS" v-model="queryParams.slStatus" clearable></dict-selector> <dict-selector :type="DICT_TYPE.SETTLEMENT_STATUS" v-model="queryParams.slStatus" clearable></dict-selector>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -81,20 +81,56 @@ ...@@ -81,20 +81,56 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('应收款(Accounts receivable)')" align="center" prop="summaryInfo.receivableTotalFeeGroup"></el-table-column> <el-table-column :label="$t('应收款(Accounts receivable)')" align="center" prop="summaryInfo.receivableTotalFeeGroup"></el-table-column>
<el-table-column :label="$t('received in + 目的国国家(目的地实收)')" align="center" prop=""> <el-table-column :label="'received in ' + (dstCountryName || $t('目的国')) + `(${$t('目的地实收')})`" align="center" prop="">
<el-table-column :label="$t('运费')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup"></el-table-column> <el-table-column :label="$t('运费')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup">
<el-table-column :label="$t('清关费')" prop="summaryInfo.netReceiptsCollectClearanceFeeGroup"></el-table-column> <template slot-scope="{row}">
<el-table-column :label="$t('额外费用')" prop="summaryInfo.netReceiptsCollectOtherFeeGroup"></el-table-column> {{row.summaryInfo.totalNetReceiptsCollectFreightFee}}{{row.summaryInfo.netReceiptsCollectFreightFeeCurrency}}
</template>
</el-table-column>
<el-table-column :label="$t('清关费')" prop="summaryInfo.netReceiptsCollectClearanceFeeGroup">
<template slot-scope="{row}">
{{row.summaryInfo.totalNetReceiptsCollectClearanceFee}}{{row.summaryInfo.netReceiptsCollectClearanceFeeCurrency}}
</template>
</el-table-column>
<el-table-column :label="$t('额外费用')" prop="summaryInfo.netReceiptsCollectOtherFeeGroup">
<template slot-scope="{row}">
{{row.summaryInfo.totalNetReceiptsCollectOtherFee}}{{row.summaryInfo.netReceiptsCollectOtherFeeCurrency}}
</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column :label="$t('received in China(中国实收)')" align="center" prop="" > <el-table-column :label="$t('received in China(中国实收)')" align="center" prop="" >
<el-table-column :label="$t('运费')" prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup"></el-table-column> <el-table-column :label="$t('运费')" prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup">
<el-table-column :label="$t('清关费')" prop="summaryInfo.netReceiptsAdvanceClearanceFeeGroup"></el-table-column> <template slot-scope="{row}">
<el-table-column :label="$t('额外费用')" prop="summaryInfo.netReceiptsAdvanceOtherFeeGroup"></el-table-column> {{row.summaryInfo.netReceiptsAdvanceFreightFeeCurrency}}{{row.summaryInfo.netReceiptsAdvanceClearanceFeeCurrency}}
</template>
</el-table-column>
<el-table-column :label="$t('清关费')" prop="summaryInfo.netReceiptsAdvanceClearanceFeeGroup">
<template slot-scope="{row}">
{{row.summaryInfo.totalNetReceiptsAdvanceClearanceFee}}{{row.summaryInfo.netReceiptsAdvanceClearanceFeeCurrency}}
</template>
</el-table-column>
<el-table-column :label="$t('额外费用')" prop="summaryInfo.netReceiptsAdvanceOtherFeeGroup">
<template slot-scope="{row}">
{{row.summaryInfo.totalNetReceiptsAdvanceOtherFee}}{{row.summaryInfo.netReceiptsAdvanceOtherFeeCurrency}}
</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column :label="$t('Discounts 折扣')" align="center" prop=""> <el-table-column :label="$t('Discounts 折扣')" align="center" prop="">
<el-table-column :label="$t('运费')" prop="summaryInfo.discountFreightFeeGroup"></el-table-column> <el-table-column :label="$t('运费')" prop="summaryInfo.discountFreightFeeGroup">
<el-table-column :label="$t('清关费')" prop="summaryInfo.discountClearanceFeeGroup"></el-table-column> <template slot-scope="{row}">
<el-table-column :label="$t('额外费用')" prop="summaryInfo.discountOtherFeeGroup"></el-table-column> {{row.summaryInfo.discountFreightFee}}{{row.summaryInfo.netReceiptsCollectFreightFeeCurrency}}
</template>
</el-table-column>
<el-table-column :label="$t('清关费')" prop="summaryInfo.discountClearanceFeeGroup">
<template slot-scope="{row}">
{{row.summaryInfo.discountClearanceFee}}{{row.summaryInfo.netReceiptsCollectClearanceFeeCurrency}}
</template>
</el-table-column>
<el-table-column :label="$t('额外费用')" prop="summaryInfo.discountOtherFeeGroup">
<template slot-scope="{row}">
{{row.summaryInfo.discountOtherFee}}{{row.summaryInfo.netReceiptsCollectOtherFeeCurrency}}
</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" v-if="permissions.indexOf('selfno:report:detail') > -1"> <el-table-column :label="$t('操作')" v-if="permissions.indexOf('selfno:report:detail') > -1">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -120,8 +156,10 @@ import {boxSettlementPage, exportSettlementExcel} from "@/api/ecw/box"; ...@@ -120,8 +156,10 @@ import {boxSettlementPage, exportSettlementExcel} from "@/api/ecw/box";
import {DICT_TYPE} from "@/utils/dict"; import {DICT_TYPE} from "@/utils/dict";
import {getCountryListAll} from "@/api/ecw/country"; 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},
data() { data() {
return { return {
loading: false, // 是否加载中 loading: false, // 是否加载中
...@@ -131,6 +169,8 @@ export default { ...@@ -131,6 +169,8 @@ export default {
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10,
startWarehouseIdList:[],
destWarehouseIdList: []
}, },
// tradeCityList: [], // tradeCityList: [],
currencyList:[], currencyList:[],
...@@ -146,7 +186,7 @@ export default { ...@@ -146,7 +186,7 @@ export default {
created() { created() {
getCurrencyPage(this.params).then(res => this.currencyList = res.data.list) getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
// getTradeCityList().then((res) => (this.tradeCityList = res.data)); // getTradeCityList().then((res) => (this.tradeCityList = res.data));
this.getList(); // 默认不查询，必须选择目的国以后才可以查询 this.getList();
getWarehouseList().then(res => this.warehouseList = res.data) getWarehouseList().then(res => this.warehouseList = res.data)
getListTree({treeType: 1}).then(r => { getListTree({treeType: 1}).then(r => {
this.countryList = r.data this.countryList = r.data
...@@ -182,6 +222,13 @@ export default { ...@@ -182,6 +222,13 @@ export default {
return this.queryParams.destCountryId === item.guojia && ( +item.tradeType === 1 || +item.tradeType === 3) return this.queryParams.destCountryId === item.guojia && ( +item.tradeType === 1 || +item.tradeType === 3)
}) })
}, },
// 目的国名称
dstCountryName(){
if(!this.queryParams.destCountryId) return null
const country = this.countryList.find(item => item.id == this.queryParams.destCountryId)
if(!country) return null
return this.$l(country, 'title')
}
}, },
methods: { methods: {
getCurrencyLabel(id){ getCurrencyLabel(id){
...@@ -192,7 +239,11 @@ export default { ...@@ -192,7 +239,11 @@ export default {
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
this.loading = true; this.loading = true;
let params = {...this.queryParams} let params = {
...this.queryParams,
startWarehouseIdList: this.queryParams.startWarehouseIdList.join(','),
destWarehouseIdList: this.queryParams.destWarehouseIdList.join(',')
}
this.addBeginAndEndTime(params, this.dateFilter, "JsDate", false); this.addBeginAndEndTime(params, this.dateFilter, "JsDate", false);
// 执行查询 // 执行查询
boxSettlementPage(params).then((response) => { boxSettlementPage(params).then((response) => {
...@@ -204,11 +255,19 @@ export default { ...@@ -204,11 +255,19 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.page = 1; this.$refs.queryForm.validate((valid) => {
if(!this.queryParams.destCountryId){ console.log({valid})
return this.$message.error(this.$t('请选择目的国')) if(!valid) return
} this.queryParams.page = 1;
this.getList(); 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();
})
}, },
handleReset(){ handleReset(){
this.$refs['queryForm'].resetFields() this.$refs['queryForm'].resetFields()
......
src/views/ecw/order/exception/index.vue
View file @ bf74d34f
...@@ -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>
......
src/views/ecw/region/index.vue
View file @ bf74d34f
...@@ -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">-->
......
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