From 25522186eb26b34d70503342d5473148bf2b1aec Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Thu, 18 Apr 2024 11:03:04 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/szxc/wish/index.vue       |   7 +-
 ruoyi-ui/src/views/szxc/workrecard/index.vue | 227 ++++++++++++++++---
 2 files changed, 195 insertions(+), 39 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/wish/index.vue b/ruoyi-ui/src/views/szxc/wish/index.vue
index 1c8c24f..4e03334 100644
--- a/ruoyi-ui/src/views/szxc/wish/index.vue
+++ b/ruoyi-ui/src/views/szxc/wish/index.vue
@@ -155,7 +155,7 @@
       <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="备注" 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">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.wishStatus==='0'"
@@ -716,7 +716,7 @@
           }
         });
       },
-      /** 审核按钮操作 */
+      /** 认领按钮操作 */
       handleRenLing(row) {
         this.reset();
         this.form = row;
@@ -767,6 +767,9 @@
         getWish(id).then(response => {
           this.form = response.data;
           this.form.wishStatus = '0';
+          this.form.auditName = '';
+          this.form.auditResult = '';
+          this.form.auditReason = '';
           this.open = true;
           this.title = "修改心愿管理";
         });
diff --git a/ruoyi-ui/src/views/szxc/workrecard/index.vue b/ruoyi-ui/src/views/szxc/workrecard/index.vue
index b61206c..88e0156 100644
--- a/ruoyi-ui/src/views/szxc/workrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/workrecard/index.vue
@@ -98,46 +98,55 @@
     </el-row>
 
     <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="workerName" />
-      <el-table-column label="提报日期" align="center" prop="submitDate">
+      <el-table-column type="selection" width="45" align="center" />
+      <el-table-column label="ID" align="center" prop="id" min-width="60" show-overflow-tooltip/>
+      <el-table-column label="标题" align="center" prop="title" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="所属网格" align="center" prop="deptName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="工作人员" align="center" prop="workerName" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="提报日期" align="center" prop="submitDate" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="startDate">
+      <el-table-column label="开始时间" align="center" prop="startDate" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endDate">
+      <el-table-column label="结束时间" align="center" prop="endDate" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="类别" align="center" prop="type" >
+      <el-table-column label="类别" align="center" prop="type" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.szxc_gzjl_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="图片" align="center" prop="picture" >
         <template slot-scope="scope">
           <image-preview :src="scope.row.picture" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="审核状态" align="center" prop="gzStatus" >
+      <el-table-column label="内容" align="center" prop="content" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核状态" align="center" prop="gzStatus" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.gzStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="审核备注" align="center" prop="shRemark" />
-      <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="审核部门" align="center" prop="auditDept" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核结果" align="center" prop="auditResult" min-width="180" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.gzStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核人" align="center" prop="auditName" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核原因" align="center" prop="auditReason" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核备注" align="center" prop="shRemark" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.gzStatus==='0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -151,6 +160,26 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['szxc:workrecard:remove']"
           >删除</el-button>
+          <el-button
+            v-if="scope.row.gzStatus==='0'"
+            size="mini"
+            type="text"
+            @click="handleShenHe(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >审核</el-button>
+          <el-button
+            v-if="scope.row.gzStatus==='2'"
+            size="mini"
+            type="text"
+            @click="handleUpdate1(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >重新提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleSHJL(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >审核记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -240,23 +269,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="审核状态" prop="gzStatus">
-              <el-select
-                v-model="form.gzStatus"
-                placeholder="审核状态"
-                clearable
-                style="width:100%"
-              >
-                <el-option
-                  v-for="dict in dict.type.szxc_audit_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
 
         <el-row :gutter="10">
@@ -270,11 +282,6 @@
               <editor v-model="form.content" :min-height="192"/>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="审核备注" prop="shRemark">
-              <el-input v-model="form.shRemark" type="textarea" placeholder="请输入审核备注" />
-            </el-form-item>
-          </el-col>
         </el-row>
 
       </el-form>
@@ -285,11 +292,53 @@
       </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-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="shenHe.form.auditReason" type="textarea" placeholder="请输入审核原因" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <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="shenHeSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="审核记录" :visible.sync="shjl.visible" width="1000px" append-to-body>
+      <el-table v-loading="shjl.loading" :data="shjl.list" border>
+        <el-table-column label="审核部门" align="center" prop="auditDept" />
+        <el-table-column label="审核人" align="center" prop="auditName" />
+        <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>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listWorkrecard, getWorkrecard, delWorkrecard, addWorkrecard, updateWorkrecard } from "@/api/szxc/workrecard";
+import { listXyrecard, 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";
@@ -375,7 +424,34 @@ export default {
         shRemark: [
           { required: true, message: "审核备注不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 审核
+      shenHe:{
+        row: null,
+        // 是否显示审核弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          auditResult: [
+            { required: true, message: "审核结果不能为空", trigger: "blur" }
+          ],
+          auditReason: [
+            { required: true, message: "审核原因不能为空", trigger: "blur" }
+          ],
+        }
+      },
+      // 审核记录信息
+      shjl: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 查询列表
+        list: [],
+        // 选中信息
+        selectedRow: null,
+      },
     };
   },
   created() {
@@ -474,6 +550,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.gzStatus = '0'
             addWorkrecard(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -498,7 +575,83 @@ export default {
       this.download('szxc/workrecard/export', {
         ...this.queryParams
       }, `workrecard_${new Date().getTime()}.xlsx`)
-    }
+    },
+    /** 审核按钮操作 */
+    handleShenHe(row) {
+      this.shenHe.row = row;
+      this.resetForm("shenHeForm");
+      this.shenHe.form = {
+        id: null,
+        shRecardType: '0',
+        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
+    },
+    // 审核提交
+    shenHeSubmit(){
+      this.$refs["shenHeForm"].validate(valid => {
+        if (valid) {
+          this.shenHe.row.auditName = this.shenHe.form.auditName;
+          this.shenHe.row.auditResult =  this.shenHe.form.auditResult;
+          this.shenHe.row.auditReason =  this.shenHe.form.auditReason;
+          this.shenHe.row.shRemark =  this.shenHe.form.remark;
+          if(this.shenHe.form.auditResult==='1'){
+            this.shenHe.row.gzStatus = '1'
+          }
+          if(this.shenHe.form.auditResult==='2'){
+            this.shenHe.row.gzStatus = '2'
+          }
+          updateWorkrecard(this.shenHe.row).then(response1 => {
+            addXyrecard(this.shenHe.form).then(response => {
+              this.$modal.msgSuccess("操作成功");
+              this.shenHe.open = false;
+              this.getList();
+            });
+          });
+        }
+      });
+    },
+    // 审核记录信息
+    handleSHJL(row){
+      this.shjl.selectedRow = row;
+      this.shjl.visible = true;
+      this.getlistXyrecard();
+    },
+    /** 查询审核记录信息列表 */
+    getlistXyrecard() {
+      listXyrecard({
+        pageNum: 1,
+        pageSize: 100000000,
+        shRecardType: '0',
+        jlId: this.shjl.selectedRow.id
+      }).then(response => {
+        this.shjl.list = response.rows
+      });
+    },
+    /** 重新提交按钮操作 */
+    handleUpdate1(row) {
+      this.reset();
+      const id = row.id
+      getWorkrecard(id).then(response => {
+        this.form = response.data;
+        this.form.gzStatus = '0';
+        this.form.auditName = '';
+        this.form.auditResult = '';
+        this.form.auditReason = '';
+        this.form.shRemark = '';
+        this.open = true;
+        this.title = "修改工作记录";
+      });
+    },
   }
 };
 </script>

