From 19ca4609daa489f390b79e09df75b5ade62b32a2 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 28 Mar 2024 15:35:13 +0800
Subject: [PATCH 1/3] bug

---
 fuintAdmin_zt/src/views/Site/index.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 5544bfe49..26c6cecfd 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -197,6 +197,16 @@
                         >{{dict.label}}</el-radio>
                       </el-radio-group>
                     </span>
+                    <span v-else-if="ruleForm.deptType">
+                      <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
+                        <el-radio
+                          v-for="dict in judgementNodeType(dict.type.node_type)"
+                          :key="dict.value"
+                          :label="dict.value"
+                          v-if="dict.value==ruleForm.deptType"
+                        >{{dict.label}}</el-radio>
+                      </el-radio-group>
+                    </span>
                     <span v-else>
                       <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
                         <el-radio

From 9f0d8f7ca25f847bd6a132013e2bb2727724abb5 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 28 Mar 2024 18:13:58 +0800
Subject: [PATCH 2/3] bug

---
 fuintAdmin_zt/src/views/Site/index.vue | 88 +++++++++++++++-----------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 26c6cecfd..d8ec1ce29 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -187,34 +187,45 @@
                         >{{dict.label}}</el-radio>
                       </el-radio-group>
                     </span>
-                    <span v-else-if="ruleForm.deptType==='1'">
-                      <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
-                        <el-radio
-                          v-for="dict in judgementNodeType(dict.type.node_type)"
-                          :key="dict.value"
-                          :label="dict.value"
-                          v-if="dict.value!='4'"
-                        >{{dict.label}}</el-radio>
-                      </el-radio-group>
-                    </span>
-                    <span v-else-if="ruleForm.deptType">
-                      <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
-                        <el-radio
-                          v-for="dict in judgementNodeType(dict.type.node_type)"
-                          :key="dict.value"
-                          :label="dict.value"
-                          v-if="dict.value==ruleForm.deptType"
-                        >{{dict.label}}</el-radio>
-                      </el-radio-group>
-                    </span>
                     <span v-else>
-                      <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
-                        <el-radio
-                          v-for="dict in judgementNodeType(dict.type.node_type)"
-                          :key="dict.value"
-                          :label="dict.value"
-                        >{{dict.label}}</el-radio>
-                      </el-radio-group>
+                      <span v-if="!ruleForm.deptType">
+                        <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
+                          <el-radio
+                            v-for="dict in judgementNodeType(dict.type.node_type)"
+                            :key="dict.value"
+                            :label="dict.value"
+                          >{{dict.label}}</el-radio>
+                        </el-radio-group>
+                      </span>
+                      <span v-else-if="ruleForm.deptType==='1'">
+                        <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
+                          <el-radio
+                            v-for="dict in judgementNodeType(dict.type.node_type)"
+                            :key="dict.value"
+                            :label="dict.value"
+                            v-if="dict.value!='4'"
+                          >{{dict.label}}</el-radio>
+                        </el-radio-group>
+                      </span>
+                      <span v-else-if="ruleForm.deptType==='4'">
+                        <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
+                          <el-radio
+                            v-for="dict in judgementNodeType(dict.type.node_type)"
+                            :key="dict.value"
+                            :label="dict.value"
+                          >{{dict.label}}</el-radio>
+                        </el-radio-group>
+                      </span>
+                      <span v-else>
+                        <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
+                          <el-radio
+                            v-for="dict in judgementNodeType(dict.type.node_type)"
+                            :key="dict.value"
+                            :label="dict.value"
+                            v-if="dict.value==ruleForm.deptType"
+                          >{{dict.label}}</el-radio>
+                        </el-radio-group>
+                      </span>
                     </span>
                   </el-form-item>
 
@@ -223,7 +234,7 @@
                   <template v-if="ruleForm.deptType !== '3'">
                     <el-row >
                       <el-col :span="20">
-                        <el-form-item label="计费方式" prop="">
+                        <el-form-item label="计费方式" prop="turnoverType">
                           <span v-if="isTopDept">
                             <el-radio-group  :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
                               <el-radio v-if="ruleForm.turnoverType=='1'" label=1>无限制</el-radio>
