From 25522186eb26b34d70503342d5473148bf2b1aec Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Thu, 18 Apr 2024 11:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E8=AE=B0=E5=BD=95=E5=AE=A1?=
 =?UTF-8?q?=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>