Merge branch '20221027_sun项目申报模块' of sckj/mz-cloud into master

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/domain/ZwywXmsbBaxx.java

@@ -1,6 +1,7 @@
 package com.ruoyi.business.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
@@ -65,4 +66,9 @@ public class ZwywXmsbBaxx extends BaseEntity
 
     private String bz;
 
+    @TableField(exist = false)
+    private String cjr;
+
+    @TableField(exist = false)
+    private String cjsj;
 }

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/service/impl/ZwywXmsbCommonServiceImpl.java

@@ -82,6 +82,10 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
             res.setKzList(maps);
             //查询项目申报信息关联备案信息list
             List<ZwywXmsbBaxx> list = zwywXmsbBaxxMapper.getZwywXmsbBaxxListById(id);
+            list.forEach(l-> {
+                l.setCjr(l.getCreateBy());
+                l.setCjsj(l.getCreateTimeStr());
+            });
             res.setZwywXmsbBaxxList(list);
         }
         return res;

ruoyi-ui/src/views/business/xmsb/xmsbCommon/index.vue

@@ -424,7 +424,7 @@
     <el-dialog :before-close="dialogClosed" v-dialog-drag title="老人补贴资金受理详情" v-if="openXq" :visible.sync="openXq" width="1000px"
       custom-class="custom2" :append-to-body="true">
       <el-scrollbar wrapClass="scrollbar-wrap">
-        <h3>基本信息</h3>
+        <h3>申报信息</h3>
         <table class="table">
           <tr>
             <td>项目名称</td>
@@ -493,7 +493,26 @@
             <td>{{ xqForm.bz }}</td>
           </tr>
         </table>
-        </el-scrollbar>
+        <h3 v-if="xqForm.zwywXmsbBaxxList && xqForm.zwywXmsbBaxxList.length > 0">备案信息</h3>
+        <table v-if="xqForm.zwywXmsbBaxxList && xqForm.zwywXmsbBaxxList.length > 0">
+          <tr>
+            <td>序号</td>
+            <td>备案状态</td>
+            <td>审核意见</td>
+            <td>备注</td>
+            <td>创建人</td>
+            <td>创建时间</td>
+          </tr>
+          <tr v-for="(baxx, index) in xqForm.zwywXmsbBaxxList" :key="baxx.id">
+            <td>{{ index + 1 }}</td>
+            <td>{{ translateDict('XZ110', baxx.bazt) }}</td>
+            <td>{{ baxx.shyj }}</td>
+            <td>{{ baxx.bz }}</td>
+            <td>{{ baxx.cjr }}</td>
+            <td>{{ special(baxx.cjsj, 'time') }}</td>
+          </tr>
+        </table>
+      </el-scrollbar>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelXQ">返 回</el-button>
       </div>
@@ -510,7 +529,7 @@
     >
       <el-form ref="shform" :model="shform" :rules="rules" label-width="160px">
         <el-scrollbar wrapClass="scrollbar-wrap">
-        <h3>基本信息</h3>
+        <h3>申报信息</h3>
         <table class="table">
           <tr>
             <td>项目名称</td>
@@ -579,6 +598,25 @@
             <td>{{ form.bz }}</td>
           </tr>
         </table>
+        <h3 v-if="form.zwywXmsbBaxxList && form.zwywXmsbBaxxList.length > 0">备案信息</h3>
+        <table v-if="form.zwywXmsbBaxxList && form.zwywXmsbBaxxList.length > 0">
+          <tr>
+            <td>序号</td>
+            <td>备案状态</td>
+            <td>审核意见</td>
+            <td>备注</td>
+            <td>创建人</td>
+            <td>创建时间</td>
+          </tr>
+          <tr v-for="(baxx, index) in form.zwywXmsbBaxxList" :key="baxx.id">
+            <td>{{ index + 1 }}</td>
+            <td>{{ translateDict('XZ110', baxx.bazt) }}</td>
+            <td>{{ baxx.shyj }}</td>
+            <td>{{ baxx.bz }}</td>
+            <td>{{ baxx.cjr }}</td>
+            <td>{{ special(baxx.cjsj, 'time') }}</td>
+          </tr>
+        </table>
         <h3>审核信息</h3>
         <el-form-item label="主键标识" prop="sbId" style="display: none">
           <el-input v-model="shform.sbId" placeholder="请输入主键标识" />
@@ -794,7 +832,7 @@ export default {
           { required: true, message: "主键标识不能为空", trigger: "blur" },
         ],
         bazt: [
-          { required: true, message: "备案状态不能为空", trigger: "change" },
+          { required: true, message: "审核结果不能为空", trigger: "change" },
         ],
         shyj: [
           { required: true, message: "审核意见不能为空", trigger: "blur" },
@@ -1147,6 +1185,9 @@ export default {
       this.openXq = false
       this.reset()
     },
+    translateDict(type, value) {
+      return this.selectDictLabel(this.dict.type[type], value)
+    },
     translateDictV(type, value) {
       var res = '';
       type.forEach((t, i)=>{