diff --git a/ruoyi-ui/src/views/szxc/csmanage/index.vue b/ruoyi-ui/src/views/szxc/csmanage/index.vue
index d1f9daf..38cb0ba 100644
--- a/ruoyi-ui/src/views/szxc/csmanage/index.vue
+++ b/ruoyi-ui/src/views/szxc/csmanage/index.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="130px">
+      <el-form-item label="所属网格" prop="deptId">
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
+                    placeholder="请选择所属网格"/>
+      </el-form-item>
       <el-form-item label="场所名称" prop="csName">
         <el-input
           v-model="queryParams.csName"
@@ -9,29 +13,50 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="场所地址" prop="csAddress">
-        <el-input
-          v-model="queryParams.csAddress"
-          placeholder="请输入场所地址"
+      <el-form-item label="行业类别" prop="hyType">
+        <el-select
+          v-model="queryParams.hyType"
+          placeholder="行业类别"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_hy_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="员工数量" prop="employeeNum">
-        <el-input
-          v-model="queryParams.employeeNum"
-          placeholder="请输入员工数量"
+      <el-form-item label="场所类型" prop="csType">
+        <el-select
+          v-model="queryParams.csType"
+          placeholder="场所类型"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxv_cs_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="商住一体(0是1否)" prop="szyt">
-        <el-input
+      <el-form-item label="商住一体" prop="szyt">
+        <el-select
           v-model="queryParams.szyt"
-          placeholder="请输入商住一体(0是1否)"
+          placeholder="商住一体"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="法人姓名" prop="frName">
         <el-input
@@ -41,22 +66,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="成立日期" prop="clDate">
-        <el-date-picker clearable
-          v-model="queryParams.clDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择成立日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="营业期限" prop="yyqx">
-        <el-input
-          v-model="queryParams.yyqx"
-          placeholder="请输入营业期限"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="统一社会信用代码" prop="tyshxyCode">
         <el-input
           v-model="queryParams.tyshxyCode"
@@ -65,54 +74,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="营业执照" prop="yyzzPicture">
-        <el-input
-          v-model="queryParams.yyzzPicture"
-          placeholder="请输入营业执照"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="关联房屋id" prop="glfwId">
-        <el-input
-          v-model="queryParams.glfwId"
-          placeholder="请输入关联房屋id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="关联房屋名称" prop="glfwName">
-        <el-input
-          v-model="queryParams.glfwName"
-          placeholder="请输入关联房屋名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属网格" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入所属网格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -165,32 +126,49 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="csmanageList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="场所名称" align="center" prop="csName" />
-      <el-table-column label="行业类别(字典)" align="center" prop="hyType" />
-      <el-table-column label="类型(字典)" align="center" prop="csType" />
-      <el-table-column label="场所地址" align="center" prop="csAddress" />
-      <el-table-column label="员工数量" align="center" prop="employeeNum" />
-      <el-table-column label="商住一体(0是1否)" align="center" prop="szyt" />
-      <el-table-column label="房屋类型(字典)" align="center" prop="fwType" />
-      <el-table-column label="法人姓名" align="center" prop="frName" />
-      <el-table-column label="成立日期" align="center" prop="clDate" width="180">
+    <el-table v-loading="loading" :data="csmanageList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="45" align="center" />
+      <el-table-column label="ID" align="center" prop="id" min-width="60"/>
+      <el-table-column label="所属网格" align="center" prop="deptName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="场所名称" align="center" prop="csName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="行业类别" align="center" prop="hyType" min-width="120" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_hy_type" :value="scope.row.hyType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="场所类型" align="center" prop="csType" min-width="120" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxv_cs_type" :value="scope.row.csType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="场所地址" align="center" prop="csAddress" min-width="160" show-overflow-tooltip/>
+      <el-table-column label="员工数量" align="center" prop="employeeNum" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="商住一体" align="center" prop="szyt" min-width="120" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span v-if="scope.row.szyt==='0'">是</span>
+          <span v-if="scope.row.szyt==='1'">否</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="房屋类型" align="center" prop="fwType" min-width="120" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_fw_type" :value="scope.row.fwType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="法人姓名" align="center" prop="frName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="成立日期" align="center" prop="clDate" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.clDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="营业期限" align="center" prop="yyqx" />
-      <el-table-column label="统一社会信用代码" align="center" prop="tyshxyCode" />
-      <el-table-column label="营业执照" align="center" prop="yyzzPicture" />
-      <el-table-column label="关联房屋id" align="center" prop="glfwId" />
-      <el-table-column label="关联房屋名称" align="center" prop="glfwName" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
-      <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="营业期限" align="center" prop="yyqx" min-width="120"/>
+      <el-table-column label="统一社会信用代码" align="center" prop="tyshxyCode" min-width="160" show-overflow-tooltip/>
+      <el-table-column label="营业执照" align="center" prop="yyzzPicture" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.yyzzPicture" :width="50" :height="50"/>
+        </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">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -209,7 +187,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -219,58 +197,147 @@
     />
 
     <!-- 添加或修改场所管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="场所名称" prop="csName">
