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

!44 浏览文件提成改为保留三位小数四舍五入，订单页面修改，增加服务天数

Browse Source 
Merge pull request !44 from 德仔/xzj
This commit is contained in:
德仔
2021-01-22 07:22:33 +08:00
committed by Gitee
parent 84eeb735b3 34a0790af2
commit a98def60b7
9 changed files with 107 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@
</el-table-column>
<el-table-column label="提成" align="center" prop="commision">
<template scope="scope">
{{scope.row.commision.toFixed(2)}}
{{scope.row.commision.toFixed(3)}}
</template>
</el-table-column>

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

@ -65,23 +65,23 @@
<el-table-column label="岗位" align="center" prop="postName"/>
<el-table-column label="总提成" align="center" prop="totalCommissionAmount">
<template scope="scope">
{{scope.row.totalCommissionAmount}}
{{scope.row.totalCommissionAmount.toFixed(3)}}
</template>
</el-table-column>
<el-table-column label="已发放提成" align="center" prop="totalHasSentCommissionAmount">
<template scope="scope">
{{scope.row.totalHasSentCommissionAmount}}
{{scope.row.totalHasSentCommissionAmount.toFixed(3)}}
</template>
</el-table-column>
<el-table-column label="未发放提成" align="center" prop="totalNotSentCommissionAmount">
<template scope="scope">
{{scope.row.totalNotSentCommissionAmount}}
{{scope.row.totalNotSentCommissionAmount.toFixed(3)}}
</template>
</el-table-column>
<el-table-column label="下月应发提成" align="center" prop="nextMonthCommission">
<template scope="scope">
{{scope.row.nextMonthCommission}}
{{scope.row.nextMonthCommission.toFixed(3)}}
</template>
</el-table-column>
@ -112,7 +112,11 @@
{{scope.row.yearMonth.substring(0, 4)}}年{{scope.row.yearMonth.substring(4)}}月
</template>
</el-table-column>
<el-table-column property="yearMonthCommission" label="提成金额" width="100"></el-table-column>
<el-table-column property="yearMonthCommission" label="提成金额" width="100">
<template scope="scope">
{{scope.row.yearMonthCommission.toFixed(3)}}
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>

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

@ -143,6 +143,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="服务时长" prop="serveTimeId">
<el-select v-model="queryParams.serveTimeId" placeholder="请选服务时长">
<el-option
v-for="dict in serveTimeIdOption"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="成交日期" prop="orderTime">
<el-date-picker
@ -159,6 +171,7 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini"
@ -265,6 +278,11 @@
<span>{{ parseTime(scope.row.serverEndTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="服务天数" align="center" prop="serverDay" width="80">
<template slot-scope="scope">
{{scope.row.serverDay ? `${scope.row.serverDay}天` : '0天'}}
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300" fixed="right">
<template slot-scope="scope">
@ -582,6 +600,30 @@
export default {
name: "Order",
data() {
const checkStartTime = (rule, value, callback) => {
if (!value) {
return callback(new Error('开始时间不能为空'))
}
if (!this.form.orderTime) {
return callback(new Error('请先选择成交时间'))
}
if(dayjs(this.form.startTime).diff(dayjs(this.form.orderTime),'day') < 0){
return callback(new Error('开始时间不能小于成交时间'))
}
callback();
};
const checkOrderTime = (rule, value, callback) => {
if (!value) {
return callback(new Error('成交时间不能为空'))
}
if (!this.form.becomeFanTime) {
return callback(new Error('请先填写进粉时间'))
}
if(dayjs(this.form.orderTime).diff(dayjs(this.form.becomeFanTime),'day') < 0){
return callback(new Error('成交时间不能小于进粉时间'))
}
callback();
}
return {
// 遮罩层
loading: true,
@ -660,6 +702,7 @@
operatorAssisId: null,
recommender: null,
reviewStatus: null,
serveTimeId: null
},
// 表单参数
form: {},
@ -677,8 +720,13 @@
phone: [
{required: true, message: "手机号不能为空", trigger: "blur"}
],
orderTime: [
{required: true, message: "成交时间不能为空", trigger: "blur"},
{required: true, trigger: "blur", validator: checkOrderTime}
],
startTime: [
{required: true, message: "开始时间不能为空", trigger: "blur"}
{required: true, message: "开始时间不能为空", trigger: "blur"},
{required: true, trigger: "blur", validator: checkStartTime}
],
becomeFanTime: [
{required: true, message: "进粉时间不能为空", trigger: "blur"}
@ -863,7 +911,7 @@
phone: null,
amount: null,
weight: null,
startTime: dayjs().format("YYYY-MM-DD"),
startTime: dayjs().add(3, 'day').format("YYYY-MM-DD"),
pauseTime: null,
payTypeId: defaultPayType ? parseInt(defaultPayType.dictValue) : null,
preSaleId: defaultPresale ? parseInt(defaultPresale.dictValue) : null,

7
stdiet-ui/src/views/custom/signContract/index.vue
View File

@ -166,7 +166,8 @@
const checkcusId = (rule, value, callback) => {
if (!value) {
return callback(new Error('证件号码不能为空'))
callback();
//return callback(new Error('证件号码不能为空'))
}
setTimeout(() => {
const {code, msg} = validatorIDCard(value, this.idType);
@ -214,7 +215,7 @@
{required: true, trigger: "blur", validator: checkPhone}
],
cusId: [
{required: true, trigger: "blur", validator: checkcusId}
{required: false, trigger: "blur", validator: checkcusId}
]
}
}
@ -243,8 +244,10 @@
})
},
submitForm() {
console.log("chdkscjksdc1");
this.$refs["form"].validate(valid => {
if (valid) {
console.log("chdkscjksdc2");
signContract(this.form).then(result => {
if (result.code === 200) {
window.location.href = window.location.origin + result.url;