Merge remote-tracking branch 'origin/master'

fuintAdmin_zt/src/views/Site/index.vue

@@ -187,7 +187,17 @@
                         >{{dict.label}}</el-radio>
                       </el-radio-group>
                     </span>
-                    <span v-else-if="ruleForm.deptType==='1'">
+                    <span v-else>
+                      <span v-if="!parentDeptType">
+                        <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="parentDeptType==='1'">
                         <el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
                           <el-radio
                             v-for="dict in judgementNodeType(dict.type.node_type)"
@@ -197,7 +207,7 @@
                           >{{dict.label}}</el-radio>
                         </el-radio-group>
                       </span>
-                    <span v-else>
+                      <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)"
@@ -206,6 +216,27 @@
                           >{{dict.label}}</el-radio>
                         </el-radio-group>
                       </span>
+                      <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)"
+                            :key="dict.value"
+                            :label="dict.value"
+                            v-if="dict.value==ruleForm.deptType"
+                          >{{dict.label}}</el-radio>
+                        </el-radio-group>
+                      </span>
+                    </span>
                   </el-form-item>
 
 
@@ -213,7 +244,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>
@@ -776,6 +807,7 @@ export default {
         storeNum: false,
         isEditDept:true,
         isTopDept:true,
+        parentDeptType:"",
 
 
         timeFrame:[],
@@ -941,6 +973,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' },
@@ -1296,6 +1334,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)
         // 用户请求
@@ -1404,13 +1443,10 @@ export default {
       // },
       handleClick(tab, event) {
         console.log(this.activeName)
-        if (this.activeName=="list"){
+        if (this.activeName==="list"){
           this.onlyGetUser()
         }
-        if (this.activeName=="duty"){
+        if (this.activeName==="duty"){
-          this.getDutyList()
-        }
-        if (this.activeName=="info"){
           this.getDutyList()
         }
       },
@@ -1425,8 +1461,8 @@ export default {
         this.timeFrame = []
         this.beginTime = ""
         this.endTime = ""
-
+        this.parentDeptType = data.deptType
-        this.addNode(data.id,data.label)
+        this.addNode(data.id,data.label,data.deptType)
         // console.log(this.pdinfo)
         event.stopPropagation();
 
@@ -1447,13 +1483,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'