Merge branch 'NanMing' of sckj/mz-cloud into master

ruoyi-ui/src/views/business/fwjggl/ajgsx/zhjgxzcf/index.vue

@@ -18,7 +18,7 @@
         />
       </el-form-item>
       <span v-if="isXzqh">
-      <el-form-item label="所属行政区划" prop="xzqh" v-if="!queryParams.jgId">
+      <el-form-item label="所在行政区划" prop="xzqh" v-if="!queryParams.jgId">
         <RegionCascaderSelect
           v-model="xzqh"
           style="width: 100%"
@@ -68,7 +68,6 @@
       <el-table-column label="机构名称" align="center" prop="jgmc"/>
       <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm"/>
       <el-table-column label="所在区划" align="center" prop="szxzqhName"/>
-      <el-table-column label="所属行政区划" align="center" prop="ssxzqhName"/>
       <el-table-column label="来源途径" align="center" prop="lytj">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CH042" :value="scope.row.lytj"/>
@@ -618,9 +617,9 @@ export default {
       handleQuery(is) {
         this.queryParams.pageNum = 1
         if (this.xzqh) {
-          this.queryParams.ssxzqh = this.xzqh[this.xzqh.length - 1]
+          this.queryParams.szxzqh = this.xzqh[this.xzqh.length - 1]
         } else {
-          this.queryParams.ssxzqh = null
+          this.queryParams.szxzqh = null
         }
         if(this.xzqhId&&is!==true)
         {

ruoyi-ui/src/views/business/fwjggl/djpd/pdzj/index.vue

@@ -273,7 +273,7 @@
                   <RegionCascaderSelect
                     v-model="form.hjqhId"
                     :isJl="false"
-                    :endLevel="3"
+                    :endLevel="5"
                     @nodeData="nodeData"
                     valueProp="code"
                     style="width: 100%"

ruoyi-ui/src/views/business/fwjggl/jgxxgl/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
+        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
@@ -409,6 +410,8 @@ export default {
         jgmc: null,
         pageNum: 1,
         pageSize: 10,
+        // 是否仅查询本级
+        isBj:'0',
       },
       searchXydm: null,
       // 表单参数
@@ -439,6 +442,11 @@ export default {
       this.form.sczt=row.command;
       this.openCz=true;
     },
+    // switch单击事件
+    changSwitch(value){
+      this.queryParams.isBj = value
+      this.handleQuery()
+    },
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.xzqhId = data.code

ruoyi-ui/src/views/business/fwjggl/sqjgxxgl/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
+        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
@@ -354,7 +355,9 @@ export default {
         jgmc: null,
         pageNum: 1,
         pageSize: 10,
-        lb: null
+        lb: null,
+        // 是否仅查询本级
+        isBj:'0',
       },
       searchXydm: null,
       // 表单参数
@@ -387,6 +390,11 @@ export default {
       this.openXG=false;
       this.getList();
     },
+    // switch单击事件
+    changSwitch(value){
+    this.queryParams.isBj = value
+    this.handleQuery()
+    },
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.xzqhId = data.code

ruoyi-ui/src/views/business/lrxx/jbxx/index.vue

@@ -365,7 +365,7 @@
                 <td>
                   <el-form-item label="户籍地址" prop="lrHjdz">
                     <!--<el-input v-model="form.lrHjdz" placeholder="请输入户籍地址"/>-->
-                    <RegionCascaderSelect :isJl="false" :endLevel="3" v-model="form.lrHjdz" @changeValue="changeValue"
+                    <RegionCascaderSelect :isJl="false" :endLevel="5" v-model="form.lrHjdz" @changeValue="changeValue"
                                           style="width: 100%"></RegionCascaderSelect>
                   </el-form-item>
                 </td>
@@ -391,7 +391,7 @@
                 <td>
                   <el-form-item label="现居地址" prop="lrXjdz">
                     <!--<el-input v-model="form.lrXjdz" placeholder="请输入现居地址"/>-->
-                    <RegionCascaderSelect :isJl="false" :endLevel="3" v-model="form.lrXjdz" :disabled="form.isYz=='1'"
+                    <RegionCascaderSelect :isJl="false" :endLevel="5" v-model="form.lrXjdz" :disabled="form.isYz=='1'"
                                           style="width: 100%"></RegionCascaderSelect>
                   </el-form-item>
                 </td>

ruoyi-ui/src/views/business/lrxx/jbxxcx/index.vue

@@ -40,7 +40,7 @@
       <el-form-item label="户籍地址查询" prop="lrHjdz">
         <RegionCascaderSelect
           :isJl="false" 
-          :endLevel="3"
+          :endLevel="5"
           v-model="lrHjdz"
           style="width: 100%"
           :isDataRoot="true"

ruoyi-ui/src/views/business/lrxx/lrjgyy/index.vue

@@ -194,7 +194,7 @@
         <!--        </el-form-item>-->
         <div class="formFlex">
           <el-form-item label="老人户籍地址行政区域" prop="jkdzxzqy" class="formWidth2">
-            <RegionCascaderSelect :isJl="false" :endLevel="3" v-model="form.jkdzxzqy" style="width: 100%"></RegionCascaderSelect>
+            <RegionCascaderSelect :isJl="false" :endLevel="5" v-model="form.jkdzxzqy" style="width: 100%"></RegionCascaderSelect>
           </el-form-item>
           <!--          <el-form-item label="老人户籍地址行政区域" prop="jkdzxzqy">-->
           <!--          <el-input v-model="form.jkdzxzqy" placeholder="请输入老人户籍地址行政区域" />-->
@@ -362,7 +362,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="老人居住地址所在行政区划" prop="lrjzdzxzqh" class="formWidth2">
-            <RegionCascaderSelect :isJl="false" :endLevel="3" v-model="form.lrjzdzxzqh" style="width: 100%"></RegionCascaderSelect>
+            <RegionCascaderSelect :isJl="false" :endLevel="5" v-model="form.lrjzdzxzqh" style="width: 100%"></RegionCascaderSelect>
           </el-form-item>
         </div>
 

ruoyi-ui/src/views/search/xxcx/fwjg/fwzl/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
     <el-col :span="4" :xs="24">
+      <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
       <span class="sxzd">行政区划</span>
       <dept-tree @handleNodeClick="handleNodeClick">
 
@@ -220,6 +221,7 @@ export default {
         queryParams: {
           pageNum: 1,
           pageSize: 10,
+          isBj:'0',
         },
         // 查询参数
         queryParamsJg: {
@@ -301,9 +303,13 @@ export default {
           this.loading = false;
         });
       },
+      changSwitch(value){
+        this.queryParams.isBj = value
+        this.getList()
+      },
       // 节点单击事件
       handleNodeClick(data) {
-        this.queryParams.ssxzqh = data.code;
+        this.queryParams.xzqhId = data.code;
         this.queryParams.pageNum = 1;
         this.getList()
       },

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/cyry/commonality/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24" v-if="!yljgId">
+        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
@@ -452,7 +453,8 @@ export default {
           gqHlydj: null,
           zw: null,
           jgId: null,
-          jgmc: null
+          jgmc: null,
+          isBj:'0',
         },
         // 表单参数
         form: {},
@@ -569,6 +571,10 @@ export default {
       getValid(){
         this.valid(this.rules,'sfzhm',this.form.sfzlx)
       },
+      changSwitch(value){
+        this.queryParams.isBj = value
+        this.handleQuery()
+      },
       // 节点单击事件
       handleNodeClick(data) {
         this.queryParams.xzqhId = data.code

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/jbxx/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
+        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
@@ -258,7 +259,8 @@ export default {
         jgmc: null,
         pageNum: 1,
         pageSize: 10,
-        lb: null
+        lb: null,
+        isBj:'0',
       },
       searchXydm: null,
       // 表单参数
@@ -293,7 +295,10 @@ export default {
     }
   },
   methods: {
-
+    changSwitch(value){
+      this.queryParams.isBj = value
+      this.handleQuery()
+    },
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.xzqhId = data.code

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/lryp/commonality/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24" v-if="!yljgId">
+        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
@@ -285,7 +286,9 @@ export default {
           lryplx: null,
           ypsccs: null,
           tyshxydm: null,
-          jgmc: null
+          jgmc: null,
+          // 是否仅查询本级
+          isBj:'0',
         },
         // 表单参数
         form: {},
@@ -383,6 +386,11 @@ export default {
         this.form.jgId = res.data.id
         this.form.szxzqhName = res.data.szxzqhName
       },
+      // switch单击事件
+      changSwitch(value){
+        this.queryParams.isBj = value
+        this.handleQuery()
+      },
       // 节点单击事件
       handleNodeClick(data) {
         this.queryParams.xzqhId = data.code

ruoyi-ui/src/views/search/xxcx/fwjg/yljg/jbxx/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
      <el-row :gutter="20">
       <el-col :span="4" :xs="24">
+        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
@@ -415,6 +416,7 @@ export default {
         jgmc: null,
         pageNum: 1,
         pageSize: 10,
+        isBj:'0',
       },
       searchXydm: null,
       // 表单参数
@@ -555,6 +557,10 @@ export default {
       }
       return this.selectDictLabel(this.dict.type[type], value)
     },
+    changSwitch(value){
+      this.queryParams.isBj = value
+      this.handleQuery()
+    },
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.xzqhId = data.code

ruoyi-ui/src/views/search/xxcx/fwjg/yljg/sssb/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24" v-if="!yljgId">
+        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
         </dept-tree>
@@ -127,6 +128,7 @@ export default {
         sssbmc: null,
         tyshxydm: null,
         jmgc: null,
+        isBj:'0',
       },
       // 表单参数
       form: {},
@@ -169,6 +171,10 @@ export default {
     }
   },
   methods: {
+    changSwitch(value){
+      this.queryParams.isBj = value
+      this.handleQuery()
+    },
      // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.xzqhId = data.code

ruoyi-ui/src/views/search/xxcx/fwjg/zhjg/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
+        <QueryThisLevel :initLevel="isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree ref="tree" :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
@@ -10,37 +11,37 @@
       <el-col :span="20" :xs="24">
     <el-tabs v-model="activeName" @tab-click="handleClick" stretch>
       <el-tab-pane label="消防检查" name="first"  v-hasPermi="['search:xfaqzcxx:list']">
-        <xfaqjcxx  ref="first" :isComponent="false" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></xfaqjcxx>
+        <xfaqjcxx  ref="first" :isComponent="false" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></xfaqjcxx>
       </el-tab-pane>
       <el-tab-pane label="机构消防自查" name="second" v-hasPermi="['search:xfaqzcxx:list']">
-        <xfaqjcxx ref="second" :isComponent="false" :isZc="true" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></xfaqjcxx>
+        <xfaqjcxx ref="second" :isComponent="false" :isZc="true" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></xfaqjcxx>
       </el-tab-pane>
       <el-tab-pane label="其他安全检查" name="third" v-hasPermi="['search:qtaqzc:list']">
-        <qtaqjc ref="third" :isComponent="false" :xzqhId="xzqhId" :isXzqh="false"  @changXzqh="changXzqh"></qtaqjc>
+        <qtaqjc ref="third" :isComponent="false" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false"  @changXzqh="changXzqh"></qtaqjc>
       </el-tab-pane>
       <el-tab-pane label="其他安全自查" name="fourth" v-hasPermi="['search:qtaqzc:list']">
-        <qtaqjc ref="fourth" :isComponent="false" :isZc="true" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></qtaqjc>
+        <qtaqjc ref="fourth" :isComponent="false" :isZc="true" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></qtaqjc>
       </el-tab-pane>
       <el-tab-pane label="投诉意见" name="fifth" v-hasPermi="['search:zhjgtsjb:list']">
-        <zhjgtsjb ref="fifth" :isComponent="false" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></zhjgtsjb>
+        <zhjgtsjb ref="fifth" :isComponent="false" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></zhjgtsjb>
       </el-tab-pane>
       <el-tab-pane label="标准实施情况" name="sixth" v-hasPermi="['search:bzssqk:list']">
-        <bzssqk ref="sixth" :isComponent="false" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></bzssqk>
+        <bzssqk ref="sixth" :isComponent="false" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></bzssqk>
       </el-tab-pane>
       <el-tab-pane label="行政处罚" name="seventh" v-hasPermi="['search:zhjgxzcf:list']">
-        <zhjgxzcf ref="seventh" :isComponent="false" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></zhjgxzcf>
+        <zhjgxzcf ref="seventh" :isComponent="false" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></zhjgxzcf>
       </el-tab-pane>
       <el-tab-pane label="捐赠记录" name="eighth" v-hasPermi="['search:jzxx:list']">
-        <jzxx ref="eighth" :isComponent="false" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></jzxx>
+        <jzxx ref="eighth" :isComponent="false" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></jzxx>
       </el-tab-pane>
       <el-tab-pane label="应急预案" name="ninth" v-hasPermi="['search:yjya:list']">
-        <yjya ref="ninth" :isComponent="false" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></yjya>
+        <yjya ref="ninth" :isComponent="false" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></yjya>
       </el-tab-pane>
       <el-tab-pane label="责任保险" name="tenth" v-hasPermi="['search:zrbxxx:list']">
-        <zrbxxx ref="tenth" :isComponent="false" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></zrbxxx>
+        <zrbxxx ref="tenth" :isComponent="false" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></zrbxxx>
       </el-tab-pane>
       <el-tab-pane label="重大事件" name="eleventh" v-hasPermi="['search:zdsj:list']">
-        <zdsj ref="eleventh" :isComponent="false" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></zdsj>
+        <zdsj ref="eleventh" :isComponent="false" :isBj="isBj" :xzqhId="xzqhId" :isXzqh="false" @changXzqh="changXzqh"></zdsj>
       </el-tab-pane>
     </el-tabs>
       </el-col>
@@ -76,7 +77,8 @@ export default {
   data() {
     return {
       activeName:'first',
-      xzqhId:null
+      xzqhId:null,
+      isBj:'0',
     };
   },
   created() {
@@ -85,6 +87,9 @@ export default {
     ...mapState(['user']),
   },
   methods: {
+    changSwitch(value){
+      this.isBj = value
+    },
     handleNodeClick(data) {
       this.xzqhId = data.code
     },

ruoyi-ui/src/views/search/xxcx/lrxx/lrjbxx/index.vue

@@ -71,7 +71,7 @@
       <el-form-item label="户籍地行政区划" prop="lrHjdz">
         <RegionCascaderSelect
           :isJl="false" 
-          :endLevel="3"
+          :endLevel="5"
           v-model="lrHjdz"
           style="width: 100%"
           valueProp="code"

ruoyi-ui/src/views/search/xxcx/lrxx/rzjg/index.vue

@@ -3,6 +3,7 @@
     <el-row :gutter="20">
       <!--部门数据-->
       <el-col :span="4" :xs="24">
+        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
@@ -73,7 +74,7 @@
           <el-form-item label="现居地行政区划" prop="xzqh">
             <RegionCascaderSelect
               :isJl="false" 
-              :endLevel="3"
+              :endLevel="5"
               v-model="xzqh"
               style="width: 100%"
               valueProp="code"
@@ -580,6 +581,7 @@ export default {
           khId: null
         },
         queryParams: {
+          isBj:'0',
           pageNum: 1,
           pageSize: 10,
           openXQ: false,
@@ -617,6 +619,10 @@ export default {
       ...mapState(['user'])
     },
     methods: {
+      changSwitch(value){
+        this.queryParams.isBj = value
+        this.handleQuery()
+      },
       // 节点单击事件
       handleNodeClick(data) {
         this.queryParams.xzqhId = data.code

ruoyi-ui/src/views/search/xxcx/lrxx/sqfw/index.vue

@@ -3,6 +3,7 @@
     <el-row :gutter="20">
       <!--部门数据-->
       <el-col :span="4" :xs="24">
+        <QueryThisLevel :initLevel="queryParams.isBj"  :active="1" :inactive="0" @changeLevel="changSwitch"></QueryThisLevel>
         <span class="sxzd">行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
@@ -73,7 +74,7 @@
       <el-form-item label="现居地行政区划" prop="xzqh">
         <RegionCascaderSelect
           :isJl="false" 
-          :endLevel="3"
+          :endLevel="5"
           v-model="xzqh"
           style="width: 100%"
           valueProp="code"
@@ -584,6 +585,7 @@ export default {
         zjhm: null,
         nlpg: null,
         isCj: null,
+        isBj:'0',
       },
       defaultProps: {
         children: "children",
@@ -617,6 +619,10 @@ this.queryParams.xzqhId = this.user.userData.dept.locationCode;
     },
   },
   methods: {
+    changSwitch(value){
+      this.queryParams.isBj = value
+      this.handleQuery()
+    },
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.xzqhId = data.code;