心愿管理页面联调

ruoyi-ui/src/views/szxc/wish/index.vue

@@ -193,6 +193,19 @@
             @click="handleXiaJia(scope.row)"
             v-hasPermi="['szxc:wish:edit']"
           >下架</el-button>
+          <el-button
+            v-if="scope.row.wishStatus==='1'"
+            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>
@@ -375,11 +388,26 @@
       />
     </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 { listWish, getWish, delWish, addWish, updateWish } from "@/api/szxc/wish";
+  import { listXyrecard } from "@/api/szxc/xyrecard";
   import { listJminfo } from "@/api/szxc/jminfo";
   import { addXyrecard } from "@/api/szxc/xyrecard";
   import { deptTreeSelect } from "@/api/system/user";
@@ -501,6 +529,16 @@
           // 查询列表
           list: []
         },
+        // 审核记录信息
+        shjl: {
+          visible: false,
+          // 遮罩层
+          loading: false,
+          // 查询列表
+          list: [],
+          // 选中信息
+          selectedRow: null,
+        },
       };
     },
     created() {
@@ -659,8 +697,6 @@
       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;
@@ -671,6 +707,7 @@
               this.shenHe.row.wishStatus = '1'
             }
             updateWish(this.shenHe.row).then(response1 => {
+              addXyrecard(this.shenHe.form).then(response => {
                 this.$modal.msgSuccess("操作成功");
                 this.shenHe.open = false;
                 this.getList();
@@ -722,7 +759,35 @@
             this.getList();
           });
         })
-      }
+      },
+      /** 重新提交按钮操作 */
+      handleUpdate1(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getWish(id).then(response => {
+          this.form = response.data;
+          this.form.wishStatus = '0';
+          this.open = true;
+          this.title = "修改心愿管理";
+        });
+      },
+      // 审核记录信息
+      handleSHJL(row){
+        this.shjl.selectedRow = row;
+        this.shjl.visible = true;
+        this.getlistXyrecard();
+      },
+      /** 查询审核记录信息列表 */
+      getlistXyrecard() {
+        listXyrecard({
+          pageNum: 1,
+          pageSize: 100000000,
+          shRecardType: '5',
+          jlId: this.shjl.selectedRow.id
+        }).then(response => {
+          this.shjl.list = response.rows
+        });
+      },
     }
   };
 </script>