单位管理新增⌈ 组织机构 ⌋必选

src/views/auditPages/unitManagement/index.vue

@@ -133,6 +133,16 @@
                 <el-input v-model="ruleForm.rcyyfzbm" placeholder="请输入日常运营负责部门"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="组织机构" required prop="zzjg">
+                <!-- @change="handleChange" -->
+                <el-cascader
+                  v-model="ruleForm.zzjg"
+                  :options="optionsTwo"
+                >
+                </el-cascader>
+              </el-form-item>
+            </el-col>
           </el-row>
           <!-- 联系人 -->
           <el-row style="margin: 10px 0;">
@@ -494,6 +504,48 @@ export default {
     }
     return {
       options: pcas ,
+      optionsTwo:[
+        {
+          value:"100",
+          label:"政务",
+          children:[
+            {
+              value:"101",
+              label:"党委机关",
+            },{
+              value:"102",
+              label:"政府机关",
+            },{
+              value:"200",
+              label:"事业单位",
+            },{
+              value:"202",
+              label:"大型国企",
+            },
+          ],
+        },
+        {
+          value:"10",
+          label:"民营企业",
+          children:[
+            {
+              value:"203",
+              label:"重点民企",
+            },{
+              value:"204",
+              label:"一般民企"
+            }
+          ],
+        },
+        {
+          value:"20",
+          label:"个人",
+        },
+        {
+          value:"30",
+          label:"社会团体"
+        }
+      ],
       props:{
         value:'value',
         label:"value",
@@ -528,6 +580,9 @@ export default {
         nickName: [
           { required: true, message: '请输入单位名称', trigger: 'blur' },
         ],
+        zzjg: [
+          { required: true, message: '请选择组织机构', trigger: 'change' },
+        ],
       },
       disabled:false,
       loading:false,
@@ -553,6 +608,10 @@ export default {
     }
   },
   methods:{
+    // handleChange(value){
+    //   console.log(value);
+    // },
+    // 获取详情
     getInfo(id){
       this.loading = true;
       lookUnit(id).then(res=>{
@@ -564,6 +623,10 @@ export default {
         } else if(res.data.ssqyprovince) {
           this.$set(this.ruleForm, 'ssqy', [res.data.ssqyprovince])
         }
+        if(this.ruleForm.ancestors) {
+          let deptId = this.ruleForm.ancestors.split(',');
+          this.$set(this.ruleForm, 'zzjg', deptId)
+        }
         this.loading = false;
       })
     },
@@ -604,6 +667,11 @@ export default {
             this.ruleForm.ssqycity = this.ruleForm.ssqy[1]
             this.ruleForm.ssqycounty = this.ruleForm.ssqy[2]
           }
+          if(this.ruleForm.zzjg.length == 2) {
+            this.ruleForm.deptId = Number(this.ruleForm.zzjg[1])
+          } else {
+            this.ruleForm.deptId = Number(this.ruleForm.zzjg[0])
+          }
           this.loading = true;
           if(this.$route.query.pageType == 'change') {
             postUnit('put',this.ruleForm).then(res=>{

src/views/components/assetsType/index.vue

@@ -455,7 +455,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="pageType !== 'look'">
             <el-col :span="24" style="text-align: right;margin: 10px 0;">
               <el-button @click="isMore = !isMore" :disabled="false">{{ isMore ? '收起' : '更多' }}</el-button>
             </el-col>
@@ -3027,7 +3027,11 @@ export default {
         if(this.ruleForm.glIpList.length == 0) {
           this.ruleForm.glIpList.push({key:""})
         }
+
+        
         this.ruleForm.xttz ? this.xttz = this.ruleForm.xttz.split(',') : [];
+
+
         let chepingUnit = this.ruleForm.gylxxList.filter((item) => item.type == 1)
         let yjgysUnit = this.ruleForm.gylxxList.filter((item) => item.type == 2)
         let jfywUnit = this.ruleForm.gylxxList.filter((item) => item.type == 3)
@@ -3051,9 +3055,9 @@ export default {
         this.wlsb = wlsb.length > 0 ? wlsb : [{sblx:"",pp:"",ipType:"",sbIP:"",czxx:"",czxxbb:"",yjxh:"",yjxlh:"",yjbbxx:"",yjyt:"",yjbswz:"",type: 2}]
         this.aqsb = aqsb.length > 0 ? aqsb : [{sblx:"",pp:"",ipType:"",sbIP:"",czxx:"",czxxbb:"",yjxh:"",yjxlh:"",yjbbxx:"",yjyt:"",yjbswz:"",type: 3}]
         this.ruleForm.xtfhqkFcg ? this.xtfhqkFcg = this.ruleForm.xtfhqkFcg.split(',') : [];
-        this.ruleForm.xtfhqkFcg ? this.xtfhqkFxl = this.ruleForm.xtfhqkFxl.split(',') : [];
-        this.ruleForm.xtfhqkFcg ? this.xtfhqkFzd = this.ruleForm.xtfhqkFzd.split(',') : [];
-        this.ruleForm.xtfhqkFcg ? this.xtfhqkFls = this.ruleForm.xtfhqkFls.split(',') : [];
+        this.ruleForm.xtfhqkFxl ? this.xtfhqkFxl = this.ruleForm.xtfhqkFxl.split(',') : [];
+        this.ruleForm.xtfhqkFzd ? this.xtfhqkFzd = this.ruleForm.xtfhqkFzd.split(',') : [];
+        this.ruleForm.xtfhqkFls ? this.xtfhqkFls = this.ruleForm.xtfhqkFls.split(',') : [];
 
 
         if(this.ruleForm.sheng && this.ruleForm.shi && this.ruleForm.qu) {

src/views/system/user/index.vue

@@ -512,6 +512,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     /** 新增按钮操作 */