From f89208d4d3bde9daa40ea5c071c723b1e84a7d2a Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Thu, 18 Apr 2024 11:50:35 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/szxc/workrecard/index.vue |   2 +-
 ruoyi-ui/src/views/szxc/xcrecard/index.vue   | 210 ++++++++++++++++---
 2 files changed, 183 insertions(+), 29 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/workrecard/index.vue b/ruoyi-ui/src/views/szxc/workrecard/index.vue
index 88e0156..8977e61 100644
--- a/ruoyi-ui/src/views/szxc/workrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/workrecard/index.vue
@@ -137,7 +137,7 @@
       <el-table-column label="审核部门" align="center" prop="auditDept" min-width="180" show-overflow-tooltip/>
       <el-table-column label="审核结果" align="center" prop="auditResult" min-width="180" show-overflow-tooltip>
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.gzStatus"/>
+          <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.auditResult"/>
         </template>
       </el-table-column>
       <el-table-column label="审核人" align="center" prop="auditName" min-width="180" show-overflow-tooltip/>
diff --git a/ruoyi-ui/src/views/szxc/xcrecard/index.vue b/ruoyi-ui/src/views/szxc/xcrecard/index.vue
index c908681..6d276d6 100644
--- a/ruoyi-ui/src/views/szxc/xcrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/xcrecard/index.vue
@@ -157,7 +157,6 @@
         </template>
       </el-table-column>
       <el-table-column label="被巡查对象" align="center" prop="xcObj" min-width="120" show-overflow-tooltip/>
-
       <el-table-column label="随行巡查人" align="center" prop="flowPeople" min-width="120" show-overflow-tooltip/>
       <el-table-column label="是否需要整改" align="center" prop="reform" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -165,21 +164,30 @@
         </template>
       </el-table-column>
       <el-table-column label="整改进度" align="center" prop="zgProgress" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="审核状态" align="center" prop="xcStatus" min-width="120" show-overflow-tooltip>
