|
|
@@ -15,7 +15,8 @@
|
|
|
<el-form :inline="true"
|
|
|
:model="searchForm">
|
|
|
<el-form-item>
|
|
|
- <el-input placeholder="标题或学生姓名" v-model="searchForm.search"></el-input>
|
|
|
+ <el-input placeholder="标题或学生姓名"
|
|
|
+ v-model="searchForm.search"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-select v-model="searchForm.organId"
|
|
|
@@ -42,6 +43,7 @@
|
|
|
:value="4"></el-option>
|
|
|
<el-option label="维修费"
|
|
|
:value="5"></el-option>
|
|
|
+
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
@@ -56,7 +58,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="danger"
|
|
|
- @click="search">搜索</el-button>
|
|
|
+ @click="search">搜索</el-button>
|
|
|
<el-button @click="onReSet"
|
|
|
type="primary">重置</el-button>
|
|
|
</el-form-item>
|
|
|
@@ -160,6 +162,8 @@
|
|
|
:value="4"></el-option>
|
|
|
<el-option label="维修费"
|
|
|
:value="5"></el-option>
|
|
|
+ <el-option label="福袋活动"
|
|
|
+ :value="6"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="金额"
|
|
|
@@ -169,6 +173,14 @@
|
|
|
@mousewheel.native.prevent
|
|
|
:disabled='!isNew'></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="减免金额"
|
|
|
+ v-if="maskForm.type == 6"
|
|
|
+ prop='money'>
|
|
|
+ <el-input v-model="maskForm.subMoney"
|
|
|
+ type="number"
|
|
|
+ @mousewheel.native.prevent
|
|
|
+ :disabled='!isNew'></el-input>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="分部"
|
|
|
prop="organId">
|
|
|
<el-select v-model="maskForm.organId"
|
|
|
@@ -330,7 +342,8 @@ export default {
|
|
|
money: '',
|
|
|
desc: '',
|
|
|
title: '',
|
|
|
- code: ''
|
|
|
+ code: '',
|
|
|
+ subMoney: ''
|
|
|
},
|
|
|
maskRules: {
|
|
|
organId: [{ required: true, message: '请选择分部', trigger: 'change' }],
|
|
|
@@ -404,7 +417,7 @@ export default {
|
|
|
page: this.pageInfo.page,
|
|
|
rows: this.pageInfo.limit
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
getZero(params).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.tableList = res.data.rows
|
|
|
@@ -413,7 +426,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
onFormClose (formName) { // 关闭弹窗重置验证
|
|
|
- if(formName == 'maskForm') {
|
|
|
+ if (formName == 'maskForm') {
|
|
|
this.maskForm = {
|
|
|
organId: null,
|
|
|
type: null,
|
|
|
@@ -422,7 +435,7 @@ export default {
|
|
|
title: null,
|
|
|
code: null
|
|
|
}
|
|
|
- } else if(formName == 'maskForm1') {
|
|
|
+ } else if (formName == 'maskForm1') {
|
|
|
this.maskForm1 = {
|
|
|
type: null,
|
|
|
money: null,
|
|
|
@@ -446,7 +459,7 @@ export default {
|
|
|
this.title1 = '新增个人收费'
|
|
|
},
|
|
|
lookVisible (row) {
|
|
|
- if(row.userId) {
|
|
|
+ if (row.userId) {
|
|
|
this.isNew1 = false;
|
|
|
this.zeroVisible1 = true;
|
|
|
this.title1 = '查看个人收费'
|
|
|
@@ -469,6 +482,7 @@ export default {
|
|
|
this.maskForm.title = row.title
|
|
|
this.maskForm.organId = row.organId
|
|
|
this.maskForm.money = row.amount
|
|
|
+ this.maskForm.subMoney = row.discountAmount
|
|
|
}
|
|
|
},
|
|
|
onCreateQRCode () { // 生成报名二维码
|
|
|
@@ -485,7 +499,7 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
this.qrcode.clear();
|
|
|
- if(this.activeRow.userId) {
|
|
|
+ if (this.activeRow.userId) {
|
|
|
this.qrcode.makeCode(vaildStudentUrl() + `/#/sporadicPay?id=${this.activeRow.id}&userId=${this.activeRow.userId}`)
|
|
|
} else {
|
|
|
this.qrcode.makeCode(vaildStudentUrl() + `/#/sporadicLogin?id=${this.activeRow.id}`)
|
|
|
@@ -500,7 +514,8 @@ export default {
|
|
|
detail: this.maskForm.desc,
|
|
|
title: this.maskForm.title,
|
|
|
organId: this.maskForm.organId,
|
|
|
- amount: this.maskForm.money
|
|
|
+ amount: this.maskForm.money,
|
|
|
+ discountAmount: this.maskForm.subMoney
|
|
|
}
|
|
|
addZero(obj).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
@@ -516,7 +531,7 @@ export default {
|
|
|
this.$refs['maskForm1'].validate(item => {
|
|
|
if (item) {
|
|
|
let maskForm1 = this.maskForm1
|
|
|
- if(!maskForm1.studentName) {
|
|
|
+ if (!maskForm1.studentName) {
|
|
|
this.$message.error('学员信息不存在')
|
|
|
return
|
|
|
}
|
|
|
@@ -537,16 +552,16 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- onStudentChange() {
|
|
|
+ onStudentChange () {
|
|
|
let studentId = this.maskForm1.studentId
|
|
|
// 判断学生编号是否存在
|
|
|
- if(!studentId) {
|
|
|
+ if (!studentId) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
getBasic({ userId: studentId }).then(res => {
|
|
|
- if(res.code == 200) {
|
|
|
- if(res.data) {
|
|
|
+ if (res.code == 200) {
|
|
|
+ if (res.data) {
|
|
|
this.maskForm1.studentName = res.data.name
|
|
|
} else {
|
|
|
this.maskForm1.studentName = null
|
|
|
@@ -594,7 +609,8 @@ export default {
|
|
|
'2': '声部更改',
|
|
|
'3': '乐器更换',
|
|
|
'4': '配件销售',
|
|
|
- '5': '维修费'
|
|
|
+ '5': '维修费',
|
|
|
+ '6': '福袋活动'
|
|
|
}
|
|
|
return template[val]
|
|
|
}
|
