Skip to content

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

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents 2157a07e eac11f1c
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 58 deletions
src/views/ecw/deptTarget/allAchievement.vue
View file @ 40c46114
......@@ -66,20 +66,7 @@
>{{$t('导出')}}</el-button> -->
</el-form-item>
</el-form>
<div class="total_num">
<span>{{ $t('开发客户：') }}</span>
<span>{{$t('总箱数')}} {{totalData.developNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.developVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.developWeight}}KG </span>
<span>{{ $t('公司客户：') }}</span>
<span>{{$t('总箱数')}} {{totalData.companyNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.companyVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.companyWeight}}KG </span>
<span>{{ $t('汇总：') }}</span>
<span>{{$t('总箱数')}} {{totalData.sumNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.sumVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.sumWeight}}KG </span>
</div>
<total_num :total-data="totalData"></total_num>
<!-- 列表 -->
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
<!-- <el-table-column :label="$t('序号')" align="center" type="index"></el-table-column> -->
......@@ -145,10 +132,11 @@
import dayjs from "dayjs";
import {listServiceUser} from "@/api/system/user";
import {getWarehouseList} from '@/api/ecw/warehouse'
import Total_num from "@/views/ecw/deptTarget/total_num.vue";
export default {
name: "EcwDepttargetAllachievement",
components: {},
components: {Total_num},
data() {
return {
// 遮罩层
......@@ -219,6 +207,12 @@
sumWeight:0,
sumVolume:0,
sumNum:0,
newTotalNum:0,
newTotalVolume:0,
newTotalWeight:0,
oldTotalNum:0,
oldTotalVolume:0,
oldTotalWeight:0,
},
myAchievementData:{},
warehouseList:[]
......@@ -313,6 +307,12 @@
this.totalData.developWeight =this.myAchievementData.devTotalWeight
this.totalData.developVolume =this.myAchievementData.devTotalVolume
this.totalData.developNum =this.myAchievementData.devTotalNum
this.$set(this.totalData,'newTotalNum',this.myAchievementData.newTotalNum )
this.$set(this.totalData,'newTotalVolume',this.myAchievementData.newTotalVolume)
this.$set(this.totalData,'newTotalWeight',this.myAchievementData.newTotalWeight)
this.$set(this.totalData,'oldTotalNum',this.myAchievementData.oldTotalNum)
this.$set(this.totalData,'oldTotalVolume',this.myAchievementData.oldTotalVolume)
this.$set(this.totalData,'oldTotalWeight',this.myAchievementData.oldTotalWeight)
this.loading = false;
});
},
......@@ -520,7 +520,7 @@
.total_num{
display:flex;
align-items: center;
justify-content: center;
justify-content: left;
margin:20px 0;
font-size:15px;
}
......
src/views/ecw/deptTarget/myAchievement.vue
View file @ 40c46114
......@@ -70,20 +70,7 @@
>{{$t('导出')}}</el-button> -->
</el-form-item>
</el-form>
<div class="total_num">
<span>{{ $t('开发客户：') }}</span>
<span>{{$t('总箱数')}} {{totalData.developNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.developVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.developWeight}}KG </span>
<span>{{ $t('公司客户：') }}</span>
<span>{{$t('总箱数')}} {{totalData.companyNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.companyVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.companyWeight}}KG </span>
<span>{{ $t('汇总：') }}</span>
<span>{{$t('总箱数')}} {{totalData.sumNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.sumVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.sumWeight}}KG </span>
</div>
<total_num :total-data="totalData"></total_num>
<!-- 列表 -->
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
<!-- <el-table-column :label="$t('序号')" align="center" type="index"></el-table-column> -->
......@@ -147,10 +134,11 @@
import dayjs from "dayjs";
import {listServiceUser} from "@/api/system/user";
import {getWarehouseList} from '@/api/ecw/warehouse'
import Total_num from "@/views/ecw/deptTarget/total_num.vue";
export default {
name: "EcwDepttargetMyachievement",
components: {},
components: {Total_num},
data() {
return {
// 遮罩层
......@@ -316,6 +304,12 @@
this.totalData.developWeight =this.myAchievementData.devTotalWeight
this.totalData.developVolume =this.myAchievementData.devTotalVolume
this.totalData.developNum =this.myAchievementData.devTotalNum
this.$set(this.totalData,'newTotalNum',this.myAchievementData.newTotalNum )
this.$set(this.totalData,'newTotalVolume',this.myAchievementData.newTotalVolume)
this.$set(this.totalData,'newTotalWeight',this.myAchievementData.newTotalWeight)
this.$set(this.totalData,'oldTotalNum',this.myAchievementData.oldTotalNum)
this.$set(this.totalData,'oldTotalVolume',this.myAchievementData.oldTotalVolume)
this.$set(this.totalData,'oldTotalWeight',this.myAchievementData.oldTotalWeight)
this.loading = false;
});
},
......
src/views/ecw/deptTarget/myDeptAchievement.vue
View file @ 40c46114
......@@ -69,20 +69,7 @@
>{{$t('导出')}}</el-button> -->
</el-form-item>
</el-form>
<div class="total_num">
<span>{{ $t('开发客户：') }}</span>
<span>{{$t('总箱数')}} {{totalData.developNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.developVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.developWeight}}KG </span>
<span>{{ $t('公司客户：') }}</span>
<span>{{$t('总箱数')}} {{totalData.companyNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.companyVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.companyWeight}}KG </span>
<span>{{ $t('汇总：') }}</span>
<span>{{$t('总箱数')}} {{totalData.sumNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.sumVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.sumWeight}}KG </span>
</div>
<total_num :total-data="totalData" ></total_num>
<!-- 列表 -->
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
<!-- <el-table-column :label="$t('序号')" align="center" type="index"></el-table-column> -->
......@@ -147,10 +134,11 @@
import dayjs from "dayjs";
import {listServiceUser} from "@/api/system/user";
import {getWarehouseList} from '@/api/ecw/warehouse'
import Total_num from "@/views/ecw/deptTarget/total_num.vue";
export default {
name: "EcwDepttargetMydeptachievement",
components: {},
components: {Total_num},
data() {
return {
// 遮罩层
......@@ -313,6 +301,12 @@
this.totalData.developWeight =this.myAchievementData.devTotalWeight
this.totalData.developVolume =this.myAchievementData.devTotalVolume
this.totalData.developNum =this.myAchievementData.devTotalNum
this.$set(this.totalData,'newTotalNum',this.myAchievementData.newTotalNum )
this.$set(this.totalData,'newTotalVolume',this.myAchievementData.newTotalVolume)
this.$set(this.totalData,'newTotalWeight',this.myAchievementData.newTotalWeight)
this.$set(this.totalData,'oldTotalNum',this.myAchievementData.oldTotalNum)
this.$set(this.totalData,'oldTotalVolume',this.myAchievementData.oldTotalVolume)
this.$set(this.totalData,'oldTotalWeight',this.myAchievementData.oldTotalWeight)
this.loading = false;
});
},
......@@ -491,14 +485,5 @@
<style scoped >
.total_num{
display:flex;
align-items: center;
justify-content: center;
margin:20px 0;
font-size:15px;
}
.total_num span{
margin: 0 8px;
}
</style>
src/views/ecw/deptTarget/total_num.vue 0 → 100644
View file @ 40c46114
<script>
export default {
name: "total_num",
props:{
totalData:{
type:Object,
default:()=>({})
}
}
}
</script>
<template>
<div>
<div class="total_num">
<span>{{ $t('新客户：') }}</span>
<span>{{$t('总箱数')}} {{totalData.newTotalNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.newTotalVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.newTotalWeight}}KG </span>
<span>{{ $t('旧客户：') }}</span>
<span>{{$t('总箱数')}} {{totalData.oldTotalNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.oldTotalVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.oldTotalWeight}}KG </span>
</div>
<div class="total_num">
<span>{{ $t('开发客户：') }}</span>
<span>{{$t('总箱数')}} {{totalData.developNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.developVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.developWeight}}KG </span>
<span>{{ $t('公司客户：') }}</span>
<span>{{$t('总箱数')}} {{totalData.companyNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.companyVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.companyWeight}}KG </span>
<span>{{ $t('汇总：') }}</span>
<span>{{$t('总箱数')}} {{totalData.sumNum}}{{$t('箱')}} </span>
<span>{{$t('总方数')}} {{totalData.sumVolume}}m³ </span>
<span>{{$t('总重量')}} {{totalData.sumWeight}}KG </span>
</div>
</div>
</template>
<style scoped lang="scss">
.total_num{
display:flex;
align-items: center;
justify-content: left;
margin:20px 0;
font-size:15px;
}
.total_num span{
margin: 0 8px;
}
</style>
src/views/ecw/offer/all-routes-list.vue
View file @ 40c46114
......@@ -10,13 +10,13 @@
</el-form-item>
<el-form-item>
<el-form-item :label="$t('始发仓')" prop="startWarehouseId">
<el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发仓')" clearable>
<el-select multiple v-model="queryParams.startWarehouseIdList" :placeholder="$t('请选择始发仓')" clearable>
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id"
:key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的仓')" prop="destWarehouseIdArr">
<el-select :multiple="true" v-model="queryParams.destWarehouseIdArr" multiple
<el-select multiple v-model="queryParams.destWarehouseIdList" multiple
:placeholder="$t('请选择目的仓')" clearable>
<el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id"
:key="item.id"></el-option>
......
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