+      <el-table-column label="图片" align="center" prop="picture" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.picture" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查情况描述" align="center" prop="content" min-width="200" show-overflow-tooltip/>
+      <el-table-column label="审核状态" align="center" prop="xcStatus" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.xcStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="审核备注" align="center" prop="shRemark" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="图片" align="center" prop="picture" >
+      <el-table-column label="审核部门" align="center" prop="auditDept" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核结果" align="center" prop="auditResult" min-width="180" show-overflow-tooltip>
         <template slot-scope="scope">
-          <image-preview :src="scope.row.picture" :width="50" :height="50"/>
+          <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.auditResult"/>
         </template>
       </el-table-column>
-      <el-table-column label="巡查情况描述" align="center" prop="content" min-width="200" show-overflow-tooltip/>
+      <el-table-column label="审核人" align="center" prop="auditName" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核原因" align="center" prop="auditReason" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核备注" align="center" prop="shRemark" min-width="180" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.xcStatus==='0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -200,6 +208,26 @@
             @click="handleUpdate1(scope.row)"
             v-hasPermi="['szxc:xcrecard:edit']"
           >整改进度</el-button>
+          <el-button
+            v-if="scope.row.xcStatus==='0'"
+            size="mini"
+            type="text"
+            @click="handleShenHe(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >审核</el-button>
+          <el-button
+            v-if="scope.row.xcStatus==='2'"
+            size="mini"
+            type="text"
+            @click="handleUpdate2(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >重新提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleSHJL(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >审核记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -303,23 +331,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="审核状态" prop="xcStatus">
-              <el-select
-                v-model="form.xcStatus"
-                placeholder="审核状态"
-                clearable
-                style="width:100%"
-              >
-                <el-option
-                  v-for="dict in dict.type.szxc_audit_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
 
         <el-form-item label="图片" prop="picture">
@@ -328,9 +339,6 @@
         <el-form-item label="巡查情况描述" prop="content">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="审核备注" prop="shRemark">
-          <el-input v-model="form.shRemark" type="textarea" placeholder="请输入审核备注" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -350,11 +358,53 @@
         <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-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="shenHe.form.auditReason" type="textarea" placeholder="请输入审核原因" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <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="shenHeSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="审核记录" :visible.sync="shjl.visible" width="1000px" append-to-body>
+      <el-table v-loading="shjl.loading" :data="shjl.list" border>
+        <el-table-column label="审核部门" align="center" prop="auditDept" />
+        <el-table-column label="审核人" align="center" prop="auditName" />
+        <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>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listXcrecard, getXcrecard, delXcrecard, addXcrecard, updateXcrecard } from "@/api/szxc/xcrecard";
+import { listXyrecard, 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";
@@ -455,7 +505,34 @@ export default {
         zgProgress: [
           { required: true, message: "整改进度不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 审核
+      shenHe:{
+        row: null,
+        // 是否显示审核弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          auditResult: [
+            { required: true, message: "审核结果不能为空", trigger: "blur" }
+          ],
+          auditReason: [
+            { required: true, message: "审核原因不能为空", trigger: "blur" }
+          ],
+        }
+      },
+      // 审核记录信息
+      shjl: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 查询列表
+        list: [],
+        // 选中信息
+        selectedRow: null,
+      },
     };
   },
   created() {
@@ -568,6 +645,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.xcStatus = '0'
             addXcrecard(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -592,7 +670,83 @@ export default {
       this.download('szxc/xcrecard/export', {
         ...this.queryParams
       }, `xcrecard_${new Date().getTime()}.xlsx`)
-    }
+    },
+    /** 审核按钮操作 */
+    handleShenHe(row) {
+      this.shenHe.row = row;
+      this.resetForm("shenHeForm");
+      this.shenHe.form = {
+        id: null,
+        shRecardType: '0',
+        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
+    },
+    // 审核提交
+    shenHeSubmit(){
+      this.$refs["shenHeForm"].validate(valid => {
+        if (valid) {
+          this.shenHe.row.auditName = this.shenHe.form.auditName;
+          this.shenHe.row.auditResult =  this.shenHe.form.auditResult;
+          this.shenHe.row.auditReason =  this.shenHe.form.auditReason;
+          this.shenHe.row.shRemark =  this.shenHe.form.remark;
+          if(this.shenHe.form.auditResult==='1'){
+            this.shenHe.row.xcStatus = '1'
+          }
+          if(this.shenHe.form.auditResult==='2'){
+            this.shenHe.row.xcStatus = '2'
+          }
+          updateXcrecard(this.shenHe.row).then(response1 => {
+            addXyrecard(this.shenHe.form).then(response => {
+              this.$modal.msgSuccess("操作成功");
+              this.shenHe.open = false;
+              this.getList();
+            });
+          });
+        }
+      });
+    },
+    // 审核记录信息
+    handleSHJL(row){
+      this.shjl.selectedRow = row;
+      this.shjl.visible = true;
+      this.getlistXyrecard();
+    },
+    /** 查询审核记录信息列表 */
+    getlistXyrecard() {
+      listXyrecard({
+        pageNum: 1,
+        pageSize: 100000000,
+        shRecardType: '0',
+        jlId: this.shjl.selectedRow.id
+      }).then(response => {
+        this.shjl.list = response.rows
+      });
+    },
+    /** 重新提交按钮操作 */
+    handleUpdate2(row) {
+      this.reset();
+      const id = row.id
+      getXcrecard(id).then(response => {
+        this.form = response.data;
+        this.form.xcStatus = '0';
+        this.form.auditName = '';
+        this.form.auditResult = '';
+        this.form.auditReason = '';
+        this.form.shRemark = '';
+        this.open = true;
+        this.title = "修改巡查记录";
+      });
+    },
   }
 };
 </script>

