Skip to content

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

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

parents ecb703c5 f5f91c4f
Show whitespace changes
Inline Side-by-side
Showing with 220 additions and 35 deletions
src/api/ecw/futureBox.js
View file @ e54c2371
......@@ -77,3 +77,19 @@ export function getWareHousedVolume(params){
params
})
}
// 根据运输方式ID获取异常订单方数
export function getExceptionVolume(params){
return request({
url: '/ecw/future-box/getExceptionVolume',
method: 'get',
params
})
}
// 根据运输方式ID获取自单代报订单方数
export function getOrderReportVolume(params){
return request({
url: '/ecw/future-box/getOrderReportVolume',
method: 'get',
params
})
}
src/api/ecw/order.js
View file @ e54c2371
......@@ -571,3 +571,88 @@ export function orderExportDeptSearch(params){
params
})
}
// 参数搜索导出异常订单统计 Excel
export function exportAbnormal(params){
return request({
url: '/ecw/order/export/export-exception',
method: 'get',
params: params,
responseType: 'blob'
})
}
// 参数搜索导出重货单统计 Excel
export function exportHeavyOrder(params){
return request({
url: '/ecw/order/export-heavyOrder',
method: 'get',
params: params,
responseType: 'blob'
})
}
// 参数搜索导出退仓单统计统计 Excel
export function exportReturnOrder(params){
return request({
url: '/ecw/order-exception/export-returnOrder',
method: 'get',
params: params,
responseType: 'blob'
})
}
// 参数搜索导出售后赔偿金额统计 Excel
export function exportSaleRepay(params){
return request({
url: '/ecw/order-exception/export-saleRepay',
method: 'get',
params: params,
responseType: 'blob'
})
}
// 参数搜索导出报关数统计 Excel
export function exportCustomsDatas(params){
return request({
url: '/ecw/order-exception/export-customDatas',
method: 'get',
params: params,
responseType: 'blob'
})
}
// 参数搜索导出客户出货量统计 Excel
export function exportShippingDatas(params){
return request({
url: '/ecw/order-exception/export-shipDatas',
method: 'get',
params: params,
responseType: 'blob'
})
}
// 参数搜索导出预付运费统计 Excel
export function exportShipFee(params){
return request({
url: '/ecw/order-exception/export-shipFee',
method: 'get',
params: params,
responseType: 'blob'
})
}
// 参数搜索导出卸货费统计 Excel
export function exportUnload(params){
return request({
url: '/ecw/order-exception/export-excel',
method: 'get',
params: params,
responseType: 'blob'
})
}
src/views/ecw/box/indexFutureBox.vue
View file @ e54c2371
......@@ -63,17 +63,27 @@
{{getShipChannelName(row.shippingChannelId)}}
</template>
</el-table-column>
<el-table-column :label="$t('待入仓方数')" align="center" prop="readyWarehousingNumber">
<el-table-column :label="$t('待入仓订单方数')" align="center" prop="readyWarehousingNumber">
<template slot-scope="{row}">
{{row.readyWarehousingNumber || 0}}
</template>
</el-table-column>
<el-table-column :label="$t('已入仓方数')" align="center" prop="warehousedNumber">
<el-table-column :label="$t('已入仓订单方数')" align="center" prop="warehousedNumber">
<template slot-scope="{row}">
{{row.warehousedNumber || 0}}
</template>
</el-table-column>
<el-table-column :label="$t('在仓方数')" align="center" prop="warehousingNumber" >
<el-table-column :label="$t('异常订单方数')" align="center" prop="exceptionNumber">
<template slot-scope="{row}">
{{row.getExceptionVolume || 0}}
</template>
</el-table-column>
<el-table-column :label="$t('待排单订单方数')" align="center" prop="warehousingNumber">
<template slot-scope="{row}">
{{row.warehousingNumber || 0}}
</template>
</el-table-column>
<el-table-column :label="$t('自单代报订单方数')" align="center" prop="orderReportNumber" >
<template slot-scope="{row}">
{{row.warehousingNumber || 0}}
</template>
......@@ -133,15 +143,21 @@
<el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('待入仓方数')">
<el-form-item :label="$t('待入仓订单方数')">
{{form.readyWarehousingNumber}} m³
</el-form-item>
<el-form-item :label="$t('已入仓方数')">
<el-form-item :label="$t('已入仓订单方数')">
{{form.warehousedNumber}} m³
</el-form-item>
<el-form-item :label="$t('在仓方数')">
<el-form-item :label="$t('异常订单方数')">
{{form.exceptionNumber}} m³
</el-form-item>
<el-form-item :label="$t('待排单订单方数')">
{{form.warehousingNumber}} m³
</el-form-item>
<el-form-item :label="$t('自单代报订单方数')">
{{form.orderReportNumber}} m³
</el-form-item>
<el-form-item :label="$t('已装柜仓数')">
{{form.loadingNumber}} m³
</el-form-item>
......@@ -174,7 +190,7 @@
</template>
<script>
import { createFutureBox, updateFutureBox, deleteFutureBox, getFutureBox, getFutureBoxPage, exportFutureBoxExcel, getBoxedVolume, getToBeWareHousedVolume,getWareHousedVolume } from "@/api/ecw/futureBox";
import { createFutureBox, updateFutureBox, deleteFutureBox, getFutureBox, getFutureBoxPage, exportFutureBoxExcel, getBoxedVolume, getToBeWareHousedVolume,getWareHousedVolume,getExceptionVolume, getOrderReportVolume} from "@/api/ecw/futureBox";
import {getCabinetPage} from "@/api/ecw/cabinet";
import { getChannelList } from '@/api/ecw/channel';
import { getWarehouseList } from "@/api/ecw/warehouse"
......@@ -211,7 +227,9 @@ export default {
readyWarehousingNumber: null,
warehousedNumber: null,
warehousingNumber: null,
exceptionNumber: null,
loadingNumber: null,
orderReportNumber: null,
futureNumber: null,
gpNumber: null,
hqNumber: null,
......@@ -352,12 +370,22 @@ export default {
getWareHousedVolume(data).then(res => {
this.$set(this.form, 'warehousedNumber', res.data || 0)
})
// 获得异常订单方数
getExceptionVolume(data).then(res => {
this.$set(this.form, 'exceptionNumber', res.data || 0)
})
// 获得自单代报订单方数
getOrderReportVolume(data).then(res => {
this.$set(this.form, 'orderReportNumber', res.data || 0)
})
},
setDefaultVolume(){
this.$set(this.form, 'loadingNumber', 0)
this.$set(this.form, 'readyWarehousingNumber', 0)
this.$set(this.form, 'warehousedNumber', 0)
this.$set(this.form, 'warehousingNumber', 0)
this.$set(this.form, 'exceptionNumber',0)
this.$set(this.form,'orderReportNumber',0)
},
/** 查询列表 */
getList() {
......@@ -387,7 +415,9 @@ export default {
readyWarehousingNumber: undefined,
warehousedNumber: undefined,
warehousingNumber: undefined,
exceptionNumber: undefined,
loadingNumber: undefined,
orderReportNumber: undefined,
futureNumber: undefined,
gpNumber: undefined,
hqNumber: undefined,
......
src/views/ecw/box/indexSea.vue
View file @ e54c2371
......@@ -65,11 +65,11 @@
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:box:create']">{{$t('出货安排')}}
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:box:action:create']">{{$t('出货安排')}}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:box:export']">{{$t('导出')}}
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:box:action:export']">{{$t('导出')}}
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......
src/views/ecw/box/indexSeaAir.vue
View file @ e54c2371
......@@ -51,11 +51,11 @@
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:box:create']">{{$t('出货安排')}}
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:seaAir:action:create']">{{$t('出货安排')}}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:box:export']">{{$t('导出')}}
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:seaAir:action:export']">{{$t('导出')}}
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......
src/views/ecw/financial/payable.vue
View file @ e54c2371
......@@ -160,7 +160,7 @@
v-hasPermi="['ecw:payable:edit']"
@click="editClick(scope.row)"
>{{ $t('编辑') }}</el-button>
<el-button size="mini" type="text" v-hasPermi="['ecw:payable:create']" @click="handleAdd(scope.row.id)"
<el-button size="mini" type="text" v-hasPermi="['ecw:payable:add']" @click="handleAdd(scope.row.id)"
>{{ $t('请款') }}</el-button>
<el-button size="mini" type="text" v-hasPermi="['ecw:payable:delete']" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
</template>
......
src/views/ecw/financial/receiptDetail.vue
View file @ e54c2371
......@@ -218,8 +218,8 @@
<el-card class="card">
<div slot="header" class="card-title">{{ $t('银行收款明细') }}</div>
<div>
<el-button type="primary" plain size="mini" @click="batchVerification" v-hasPermi="['ecw:verification:update']" style="padding: 10px; margin-bottom: 10px">{{ $t('批量核销') }}</el-button>
<el-button type="primary" plain size="mini" @click="handleAddReceiptItem" style="padding: 10px; margin-bottom: 10px">{{ $t('添加收款明细') }}</el-button>
<el-button type="primary" plain size="mini" @click="batchVerification" v-hasPermi="['ecw:payment:detail:batchWriteOff']" style="padding: 10px; margin-bottom: 10px">{{ $t('批量核销') }}</el-button>
<el-button type="primary" plain size="mini" @click="handleAddReceiptItem" v-hasPermi="['ecw:payment:detail:addBank']" style="padding: 10px; margin-bottom: 10px">{{ $t('添加收款明细') }}</el-button>
</div>
<el-table ref="multipleTable" :data="detailed" border row-key="id" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" :reserve-selection="true"> </el-table-column>
......@@ -256,11 +256,11 @@
</el-table-column>
<el-table-column :label="$t('操作')" align="center" width="200">
<template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
<el-button type="text" @click="detailClick(scope.row)">{{ $t('详情') }}</el-button>
<el-button v-if="scope.row.status == 0" type="text" @click="verificationClick(scope.row)" v-hasPermi="['ecw:verification:update']">{{ $t('核销') }}</el-button>
<el-button v-if="scope.row.status == 1" type="text" @click="verificationCancelClick(scope.row)" v-hasPermi="['ecw:verification:update']">{{ $t('反核销') }}</el-button>
<el-button v-if="scope.row.status == 0" type="text" @click="editClick(scope.row)">{{ $t('编辑') }}</el-button>
<el-button v-if="scope.row.status == 0" v-hasPermi="['ecw:payment:detail:delete']" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
<el-button type="text" @click="detailClick(scope.row)" v-hasPermi="['ecw:payment:detail:detail']">{{ $t('详情') }}</el-button>
<el-button v-if="scope.row.status == 0" type="text" @click="verificationClick(scope.row)" v-hasPermi="['ecw:payment:detail:writeOff']">{{ $t('核销') }}</el-button>
<el-button v-if="scope.row.status == 1" type="text" @click="verificationCancelClick(scope.row)" v-hasPermi="['ecw:payment:detail:cancelWriteOff']">{{ $t('反核销') }}</el-button>
<el-button v-if="scope.row.status == 0" type="text" @click="editClick(scope.row)" v-hasPermi="['ecw:payment:detail:bankEdit']">{{ $t('编辑') }}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -306,8 +306,8 @@
</el-descriptions>
</el-card>
<div slot="footer" style="margin: 20px 0">
<el-button type="primary" @click="toEdit">{{ $t('编辑') }}</el-button>
<el-button type="primary" @click="verificationAll" v-hasPermi="['ecw:verification:update']">{{ $t('全部核销') }}</el-button>
<el-button type="primary" @click="toEdit" v-hasPermi="['ecw:payment:detail:edit']">{{ $t('编辑') }}</el-button>
<el-button type="primary" @click="verificationAll" v-hasPermi="['ecw:payment:detail:allWriteOff']">{{ $t('全部核销') }}</el-button>
</div>
<el-dialog v-if="openAddDialog" :visible.sync="openAddDialog" :title="dialogTitle" width="50%" append-to-body>
<div style="padding: 0 24px">
......
src/views/ecw/financial/voucher.vue
View file @ e54c2371
......@@ -143,6 +143,7 @@
v-if="scope.row.state == 5"
size="mini"
type="text"
v-hasPermi="['ecw:voucher:ballot']"
@click="openInvoice(scope.row.id)"
>{{ $t('开票') }}</el-button
>
......
src/views/ecw/order/exception/index.vue
View file @ e54c2371
......@@ -172,8 +172,23 @@
</el-table-column>
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.orderExceptionStatus<2" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-share" @click="handEdit(scope.row.orderId)">{{$t('查看')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('查看')}}</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-share" @click="handEdit(scope.row.orderId)">{{$t('查看')}}</el-button> -->
<el-button v-if="scope.row.orderExceptionType=='order_superfluous_box_exception'" v-hasPermi="['ecw:exception:superfluousBox']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_lack_box_exception'" v-hasPermi="['ecw:exception:lackBox']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_pay_exception'" v-hasPermi="['ecw:exception:pay']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_miss_exception'" v-hasPermi="['ecw:exception:miss']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_superfluous_goods_exception'" v-hasPermi="['ecw:exception:superfluousGoods']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_in_water_exception'" v-hasPermi="['ecw:exception:inWater']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_damage_exception'" v-hasPermi="['ecw:exception:damaged']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_heavy_cargo_exception'" v-hasPermi="['ecw:exception:heavyCargo']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_doc_exception'" v-hasPermi="['ecw:exception:doc']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_consignor_exception'" v-hasPermi="['ecw:exception:consignor']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_other_exception'" v-hasPermi="['ecw:exception:other']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_cod_exception'" v-hasPermi="['ecw:exception:cod']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_no_quote_exception'" v-hasPermi="['ecw:exception:noQuote']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_bulky_cargo_exception'" v-hasPermi="['ecw:exception:bulkyCargo']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_pick_up_exception'" v-hasPermi="['ecw:exception:pickUp']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
</template>
</el-table-column>
</el-table>
......
src/views/ecw/order/index.vue
View file @ e54c2371
......@@ -133,15 +133,14 @@
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">导出勾选</el-dropdown-item>
<el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">导出搜索</el-dropdown-item>
<template v-if="isAll" v-hasPermi="['ecw:order:export:other']">
<el-dropdown-item @click.native="$message('// TODO')">异常单统计</el-dropdown-item>
<el-dropdown-item @click.native="$message('// TODO')">重货单统计</el-dropdown-item>
<el-dropdown-item @click.native="$message('// TODO')">退仓单统计</el-dropdown-item>
<el-dropdown-item @click.native="$message('// TODO')">售后赔偿金额统计</el-dropdown-item>
<el-dropdown-item @click.native="$message('// TODO')">报关数据统计</el-dropdown-item>
<el-dropdown-item @click.native="$message('// TODO')">客户出货量统计</el-dropdown-item>
<el-dropdown-item @click.native="$message('// TODO')">预付运费统计</el-dropdown-item>
<el-dropdown-item @click.native="$message('// TODO')">卸货费统计</el-dropdown-item>
<template v-if="isAll">
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportAbnormal">异常单统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportHeavyOrder">重货单统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportReturnOrder">退仓单统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportSaleRepay">售后赔偿金额统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportCustomsDatas">报关数据统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShippingDatas">客户出货量统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShipFee">预付运费统计</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
......@@ -469,7 +468,15 @@ import {
orderDeptStatistics,
orderExportSearch,
orderExportMySearch,
orderExportDeptSearch
orderExportDeptSearch,
exportAbnormal,
exportHeavyOrder,
exportReturnOrder,
exportSaleRepay,
exportCustomsDatas,
exportShippingDatas,
exportShipFee,
exportUnload
} from "@/api/ecw/order";
/* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
import PrintTag from './components/PrintTag'
......@@ -648,6 +655,37 @@ export default {
exportSearch(){
return this.exportExcel(this.getExportFunc(), this.combinedQueryParams, this.$t("导出搜索"))
},
// 导出异常单
exportAbnormal(){
return this.exportExcel(exportAbnormal, this.combinedQueryParams, this.$t("异常单统计"))
},
// 退仓单统计
exportReturnOrder(){
return this.exportExcel(exportReturnOrder, this.combinedQueryParams, this.$t("退仓单统计"))
},
// 售后赔偿金额统计
exportSaleRepay(){
return this.exportExcel(exportSaleRepay, this.combinedQueryParams, this.$t("售后赔偿金额统计"))
},
// 报关数据统计
exportCustomsDatas(){
return this.exportExcel(exportCustomsDatas, this.combinedQueryParams, this.$t("报关数据统计"))
},
// 客户出货量统计
exportShippingDatas(){
return this.exportExcel(exportShippingDatas, this.combinedQueryParams, this.$t("客户出货量统计"))
},
// 预付运费统计
exportShipFee(){
return this.exportExcel(exportShipFee, this.combinedQueryParams, this.$t("预付运费统计"))
},
// 卸货费统计
exportUnload(){
return this.exportExcel(exportUnload, this.combinedQueryParams, this.$t("卸货费统计"))
},
// 通用导出函数
exportExcel(func, params, fileName = null){
this.exportLoading = true;
......
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