@@ -943,6 +954,12 @@ export default {
           mobile: [
             { required: true, message: '手机号不能为空', trigger: 'blur' },
           ],
+          deptType: [
+            { required: true, message: '机构类型不能为空', trigger: 'blur' },
+          ],
+          turnoverType: [
+            { required: true, message: '计费方式不能为空', trigger: 'blur' },
+          ],
 
           deptName: [
             { required: true, message: '请输入机构名称', trigger: 'blur' },
@@ -1401,13 +1418,10 @@ export default {
       // },
       handleClick(tab, event) {
         console.log(this.activeName)
-        if (this.activeName=="list"){
+        if (this.activeName==="list"){
           this.onlyGetUser()
         }
-        if (this.activeName=="duty"){
-          this.getDutyList()
-        }
-        if (this.activeName=="info"){
+        if (this.activeName==="duty"){
           this.getDutyList()
         }
       },
@@ -1423,7 +1437,7 @@ export default {
         this.beginTime = ""
         this.endTime = ""
 
-        this.addNode(data.id,data.label)
+        this.addNode(data.id,data.label,data.deptType)
         // console.log(this.pdinfo)
         event.stopPropagation();
 
@@ -1444,13 +1458,13 @@ export default {
         }
       },
       // 新增数据
-       addNode(id,label) {
+       addNode(id,label,deptType) {
         let _this = this
         // 默认类型
         this.isClick = false
-        this.ruleForm.deptType = "3"
+        this.ruleForm.deptType = deptType
         this.$nextTick(() => {
-          console.log("新增树的返回222", this.ruleForm);
+          console.log("新增树的返回222", this.ruleForm,id,label);
         });
 
         // _this.ruleForm.deptType = '1'

From 435bca9441f9a1102faf540d62df5c5d761de369 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 29 Mar 2024 10:18:43 +0800
Subject: [PATCH 3/3] bug

---
 fuintAdmin_zt/src/views/Site/index.vue | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index d8ec1ce29..2bb514f5d 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -188,7 +188,7 @@
                       </el-radio-group>
                     </span>
                     <span v-else>
-                      <span v-if="!ruleForm.deptType">
+                      <span v-if="!parentDeptType">
                         <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
                           <el-radio
                             v-for="dict in judgementNodeType(dict.type.node_type)"
@@ -197,7 +197,7 @@
                           >{{dict.label}}</el-radio>
                         </el-radio-group>
                       </span>
-                      <span v-else-if="ruleForm.deptType==='1'">
+                      <span v-else-if="parentDeptType==='1'">
                         <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
                           <el-radio
                             v-for="dict in judgementNodeType(dict.type.node_type)"
@@ -207,7 +207,7 @@
                           >{{dict.label}}</el-radio>
                         </el-radio-group>
                       </span>
-                      <span v-else-if="ruleForm.deptType==='4'">
+                      <span v-else-if="parentDeptType==='4'">
                         <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
                           <el-radio
                             v-for="dict in judgementNodeType(dict.type.node_type)"
@@ -216,7 +216,17 @@
                           >{{dict.label}}</el-radio>
                         </el-radio-group>
                       </span>
-                      <span v-else>
+                      <span v-else-if="parentDeptType==='2'">
+                        <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
+                          <el-radio
+                            v-for="dict in judgementNodeType(dict.type.node_type)"
+                            :key="dict.value"
+                            :label="dict.value"
+                            v-if="dict.value=='3'"
+                          >{{dict.label}}</el-radio>
+                        </el-radio-group>
+                      </span>
+                      <span v-else-if="parentDeptType==='3'">
                         <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
                           <el-radio
                             v-for="dict in judgementNodeType(dict.type.node_type)"
@@ -789,6 +799,7 @@ export default {
         storeNum: false,
         isEditDept:true,
         isTopDept:true,
+        parentDeptType:"",
 
 
         timeFrame:[],
@@ -1310,6 +1321,7 @@ export default {
         this.queryParams.deptId = data.id
         this.queryParams1.storeId = data.id
         this.deptType = data.deptType
+        this.parentDeptType = data.deptType
         // 新增节点
         this.appedit(data.id,data.label)
         // 用户请求
@@ -1436,7 +1448,7 @@ export default {
         this.timeFrame = []
         this.beginTime = ""
         this.endTime = ""
-
+        this.parentDeptType = data.deptType
         this.addNode(data.id,data.label,data.deptType)
         // console.log(this.pdinfo)
         event.stopPropagation();