Skip to content

J
jiedao-app-operator-master
Commit 57f8374e authored by houjn@hikoon.cn's avatar houjn@hikoon.cn
Browse files
Options

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

 Conflicts:
	src/api/ecw/futureBox.js
	src/api/ecw/order.js
	src/views/ecw/box/indexFutureBox.vue
	src/views/ecw/order/cargoControl.vue
	src/views/ecw/order/index.vue
parents f4e781a6 fbd191d0
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 86 deletions
src/api/ecw/order.js
View file @ 57f8374e
...@@ -586,7 +586,7 @@ export function exportAbnormal(params){ ...@@ -586,7 +586,7 @@ export function exportAbnormal(params){
// 参数搜索导出重货单统计 Excel // 参数搜索导出重货单统计 Excel
export function exportHeavyOrder(params){ export function exportHeavyOrder(params){
return request({ return request({
url: '/ecw/order/export-excel', url: '/ecw/order/export-heavyOrder',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -596,7 +596,7 @@ export function exportHeavyOrder(params){ ...@@ -596,7 +596,7 @@ export function exportHeavyOrder(params){
// 参数搜索导出退仓单统计统计 Excel // 参数搜索导出退仓单统计统计 Excel
export function exportReturnOrder(params){ export function exportReturnOrder(params){
return request({ return request({
url: '/ecw/order-exception/export-excel', url: '/ecw/order-exception/export-returnOrder',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -606,7 +606,7 @@ export function exportReturnOrder(params){ ...@@ -606,7 +606,7 @@ export function exportReturnOrder(params){
// 参数搜索导出售后赔偿金额统计 Excel // 参数搜索导出售后赔偿金额统计 Excel
export function exportSaleRepay(params){ export function exportSaleRepay(params){
return request({ return request({
url: '/ecw/order-exception/export-excel', url: '/ecw/order-exception/export-saleRepay',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -617,7 +617,7 @@ export function exportSaleRepay(params){ ...@@ -617,7 +617,7 @@ export function exportSaleRepay(params){
// 参数搜索导出报关数统计 Excel // 参数搜索导出报关数统计 Excel
export function exportCustomsDatas(params){ export function exportCustomsDatas(params){
return request({ return request({
url: '/ecw/order-exception/export-excel', url: '/ecw/order-exception/export-customDatas',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -628,7 +628,7 @@ export function exportCustomsDatas(params){ ...@@ -628,7 +628,7 @@ export function exportCustomsDatas(params){
// 参数搜索导出客户出货量统计 Excel // 参数搜索导出客户出货量统计 Excel
export function exportShippingDatas(params){ export function exportShippingDatas(params){
return request({ return request({
url: '/ecw/order-exception/export-excel', url: '/ecw/order-exception/export-shipDatas',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -639,7 +639,7 @@ export function exportShippingDatas(params){ ...@@ -639,7 +639,7 @@ export function exportShippingDatas(params){
// 参数搜索导出预付运费统计 Excel // 参数搜索导出预付运费统计 Excel
export function exportShipFee(params){ export function exportShipFee(params){
return request({ return request({
url: '/ecw/order-exception/export-excel', url: '/ecw/order-exception/export-shipFee',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
......
src/views/ecw/box/indexFutureBox.vue
View file @ 57f8374e
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
{{row.warehousingNumber || 0}} {{row.warehousingNumber || 0}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('自单代报订单方数')" align="center" prop="orderReportNumber"> <el-table-column :label="$t('自单代报订单方数')" align="center" prop="orderReportNumber" >
<template slot-scope="{row}"> <template slot-scope="{row}">
{{row.warehousingNumber || 0}} {{row.warehousingNumber || 0}}
</template> </template>
......
src/views/ecw/box/indexSea.vue
View file @ 57f8374e
...@@ -65,11 +65,11 @@ ...@@ -65,11 +65,11 @@
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <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-button>
</el-col> </el-col>
<el-col :span="1.5"> <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-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......
src/views/ecw/box/indexSeaAir.vue
View file @ 57f8374e
...@@ -51,11 +51,11 @@ ...@@ -51,11 +51,11 @@
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <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-button>
</el-col> </el-col>
<el-col :span="1.5"> <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-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......
src/views/ecw/financial/payable.vue
View file @ 57f8374e
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
v-hasPermi="['ecw:payable:edit']" v-hasPermi="['ecw:payable:edit']"
@click="editClick(scope.row)" @click="editClick(scope.row)"
>{{ $t('编辑') }}</el-button> >{{ $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> >{{ $t('请款') }}</el-button>
<el-button size="mini" type="text" v-hasPermi="['ecw:payable:delete']" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button> <el-button size="mini" type="text" v-hasPermi="['ecw:payable:delete']" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
</template> </template>
......
src/views/ecw/financial/receiptDetail.vue
View file @ 57f8374e
...@@ -218,8 +218,8 @@ ...@@ -218,8 +218,8 @@
<el-card class="card"> <el-card class="card">
<div slot="header" class="card-title">{{ $t('银行收款明细') }}</div> <div slot="header" class="card-title">{{ $t('银行收款明细') }}</div>
<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="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" 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> </div>
<el-table ref="multipleTable" :data="detailed" border row-key="id" @selection-change="handleSelectionChange"> <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> <el-table-column type="selection" width="50" :reserve-selection="true"> </el-table-column>
...@@ -256,11 +256,11 @@ ...@@ -256,11 +256,11 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" width="200"> <el-table-column :label="$t('操作')" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" @click="deleteClick(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)">{{ $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:verification:update']">{{ $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:verification:update']">{{ $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)">{{ $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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -306,8 +306,8 @@ ...@@ -306,8 +306,8 @@
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<div slot="footer" style="margin: 20px 0"> <div slot="footer" style="margin: 20px 0">
<el-button type="primary" @click="toEdit">{{ $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:verification:update']">{{ $t('全部核销') }}</el-button> <el-button type="primary" @click="verificationAll" v-hasPermi="['ecw:payment:detail:allWriteOff']">{{ $t('全部核销') }}</el-button>
</div> </div>
<el-dialog v-if="openAddDialog" :visible.sync="openAddDialog" :title="dialogTitle" width="50%" append-to-body> <el-dialog v-if="openAddDialog" :visible.sync="openAddDialog" :title="dialogTitle" width="50%" append-to-body>
<div style="padding: 0 24px"> <div style="padding: 0 24px">
......
src/views/ecw/financial/voucher.vue
View file @ 57f8374e
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
v-if="scope.row.state == 5" v-if="scope.row.state == 5"
size="mini" size="mini"
type="text" type="text"
v-hasPermi="['ecw:voucher:ballot']"
@click="openInvoice(scope.row.id)" @click="openInvoice(scope.row.id)"
>{{ $t('开票') }}</el-button >{{ $t('开票') }}</el-button
> >
......
src/views/ecw/order/cargoControl.vue
View file @ 57f8374e
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery"/> <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('订单状态')" prop="status"> <el-form-item :label="$t('订单状态')" prop="status">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.PAY_ORDER_STATUS" v-model="queryParams.status" clearable @change="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('提单号')" prop="tidanNo"> <el-form-item :label="$t('提单号')" prop="tidanNo">
<el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
...@@ -58,22 +58,15 @@ ...@@ -58,22 +58,15 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
:loading="exportLoading" v-hasPermi="['ecw:order:export']">{{$t('导出')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="12"> <el-col :span="2">
<el-button type="primary" plain icon="el-icon-setting" size="mini" :disabled="multiple" @click="batchReview">{{$t('批量复核')}}</el-button> <el-button v-hasPermi="['ecw:cargo_control:batch_review']" type="primary" plain icon="el-icon-setting" size="mini" :disabled="multiple" @click="batchReview">{{$t('批量复核')}}</el-button>
<el-dropdown v-hasPermi="['ecw:cargo:export:checked','ecw:cargo:export:search']" class="ml-10">
<el-button type="primary" :loading="exportLoading" size="mini">
导出 <i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-hasPermi="['ecw:cargo:export:checked']" @click.native="exportChecked">导出勾选</el-dropdown-item>
<el-dropdown-item v-hasPermi="['ecw:cargo:export:search']" @click.native="exportSearch">导出搜索</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -90,7 +83,7 @@ ...@@ -90,7 +83,7 @@
<el-table-column :label="$t('唛头')" align="center" prop="marks" /> <el-table-column :label="$t('唛头')" align="center" prop="marks" />
<el-table-column :label="$t('箱数')" align="center" prop="sumNum" > <el-table-column :label="$t('箱数')" align="center" prop="sumNum" >
<template v-slot="{row}"> <template v-slot="{row}">
{{row.sumNum > 0 ? row.sumNum : row.totalNum}} {{row.inWarehouseState > 1 ? row.sumNum : row.totalNum}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight"> <el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight">
...@@ -168,7 +161,7 @@ import CustomerSelector from '@/components/CustomerSelector' ...@@ -168,7 +161,7 @@ import CustomerSelector from '@/components/CustomerSelector'
import Transfer from '@/views/ecw/order/components/Transfer' import Transfer from '@/views/ecw/order/components/Transfer'
import Release from './components/Release' import Release from './components/Release'
import CargoControlEdit from './components/CargoControlEdit' import CargoControlEdit from './components/CargoControlEdit'
import { getCargoControlOrderPage, batchReview, orderReview, getPickRleaseInfo, exportCargoControl } from "@/api/ecw/orderCargoControl" import { getCargoControlOrderPage, batchReview, orderReview, getPickRleaseInfo } from "@/api/ecw/orderCargoControl"
import TransferCargo from '@/views/ecw/order/components/TransferCargo' import TransferCargo from '@/views/ecw/order/components/TransferCargo'
import Fallback from './components/Fallback' import Fallback from './components/Fallback'
import {getWarehouseList} from '@/api/ecw/warehouse' import {getWarehouseList} from '@/api/ecw/warehouse'
...@@ -335,32 +328,7 @@ export default { ...@@ -335,32 +328,7 @@ export default {
onTransferCargoSuccess(){ onTransferCargoSuccess(){
this.showTransferCargoOrderId = null this.showTransferCargoOrderId = null
this.handleQuery() this.handleQuery()
},
// 导出勾选
exportChecked(){
if(!this.ids.length){
return this.$message.error(this.$t('请勾选需要导出的订单'))
}
return this.exportExcel(exportCargoControl, {orderIdList: this.ids}, this.$t("导出勾选控货订单"))
},
// 导出搜索
exportSearch(){
return this.exportExcel(exportCargoControl, this.queryParams, this.$t("导出搜索控货订单"))
},
// 通用导出函数
exportExcel(func, params, fileName = null){
this.exportLoading = true;
func(params).then(res => {
console.log({res})
if(!fileName){
fileName = this.$t('控货订单')
} }
this.$download.excel(res, fileName + '.xlsx');
}).finally(() => {
this.exportLoading = false
})
},
} }
}; };
</script> </script>
src/views/ecw/order/exception/index.vue
View file @ 57f8374e
...@@ -172,8 +172,23 @@ ...@@ -172,8 +172,23 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center"> <el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope"> <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-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-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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/views/ecw/order/index.vue
View file @ 57f8374e
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<el-form-item :label="$t('收货人')" prop="consigneeKey"> <el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="dateFilter"> <el-form-item label="">
<dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" /> <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" />
<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('开始日期')"
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<el-col :span="1.5"> <el-col :span="1.5">
<!-- <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleEdit" :disabled="!batchWarehouseAdjustment">{{$t('批量调仓')}}--> <!-- <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleEdit" :disabled="!batchWarehouseAdjustment">{{$t('批量调仓')}}-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button type="primary" plain icon="el-icon-setting" size="mini" @click="showBatchPickup=true">{{$t('批量提货')}}</el-button> <el-button type="primary" v-hasPermi="['ecw:order:batch_release']" plain icon="el-icon-setting" size="mini" @click="showBatchPickup=true">{{$t('批量提货')}}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
...@@ -134,14 +134,13 @@ ...@@ -134,14 +134,13 @@
<el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">导出勾选</el-dropdown-item> <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">导出勾选</el-dropdown-item>
<el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">导出搜索</el-dropdown-item> <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">导出搜索</el-dropdown-item>
<template v-if="isAll"> <template v-if="isAll">
<el-dropdown-item v-hasPermi="['ecw:order:export:other']" @click.native="exportAbnormal">异常单统计</el-dropdown-item> <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportAbnormal">异常单统计</el-dropdown-item>
<el-dropdown-item v-hasPermi="['ecw:order:export:other']" @click.native="exportHeavyOrder">重货单统计</el-dropdown-item> <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportHeavyOrder">重货单统计</el-dropdown-item>
<el-dropdown-item v-hasPermi="['ecw:order:export:other']" @click.native="exportReturnOrder">退仓单统计</el-dropdown-item> <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportReturnOrder">退仓单统计</el-dropdown-item>
<el-dropdown-item v-hasPermi="['ecw:order:export:other']" @click.native="exportSaleRepay">售后赔偿金额统计</el-dropdown-item> <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportSaleRepay">售后赔偿金额统计</el-dropdown-item>
<el-dropdown-item v-hasPermi="['ecw:order:export:other']" @click.native="exportCustomsDatas">报关数据统计</el-dropdown-item> <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportCustomsDatas">报关数据统计</el-dropdown-item>
<el-dropdown-item v-hasPermi="['ecw:order:export:other']" @click.native="exportShippingDatas">客户出货量统计</el-dropdown-item> <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShippingDatas">客户出货量统计</el-dropdown-item>
<el-dropdown-item v-hasPermi="['ecw:order:export:other']" @click.native="exportShipFee">预付运费统计</el-dropdown-item> <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShipFee">预付运费统计</el-dropdown-item>
<!-- <el-dropdown-item @click.native="$message('// TODO')">卸货费统计</el-dropdown-item> -->
</template> </template>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
...@@ -263,9 +262,9 @@ ...@@ -263,9 +262,9 @@
<!-- 恢复 --> <!-- 恢复 -->
<!-- <el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'recoveryOrder')" >{{$t('恢复订单')}}</el-dropdown-item>--> <!-- <el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'recoveryOrder')" >{{$t('恢复订单')}}</el-dropdown-item>-->
<!-- 费用申请 未报价异常不能操作 --> <!-- 费用申请 -->
<template v-if=" <template v-if="
exclude(scope.row.status, [0, 88]) && scope.row.abnormalState != 1 && exclude(scope.row.inWarehouseState, [204,205,206]) exclude(scope.row.status, [0, 88]) && exclude(scope.row.inWarehouseState, [204,205,206])
"> ">
<el-dropdown-item @click.native="feeApplicationBol = true; orderId = scope.row.orderId" v-hasPermi="['ecw:order:fee_apply']" >{{$t('费用申请')}}</el-dropdown-item> <el-dropdown-item @click.native="feeApplicationBol = true; orderId = scope.row.orderId" v-hasPermi="['ecw:order:fee_apply']" >{{$t('费用申请')}}</el-dropdown-item>
</template> </template>
...@@ -284,7 +283,7 @@ ...@@ -284,7 +283,7 @@
<!-- 特价 --> <!-- 特价 -->
<template v-if=" <template v-if="
exclude(scope.row.status, [0]) && exclude(scope.row.status, [0]) &&
exclude(scope.row.abnormalState, [1]) && // 未报价异常不能操作 // exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
exclude(scope.row.inWarehouseState, [204,205,206]) exclude(scope.row.inWarehouseState, [204,205,206])
"> ">
<el-dropdown-item @click.native="$router.push('/order/special/' + scope.row.orderId)" v-hasPermi="['ecw:order:special_price']" >{{$t('特价')}}</el-dropdown-item> <el-dropdown-item @click.native="$router.push('/order/special/' + scope.row.orderId)" v-hasPermi="['ecw:order:special_price']" >{{$t('特价')}}</el-dropdown-item>
...@@ -340,7 +339,7 @@ ...@@ -340,7 +339,7 @@
scope.row.abnormalState != 1 && scope.row.abnormalState != 1 &&
include(scope.row.status, [2,3,5,10,9,8]) include(scope.row.status, [2,3,5,10,9,8])
"> ">
<el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:warehouse_update']">{{$t('入仓补充')}}</el-dropdown-item> <el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:warehouse_replenish']">{{$t('入仓补充')}}</el-dropdown-item>
</template> </template>
<!-- 入仓修改 --> <!-- 入仓修改 -->
<template v-if=" <template v-if="
...@@ -687,10 +686,6 @@ export default { ...@@ -687,10 +686,6 @@ export default {
exportUnload(){ exportUnload(){
return this.exportExcel(exportUnload, this.combinedQueryParams, this.$t("卸货费统计")) return this.exportExcel(exportUnload, this.combinedQueryParams, this.$t("卸货费统计"))
}, },
// 导出重货单统计
exportHeavyOrder(){
return this.exportExcel(exportHeavyOrder, this.combinedQueryParams, this.$t("重货单统计"))
},
// 通用导出函数 // 通用导出函数
exportExcel(func, params, fileName = null){ exportExcel(func, params, fileName = null){
this.exportLoading = true; this.exportLoading = true;
...@@ -699,7 +694,7 @@ export default { ...@@ -699,7 +694,7 @@ export default {
if(!fileName){ if(!fileName){
fileName = this.$t('订单') fileName = this.$t('订单')
} }
this.$download.excel(res, fileName + '.xlsx'); this.$download.excel(res, fileName + '.xls');
}).finally(() => { }).finally(() => {
this.exportLoading = false this.exportLoading = false
}) })
...@@ -786,7 +781,6 @@ export default { ...@@ -786,7 +781,6 @@ export default {
page: 1, page: 1,
rows: 10 rows: 10
} }
this.dateFilter = []
this.handleQuery(); this.handleQuery();
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
......
src/views/system/menu/index.vue
View file @ 57f8374e
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="form.type == 2"> <el-col :span="12" v-if="form.type == 2 || form.type == 1">
<el-form-item :label="$t('显示菜单')" prop="isShowInMenuBar"> <el-form-item :label="$t('显示菜单')" prop="isShowInMenuBar">
<dict-selector v-model="form.isShowInMenuBar" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" form-type="radio" /> <dict-selector v-model="form.isShowInMenuBar" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" form-type="radio" />
</el-form-item> </el-form-item>
......
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