diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index cdbab1e..f1de25c 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -6,6 +6,7 @@ const user = {
     token: getToken(),
     id: '',
     name: '',
+    nickName: '',
     avatar: '',
     roles: [],
     permissions: []
@@ -21,6 +22,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_NICKNAME: (state, nickName) => {
+      state.nickName = nickName
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -64,6 +68,7 @@ const user = {
           }
           commit('SET_ID', user.userId)
           commit('SET_NAME', user.userName)
+          commit('SET_NICKNAME', user.nickName)
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {
diff --git a/ruoyi-ui/src/views/szxc/wish/index.vue b/ruoyi-ui/src/views/szxc/wish/index.vue
index f96041d..ae9e4f9 100644
--- a/ruoyi-ui/src/views/szxc/wish/index.vue
+++ b/ruoyi-ui/src/views/szxc/wish/index.vue
@@ -1,6 +1,18 @@
 <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="100px">
+      <el-form-item label="心愿标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入心愿标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <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="applyName">
         <el-input
           v-model="queryParams.applyName"
@@ -25,14 +37,6 @@
                         placeholder="请选择申请时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="心愿标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入心愿标题"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="认领人" prop="rlName">
         <el-input
           v-model="queryParams.rlName"
@@ -49,14 +53,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="认领人居民id" prop="rlId">
-        <el-input
-          v-model="queryParams.rlId"
-          placeholder="请输入认领人居民id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="审核部门" prop="auditDept">
         <el-input
           v-model="queryParams.auditDept"
@@ -65,14 +61,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核部门id" prop="auditDeptid">
-        <el-input
-          v-model="queryParams.auditDeptid"
-          placeholder="请输入审核部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="审核人" prop="auditName">
         <el-input
           v-model="queryParams.auditName"
@@ -81,46 +69,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核结果" prop="auditResult">
-        <el-input
-          v-model="queryParams.auditResult"
-          placeholder="请输入审核结果"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核原因" prop="auditReason">
-        <el-input
-          v-model="queryParams.auditReason"
-          placeholder="请输入审核原因"
-          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="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入申请人部门id"
-          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>
@@ -173,35 +121,45 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="wishList" @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="applyName" />
-      <el-table-column label="申请人电话" align="center" prop="applyPhone" />
-      <el-table-column label="申请时间" align="center" prop="applyDate" width="180">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="45" align="center" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="心愿标题" align="center" prop="title" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="心愿类型" align="center" prop="wishType" min-width="100" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_wish_type" :value="scope.row.wishType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="心愿描述" align="center" prop="wishDescrib" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="心愿状态" align="center" prop="wishStatus" min-width="100" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_xystatus" :value="scope.row.wishStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请人网格" align="center" prop="deptName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="申请人" align="center" prop="applyName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="申请人电话" align="center" prop="applyPhone" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="申请时间" align="center" prop="applyDate" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="心愿标题" align="center" prop="title" />
-      <el-table-column label="心愿类型" align="center" prop="wishType" />
-      <el-table-column label="心愿描述" align="center" prop="wishDescrib" />
-      <el-table-column label="心愿状态" align="center" prop="wishStatus" />
-      <el-table-column label="认领人" align="center" prop="rlName" />
-      <el-table-column label="认领人电话" align="center" prop="rlPhone" />
-      <el-table-column label="认领人居民id" align="center" prop="rlId" />
-      <el-table-column label="审核部门" align="center" prop="auditDept" />
-      <el-table-column label="审核部门id" align="center" prop="auditDeptid" />
-      <el-table-column label="审核人" align="center" prop="auditName" />
-      <el-table-column label="审核结果" align="center" prop="auditResult" />
-      <el-table-column label="审核原因" align="center" prop="auditReason" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="申请人网格" align="center" prop="deptName" />
-      <el-table-column label="申请人部门id" align="center" prop="deptId" />
-      <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="auditDept" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="审核人" align="center" prop="auditName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="审核结果" align="center" prop="auditResult" min-width="120" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.auditResult"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核原因" align="center" prop="auditReason" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="认领人" align="center" prop="rlName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="认领人电话" align="center" prop="rlPhone" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="认领人居民id" align="center" prop="rlId" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="备注" align="center" prop="remark" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.wishStatus==='0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -215,6 +173,20 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['szxc:wish:remove']"
           >删除</el-button>
+          <el-button
+            v-if="scope.row.wishStatus==='0'"
+            size="mini"
+            type="text"
+            @click="handleShenHe(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >审核</el-button>
+          <el-button
+            v-if="scope.row.wishStatus==='2'"
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >认领</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -228,78 +200,121 @@
     />
 
     <!-- 添加或修改心愿管理对话框 -->
-    <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="applyName">
-          <el-input v-model="form.applyName" placeholder="请输入申请人" />
-        </el-form-item>
-        <el-form-item label="申请人电话" prop="applyPhone">
-          <el-input v-model="form.applyPhone" placeholder="请输入申请人电话" />
-        </el-form-item>
-        <el-form-item label="申请时间" prop="applyDate">
-          <el-date-picker clearable
-                          v-model="form.applyDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择申请时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="心愿标题" prop="title">
-          <el-input v-model="form.title" 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="100px">
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="心愿标题" prop="title">
+              <el-input v-model="form.title" placeholder="请输入心愿标题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="心愿类型" prop="wishType">
+              <el-select
+                v-model="form.wishType"
+                placeholder="心愿类型"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_wish_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="applyName">
+              <el-input v-model="form.applyName" placeholder="请输入申请人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="申请人电话" prop="applyPhone">
+              <el-input v-model="form.applyPhone" placeholder="请输入申请人电话" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <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="applyDate">
+              <el-date-picker clearable style="width: 100%"
+                              v-model="form.applyDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择申请时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-form-item label="心愿描述" prop="wishDescrib">
-          <el-input v-model="form.wishDescrib" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="认领人" prop="rlName">
-          <el-input v-model="form.rlName" placeholder="请输入认领人" />
-        </el-form-item>
-        <el-form-item label="认领人电话" prop="rlPhone">
-          <el-input v-model="form.rlPhone" placeholder="请输入认领人电话" />
-        </el-form-item>
-        <el-form-item label="认领人居民id" prop="rlId">
-          <el-input v-model="form.rlId" placeholder="请输入认领人居民id" />
-        </el-form-item>
-        <el-form-item label="审核部门" prop="auditDept">
-          <el-input v-model="form.auditDept" placeholder="请输入审核部门" />
+          <editor v-model="form.wishDescrib" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="审核部门id" prop="auditDeptid">
-          <el-input v-model="form.auditDeptid" placeholder="请输入审核部门id" />
-        </el-form-item>
-        <el-form-item label="审核人" prop="auditName">
-          <el-input v-model="form.auditName" placeholder="请输入审核人" />
+
+        <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="shenHe.open" width="500px" append-to-body>
+      <el-form ref="shenHeForm" :model="shenHe.form" :rules="shenHe.rules" label-width="90px">
         <el-form-item label="审核结果" prop="auditResult">
-          <el-input v-model="form.auditResult" placeholder="请输入审核结果" />
+          <el-select
+            v-model="shenHe.form.auditResult"
+            placeholder="请选择审核结果"
+            clearable
+            style="width:100%"
+          >
+            <el-option label="通过" value="1"/>
+            <el-option label="不通过" value="2"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="审核原因" prop="auditReason">
-          <el-input v-model="form.auditReason" placeholder="请输入审核原因" />
+          <el-input v-model="shenHe.form.auditReason" type="textarea" placeholder="请输入审核原因" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </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="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入申请人部门id" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+          <el-input v-model="shenHe.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>
+        <el-button type="primary" @click="shenHeSubmit">确 定</el-button>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
 <script>
   import { listWish, getWish, delWish, addWish, updateWish } from "@/api/szxc/wish";
+  import { addXyrecard } from "@/api/szxc/xyrecard";
+  import { deptTreeSelect } from "@/api/system/user";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
   export default {
     name: "Wish",
+    components: { Treeselect },
+    dicts: ['szxc_wish_type', 'szxc_xystatus', 'szxc_audit_status'],
     data() {
       return {
         // 遮罩层
@@ -315,7 +330,9 @@
         // 总条数
         total: 0,
         // 心愿管理表格数据
-        wishList: [],
+        list: [],
+        // 组织树选项
+        deptOptions: undefined,
         // 弹出层标题
         title: "",
         // 是否显示弹出层
@@ -347,18 +364,70 @@
         form: {},
         // 表单校验
         rules: {
+          title: [
+            { required: true, message: "心愿标题不能为空", trigger: "blur" }
+          ],
+          wishType: [
+            { required: true, message: "心愿类型不能为空", trigger: "blur" }
+          ],
+          wishStatus: [
+            { required: true, message: "心愿状态不能为空", trigger: "blur" }
+          ],
+          deptId: [
+            { required: true, message: "申请人网格不能为空", trigger: "blur" }
+          ],
+          applyName: [
+            { required: true, message: "申请人不能为空", trigger: "blur" }
+          ],
+          applyPhone: [
+            { required: true, message: "申请人电话不能为空", trigger: "blur" }
+          ],
+          applyDate: [
+            { required: true, message: "申请时间不能为空", trigger: "blur" }
+          ],
+          wishDescrib: [
+            { required: true, message: "心愿描述不能为空", trigger: "blur" }
+          ]
+        },
+        // 审核
+        shenHe:{
+          row: null,
+          // 是否显示审核弹出层
+          open: false,
+          // 表单参数
+          form: {},
+          // 表单校验
+          rules: {
+            auditResult: [
+              { required: true, message: "审核结果不能为空", trigger: "blur" }
+            ],
+            auditReason: [
+              { required: true, message: "审核原因不能为空", trigger: "blur" }
+            ],
+          }
         }
       };
     },
     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;
         listWish(this.queryParams).then(response => {
-          this.wishList = response.rows;
+          this.list = response.rows;
           this.total = response.total;
           this.loading = false;
         });
@@ -430,6 +499,27 @@
           this.title = "修改心愿管理";
         });
       },
+      /** 审核按钮操作 */
+      handleShenHe(row) {
+        console.log(this.$store.state.user);
+        this.shenHe.row = row;
+        this.resetForm("shenHeForm");
+        this.shenHe.form = {
+          id: null,
+          shRecardType: '5',
+          jlId: row.id,
+          auditDept: row.auditDept,
+          auditName: this.$store.state.user.nickName,
+          auditResult: null,
+          auditReason: null,
+          remark: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null
+        };
+        this.shenHe.open = true
+      },
       /** 提交按钮 */
       submitForm() {
         this.$refs["form"].validate(valid => {
@@ -441,6 +531,7 @@
                 this.getList();
               });
             } else {
+              this.form.wishStatus = '0';
               addWish(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
@@ -465,6 +556,30 @@
         this.download('szxc/wish/export', {
           ...this.queryParams
         }, `wish_${new Date().getTime()}.xlsx`)
+      },
+      // 审核提交
+      shenHeSubmit(){
+        this.$refs["shenHeForm"].validate(valid => {
+          if (valid) {
+            addXyrecard(this.shenHe.form).then(response => {
+
+              this.shenHe.row.auditName = this.shenHe.form.auditName;
+              this.shenHe.row.auditResult =  this.shenHe.form.auditResult;
+              this.shenHe.row.auditReason =  this.shenHe.form.auditReason;
+              if(this.shenHe.form.auditResult==='1'){
+                this.shenHe.row.wishStatus = '2'
+              }
+              if(this.shenHe.form.auditResult==='2'){
+                this.shenHe.row.wishStatus = '1'
+              }
+              updateWish(this.shenHe.row).then(response1 => {
+                this.$modal.msgSuccess("操作成功");
+                this.shenHe.open = false;
+                this.getList();
+              });
+            });
+          }
+        });
       }
     }
   };
