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

ruoyi-ui/src/views/business/lhcj/sxxx/cyrySxxx/index.vue

@@ -49,7 +49,7 @@
       </el-table-column>
       <el-table-column label="人员姓名" align="center" prop="xm" />
       <el-table-column label="证件号码" align="center" prop="zjhm" />
-      <el-table-column label="所在区划" align="center" prop="szxzqh" />
+      <el-table-column label="所在区划" align="center" prop="szxzqhNames" />
       <el-table-column label="数据来源" align="center" prop="sjly">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CH042" :value="scope.row.sjly" />
@@ -110,7 +110,7 @@
           <el-input v-model="form.szxzqh" placeholder="请输入行政区划" />
         </el-form-item> -->
         <el-form-item label="行政区划" prop="szxzqh">
-          <RegionCascaderSelect v-model="form.szxzqh" style="width: 100%" valueProp="code" endLevel="2"  :isDataRoot="true"></RegionCascaderSelect>
+          <RegionCascaderSelect v-model="form.szxzqh" style="width: 100%" valueProp="code" endLevel="2"  :isDataRoot="true" @changeValue="changeValue" @nodeData="changeLabel"></RegionCascaderSelect>
         </el-form-item>
 
         <el-form-item label="通信地址" prop="txdz">
@@ -378,6 +378,12 @@ export default {
     this.getList();
   },
   methods: {
+    changeValue(value){
+      this.form.szxzqh = value
+    },
+    changeLabel(node){
+      this.form.szxzqhNames = node[0].pathLabels.join(' ')
+    },
     getValid(){
       this.valid(this.rules, 'zjhm', this.form.zjlx)
     },

ruoyi-ui/src/views/business/lhcj/sxxx/yljgSxxx/index.vue

@@ -48,7 +48,7 @@
       </el-table-column>
       <el-table-column label="机构名称" align="center" prop="jgmc" />
       <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" />
-      <el-table-column label="所在区划" align="center" prop="szxzqh" />
+      <el-table-column label="所在区划" align="center" prop="szxzqhNames" />
       <el-table-column label="数据来源" align="center" prop="sjly">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CH042" :value="scope.row.sjly" />
@@ -108,7 +108,7 @@
         </el-form-item>
 
         <el-form-item label="行政区划" prop="szxzqh">
-          <RegionCascaderSelect v-model="form.szxzqh" endLevel="2" :isDataRoot="true" style="width: 100%" valueProp="code"></RegionCascaderSelect>
+          <RegionCascaderSelect v-model="form.szxzqh" endLevel="2" :isDataRoot="true" style="width: 100%" valueProp="code" @changeValue="changeValue" @nodeData="changeLabel"></RegionCascaderSelect>
         </el-form-item>
 
         <el-form-item label="通信地址" prop="txdzms">
@@ -351,6 +351,12 @@ export default {
     this.getList();
   },
   methods: {
+    changeValue(value){
+      this.form.szxzqh = value
+    },
+    changeLabel(node){
+      this.form.szxzqhNames = node[0].pathLabels.join(' ')
+    },
     getValid(){
       this.valid(this.rules,'frzjhm',this.form.frzjlx)
     },

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24" v-if="!yljgId">
-        <span class="sxzd">所在行政区划</span>
+        <span class="sxzd">所属行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
         </dept-tree>

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
-        <span class="sxzd">所在行政区划</span>
+        <span class="sxzd">所属行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
         </dept-tree>

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24" v-if="!yljgId">
-        <span class="sxzd">所在行政区划</span>
+        <span class="sxzd">所属行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
         </dept-tree>

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

@@ -2,7 +2,7 @@
   <div class="app-container">
      <el-row :gutter="20">
       <el-col :span="4" :xs="24">
-        <span class="sxzd">所在行政区划</span>
+        <span class="sxzd">所属行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
 
         </dept-tree>

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24" v-if="!yljgId">
-        <span class="sxzd">所在行政区划</span>
+        <span class="sxzd">所属行政区划</span>
         <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
         </dept-tree>
       </el-col>