From 5511c7c958f5934a930f992feaa2b7519b862c7f Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Thu, 18 Apr 2024 14:09:05 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=B5=B0=E8=AE=BF=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/szxc/visitrecard/index.vue | 234 ++++++++++++++----
 ruoyi-ui/src/views/szxc/xcrecard/index.vue    |   4 +-
 2 files changed, 194 insertions(+), 44 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/visitrecard/index.vue b/ruoyi-ui/src/views/szxc/visitrecard/index.vue
index dacdd37..13ef590 100644
--- a/ruoyi-ui/src/views/szxc/visitrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/visitrecard/index.vue
@@ -114,49 +114,57 @@
     </el-row>
 
     <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="visiterName" />
-      <el-table-column label="提报日期" align="center" prop="submitDate">
+      <el-table-column type="selection" width="45" align="center" />
+      <el-table-column label="ID" align="center" prop="id" min-width="60" show-overflow-tooltip/>
+      <el-table-column label="标题" align="center" prop="title" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="所属网格" align="center" prop="deptName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="提报人" align="center" prop="visiterName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="提报日期" align="center" prop="submitDate" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="startDate">
+      <el-table-column label="开始时间" align="center" prop="startDate" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endDate">
+      <el-table-column label="结束时间" align="center" prop="endDate" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="走访类别" align="center" prop="type" >
+      <el-table-column label="走访类别" align="center" prop="type" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.szxc_zf_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="走访对像id" align="center" prop="jmId" />-->
-      <el-table-column label="走访对象" align="center" prop="visitObj" />
-      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="走访对象" align="center" prop="visitObj" min-width="120" show-overflow-tooltip/>
       <el-table-column label="图片" align="center" prop="picture" >
         <template slot-scope="scope">
           <image-preview :src="scope.row.picture" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="随行走访人" align="center" prop="flowPeople" />
-      <el-table-column label="审核状态" align="center" prop="zfStatus" >
+      <el-table-column label="内容" align="center" prop="content" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="随行走访人" align="center" prop="flowPeople" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="审核状态" align="center" prop="zfStatus" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.zfStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="审核备注" align="center" prop="shRemark" />
-      <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="审核部门" align="center" prop="auditDept" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核结果" align="center" prop="auditResult" min-width="180" 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="auditName" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核原因" align="center" prop="auditReason" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核备注" align="center" prop="shRemark" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.zfStatus==='0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -170,6 +178,26 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['szxc:visitrecard:remove']"
           >删除</el-button>
+          <el-button
+            v-if="scope.row.zfStatus==='0'"
+            size="mini"
+            type="text"
+            @click="handleShenHe(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >审核</el-button>
+          <el-button
+            v-if="scope.row.zfStatus==='2'"
+            size="mini"
+            type="text"
+            @click="handleUpdate1(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >重新提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleSHJL(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >审核记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -253,30 +281,11 @@
         </el-row>
 
         <el-row :gutter="10">
-          <el-col :span="12">
+          <el-col :span="24">
             <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="zfStatus">
-              <el-select
-                v-model="form.zfStatus"
-                placeholder="审核状态"
-                clearable
-                style="width:100%"
-              >
-                <el-option
-                  v-for="dict in dict.type.szxc_audit_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
         </el-row>
 
         <el-row :gutter="10">
@@ -298,21 +307,59 @@
         <el-form-item label="走访内容" prop="content">
           <el-input v-model="form.content" type="textarea" placeholder="请输入走访内容" />
         </el-form-item>
