省市县修改

ruoyi-ui/src/views/szxc/csmanage/index.vue

@@ -168,7 +168,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="140" fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -184,6 +184,14 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['szxc:csmanage:remove']"
           >删除</el-button>
+
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" style="margin-left: 6px">
+            <el-button size="mini" type="text">更多操作</el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="handleYg">场所员工</el-dropdown-item>
+              <el-dropdown-item command="handleFzr">场所负责人</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -344,11 +352,67 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="场所员工" :visible.sync="csyg.visible" width="1000px" append-to-body>
+      <el-table v-loading="csyg.loading" :data="csyg.list" border>
+        <el-table-column label="场所名称" align="center" prop="csName" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="员工姓名" align="center" prop="ygName" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="手机号" align="center" prop="phone" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="身份证号" align="center" prop="cardId" min-width="150" show-overflow-tooltip/>
+        <el-table-column label="性别" align="center" prop="sex" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否党员" align="center" prop="dyOrNot" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_yes_no" :value="scope.row.dyOrNot"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="现居住地" align="center" prop="currentAddress" min-width="160" show-overflow-tooltip/>
+        <el-table-column label="省" align="center" prop="province" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="市" align="center" prop="city" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="县" align="center" prop="county" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="户籍地址" align="center" prop="hjAddress" min-width="160" show-overflow-tooltip/>
+      </el-table>
+    </el-dialog>
+
+    <el-dialog title="场所负责人" :visible.sync="csfzr.visible" width="1000px" append-to-body>
+      <el-table v-loading="csfzr.loading" :data="csfzr.list" border>
+        <el-table-column label="场所名称" align="center" prop="csName"  min-width="120" show-overflow-tooltip/>
+        <el-table-column label="负责人类型" align="center" prop="fzrType"  min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_fzr_type" :value="scope.row.fzrType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="负责人姓名" align="center" prop="fzrName"  min-width="120" show-overflow-tooltip/>
+        <el-table-column label="手机号" align="center" prop="phone"  min-width="120" show-overflow-tooltip/>
+        <el-table-column label="身份证号" align="center" prop="cardId"  min-width="150" show-overflow-tooltip/>
+        <el-table-column label="性别" align="center" prop="sex"  min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否党员" align="center" prop="dyOrNot"  min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_yes_no" :value="scope.row.dyOrNot"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="现居住地" align="center" prop="currentAddress"  min-width="160" show-overflow-tooltip/>
+        <el-table-column label="省" align="center" prop="province"  min-width="120" show-overflow-tooltip/>
+        <el-table-column label="市" align="center" prop="city"  min-width="120" show-overflow-tooltip/>
+        <el-table-column label="县" align="center" prop="county"  min-width="120" show-overflow-tooltip/>
+        <el-table-column label="户籍地址" align="center" prop="hjAddress"  min-width="160" show-overflow-tooltip/>
+      </el-table>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listCsmanage, getCsmanage, delCsmanage, addCsmanage, updateCsmanage } from "@/api/szxc/csmanage";
+import { listEmplyees } from "@/api/szxc/emplyees";
+import { listResponse } from "@/api/szxc/response";
 import { deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -356,7 +420,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Csmanage",
   components: { Treeselect },
-  dicts: ['szxc_hy_type', 'szxv_cs_type', 'szxc_fw_type', 'szxc_yes_no'],
+  dicts: ['szxc_hy_type', 'szxv_cs_type', 'szxc_fw_type', 'szxc_yes_no', 'szxc_fzr_type', 'sys_user_sex'],
   data() {
     return {
       cq_checked: false,
@@ -407,7 +471,27 @@ export default {
         deptId: [
           { required: true, message: "部门id不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 场所员工信息
+      csyg: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 查询列表
+        list: [],
+        // 选中信息
+        selectedRow: null,
+      },
+      // 场所负责人信息
+      csfzr: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 查询列表
+        list: [],
+        // 选中信息
+        selectedRow: null,
+      },
     };
   },
   created() {
@@ -540,7 +624,52 @@ export default {
     // 长期选择
     cqChange(){
       this.form.yyqx = ''
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleYg":
+          this.handleYg(row);
+          break;
+        case "handleFzr":
+          this.handleFzr(row);
+          break;
+        default:
+          break;
       }
+    },
+    // 场所员工信息
+    handleYg(row){
+      this.csyg.selectedRow = row;
+      this.csyg.visible = true;
+      this.getlistEmplyees();
+    },
+    /** 查询场所员工信息列表 */
+    getlistEmplyees() {
+      listEmplyees({
+        pageNum: 1,
+        pageSize: 100000000,
+        csId: this.csyg.selectedRow.id
+      }).then(response => {
+        this.csyg.list = response.rows
+      });
+    },
+    // 场所负责人
+    handleFzr(row){
+      this.csfzr.selectedRow = row;
+      this.csfzr.visible = true;
+      this.getlistResponse();
+    },
+    /** 查询场所员工信息列表 */
+    getlistResponse() {
+      listResponse({
+        pageNum: 1,
+        pageSize: 100000000,
+        csId: this.csfzr.selectedRow.id
+      }).then(response => {
+        this.csfzr.list = response.rows
+      });
+    },
   }
 };
 </script>

ruoyi-ui/src/views/szxc/emplyees/index.vue

@@ -241,14 +241,11 @@
         <el-form-item label="现居住地" prop="currentAddress">
           <el-input v-model="form.currentAddress" placeholder="请输入现居住地" />
         </el-form-item>
-        <el-form-item label="省" prop="province">
+        <el-form-item label="省/市/县" prop="province">
-          <el-input v-model="form.province" placeholder="请输入省" />
+          <el-cascader style="width: 100%"
-        </el-form-item>
+            :props="{value: 'label'}" v-model="ssx"
-        <el-form-item label="市" prop="city">
+            :options="ssxData"
-          <el-input v-model="form.city" placeholder="请输入市" />
+            @change="handleChange"></el-cascader>
-        </el-form-item>
-        <el-form-item label="县" prop="county">
-          <el-input v-model="form.county" placeholder="请输入县" />
         </el-form-item>
         <el-form-item label="户籍地址" prop="hjAddress">
           <el-input v-model="form.hjAddress" placeholder="请输入户籍地址" />
@@ -342,12 +339,17 @@
 <script>
 import { listEmplyees, getEmplyees, delEmplyees, addEmplyees, updateEmplyees } from "@/api/szxc/emplyees";
 import { listCsmanage } from "@/api/szxc/csmanage";
+import ssxData from '@/utils/ssxData.json';
+
+console.log(ssxData)
 
 export default {
   name: "Emplyees",
   dicts: ['szxc_yes_no', 'szxc_hy_type', 'szxv_cs_type', 'szxc_fw_type', 'sys_user_sex'],
   data() {
     return {
+      ssxData: ssxData,
+      ssx: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -461,6 +463,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
+      this.ssx = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -491,6 +494,13 @@ export default {
       const id = row.id || this.ids
       getEmplyees(id).then(response => {
         this.form = response.data;
+
+        if(this.form.province && this.form.city && this.form.county){
+          this.ssx = [this.form.province, this.form.city, this.form.county]
+        }else {
+          this.ssx = []
+        }
+
         this.open = true;
         this.title = "修改场所员工";
       });
@@ -499,7 +509,6 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.csId = 1
           if (this.form.id != null) {
             updateEmplyees(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -557,6 +566,12 @@ export default {
       this.form.csName = row.csName;
       this.csInfo.visible = false
     },
+    handleChange(value) {
+      this.ssx = value;
+      this.form.province = value[0];
+      this.form.city = value[1];
+      this.form.county = value[2];
+    }
   }
 };
 </script>

ruoyi-ui/src/views/szxc/response/index.vue

@@ -276,14 +276,11 @@
         <el-form-item label="现居住地" prop="currentAddress">
           <el-input v-model="form.currentAddress" placeholder="请输入现居住地" />
         </el-form-item>
-        <el-form-item label="省" prop="province">
+        <el-form-item label="省/市/县" prop="province">
-          <el-input v-model="form.province" placeholder="请输入省" />
+          <el-cascader style="width: 100%"
-        </el-form-item>
+                       :props="{value: 'label'}" v-model="ssx"
-        <el-form-item label="市" prop="city">
+                       :options="ssxData"
-          <el-input v-model="form.city" placeholder="请输入市" />
+                       @change="handleChange"></el-cascader>
-        </el-form-item>
-        <el-form-item label="县" prop="county">
-          <el-input v-model="form.county" placeholder="请输入县" />
         </el-form-item>
         <el-form-item label="户籍地址" prop="hjAddress">
           <el-input v-model="form.hjAddress" placeholder="请输入户籍地址" />
@@ -377,12 +374,15 @@
 <script>
 import { listResponse, getResponse, delResponse, addResponse, updateResponse } from "@/api/szxc/response";
 import { listCsmanage } from "@/api/szxc/csmanage";
+import ssxData from '@/utils/ssxData.json';
 
 export default {
   name: "Response",
   dicts: ['szxc_yes_no', 'szxc_hy_type', 'szxv_cs_type', 'szxc_fw_type', 'sys_user_sex', 'szxc_fzr_type'],
   data() {
     return {
+      ssxData: ssxData,
+      ssx: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -501,6 +501,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
+      this.ssx = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -596,6 +597,12 @@ export default {
       this.form.csName = row.csName;
       this.csInfo.visible = false
     },
+    handleChange(value) {
+      this.ssx = value;
+      this.form.province = value[0];
+      this.form.city = value[1];
+      this.form.county = value[2];
+    }
   }
 };
 </script>