From 7741e57329bd792da3f2b0f82b2ed6e9dca8ac99 Mon Sep 17 00:00:00 2001
From: sw <17615834396@163.com>
Date: Wed, 20 Nov 2024 09:54:59 +0800
Subject: [PATCH] 11.19

---
 .../src/views/Site/components/yearff.vue      | 16 +++++++++++----
 fuintAdmin_zt/src/views/Site/index.vue        | 20 +++++++------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/fuintAdmin_zt/src/views/Site/components/yearff.vue b/fuintAdmin_zt/src/views/Site/components/yearff.vue
index c91346966..599ed824a 100644
--- a/fuintAdmin_zt/src/views/Site/components/yearff.vue
+++ b/fuintAdmin_zt/src/views/Site/components/yearff.vue
@@ -23,7 +23,8 @@ export default {
     }
   },
   props: {
-    deptId: Number
+    deptId: Number,
+    status: Boolean
   },
   created() {
     console.log("deptId",this.deptId)
@@ -31,9 +32,16 @@ export default {
   },
   methods: {
     getList() {
-      getYearListApi({deptId : this.deptId}).then(res => {
-        this.tableData = res.data.records
-      })
+      console.log(this.status)
+      if(this.status){
+        getYearListApi().then(res => {
+          this.tableData = res.data.records
+        })
+      }else {
+        getYearListApi({deptId : this.deptId}).then(res => {
+          this.tableData = res.data.records
+        })
+      }
     },
     onSubmit() {
       console.log('表单提交', this.form);
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index fddd49fc5..80cd1e286 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -273,7 +273,7 @@
                       <el-col :span="20">
                         <el-form-item label="计费方式" prop="turnoverType">
                           <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=='5'" label=5>年付费</el-radio>
 <!--                              <el-radio v-if="ruleForm.turnoverType=='2'" label=2>时间限制</el-radio>-->
@@ -282,7 +282,7 @@
                             </el-radio-group>
                           </span>
                           <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=3>预付费</el-radio>
                               <el-radio label=4>后付费</el-radio>
@@ -305,7 +305,7 @@
                         <afterff :deptId="queryParams.deptId"></afterff>
                       </template>
                       <template v-if="ruleForm.turnoverType === '5'">
-                        <yearff :deptId="queryParams.deptId"></yearff>
+                        <yearff :deptId="queryParams.deptId" :status="queryParams.status"></yearff>
                       </template>
                       <template v-if="ruleForm.turnoverType === '6'">
                         <el-col :span="10">
@@ -856,9 +856,7 @@ export default {
           rates:0,
           storeNum:0,
           prepaidAmount:0,
-
-
-
+          stauts:false,
         },
         filterText:'',
         xtitle:'',
@@ -1346,8 +1344,6 @@ export default {
             this.ruleForm.turnoverType = this.oldValue
           });
         }
-
-
       },
       // 清空数据
       rateClearing () {
@@ -1588,7 +1584,8 @@ export default {
       },
       //树形页操作
       //新增树
-      append(data) {
+      append(status,data) {
+        this.ruleForm.status=true,
         console.log('新增树',data)
         // 清除表单
         this.cleanRuleForm()
@@ -1680,9 +1677,6 @@ export default {
              this.isTopDept = false
            console.log( this.ruleForm.parentId ,111)
            })
-
-
-
       },
       //修改树
       appedit(id,label) {
@@ -1784,7 +1778,7 @@ export default {
             {!isAdd && this.isAgencyAdd ?
 
 
-              < img alt="" src="https://www.youkerr.com/add" style=" width: 20px;height: 20px;  " on-click={() => this.append(data)}/>
+              < img alt="" src="https://www.youkerr.com/add" style=" width: 20px;height: 20px;  " on-click={() => this.append('add',data)}/>
               : null
             }
             {node.level !== 1 && this.isAgencyDelete ?