-          <el-input v-model="form.csName" placeholder="请输入场所名称" />
-        </el-form-item>
-        <el-form-item label="场所地址" prop="csAddress">
-          <el-input v-model="form.csAddress" placeholder="请输入场所地址" />
-        </el-form-item>
-        <el-form-item label="员工数量" prop="employeeNum">
-          <el-input v-model="form.employeeNum" placeholder="请输入员工数量" />
-        </el-form-item>
-        <el-form-item label="商住一体(0是1否)" prop="szyt">
-          <el-input v-model="form.szyt" placeholder="请输入商住一体(0是1否)" />
-        </el-form-item>
-        <el-form-item label="法人姓名" prop="frName">
-          <el-input v-model="form.frName" placeholder="请输入法人姓名" />
-        </el-form-item>
-        <el-form-item label="成立日期" prop="clDate">
-          <el-date-picker clearable
-            v-model="form.clDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择成立日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="营业期限" prop="yyqx">
-          <el-input v-model="form.yyqx" placeholder="请输入营业期限" />
-        </el-form-item>
-        <el-form-item label="统一社会信用代码" prop="tyshxyCode">
-          <el-input v-model="form.tyshxyCode" placeholder="请输入统一社会信用代码" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="所属网格" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
+                          placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="场所名称" prop="csName">
+              <el-input v-model="form.csName" placeholder="请输入场所名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="行业类别" prop="hyType">
+              <el-select
+                v-model="form.hyType"
+                placeholder="行业类别"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_hy_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="场所类型" prop="csType">
+              <el-select
+                v-model="form.csType"
+                placeholder="场所类型"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxv_cs_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="场所地址" prop="csAddress">
+              <el-input v-model="form.csAddress" placeholder="请输入场所地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="员工数量" prop="employeeNum">
+              <el-input v-model="form.employeeNum" placeholder="请输入员工数量" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="商住一体" prop="szyt">
+              <el-radio-group v-model="form.szyt">
+                <el-radio
+                  v-for="dict in dict.type.szxc_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="房屋类型" prop="fwType">
+              <el-select
+                v-model="form.fwType"
+                placeholder="房屋类型"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_fw_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="法人姓名" prop="frName">
+              <el-input v-model="form.frName" placeholder="请输入法人姓名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="成立日期" prop="clDate">
+              <el-date-picker clearable style="width: 100%;"
+                              v-model="form.clDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择成立日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="营业期限" prop="yyqx">
+              <el-checkbox v-model="cq_checked" style="margin-right: 15px;" @change="cqChange">长期</el-checkbox>
+              <el-date-picker clearable v-if="!cq_checked"
+                              v-model="form.yyqx"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择营业期限">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码" prop="tyshxyCode">
+              <el-input v-model="form.tyshxyCode" placeholder="请输入统一社会信用代码" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="营业执照" prop="yyzzPicture">
-          <el-input v-model="form.yyzzPicture" placeholder="请输入营业执照" />
-        </el-form-item>
-        <el-form-item label="关联房屋id" prop="glfwId">
-          <el-input v-model="form.glfwId" placeholder="请输入关联房屋id" />
-        </el-form-item>
-        <el-form-item label="关联房屋名称" prop="glfwName">
-          <el-input v-model="form.glfwName" placeholder="请输入关联房屋名称" />
+          <image-upload v-model="form.yyzzPicture"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="所属网格" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -282,11 +349,17 @@
 
 <script>
 import { listCsmanage, getCsmanage, delCsmanage, addCsmanage, updateCsmanage } from "@/api/szxc/csmanage";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+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'],
   data() {
     return {
+      cq_checked: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -301,6 +374,8 @@ export default {
       total: 0,
       // 场所管理表格数据
       csmanageList: [],
+      // 组织树选项
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -321,8 +396,6 @@ export default {
         yyqx: null,
         tyshxyCode: null,
         yyzzPicture: null,
-        glfwId: null,
-        glfwName: null,
         deptId: null,
         deptName: null,
         userId: null
@@ -339,8 +412,19 @@ export default {
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    /** 查询组织下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    selectedTree(node){
+      this.form.deptId = node.id;
+      this.form.deptName = node.label;
+    },
     /** 查询场所管理列表 */
     getList() {
       this.loading = true;
@@ -371,8 +455,6 @@ export default {
         yyqx: null,
         tyshxyCode: null,
         yyzzPicture: null,
-        glfwId: null,
-        glfwName: null,
         remark: null,
         createBy: null,
         createTime: null,
@@ -420,6 +502,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.cq_checked){
+            this.form.yyqx = '长期';
+          }
           if (this.form.id != null) {
             updateCsmanage(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -451,6 +536,10 @@ export default {
       this.download('szxc/csmanage/export', {
         ...this.queryParams
       }, `csmanage_${new Date().getTime()}.xlsx`)
+    },
+    // 长期选择
+    cqChange(){
+      this.form.yyqx = ''
     }
   }
 };
diff --git a/ruoyi-ui/src/views/szxc/emplyees/index.vue b/ruoyi-ui/src/views/szxc/emplyees/index.vue
index e6fb437..4a0c898 100644
--- a/ruoyi-ui/src/views/szxc/emplyees/index.vue
+++ b/ruoyi-ui/src/views/szxc/emplyees/index.vue
@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="场所id" prop="csId">
-        <el-input
-          v-model="queryParams.csId"
-          placeholder="请输入场所id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="场所名称" prop="csName">
         <el-input
           v-model="queryParams.csName"
@@ -41,21 +33,35 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否党员(0是1否)" prop="dyOrNot">
-        <el-input
-          v-model="queryParams.dyOrNot"
-          placeholder="请输入是否党员(0是1否)"
+      <el-form-item label="性别" prop="sex">
+        <el-select
+          v-model="queryParams.sex"
+          placeholder="性别"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.sys_user_sex"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="现居住地" prop="currentAddress">
-        <el-input
-          v-model="queryParams.currentAddress"
-          placeholder="请输入现居住地"
+      <el-form-item label="是否党员" prop="dyOrNot">
+        <el-select
+          v-model="queryParams.dyOrNot"
+          placeholder="是否党员"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="省" prop="province">
         <el-input
@@ -81,14 +87,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="户籍地址" prop="hjAddress">
-        <el-input
-          v-model="queryParams.hjAddress"
-          placeholder="请输入户籍地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -141,22 +139,29 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="emplyeesList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="场所id" align="center" prop="csId" />
-      <el-table-column label="场所名称" align="center" prop="csName" />
-      <el-table-column label="员工姓名" align="center" prop="ygName" />
-      <el-table-column label="手机号" align="center" prop="phone" />
-      <el-table-column label="身份证号" align="center" prop="cardId" />
-      <el-table-column label="性别" align="center" prop="sex" />
-      <el-table-column label="是否党员(0是1否)" align="center" prop="dyOrNot" />
-      <el-table-column label="现居住地" align="center" prop="currentAddress" />
-      <el-table-column label="省" align="center" prop="province" />
-      <el-table-column label="市" align="center" prop="city" />
-      <el-table-column label="县" align="center" prop="county" />
-      <el-table-column label="户籍地址" align="center" prop="hjAddress" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+    <el-table v-loading="loading" :data="emplyeesList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="45" align="center" />
+      <el-table-column label="ID" align="center" prop="id" min-width="60"/>
+      <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-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -175,7 +180,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -185,13 +190,14 @@
     />
 
     <!-- 添加或修改场所员工对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="场所id" prop="csId">
-          <el-input v-model="form.csId" placeholder="请输入场所id" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="场所名称" prop="csName">
-          <el-input v-model="form.csName" placeholder="请输入场所名称" />
+          <el-input readonly
+                    placeholder="请选择场所"
+                    v-model="form.csName">
+            <el-button slot="append" icon="el-icon-search" @click="csQuery"></el-button>
+          </el-input>
         </el-form-item>
         <el-form-item label="员工姓名" prop="ygName">
           <el-input v-model="form.ygName" placeholder="请输入员工姓名" />
@@ -202,8 +208,35 @@
         <el-form-item label="身份证号" prop="cardId">
           <el-input v-model="form.cardId" placeholder="请输入身份证号" />
         </el-form-item>
-        <el-form-item label="是否党员(0是1否)" prop="dyOrNot">
-          <el-input v-model="form.dyOrNot" placeholder="请输入是否党员(0是1否)" />
+        <el-form-item label="性别" prop="sex">
+          <el-select
+            v-model="form.sex"
+            placeholder="性别"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.sys_user_sex"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否党员" prop="dyOrNot">
+          <el-select
+            v-model="form.dyOrNot"
+            placeholder="是否党员"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="现居住地" prop="currentAddress">
           <el-input v-model="form.currentAddress" placeholder="请输入现居住地" />
@@ -220,20 +253,99 @@
         <el-form-item label="户籍地址" prop="hjAddress">
           <el-input v-model="form.hjAddress" placeholder="请输入户籍地址" />
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="选择场所信息" :visible.sync="csInfo.visible" width="1000px" append-to-body>
+      <el-form :model="csInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="130px">
+        <el-form-item label="统一社会信用代码" prop="tyshxyCode">
+          <el-input
+            v-model="csInfo.queryParams.tyshxyCode"
+            placeholder="请输入统一社会信用代码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="场所名称" prop="csName">
+          <el-input
+            v-model="csInfo.queryParams.csName"
+            placeholder="请输入场所名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="csInfoQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <el-alert title="双击选择场所" type="warning" :closable="false"></el-alert>
+      <el-table v-loading="csInfo.loading" :data="csInfo.list" border @cell-dblclick="csInfoDblclick">
+        <el-table-column label="所属网格" align="center" prop="deptName" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="场所名称" align="center" prop="csName" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="行业类别" align="center" prop="hyType" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_hy_type" :value="scope.row.hyType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="场所类型" align="center" prop="csType" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxv_cs_type" :value="scope.row.csType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="场所地址" align="center" prop="csAddress" min-width="140" show-overflow-tooltip/>
+        <el-table-column label="统一社会信用代码" align="center" prop="tyshxyCode" min-width="160" show-overflow-tooltip/>
+        <el-table-column label="员工数量" align="center" prop="employeeNum" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="商住一体" align="center" prop="szyt" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="scope.row.szyt==='0'">是</span>
+            <span v-if="scope.row.szyt==='1'">否</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="房屋类型" align="center" prop="fwType" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_fw_type" :value="scope.row.fwType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="法人姓名" align="center" prop="frName" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="成立日期" align="center" prop="clDate" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.clDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="营业期限" align="center" prop="yyqx" min-width="120" show-overflow-tooltip/>
+
+<!--        <el-table-column label="营业执照" align="center" prop="yyzzPicture" >
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.yyzzPicture" :width="50" :height="50"/>
+          </template>
+        </el-table-column>-->
+      </el-table>
+      <pagination
+        v-show="csInfo.total>0"
+        :total="csInfo.total"
+        :page.sync="csInfo.queryParams.pageNum"
+        :limit.sync="csInfo.queryParams.pageSize"
+        @pagination="getlistCsmanage"
+      />
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listEmplyees, getEmplyees, delEmplyees, addEmplyees, updateEmplyees } from "@/api/szxc/emplyees";
+import { listCsmanage } from "@/api/szxc/csmanage";
 
 export default {
   name: "Emplyees",
+  dicts: ['szxc_yes_no', 'szxc_hy_type', 'szxv_cs_type', 'szxc_fw_type', 'sys_user_sex'],
   data() {
     return {
       // 遮罩层
@@ -275,10 +387,39 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        csId: [
-          { required: true, message: "场所id不能为空", trigger: "blur" }
+        csName: [
+          { required: true, message: "场所不能为空", trigger: "blur" }
+        ],
+        ygName: [
+          { required: true, message: "员工姓名不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "手机号不能为空", trigger: "blur" }
         ],
-      }
+        cardId: [
+          { required: true, message: "身份证号不能为空", trigger: "blur" }
+        ],
+        sex: [
+          { required: true, message: "性别不能为空", trigger: "blur" }
+        ]
+      },
+      // 场所信息
+      csInfo: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10,
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
+      },
     };
   },
   created() {
@@ -358,6 +499,7 @@ 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("修改成功");
@@ -389,7 +531,32 @@ export default {
       this.download('szxc/emplyees/export', {
         ...this.queryParams
       }, `emplyees_${new Date().getTime()}.xlsx`)
-    }
+    },
+    csQuery(){
+      this.csInfo.visible = true;
+      this.getlistCsmanage()
+    },
+    /** 查询场所信息列表 */
+    getlistCsmanage() {
+      this.csInfo.loading = true;
+      listCsmanage(this.csInfo.queryParams).then(response => {
+        this.csInfo.list = response.rows;
+        this.csInfo.total = response.total;
+        this.csInfo.loading = false;
+      });
+    },
+    // 场所信息查询
+    csInfoQuery(){
+      this.csInfo.queryParams.pageNum = 1;
+      this.getlistCsmanage();
+    },
+    // 场所选择 选中数据
+    csInfoDblclick(row) {
+      this.csInfo.selectRow = row;
+      this.form.csId = row.id;
+      this.form.csName = row.csName;
+      this.csInfo.visible = false
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/szxc/jminfo/index.vue b/ruoyi-ui/src/views/szxc/jminfo/index.vue
index 3cd6284..3fec905 100644
--- a/ruoyi-ui/src/views/szxc/jminfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/jminfo/index.vue
@@ -434,7 +434,7 @@
         <el-row :gutter="10" v-if="!form.id">
           <el-col :span="8">
             <el-form-item label="户号" prop="acountNo">
-              <el-input
+              <el-input readonly
                 placeholder="请选择户主"
                 v-model="form.acountNo">
                 <el-button slot="append" icon="el-icon-search" @click="acountNoQuery(1)"></el-button>
diff --git a/ruoyi-ui/src/views/szxc/response/index.vue b/ruoyi-ui/src/views/szxc/response/index.vue
index ed6c419..88c259f 100644
--- a/ruoyi-ui/src/views/szxc/response/index.vue
+++ b/ruoyi-ui/src/views/szxc/response/index.vue
@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="场所id" prop="csId">
-        <el-input
-          v-model="queryParams.csId"
-          placeholder="请输入场所id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="场所名称" prop="csName">
         <el-input
           v-model="queryParams.csName"
@@ -17,6 +9,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="负责人类型" prop="fzrType">
+        <el-select
+          v-model="queryParams.fzrType"
+          placeholder="负责人类型"
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_fzr_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="负责人姓名" prop="fzrName">
         <el-input
           v-model="queryParams.fzrName"
@@ -41,21 +48,35 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否党员(0是1否)" prop="dyOrNot">
-        <el-input
-          v-model="queryParams.dyOrNot"
-          placeholder="请输入是否党员(0是1否)"
+      <el-form-item label="性别" prop="sex">
+        <el-select
+          v-model="queryParams.sex"
+          placeholder="性别"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.sys_user_sex"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="现居住地" prop="currentAddress">
-        <el-input
-          v-model="queryParams.currentAddress"
-          placeholder="请输入现居住地"
+      <el-form-item label="是否党员" prop="dyOrNot">
+        <el-select
+          v-model="queryParams.dyOrNot"
+          placeholder="是否党员"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="省" prop="province">
         <el-input
@@ -81,14 +102,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="户籍地址" prop="hjAddress">
-        <el-input
-          v-model="queryParams.hjAddress"
-          placeholder="请输入户籍地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -141,23 +154,34 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="responseList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="场所id" align="center" prop="csId" />
-      <el-table-column label="场所名称" align="center" prop="csName" />
-      <el-table-column label="负责人类型" align="center" prop="fzrType" />
-      <el-table-column label="负责人姓名" align="center" prop="fzrName" />
-      <el-table-column label="手机号" align="center" prop="phone" />
-      <el-table-column label="身份证号" align="center" prop="cardId" />
-      <el-table-column label="性别" align="center" prop="sex" />
-      <el-table-column label="是否党员(0是1否)" align="center" prop="dyOrNot" />
-      <el-table-column label="现居住地" align="center" prop="currentAddress" />
-      <el-table-column label="省" align="center" prop="province" />
-      <el-table-column label="市" align="center" prop="city" />
-      <el-table-column label="县" align="center" prop="county" />
-      <el-table-column label="户籍地址" align="center" prop="hjAddress" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+    <el-table v-loading="loading" :data="responseList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="45" align="center" />
+      <el-table-column label="ID" align="center" prop="id"  min-width="60"/>
+      <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-column label="操作" align="center" class-name="small-padding fixed-width"  min-width="120" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -176,7 +200,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -186,13 +210,29 @@
     />
 
     <!-- 添加或修改场所负责人对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="场所id" prop="csId">
-          <el-input v-model="form.csId" placeholder="请输入场所id" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="场所名称" prop="csName">
-          <el-input v-model="form.csName" placeholder="请输入场所名称" />
+          <el-input readonly
+                    placeholder="请选择场所"
+                    v-model="form.csName">
+            <el-button slot="append" icon="el-icon-search" @click="csQuery"></el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="负责人类型" prop="fzrType">
+          <el-select
+            v-model="form.fzrType"
+            placeholder="负责人类型"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_fzr_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="负责人姓名" prop="fzrName">
           <el-input v-model="form.fzrName" placeholder="请输入负责人姓名" />
@@ -203,8 +243,35 @@
         <el-form-item label="身份证号" prop="cardId">
           <el-input v-model="form.cardId" placeholder="请输入身份证号" />
         </el-form-item>
-        <el-form-item label="是否党员(0是1否)" prop="dyOrNot">
-          <el-input v-model="form.dyOrNot" placeholder="请输入是否党员(0是1否)" />
+        <el-form-item label="性别" prop="sex">
+          <el-select
+            v-model="form.sex"
+            placeholder="性别"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.sys_user_sex"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否党员" prop="dyOrNot">
+          <el-select
+            v-model="form.dyOrNot"
+            placeholder="是否党员"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="现居住地" prop="currentAddress">
           <el-input v-model="form.currentAddress" placeholder="请输入现居住地" />
@@ -221,20 +288,99 @@
         <el-form-item label="户籍地址" prop="hjAddress">
           <el-input v-model="form.hjAddress" placeholder="请输入户籍地址" />
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="选择场所信息" :visible.sync="csInfo.visible" width="1000px" append-to-body>
+      <el-form :model="csInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="130px">
+        <el-form-item label="统一社会信用代码" prop="tyshxyCode">
+          <el-input
+            v-model="csInfo.queryParams.tyshxyCode"
+            placeholder="请输入统一社会信用代码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="场所名称" prop="csName">
+          <el-input
+            v-model="csInfo.queryParams.csName"
+            placeholder="请输入场所名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="csInfoQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <el-alert title="双击选择场所" type="warning" :closable="false"></el-alert>
+      <el-table v-loading="csInfo.loading" :data="csInfo.list" border @cell-dblclick="csInfoDblclick">
+        <el-table-column label="所属网格" align="center" prop="deptName" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="场所名称" align="center" prop="csName" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="行业类别" align="center" prop="hyType" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_hy_type" :value="scope.row.hyType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="场所类型" align="center" prop="csType" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxv_cs_type" :value="scope.row.csType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="场所地址" align="center" prop="csAddress" min-width="140" show-overflow-tooltip/>
+        <el-table-column label="统一社会信用代码" align="center" prop="tyshxyCode" min-width="160" show-overflow-tooltip/>
+        <el-table-column label="员工数量" align="center" prop="employeeNum" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="商住一体" align="center" prop="szyt" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="scope.row.szyt==='0'">是</span>
+            <span v-if="scope.row.szyt==='1'">否</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="房屋类型" align="center" prop="fwType" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_fw_type" :value="scope.row.fwType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="法人姓名" align="center" prop="frName" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="成立日期" align="center" prop="clDate" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.clDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="营业期限" align="center" prop="yyqx" min-width="120" show-overflow-tooltip/>
+
+        <!--        <el-table-column label="营业执照" align="center" prop="yyzzPicture" >
+                  <template slot-scope="scope">
+                    <image-preview :src="scope.row.yyzzPicture" :width="50" :height="50"/>
+                  </template>
+                </el-table-column>-->
+      </el-table>
+      <pagination
+        v-show="csInfo.total>0"
+        :total="csInfo.total"
+        :page.sync="csInfo.queryParams.pageNum"
+        :limit.sync="csInfo.queryParams.pageSize"
+        @pagination="getlistCsmanage"
+      />
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listResponse, getResponse, delResponse, addResponse, updateResponse } from "@/api/szxc/response";
+import { listCsmanage } from "@/api/szxc/csmanage";
 
 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 {
       // 遮罩层
@@ -277,10 +423,42 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        csId: [
-          { required: true, message: "场所id不能为空", trigger: "blur" }
+        csName: [
+          { required: true, message: "场所不能为空", trigger: "blur" }
+        ],
+        fzrType: [
+          { required: true, message: "负责人类型不能为空", trigger: "blur" }
+        ],
+        fzrName: [
+          { required: true, message: "负责人姓名不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "手机号不能为空", trigger: "blur" }
         ],
-      }
+        cardId: [
+          { required: true, message: "身份证号不能为空", trigger: "blur" }
+        ],
+        sex: [
+          { required: true, message: "性别不能为空", trigger: "blur" }
+        ]
+      },
+      // 场所信息
+      csInfo: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10,
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
+      },
     };
   },
   created() {
@@ -392,7 +570,32 @@ export default {
       this.download('szxc/response/export', {
         ...this.queryParams
       }, `response_${new Date().getTime()}.xlsx`)
-    }
+    },
+    csQuery(){
+      this.csInfo.visible = true;
+      this.getlistCsmanage()
+    },
+    /** 查询场所信息列表 */
+    getlistCsmanage() {
+      this.csInfo.loading = true;
+      listCsmanage(this.csInfo.queryParams).then(response => {
+        this.csInfo.list = response.rows;
+        this.csInfo.total = response.total;
+        this.csInfo.loading = false;
+      });
+    },
+    // 场所信息查询
+    csInfoQuery(){
+      this.csInfo.queryParams.pageNum = 1;
+      this.getlistCsmanage();
+    },
+    // 场所选择 选中数据
+    csInfoDblclick(row) {
+      this.csInfo.selectRow = row;
+      this.form.csId = row.id;
+      this.form.csName = row.csName;
+      this.csInfo.visible = false
+    },
   }
 };
 </script>