补贴管理页面修改

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="ID" align="center" prop="id" min-width="60" show-overflow-tooltip/>
-      <el-table-column label="补贴类别" align="center" prop="type" />
+      <el-table-column label="补贴组织" align="center" prop="deptName" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="补贴项目名称" align="center" prop="xmTitle" />
+<!--      <el-table-column label="补贴类别" align="center" prop="type" min-width="120" show-overflow-tooltip/>-->
-      <el-table-column label="项目编号" align="center" prop="xmId" />
+      <el-table-column label="补贴项目名称" align="center" prop="xmTitle" min-width="180" show-overflow-tooltip/>
-      <el-table-column label="年度" align="center" prop="year" />
+      <el-table-column label="项目编号" align="center" prop="xmId" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="标准金额" align="center" prop="money" />
+      <el-table-column label="年度" align="center" prop="year" min-width="60" show-overflow-tooltip/>
-      <el-table-column label="补贴人" align="center" prop="name" />
+      <el-table-column label="标准金额" align="center" prop="money" min-width="80" show-overflow-tooltip/>
-<!--      <el-table-column label="内容描述" align="center" prop="content" />-->
+      <el-table-column label="补贴人" align="center" prop="name" min-width="120" show-overflow-tooltip/>
-      <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="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="auditDept" min-width="180" show-overflow-tooltip/>
-      <el-table-column label="补贴组织" align="center" prop="deptName" />
+      <el-table-column label="审核结果" align="center" prop="auditResult" min-width="180" show-overflow-tooltip>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <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>