Skip to content

J
jiedao-app-operator-master
Commit fb29057f authored by 我在何方's avatar 我在何方
Browse files
Options

更新佣金规则

parent c0651547
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 125 deletions
src/api/ecw/order.js
View file @ fb29057f
......@@ -352,6 +352,15 @@ export function createOrderSpecial(data) {
})
}
// 特价申请
export function cancelOrderSpecial(orderApprovalId,data) {
return request({
url: '/ecw/order/cancel/approval/'+orderApprovalId,
method: 'get',
params:data
})
}
// 获得订单特价申请详情
export function getOrderSpecial(offerProdId, type = 1) {
return request({
......@@ -393,4 +402,4 @@ export function exportPackingList(){
method: 'get',
responseType: 'blob'
})
}
\ No newline at end of file
}
src/api/ecw/orderException.js
View file @ fb29057f
......@@ -83,3 +83,12 @@ export function getOrderItemById(id) {
method: 'get'
})
}
// 根据订ID获取所有费用及比例
export function getOrderFeeById(query) {
return request({
url: '/ecw/order-exception/getOrderFeeById',
method: 'get',
params: query
})
}
\ No newline at end of file
src/router/index.js
View file @ fb29057f
......@@ -303,7 +303,13 @@ export const constantRoutes = [
name: 'discount',
meta: {title: '订单优惠申请', icon: '', activeMenu: '/order/index'}
},
{
path: 'speciallight/:orderId(\\d+)',
component: (resolve) => import('@/views/ecw/order/special/light'),
props: true,
name: 'special-light',
meta: {title: '申请泡货优惠', icon: '', activeMenu: '/order/index'}
},
{
path: 'specialWeight/:orderId(\\d+)',
component: (resolve) => import('@/views/ecw/order/special/weight'),
......
src/views/ecw/order/prepayDeal.vue
View file @ fb29057f
......@@ -3,7 +3,7 @@
<el-card>
<div slot="header" class="header">
<div class="card-title">查看</div>
<el-button type="primary" icon="el-icon-arrow-left" @click="$router.back()">返回</el-button>
<el-button type="primary" icon="el-icon-arrow-left" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
</div>
<el-form :model="orderData" ref="queryForm" size="small" :inline="true" label-width="120px" class="card">
<el-row>
......@@ -32,12 +32,12 @@
<div v-if="orderExceptionData.orderExceptionType!='order_doc_exception'&&orderExceptionData.orderExceptionType!='order_consignor_exception'&&orderExceptionData.orderExceptionType!='order_other_exception'">
<el-row>
<el-form-item label="填单参数:">
{{(shopData.num||0)+'箱 '+(shopData.volume||0)+'m³ '+(shopData.weight||0)+'kg'}}
{{(shopData.num||0)+'箱 '+(shopData.volume||0)+'m³ '+(shopData.weight||0)+'kg '+(shopData.quantity||0)+'个'}}
</el-form-item>
</el-row>
<el-row>
<el-form-item label="入仓参数:">
{{(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.cartonsNum:0)+'箱 '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.volume:0)+'m³ '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.weight:0)+'kg'}}
{{(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.cartonsNum:0)+'箱 '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.volume:0)+'m³ '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.weight:0)+'kg '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.quantityAll:0)+'个'}}
</el-form-item>
</el-row>
<el-row :span="12">
......@@ -47,8 +47,8 @@
<el-button v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;" @click="handleAdd">新增收款单</el-button>
</el-row>
<el-row>
<el-form-item label="入仓参数:">
<span>{{order.entryNum||0}}箱 {{order.entryWeight||0}}Kg {{order.entryVolume||0}}m³</span>
<el-form-item label="收费参数:">
<span>{{orderData.entryNum||0}}箱 {{orderData.entryVolume||0}}m³ {{orderData.entryWeight||0}}Kg {{orderData.entryQuantity||0}}个</span>
</el-form-item>
</el-row>
<!-- <el-row :span="12">
......@@ -58,7 +58,7 @@
<el-button v-if="orderExceptionData.orderExceptionStatus==3" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;" @click="handleAdd">新增收款单</el-button>
</el-row> -->
</div>
</el-form> {{order.entryNum}}箱 {{order.entryWeight}}Kg {{order.entryVolume}}m³
</el-form>
<el-table v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" v-loading="loading" border :data="preException">
<el-table-column label="品名" align="center">
<template slot-scope="scope">
......@@ -127,52 +127,52 @@
<el-form :model="handlerParams" ref="queryForms" size="small" :inline="true" label-width="120px" class="card">
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-form-item label="订单总金额:">
{{orderData.totalMoney}}
{{orderFee.totalAmount||0}}
</el-form-item>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-form-item label="应付预付金额:">
{{orderData.totalMoney}}
{{orderFee.totalPaymentAmount}}
</el-form-item>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-col :span="6">
<el-form-item label="已核销预付金额:">
{{orderData.totalMoney}}
{{orderFee.writeOffAmount}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="已核销预付金额占总金额比例:" label-width="200px">
{{orderData.totalMoney}}
{{orderFee.writeOffAmountScale}}
</el-form-item>
</el-col>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" >
<el-col :span="6">
<el-form-item label="预付商品货值:">
{{orderData.totalMoney}}
{{orderFee.paymentGoodsWorth}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="预付商品货值占佣金额比例:" label-width="200px">
{{orderData.totalMoney}}
{{orderFee.paymentGoodsWorthScale}}
</el-form-item>
</el-col>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-form-item label="预付商品方数:">
{{orderData.totalMoney}}
{{orderFee.paymentGoodsVolume}}
</el-form-item>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-col :span="6">
<el-form-item label="订单总方数:">
{{orderData.totalMoney}}
{{orderFee.totalVolume}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="预付商品方数占总方数比例:" label-width="200px">
{{orderData.totalMoney}}
{{orderFee.paymentGoodsVolumeScale}}
</el-form-item>
</el-col>
</el-row>
......@@ -230,7 +230,7 @@
<div slot="footer" class="dialog-footer">
<div>
<el-button type="primary" @click="submitForm">提交</el-button>
<el-button plain type="primary" @click="$router.back()">取消</el-button>
<el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
</div>
<el-button v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'" type="primary" @click="submitForm">转交</el-button>
</div>
......@@ -241,7 +241,7 @@
import FileUpload from '@/components/FileUpload'
import {getDictData, getDictDatas} from '@/utils/dict'
import {getOrder} from '@/api/ecw/order'
import {getExceptionById,handlerExceptionByExceptionId,getOrderItemById} from "@/api/ecw/orderException"
import {getExceptionById,handlerExceptionByExceptionId,getOrderItemById,getOrderFeeById} from "@/api/ecw/orderException"
import {getFirstReceivableListByOrderId} from '@/api/ecw/financial'
export default {
......@@ -269,7 +269,8 @@
consigneeData:[],
routerList:[],
multipleSelection:[],
preException:[]
preException:[],
orderFee:[]
};
},
created() {
......@@ -277,6 +278,7 @@
this.orderExceptionId = this.$route.query.id
this.handlerParams.orderExceptionId = this.$route.query.id
this.getList()
}
},
methods: {
......@@ -288,7 +290,7 @@
that.orderExceptionData = response.data;
// that.orderExceptionData.orderExceptionType = 'order_other_exception'
// that.orderExceptionData.orderExceptionType = 'order_pick_up_exception'
that.orderExceptionData.orderExceptionType = 'order_pay_exception'
// that.orderExceptionData.orderExceptionType = 'order_pay_exception'
that.loading = false;
that.orderId = response.data.orderId
that.getOrderData()
......@@ -296,6 +298,7 @@
that.getShopData(response.data.orderItemId)
}
that.getPreExceptionData()
that.getOrderFeeByIdData()
});
},
getOrderData(){
......@@ -303,7 +306,11 @@
this.orderData = response.data
});
},
getOrderFeeByIdData(){
getOrderFeeById({id:this.orderId}).then(response => {
this.orderFee = response.data
})
},
getPreExceptionData(){
getFirstReceivableListByOrderId({id:this.orderId}).then(response => {
this.preException = response.data
......@@ -336,7 +343,7 @@
}
handlerExceptionByExceptionId(this.handlerParams).then(res=>{
this.$modal.msgSuccess("提交成功");
this.$router.back()
this.$store.dispatch('tagsView/delCurrentView')
})
},
/** 跟进按钮操作 */
......
src/views/ecw/order/singleApply.vue
View file @ fb29057f
......@@ -143,10 +143,10 @@
<work-flow v-if='singleData.length>0' xmlkey="merge_order" v-model="selectedUsers"></work-flow>
<div slot="footer" class="card footer_btn" v-if="singleData.length>0">
<el-button v-if="orderData.inWarehouseState!=209" type="primary" @click="submitForm">提交申请</el-button>
<el-button v-if="orderData.inWarehouseState!=209" plain type="primary" @click="$router.back()">取消</el-button>
<el-button v-if="orderData.inWarehouseState==209" type="primary" disabled>审核中</el-button>
<el-button v-if="orderData.inWarehouseState!=209" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
<el-button v-if="orderData.inWarehouseState==209" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+bpmProcessId)">审核中</el-button>
<el-button v-if="orderData.inWarehouseState==209" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
<el-button v-if="orderData.inWarehouseState==209" plain type="primary" @click="$router.back()">返回</el-button>
<el-button v-if="orderData.inWarehouseState==209" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
</div>
<el-dialog
title="提示"
......@@ -196,6 +196,7 @@ export default {
selectedUsers:[],
total:0,
orderNos:'',
bpmProcessId:'',
reason:'',
dialogVisible:false
};
......@@ -215,7 +216,7 @@ export default {
getMergeListByOrderNo(this.queryParams).then(response => {
this.loading = false;
if(response.data.mergedList){
this.mergedList = response.data;
this.mergedList = response.data.mergedList;
}
if(response.data.unMergeList){
this.total = response.data.unMergeList.total;
......@@ -224,6 +225,9 @@ export default {
if(response.data.orderInfo){
this.orderData = response.data.orderInfo
}
if(response.data.bpmProcessId){
this.bpmProcessId = response.data.bpmProcessId
}
});
},
handleSelectionChange(val) {
......@@ -259,7 +263,7 @@ export default {
}
cancelMerge(params).then(res=>{
that.$message.success("取消成功");
that.$router.back()
that.$store.dispatch('tagsView/delCurrentView')
})
},
submitForm(){
......@@ -280,7 +284,7 @@ export default {
})
createMerge(params).then(res=>{
that.$message.success("修改成功");
that.$router.back()
that.$store.dispatch('tagsView/delCurrentView')
})
}
}
......
src/views/ecw/order/special/commission.vue
View file @ fb29057f
This diff is collapsed.
src/views/ecw/order/special/index.vue
View file @ fb29057f
......@@ -88,7 +88,7 @@
<div style="text-align: center;margin-top: 80px">
<el-button type="primary" @click="toweight">申请重货优惠</el-button>
<el-button type="primary">申请泡货优惠</el-button>
<el-button type="primary" @click="tolight" >申请泡货优惠</el-button>
<el-button type="primary">关闭窗口</el-button>
</div>
</el-card>
......@@ -157,6 +157,11 @@ export default {
path:"/order/specialWeight/"+this.params.orderId,
})
},
tolight(){
this.$router.push({
path:"/order/specialLight/"+this.params.orderId,
})
},
getProductNamesByIds(ids){
const result = []
ids.split(',').forEach(e => {
......
src/views/ecw/order/special/light.vue
View file @ fb29057f
......@@ -17,18 +17,18 @@
</el-row>
<el-row :span="8">
<el-form-item label="备注:" size="medium" label-width="150px">
<el-input style="width: 500px;" type="textarea" v-model="queryParams.orderExceptionHandlerRemark" />
<el-input style="width: 500px;" type="textarea" v-model="queryParams.remarks" />
</el-form-item>
</el-row>
</el-form>
</el-card>
<work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
<div slot="footer" class="card footer_btn">
<el-button type="primary" @click="submitForm">提交</el-button>
<el-button plain type="primary" @click="$router.back()">取消</el-button>
<!-- <el-button v-if="orderData.inWarehouseState==207" type="primary" disabled>审核中</el-button> -->
<!-- <el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="dialogVisible = true">取消审核</el-button> -->
<!-- <el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="$router.back()">返回</el-button> -->
<el-button v-if="queryParams.applyStatus==0" type="primary" @click="submitForm">提交</el-button>
<el-button v-if="queryParams.applyStatus==0" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
<el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">审核中</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
</div>
<el-dialog
title="提示"
......@@ -51,10 +51,10 @@
<script>
import {getDictData, getDictDatas,DICT_TYPE} from '@/utils/dict'
import WorkFlow from '@/components/WorkFlow'
import {getOrderSpecial,createOrderSpecial} from '@/api/ecw/order'
import {getOrderSpecial,createOrderSpecial,cancelOrderSpecial} from '@/api/ecw/order'
export default {
name: "specialWeight",
name: "specialLight",
components: {
WorkFlow
},
......@@ -96,17 +96,11 @@ export default {
})
},
submitForm(){
createOrderSpecial({
applyType: this.queryParams.applyType,
lineId: this.queryParams.lineId,
vweight: this.queryParams.vweight,
orderId: this.queryParams.orderId,
orderNo: this.queryParams.orderNo,
orderItemId: this.queryParams.orderItemId,
prodId:this.queryParams.prodId,
ccIds:this.selectedUsers.join(',')
}).then(r => {
this.queryParams.applyType = 5
this.queryParams.ccIds = this.selectedUsers.join(',')
createOrderSpecial(this.queryParams).then(r => {
this.$message.success(r.msg || '提交成功')
this.$store.dispatch('tagsView/delCurrentView')
})
},
cancelSplit(){
......@@ -115,9 +109,9 @@ export default {
that.$message.error("请输入取消原因");
return
}
cancelApply({orderId:that.queryParams.orderId,reason:that.reason}).then(res=>{
cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
that.$message.success("取消成功");
that.$router.back()
that.$store.dispatch('tagsView/delCurrentView')
})
},
......
src/views/ecw/order/special/weight.vue
View file @ fb29057f
......@@ -17,7 +17,7 @@
</el-row>
<el-row :span="8">
<el-form-item label="备注:" size="medium" label-width="150px">
<el-input style="width: 500px;" type="textarea" v-model="queryParams.orderExceptionHandlerRemark" />
<el-input style="width: 500px;" type="textarea" v-model="queryParams.remarks" />
</el-form-item>
</el-row>
</el-form>
......@@ -25,10 +25,10 @@
<work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
<div slot="footer" class="card footer_btn">
<el-button type="primary" v-if="queryParams.applyStatus==0" @click="submitForm">提交</el-button>
<el-button plain type="primary" v-if="queryParams.applyStatus==0" @click="$router.back()">取消</el-button>
<el-button v-if="queryParams.applyStatus==1" type="primary" disabled>审核中</el-button>
<el-button plain type="primary" v-if="queryParams.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
<el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">审核中</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$router.back()">返回</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
</div>
<el-dialog
title="提示"
......@@ -51,7 +51,7 @@
<script>
import {getDictData, getDictDatas,DICT_TYPE} from '@/utils/dict'
import WorkFlow from '@/components/WorkFlow'
import {getOrderSpecial,createOrderSpecial} from '@/api/ecw/order'
import {getOrderSpecial,createOrderSpecial,cancelOrderSpecial} from '@/api/ecw/order'
export default {
name: "specialWeight",
......@@ -97,17 +97,11 @@ export default {
})
},
submitForm(){
createOrderSpecial({
applyType: this.queryParams.applyType,
lineId: this.queryParams.lineId,
wvolume: this.queryParams.wvolume,
orderId: this.queryParams.orderId,
orderNo: this.queryParams.orderNo,
orderItemId: this.queryParams.orderItemId,
prodId:this.queryParams.prodId,
ccIds:this.selectedUsers.join(',')
}).then(r => {
this.queryParams.applyType = 4
this.queryParams.ccIds = this.selectedUsers.join(',')
createOrderSpecial(this.queryParams).then(r => {
this.$message.success(r.msg || '提交成功')
this.$store.dispatch('tagsView/delCurrentView')
})
},
cancelSplit(){
......@@ -116,9 +110,9 @@ export default {
that.$message.error("请输入取消原因");
return
}
cancelApply({orderId:that.queryParams.orderId,reason:that.reason}).then(res=>{
cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
that.$message.success("取消成功");
that.$router.back()
that.$store.dispatch('tagsView/delCurrentView')
})
},
......
src/views/ecw/order/splitApply.vue
View file @ fb29057f
......@@ -177,10 +177,10 @@
<work-flow xmlkey="split_order" v-model="selectedUsers"></work-flow>
<div slot="footer" class="card footer_btn" v-if="orderData.status!=99">
<el-button v-if="orderData.inWarehouseState!=207" type="primary" @click="submitForm">提交申请</el-button>
<el-button v-if="orderData.inWarehouseState!=207" plain type="primary" @click="$router.back()">取消</el-button>
<el-button v-if="orderData.inWarehouseState==207" type="primary" disabled>审核中</el-button>
<el-button v-if="orderData.inWarehouseState!=207" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
<el-button v-if="orderData.inWarehouseState==207" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderApprovalBackVO.formId)">审核中</el-button>
<el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
<el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="$router.back()">返回</el-button>
<el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
</div>
<!-- 对话框(添加 / 修改) -->
<el-dialog title="新建拆单" :visible.sync="open" width="400px" append-to-body>
......@@ -280,6 +280,7 @@ export default {
dialogVisible:false,
orderData:{},
splitData:[],
orderApprovalBackVO:{},
splitIndex:0,
channelData:[],
tradeCityList:[],
......@@ -371,7 +372,11 @@ export default {
this.loading = true;
// 执行查询
getSplitList(this.queryParams).then(response => {
this.splitData = response.data
this.splitData = response.data.orderSplitBackVOList
if(response.data.orderApprovalBackVO){
this.orderApprovalBackVO = response.data.orderApprovalBackVO
}
this.loading = false;
});
},
......@@ -436,7 +441,7 @@ export default {
}
splitApply(params).then(res=>{
this.$modal.msgSuccess("申请成功");
this.$router.back()
this.$store.dispatch('tagsView/delCurrentView')
})
},
addShop(index){
......@@ -522,7 +527,7 @@ export default {
}
cancelApply({orderId:that.queryParams.orderId,reason:that.reason}).then(res=>{
that.$message.success("取消成功");
that.$router.back()
that.$store.dispatch('tagsView/delCurrentView')
})
},
shopCancel(){
......
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