Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

订单优化、提成分为审核、未审核

Browse Source
This commit is contained in:
xiezhijun
2021-03-01 19:00:01 +08:00
parent 7539ec6b7f
commit f92e07f1ed
21 changed files with 207 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-ui/src/components/OrderAdd/index.vue
View File

@ -37,7 +37,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="成交金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入金额" />
<el-input v-model.trim="form.amount" placeholder="请输入金额" />
</el-form-item>
</el-col>
<el-col :span="8">

2
stdiet-ui/src/components/OrderEdit/index.vue
View File

@ -16,7 +16,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="成交金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入金额" />
<el-input v-model.trim="form.amount" placeholder="请输入金额" />
</el-form-item>
</el-col>
<el-col :span="8">

2
stdiet-ui/src/utils/orderType.js
View File

@ -25,7 +25,7 @@ export const orderCountTypeArray = [
}
]
//订单类型
//订单类型（订单新增）
export const orderTypeArray = [
{
value: 0,

21
stdiet-ui/src/views/custom/commision/detail/index.vue
View File

@ -48,6 +48,21 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="订单状态" prop="reviewStatus">
<el-select
v-model="queryParams.reviewStatus"
placeholder="请选择审核状态"
clearable
size="small"
>
<el-option
v-for="dict in reviewStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="cyan"
@ -155,6 +170,8 @@ export default {
totalUserIdOptions: [],
//
searchUserIdOptions: [],
// 审核状态
reviewStatusOptions: [],
//
options: {},
// 查询参数
@ -163,6 +180,7 @@ export default {
pageSize: 10,
userId: null,
postId: null,
reviewStatus: "yes"
},
};
},
@ -202,6 +220,9 @@ export default {
);
this.searchUserIdOptions = this.totalUserIdOptions.slice();
});
this.getDicts("cus_review_status").then((response) => {
this.reviewStatusOptions = response.data;
});
},
methods: {
/** 查询业务提成比例列表 */

21
stdiet-ui/src/views/custom/commision/detail_day/index.vue
View File

@ -48,6 +48,21 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="订单状态" prop="reviewStatus">
<el-select
v-model="queryParams.reviewStatus"
placeholder="请选择审核状态"
clearable
size="small"
>
<el-option
v-for="dict in reviewStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="cyan"
@ -242,6 +257,8 @@ export default {
//
searchUserIdOptions: [],
//
// 审核状态
reviewStatusOptions: [],
options: {},
// 查询参数
queryParams: {
@ -249,6 +266,7 @@ export default {
pageSize: 20,
userId: null,
postId: null,
reviewStatus: "yes",
},
sendCommissionPlanTable: false,
sendCommissionPlan: {},
@ -291,6 +309,9 @@ export default {
);
this.searchUserIdOptions = this.totalUserIdOptions.slice();
});
this.getDicts("cus_review_status").then((response) => {
this.reviewStatusOptions = response.data;
});
},
methods: {
/** 查询业务提成比例列表 */

8
stdiet-ui/src/views/custom/customer/index.vue
View File

@ -9,7 +9,7 @@
>
<el-form-item label="名字" prop="name">
<el-input
v-model="queryParams.name"
v-model.trim="queryParams.name"
placeholder="请输入名字"
clearable
size="small"
@ -18,7 +18,7 @@
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input
v-model="queryParams.phone"
v-model.trim="queryParams.phone"
placeholder="请输入手机号"
clearable
size="small"
@ -260,12 +260,12 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-col :span="12">
<el-form-item label="客户名字" prop="name">
<el-input v-model="form.name" placeholder="请输入名字" />
<el-input v-model.trim="form.name" placeholder="请输入名字" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
<el-input v-model.trim="form.phone" placeholder="请输入手机号" />
</el-form-item>
</el-col>
<el-col :span="12">

51
stdiet-ui/src/views/custom/order/index.vue
View File

@ -11,7 +11,7 @@
<el-col :span="6">
<el-form-item label="客户信息" prop="customer">
<el-input
v-model="queryParams.customer"
v-model.trim="queryParams.customer"
placeholder="请输入客户姓名或手机号"
clearable
size="small"
@ -248,6 +248,19 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="订单类型" prop="searchOrderTypeArray" >
<el-cascader
placeholder="请选择订单类型"
v-model="searchOrderTypeArray"
:options="orderTypeOptions"
:props="orderTypeProps"
collapse-tags
clearable
style="width: 300px"
></el-cascader>
</el-form-item><!-- -->
</el-col>
<el-col :span="12">
<el-form-item label="成交日期" prop="orderTime">
<el-date-picker
@ -428,7 +441,7 @@
@pagination="getList"
>
<span style="margin-right: 12px"
>总计：{{ toThousands(this.totalAmount) }} 元</span
>总计收款（已除去二开售后提成金额）：{{ toThousands(this.totalAmount) }} 元</span
>
</pagination>
@ -459,7 +472,7 @@
import { delOrder, exportOrder, listOrder } from "@/api/custom/order";
import dayjs from "dayjs";
import orderPause from "./orderPause";
import * as orderTypeData from "@/utils/orderType";
import OrderDetail from "@/components/OrderDetail";
import OrderEdit from "@/components/OrderEdit";
import AutoHideMessage from "@/components/AutoHideMessage";
@ -510,6 +523,9 @@ export default {
conditioningProjectIdOption: [],
// 审核状态
reviewStatusOptions: [],
//订单类型
orderTypeOptions: orderTypeData["orderTypeArray"],
orderTypeProps: { multiple: true,expandTrigger: 'click' },//,checkStrictly:true
// 查询参数
queryParams: {
pageNum: 1,
@ -531,6 +547,8 @@ export default {
reviewStatus: null,
serveTimeId: null,
},
//查询时选择的订单类型数组
searchOrderTypeArray: null
};
},
computed: {
@ -578,6 +596,9 @@ export default {
/** 查询销售订单列表 */
getList() {
this.loading = true;
this.queryParams.orderType = this.searchOrderTypeArray != null ? encodeURIComponent(JSON.stringify(this.searchOrderTypeArray)) : null;
console.log(this.queryParams.searchOrderTypeArray);
//this.dealOrderTypeArray();
listOrder(this.addDateRange(this.queryParams, this.daterange)).then(
(response) => {
this.orderList = response.rows;
@ -586,7 +607,27 @@ export default {
this.totalAmount = response.totalAmount;
}
);
}, // 收款方式字典翻译
},
/*dealOrderTypeArray(){
this.queryParams.orderType = "";
this.queryParams.orderCountType = "";
this.queryParams.orderMoneyType = "";
if(this.searchOrderTypeArray == null){
return;
}
this.searchOrderTypeArray.forEach((item,index) => {
if(this.queryParams.orderType.indexOf(item[0]+"") == -1){
this.queryParams.orderType += this.queryParams.orderType != "" ? (","+item[0]) : item[0];
}
if(this.queryParams.orderCountType.indexOf(item[1]+"") == -1){
this.queryParams.orderCountType += this.queryParams.orderCountType != "" ? (","+item[1]) : item[1];
}
if(this.queryParams.orderMoneyType.indexOf(item[2]+"") == -1){
this.queryParams.orderMoneyType += this.queryParams.orderMoneyType != "" ? (","+item[2]) : item[2];
}
});
},*/
// 收款方式字典翻译
payTypeIdFormat(row, column) {
return this.selectDictLabel(this.payTypeIdOptions, row.payTypeId);
},
@ -711,7 +752,7 @@ export default {
return "warning-row";
}
return "success-row";
},
}
},
watch: {},
};