Compare commits

..

No commits in common. "454bc2e4b19648ff2c791a118df5a0e87dff6e19" and "8131596c93d06564d328bd5993f43c27fd3e6d87" have entirely different histories.

2 changed files with 17 additions and 19 deletions

View File

@ -25,8 +25,7 @@ export default {
} }
}, },
props: { props: {
deptId: Number, deptId: Number
status: Boolean
}, },
created() { created() {
this.getDeptName(); this.getDeptName();
@ -40,16 +39,9 @@ export default {
}) })
}, },
getList() { getList() {
console.log(this.status)
if(this.status){
getYearListApi().then(res => {
this.tableData = res.data.records
})
}else {
getYearListApi({deptId : this.deptId}).then(res => { getYearListApi({deptId : this.deptId}).then(res => {
this.tableData = res.data.records this.tableData = res.data.records
}) })
}
}, },
onSubmit() { onSubmit() {
console.log('表单提交', this.form); console.log('表单提交', this.form);

View File

@ -273,7 +273,7 @@
<el-col :span="20"> <el-col :span="20">
<el-form-item label="计费方式" prop="turnoverType"> <el-form-item label="计费方式" prop="turnoverType">
<span v-if="isTopDept "> <span v-if="isTopDept ">
<el-radio-group :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule()"> <el-radio-group :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
<el-radio v-if="ruleForm.turnoverType=='1'" label=1>无限制</el-radio> <el-radio v-if="ruleForm.turnoverType=='1'" label=1>无限制</el-radio>
<el-radio v-if="ruleForm.turnoverType=='5'" label=5>年付费</el-radio> <el-radio v-if="ruleForm.turnoverType=='5'" label=5>年付费</el-radio>
<!-- <el-radio v-if="ruleForm.turnoverType=='2'" label=2>时间限制</el-radio>--> <!-- <el-radio v-if="ruleForm.turnoverType=='2'" label=2>时间限制</el-radio>-->
@ -282,7 +282,7 @@
</el-radio-group> </el-radio-group>
</span> </span>
<span v-else> <span v-else>
<el-radio-group :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule()"> <el-radio-group :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
<el-radio label=5>年付费</el-radio> <el-radio label=5>年付费</el-radio>
<el-radio label=3>预付费</el-radio> <el-radio label=3>预付费</el-radio>
<el-radio label=4>后付费</el-radio> <el-radio label=4>后付费</el-radio>
@ -305,7 +305,7 @@
<afterff :deptId="queryParams.deptId"></afterff> <afterff :deptId="queryParams.deptId"></afterff>
</template> </template>
<template v-if="ruleForm.turnoverType === '5'"> <template v-if="ruleForm.turnoverType === '5'">
<yearff :deptId="queryParams.deptId" :status="queryParams.status"></yearff> <yearff :deptId="queryParams.deptId"></yearff>
</template> </template>
<template v-if="ruleForm.turnoverType === '6'"> <template v-if="ruleForm.turnoverType === '6'">
<el-col :span="10"> <el-col :span="10">
@ -856,7 +856,9 @@ export default {
rates:0, rates:0,
storeNum:0, storeNum:0,
prepaidAmount:0, prepaidAmount:0,
stauts:false,
}, },
filterText:'', filterText:'',
xtitle:'', xtitle:'',
@ -1344,6 +1346,8 @@ export default {
this.ruleForm.turnoverType = this.oldValue this.ruleForm.turnoverType = this.oldValue
}); });
} }
}, },
// //
rateClearing () { rateClearing () {
@ -1584,8 +1588,7 @@ export default {
}, },
// //
// //
append(status,data) { append(data) {
this.ruleForm.status=true,
console.log('新增树',data) console.log('新增树',data)
// //
this.cleanRuleForm() this.cleanRuleForm()
@ -1677,6 +1680,9 @@ export default {
this.isTopDept = false this.isTopDept = false
console.log( this.ruleForm.parentId ,111) console.log( this.ruleForm.parentId ,111)
}) })
}, },
// //
appedit(id,label) { appedit(id,label) {
@ -1778,7 +1784,7 @@ export default {
{!isAdd && this.isAgencyAdd ? {!isAdd && this.isAgencyAdd ?
< img alt="" src="https://www.youkerr.com/add" style=" width: 20px;height: 20px; " on-click={() => this.append('add',data)}/> < img alt="" src="https://www.youkerr.com/add" style=" width: 20px;height: 20px; " on-click={() => this.append(data)}/>
: null : null
} }
{node.level !== 1 && this.isAgencyDelete ? {node.level !== 1 && this.isAgencyDelete ?