diff --git a/ruoyi-ui/src/views/szxc/xyrecard/index.vue b/ruoyi-ui/src/views/szxc/xyrecard/index.vue
index f296f69..c830a27 100644
--- a/ruoyi-ui/src/views/szxc/xyrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/xyrecard/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="jlId">
-        <el-input
-          v-model="queryParams.jlId"
-          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="auditDept">
         <el-input
           v-model="queryParams.auditDept"
@@ -25,21 +17,31 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核结果" prop="auditResult">
-        <el-input
-          v-model="queryParams.auditResult"
-          placeholder="请输入审核结果"
+      <el-form-item label="审核类型" prop="shRecardType">
+        <el-select
+          v-model="queryParams.shRecardType"
+          placeholder="审核类型"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_sh_recard_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="审核原因" prop="auditReason">
-        <el-input
-          v-model="queryParams.auditReason"
-          placeholder="请输入审核原因"
+      <el-form-item label="审核结果" prop="auditResult">
+        <el-select
+          v-model="queryParams.auditResult"
+          placeholder="请选择审核结果"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option label="通过" value="1"/>
+          <el-option label="不通过" value="2"/>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -48,38 +50,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['szxc:xyrecard:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['szxc:xyrecard:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['szxc:xyrecard:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -93,25 +63,26 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="xyrecardList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
       <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="shRecardType" />
-      <el-table-column label="对应记录id" align="center" prop="jlId" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="审核记录类型" align="center" prop="shRecardType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_sh_recard_type" :value="scope.row.shRecardType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="对应记录ID" align="center" prop="jlId" />
       <el-table-column label="审核部门" align="center" prop="auditDept" />
       <el-table-column label="审核人" align="center" prop="auditName" />
-      <el-table-column label="审核结果" align="center" prop="auditResult" />
+      <el-table-column label="审核结果" align="center" prop="auditResult" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.auditResult"/>
+        </template>
+      </el-table-column>
       <el-table-column label="审核原因" align="center" prop="auditReason" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['szxc:xyrecard:edit']"
-          >修改</el-button>
           <el-button
             size="mini"
             type="text"
@@ -131,77 +102,34 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改审核记录对话框 -->
-    <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="jlId">
-          <el-input v-model="form.jlId" placeholder="请输入对应记录id" />
-        </el-form-item>
-        <el-form-item label="审核部门" prop="auditDept">
-          <el-input v-model="form.auditDept" placeholder="请输入审核部门" />
-        </el-form-item>
-        <el-form-item label="审核人" prop="auditName">
-          <el-input v-model="form.auditName" placeholder="请输入审核人" />
-        </el-form-item>
-        <el-form-item label="审核结果" prop="auditResult">
-          <el-input v-model="form.auditResult" placeholder="请输入审核结果" />
-        </el-form-item>
-        <el-form-item label="审核原因" prop="auditReason">
-          <el-input v-model="form.auditReason" placeholder="请输入审核原因" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" 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>
   </div>
 </template>
 
 <script>
-  import { listXyrecard, getXyrecard, delXyrecard, addXyrecard, updateXyrecard } from "@/api/szxc/xyrecard";
+  import { listXyrecard, delXyrecard } from "@/api/szxc/xyrecard";
 
   export default {
     name: "Xyrecard",
+    dicts: ['szxc_sh_recard_type', 'szxc_audit_status'],
     data() {
       return {
         // 遮罩层
         loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
         // 显示搜索条件
         showSearch: true,
         // 总条数
         total: 0,
         // 审核记录表格数据
-        xyrecardList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
+        list: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
           pageSize: 10,
           shRecardType: null,
-          jlId: null,
           auditDept: null,
           auditName: null,
           auditResult: null,
-          auditReason: null,
         },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-        }
       };
     },
     created() {
@@ -212,34 +140,11 @@
       getList() {
         this.loading = true;
         listXyrecard(this.queryParams).then(response => {
-          this.xyrecardList = response.rows;
+          this.list = response.rows;
           this.total = response.total;
           this.loading = false;
         });
       },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          shRecardType: null,
-          jlId: null,
-          auditDept: null,
-          auditName: null,
-          auditResult: null,
-          auditReason: null,
-          remark: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null
-        };
-        this.resetForm("form");
-      },
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
@@ -250,51 +155,9 @@
         this.resetForm("queryForm");
         this.handleQuery();
       },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加审核记录";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getXyrecard(id).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.title = "修改审核记录";
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != null) {
-              updateXyrecard(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addXyrecard(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
       /** 删除按钮操作 */
       handleDelete(row) {
-        const ids = row.id || this.ids;
+        const ids = row.id;
         this.$modal.confirm('是否确认删除审核记录编号为"' + ids + '"的数据项？').then(function() {
           return delXyrecard(ids);
         }).then(() => {