|
@@ -68,6 +68,10 @@
|
|
|
label="折扣(%)">
|
|
|
</el-table-column>
|
|
|
<el-table-column align='center'
|
|
|
+ prop="fee"
|
|
|
+ label="经营报表确认收入(%)">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align='center'
|
|
|
label="操作">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button @click="openTypes('update', scope.row)"
|
|
@@ -94,6 +98,7 @@
|
|
|
width="500px">
|
|
|
<el-form :model="form"
|
|
|
:rules="rules"
|
|
|
+ label-width="220px"
|
|
|
ref="ruleForm">
|
|
|
<el-form-item label="收费类型"
|
|
|
prop="chargeTypeId"
|
|
@@ -130,7 +135,7 @@
|
|
|
</el-option-group>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="折扣(%)"
|
|
|
+ <el-form-item label="乐器折扣(%)"
|
|
|
prop="goodsDiscountRate"
|
|
|
:label-width="formLabelWidth">
|
|
|
<el-input v-model.trim="form.goodsDiscountRate"
|
|
@@ -142,6 +147,18 @@
|
|
|
min="0"
|
|
|
max="100"></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="经营报表确认收入(%)"
|
|
|
+ prop="goodsDiscountRate"
|
|
|
+ :label-width="formLabelWidth">
|
|
|
+ <el-input v-model.trim="form.fee"
|
|
|
+ autocomplete="off"
|
|
|
+ type="number"
|
|
|
+ placeholder="请输入折扣 0%-100%"
|
|
|
+ controls-position="right"
|
|
|
+ class="number-input"
|
|
|
+ min="0"
|
|
|
+ max="100"></el-input>
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
<span slot="footer"
|
|
|
class="dialog-footer">
|
|
@@ -150,8 +167,9 @@
|
|
|
@click="onTypesSubmit('ruleForm')">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
- <el-dialog :visible.sync="createVisible"
|
|
|
+ <el-dialog class="dialog" :visible.sync="createVisible"
|
|
|
title="添加商品折扣"
|
|
|
+ top="10vh"
|
|
|
width="500px">
|
|
|
<createDiscount @close="createVisible = false"
|
|
|
@submited="getList"
|
|
@@ -182,11 +200,12 @@ export default {
|
|
|
},
|
|
|
createVisible: false,
|
|
|
typeStatus: false, // 添加教学点
|
|
|
- formLabelWidth: '100px',
|
|
|
+ formLabelWidth: '120px',
|
|
|
form: {
|
|
|
name: null, //
|
|
|
subjectId: null,
|
|
|
goodsDiscountRate: null,
|
|
|
+ fee: null
|
|
|
},
|
|
|
searchForm: {
|
|
|
subjectId: null,
|
|
@@ -278,7 +297,7 @@ export default {
|
|
|
typesListById[item.id] = item.name
|
|
|
this.typesList.push({
|
|
|
label: item.name,
|
|
|
- value: item.id
|
|
|
+ value: item.id,
|
|
|
})
|
|
|
})
|
|
|
this.typesListById = typesListById
|
|
@@ -293,20 +312,7 @@ export default {
|
|
|
}).then(res => {
|
|
|
let result = res.data
|
|
|
this.tableList = result.rows
|
|
|
- // if (res.code == 200) {
|
|
|
- // result.data.rows.forEach(row => {
|
|
|
- // let subjectname = [],
|
|
|
- // subjectIds = []
|
|
|
- // row.subjects.forEach(item => {
|
|
|
- // subjectname.push(item.name)
|
|
|
- // subjectIds.push(item.id)
|
|
|
- // })
|
|
|
- // row.subjectName = subjectname
|
|
|
- // row.subjectIds = subjectIds
|
|
|
- // })
|
|
|
- // this.tableList = result.rows
|
|
|
this.pageInfo.total = result.total
|
|
|
- // }
|
|
|
})
|
|
|
},
|
|
|
openTypes (type, row) {
|
|
@@ -319,6 +325,7 @@ export default {
|
|
|
chargeTypeId: row.chargeTypeId,
|
|
|
subjectId: row.subjectId,
|
|
|
goodsDiscountRate: row.goodsDiscountRate,
|
|
|
+ fee: row.fee
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -327,6 +334,7 @@ export default {
|
|
|
name: null, // 训练模块名称
|
|
|
subjectId: null,
|
|
|
goodsDiscountRate: null,
|
|
|
+ fee: null
|
|
|
}
|
|
|
this.$refs[formName].resetFields()
|
|
|
},
|
|
@@ -379,4 +387,59 @@ export default {
|
|
|
|
|
|
width: 100%;
|
|
|
}
|
|
|
+.dialog{
|
|
|
+ ::v-deep {
|
|
|
+ .el-dialog{
|
|
|
+ border-radius: 4px;
|
|
|
+ overflow: hidden;
|
|
|
+ }
|
|
|
+ .el-dialog__header{
|
|
|
+ display: flex;
|
|
|
+ flex-shrink: 0;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
+ box-sizing: border-box;
|
|
|
+ width: 100%;
|
|
|
+ height: 48px;
|
|
|
+ padding: 0 20px;
|
|
|
+ .el-dialog__title{
|
|
|
+ font-weight: 500;
|
|
|
+ font-size: 16px;
|
|
|
+ }
|
|
|
+ .el-dialog__headerbtn{
|
|
|
+ position: relative;
|
|
|
+ top: 0;
|
|
|
+ right: 0;
|
|
|
+ &::before{
|
|
|
+ position: absolute;
|
|
|
+ display: block;
|
|
|
+ box-sizing: border-box;
|
|
|
+ background-color: transparent;
|
|
|
+ border-radius: 50%;
|
|
|
+ transition: background-color .1s cubic-bezier(0,0,1,1);
|
|
|
+ content: "";
|
|
|
+ top: 50%;
|
|
|
+ left: 50%;
|
|
|
+ width: 20px;
|
|
|
+ height: 20px;
|
|
|
+ transform: translate(-50%,-50%);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .el-dialog__headerbtn:hover{
|
|
|
+ &::before{
|
|
|
+ background-color: rgba(0,0,0, .5);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .el-dialog__close{
|
|
|
+ position: relative;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .el-dialog__body{
|
|
|
+ padding: 10px 20px;
|
|
|
+ }
|
|
|
+ .el-input-group__append{
|
|
|
+ padding: 0 10px;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|