-
-        <el-form-item label="审核备注" prop="shRemark">
-          <el-input v-model="form.shRemark" 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-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="shenHe.form.auditReason" type="textarea" placeholder="请输入审核原因" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <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="shenHeSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="审核记录" :visible.sync="shjl.visible" width="1000px" append-to-body>
+      <el-table v-loading="shjl.loading" :data="shjl.list" border>
+        <el-table-column label="审核部门" align="center" prop="auditDept" />
+        <el-table-column label="审核人" align="center" prop="auditName" />
+        <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>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listVisitrecard, getVisitrecard, delVisitrecard, addVisitrecard, updateVisitrecard } from "@/api/szxc/visitrecard";
+import { listXyrecard, 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";
@@ -407,7 +454,34 @@ export default {
         shRemark: [
           { required: true, message: "审核备注不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 审核
+      shenHe:{
+        row: null,
+        // 是否显示审核弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          auditResult: [
+            { required: true, message: "审核结果不能为空", trigger: "blur" }
+          ],
+          auditReason: [
+            { required: true, message: "审核原因不能为空", trigger: "blur" }
+          ],
+        }
+      },
+      // 审核记录信息
+      shjl: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 查询列表
+        list: [],
+        // 选中信息
+        selectedRow: null,
+      },
     };
   },
   created() {
@@ -534,7 +608,83 @@ export default {
       this.download('szxc/visitrecard/export', {
         ...this.queryParams
       }, `visitrecard_${new Date().getTime()}.xlsx`)
-    }
+    },
+    /** 审核按钮操作 */
+    handleShenHe(row) {
+      this.shenHe.row = row;
+      this.resetForm("shenHeForm");
+      this.shenHe.form = {
+        id: null,
+        shRecardType: '1',
+        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
+    },
+    // 审核提交
+    shenHeSubmit(){
+      this.$refs["shenHeForm"].validate(valid => {
+        if (valid) {
+          this.shenHe.row.auditName = this.shenHe.form.auditName;
+          this.shenHe.row.auditResult =  this.shenHe.form.auditResult;
+          this.shenHe.row.auditReason =  this.shenHe.form.auditReason;
+          this.shenHe.row.shRemark =  this.shenHe.form.remark;
+          if(this.shenHe.form.auditResult==='1'){
+            this.shenHe.row.zfStatus = '1'
+          }
+          if(this.shenHe.form.auditResult==='2'){
+            this.shenHe.row.zfStatus = '2'
+          }
+          updateVisitrecard(this.shenHe.row).then(response1 => {
+            addXyrecard(this.shenHe.form).then(response => {
+              this.$modal.msgSuccess("操作成功");
+              this.shenHe.open = false;
+              this.getList();
+            });
+          });
+        }
+      });
+    },
+    // 审核记录信息
+    handleSHJL(row){
+      this.shjl.selectedRow = row;
+      this.shjl.visible = true;
+      this.getlistXyrecard();
+    },
+    /** 查询审核记录信息列表 */
+    getlistXyrecard() {
+      listXyrecard({
+        pageNum: 1,
+        pageSize: 100000000,
+        shRecardType: '1',
+        jlId: this.shjl.selectedRow.id
+      }).then(response => {
+        this.shjl.list = response.rows
+      });
+    },
+    /** 重新提交按钮操作 */
+    handleUpdate1(row) {
+      this.reset();
+      const id = row.id
+      getVisitrecard(id).then(response => {
+        this.form = response.data;
+        this.form.zfStatus = '0';
+        this.form.auditName = '';
+        this.form.auditResult = '';
+        this.form.auditReason = '';
+        this.form.shRemark = '';
+        this.open = true;
+        this.title = "修改走访记录";
+      });
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/szxc/xcrecard/index.vue b/ruoyi-ui/src/views/szxc/xcrecard/index.vue
index 6d276d6..eddce9d 100644
--- a/ruoyi-ui/src/views/szxc/xcrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/xcrecard/index.vue
@@ -677,7 +677,7 @@ export default {
       this.resetForm("shenHeForm");
       this.shenHe.form = {
         id: null,
-        shRecardType: '0',
+        shRecardType: '2',
         jlId: row.id,
         auditDept: row.auditDept,
         auditName: this.$store.state.user.nickName,
@@ -726,7 +726,7 @@ export default {
       listXyrecard({
         pageNum: 1,
         pageSize: 100000000,
-        shRecardType: '0',
+        shRecardType: '2',
         jlId: this.shjl.selectedRow.id
       }).then(response => {
         this.shjl.list = response.rows

From fa4d98d7a75b2d1073c3b6fb20e575faaa2b4000 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Thu, 18 Apr 2024 15:13:07 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/szxc/butie/index.vue | 230 +++++++++++++++++++++---
 1 file changed, 209 insertions(+), 21 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/butie/index.vue b/ruoyi-ui/src/views/szxc/butie/index.vue
index 98f545f..2c44f1e 100644
--- a/ruoyi-ui/src/views/szxc/butie/index.vue
+++ b/ruoyi-ui/src/views/szxc/butie/index.vue
@@ -99,24 +99,33 @@
 
     <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="type" />
-      <el-table-column label="补贴项目名称" align="center" prop="xmTitle" />
-      <el-table-column label="项目编号" align="center" prop="xmId" />
-      <el-table-column label="年度" align="center" prop="year" />
-      <el-table-column label="标准金额" align="center" prop="money" />
-      <el-table-column label="补贴人" align="center" prop="name" />
-<!--      <el-table-column label="内容描述" align="center" prop="content" />-->
-      <el-table-column label="审核状态" align="center" prop="zfStatus" >
+      <el-table-column label="ID" align="center" prop="id" min-width="60" show-overflow-tooltip/>
+      <el-table-column label="补贴组织" align="center" prop="deptName" min-width="120" show-overflow-tooltip/>
+<!--      <el-table-column label="补贴类别" align="center" prop="type" min-width="120" show-overflow-tooltip/>-->
+      <el-table-column label="补贴项目名称" align="center" prop="xmTitle" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="项目编号" align="center" prop="xmId" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="年度" align="center" prop="year" min-width="60" show-overflow-tooltip/>
+      <el-table-column label="标准金额" align="center" prop="money" min-width="80" show-overflow-tooltip/>
+      <el-table-column label="补贴人" align="center" prop="name" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="内容描述" align="center" prop="content" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核状态" align="center" prop="zfStatus" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.zfStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="审核备注" align="center" prop="shRemark" />
-      <el-table-column label="补贴组织" align="center" prop="deptName" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="审核部门" align="center" prop="auditDept" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核结果" align="center" prop="auditResult" min-width="180" 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="auditName" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核原因" align="center" prop="auditReason" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="审核备注" align="center" prop="shRemark" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.zfStatus==='0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -130,6 +139,26 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['szxc:butie:remove']"
           >删除</el-button>
+          <el-button
+            v-if="scope.row.zfStatus==='0'"
+            size="mini"
+            type="text"
+            @click="handleShenHe(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >审核</el-button>
+          <el-button
+            v-if="scope.row.zfStatus==='2'"
+            size="mini"
+            type="text"
+            @click="handleUpdate1(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >重新提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleSHJL(scope.row)"
+            v-hasPermi="['szxc:wish:edit']"
+          >审核记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -144,14 +173,13 @@
 
     <!-- 添加或修改补贴管理对话框 -->
     <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 ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="补贴项目名称" prop="xmTitle">
           <el-input v-model="form.xmTitle" placeholder="请输入补贴项目名称" />
         </el-form-item>
         <el-form-item label="项目编号" prop="xmId">
           <el-input v-model="form.xmId" placeholder="请输入项目编号" />
         </el-form-item>
-
         <el-form-item label="补贴居民" prop="name">
           <el-input readonly
                     placeholder="请选择补贴居民"
@@ -159,23 +187,18 @@
             <el-button slot="append" icon="el-icon-search" @click="jminSelect"></el-button>
           </el-input>
         </el-form-item>
-
         <el-form-item label="补贴组织" prop="deptName">
           <el-input v-model="form.deptName" placeholder="请输入补贴组织" disabled/>
         </el-form-item>
-
         <el-form-item label="年度" prop="year">
           <el-input v-model="form.year" placeholder="请输入年度" />
         </el-form-item>
         <el-form-item label="标准金额" prop="money">
           <el-input v-model="form.money" placeholder="请输入标准金额" />
         </el-form-item>
-        <el-form-item label="内容描述">
+        <el-form-item label="内容描述" prop="content">
           <editor v-model="form.content" :min-height="150"/>
         </el-form-item>
-        <el-form-item label="审核备注" prop="shRemark">
-          <el-input v-model="form.shRemark" type="textarea" placeholder="请输入审核备注" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -228,11 +251,52 @@
       />
     </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-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="shenHe.form.auditReason" type="textarea" placeholder="请输入审核原因" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <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="shenHeSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="审核记录" :visible.sync="shjl.visible" width="1000px" append-to-body>
+      <el-table v-loading="shjl.loading" :data="shjl.list" border>
+        <el-table-column label="审核部门" align="center" prop="auditDept" />
+        <el-table-column label="审核人" align="center" prop="auditName" />
+        <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>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listButie, getButie, delButie, addButie, updateButie } from "@/api/szxc/butie";
+import { listXyrecard, addXyrecard } from "@/api/szxc/xyrecard";
 import { listJminfo } from "@/api/szxc/jminfo";
 import { deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
@@ -241,7 +305,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Butie",
   components: { Treeselect },
-  dicts: ['szxc_yes_no', 'szxc_audit_status'],
+  dicts: ['szxc_yes_no', 'szxc_audit_status', 'sys_user_sex'],
   data() {
     return {
       // 遮罩层
@@ -286,6 +350,27 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        xmTitle: [
+          { required: true, message: "补贴项目名称不能为空", trigger: "blur" }
+        ],
+        xmId: [
+          { required: true, message: "项目编号不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "补贴居民不能为空", trigger: "blur" }
+        ],
+        deptName: [
+          { required: true, message: "补贴组织不能为空", trigger: "blur" }
+        ],
+        year: [
+          { required: true, message: "年度不能为空", trigger: "blur" }
+        ],
+        money: [
+          { required: true, message: "标准金额不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "内容描述不能为空", trigger: "blur" }
+        ]
       },
       // 居民信息
       jmin: {
@@ -305,6 +390,33 @@ export default {
         // 查询列表
         list: []
       },
+      // 审核
+      shenHe:{
+        row: null,
+        // 是否显示审核弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          auditResult: [
+            { required: true, message: "审核结果不能为空", trigger: "blur" }
+          ],
+          auditReason: [
+            { required: true, message: "审核原因不能为空", trigger: "blur" }
+          ],
+        }
+      },
+      // 审核记录信息
+      shjl: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 查询列表
+        list: [],
+        // 选中信息
+        selectedRow: null,
+      },
     };
   },
   created() {
@@ -452,6 +564,82 @@ export default {
       this.form.deptName = row.deptName;
       this.jmin.visible = false
     },
+    /** 审核按钮操作 */
+    handleShenHe(row) {
+      this.shenHe.row = row;
+      this.resetForm("shenHeForm");
+      this.shenHe.form = {
+        id: null,
+        shRecardType: '4',
+        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
+    },
+    // 审核提交
+    shenHeSubmit(){
+      this.$refs["shenHeForm"].validate(valid => {
+        if (valid) {
+          this.shenHe.row.auditName = this.shenHe.form.auditName;
+          this.shenHe.row.auditResult =  this.shenHe.form.auditResult;
+          this.shenHe.row.auditReason =  this.shenHe.form.auditReason;
+          this.shenHe.row.shRemark =  this.shenHe.form.remark;
+          if(this.shenHe.form.auditResult==='1'){
+            this.shenHe.row.zfStatus = '1'
+          }
+          if(this.shenHe.form.auditResult==='2'){
+            this.shenHe.row.zfStatus = '2'
+          }
+          updateButie(this.shenHe.row).then(response1 => {
+            addXyrecard(this.shenHe.form).then(response => {
+              this.$modal.msgSuccess("操作成功");
+              this.shenHe.open = false;
+              this.getList();
+            });
+          });
+        }
+      });
+    },
+    // 审核记录信息
+    handleSHJL(row){
+      this.shjl.selectedRow = row;
+      this.shjl.visible = true;
+      this.getlistXyrecard();
+    },
+    /** 查询审核记录信息列表 */
+    getlistXyrecard() {
+      listXyrecard({
+        pageNum: 1,
+        pageSize: 100000000,
+        shRecardType: '4',
+        jlId: this.shjl.selectedRow.id
+      }).then(response => {
+        this.shjl.list = response.rows
+      });
+    },
+    /** 重新提交按钮操作 */
+    handleUpdate1(row) {
+      this.reset();
+      const id = row.id
+      getButie(id).then(response => {
+        this.form = response.data;
+        this.form.zfStatus = '0';
+        this.form.auditName = '';
+        this.form.auditResult = '';
+        this.form.auditReason = '';
+        this.form.shRemark = '';
+        this.open = true;
+        this.title = "修改补贴管理";
+      });
+    },
   }
 };
 </script>

From 84765dae584da829bffd3455a4b6cb989cc4d03c Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Fri, 19 Apr 2024 10:51:56 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=BF=83=E6=84=BF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E8=B5=B0=E8=AE=BF=E8=AE=B0=E5=BD=95=E3=80=81=E8=A1=A5?=
 =?UTF-8?q?=E8=B4=B4=E7=AE=A1=E7=90=86=E3=80=81=E5=B7=A1=E6=9F=A5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E3=80=81=E5=B7=A5=E4=BD=9C=E8=AE=B0=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/store/modules/user.js            | 10 ++++++++++
 ruoyi-ui/src/views/szxc/butie/index.vue       |  2 +-
 ruoyi-ui/src/views/szxc/visitrecard/index.vue |  2 +-
 ruoyi-ui/src/views/szxc/wish/index.vue        |  2 +-
 ruoyi-ui/src/views/szxc/workrecard/index.vue  |  2 +-
 ruoyi-ui/src/views/szxc/xcrecard/index.vue    |  2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index f1de25c..bbe7a3a 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -4,9 +4,11 @@ import { getToken, setToken, removeToken } from '@/utils/auth'
 const user = {
   state: {
     token: getToken(),
+    admin: '',
     id: '',
     name: '',
     nickName: '',
+    deptId: '',
     avatar: '',
     roles: [],
     permissions: []
@@ -16,6 +18,9 @@ const user = {
     SET_TOKEN: (state, token) => {
       state.token = token
     },
+    SET_ADMIN: (state, admin) => {
+      state.admin = admin
+    },
     SET_ID: (state, id) => {
       state.id = id
     },
@@ -25,6 +30,9 @@ const user = {
     SET_NICKNAME: (state, nickName) => {
       state.nickName = nickName
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -66,9 +74,11 @@ const user = {
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
+          commit('SET_ADMIN', user.admin)
           commit('SET_ID', user.userId)
           commit('SET_NAME', user.userName)
           commit('SET_NICKNAME', user.nickName)
+          commit('SET_DEPTID', user.deptId)
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {
diff --git a/ruoyi-ui/src/views/szxc/butie/index.vue b/ruoyi-ui/src/views/szxc/butie/index.vue
index 2c44f1e..d9a12c9 100644
--- a/ruoyi-ui/src/views/szxc/butie/index.vue
+++ b/ruoyi-ui/src/views/szxc/butie/index.vue
@@ -140,7 +140,7 @@
             v-hasPermi="['szxc:butie:remove']"
           >删除</el-button>
           <el-button
-            v-if="scope.row.zfStatus==='0'"
+            v-if="scope.row.zfStatus==='0'&& ($store.state.user.deptId===scope.row.auditDeptid || $store.state.user.admin)"
             size="mini"
             type="text"
             @click="handleShenHe(scope.row)"
diff --git a/ruoyi-ui/src/views/szxc/visitrecard/index.vue b/ruoyi-ui/src/views/szxc/visitrecard/index.vue
index 13ef590..f5d8383 100644
--- a/ruoyi-ui/src/views/szxc/visitrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/visitrecard/index.vue
@@ -179,7 +179,7 @@
             v-hasPermi="['szxc:visitrecard:remove']"
           >删除</el-button>
           <el-button
-            v-if="scope.row.zfStatus==='0'"
+            v-if="scope.row.zfStatus==='0'&& ($store.state.user.deptId===scope.row.auditDeptid || $store.state.user.admin)"
             size="mini"
             type="text"
             @click="handleShenHe(scope.row)"
diff --git a/ruoyi-ui/src/views/szxc/wish/index.vue b/ruoyi-ui/src/views/szxc/wish/index.vue
index 4e03334..b21553a 100644
--- a/ruoyi-ui/src/views/szxc/wish/index.vue
+++ b/ruoyi-ui/src/views/szxc/wish/index.vue
@@ -173,7 +173,7 @@
             v-hasPermi="['szxc:wish:remove']"
           >删除</el-button>
           <el-button
-            v-if="scope.row.wishStatus==='0'"
+            v-if="scope.row.wishStatus==='0'&& ($store.state.user.deptId===scope.row.auditDeptid || $store.state.user.admin)"
             size="mini"
             type="text"
             @click="handleShenHe(scope.row)"
diff --git a/ruoyi-ui/src/views/szxc/workrecard/index.vue b/ruoyi-ui/src/views/szxc/workrecard/index.vue
index 8977e61..efdc670 100644
--- a/ruoyi-ui/src/views/szxc/workrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/workrecard/index.vue
@@ -161,7 +161,7 @@
             v-hasPermi="['szxc:workrecard:remove']"
           >删除</el-button>
           <el-button
-            v-if="scope.row.gzStatus==='0'"
+            v-if="scope.row.gzStatus==='0'&& ($store.state.user.deptId===scope.row.auditDeptid || $store.state.user.admin)"
             size="mini"
             type="text"
             @click="handleShenHe(scope.row)"
diff --git a/ruoyi-ui/src/views/szxc/xcrecard/index.vue b/ruoyi-ui/src/views/szxc/xcrecard/index.vue
index eddce9d..a9b3198 100644
--- a/ruoyi-ui/src/views/szxc/xcrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/xcrecard/index.vue
@@ -209,7 +209,7 @@
             v-hasPermi="['szxc:xcrecard:edit']"
           >整改进度</el-button>
           <el-button
-            v-if="scope.row.xcStatus==='0'"
+            v-if="scope.row.xcStatus==='0'&& ($store.state.user.deptId===scope.row.auditDeptid || $store.state.user.admin)"
             size="mini"
             type="text"
             @click="handleShenHe(scope.row)"