Merge branch '20221122_sun高龄津贴相关改动' of sckj/mz-cloud into master

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/domain/ZwywBtglGlbt.java

@@ -128,7 +128,7 @@ public class ZwywBtglGlbt extends BaseEntity
     /** 发放月份 */
     @Excel(name = "发放月份")
     @ApiModelProperty(value = "发放月份", required = true)
-    @NotBlank(message = "{发放月份}",groups = AddGroup.class)
+//    @NotBlank(message = "{发放月份}",groups = AddGroup.class)
     @Size(min = 1, max = 8, message = "{发放月份}")
     private String ffyf;
 

ruoyi-ui/src/views/business/btgl/glbt/index.vue

@@ -912,6 +912,7 @@ export default {
         dbrLxdh: null,
         gx: null,
         isBf: null,
+        ffyf: null,
         bfys: null,
         bfje: null,
         bfjeCity: null,
@@ -925,12 +926,20 @@ export default {
         mzShjg: null,
         mzShyj: null,
         mzShsj: null,
+        tfsqShjg: null,
+        tfsqShyj: null,
+        tfsqShsj: null,
+        tfjdShjg: null,
+        tfjdShyj: null,
+        tfjdShsj: null,
+        tfmzShjg: null,
+        tfmzShyj: null,
+        tfmzShsj: null,
         tfdbrXm: null,
         tfbdrLxdh: null,
         tfsj: null,
         tfyy: null,
         status: "0",
-        createAreaCode: null,
         state: null,
       };
       this.resetForm("form");

ruoyi-ui/src/views/business/btgl/glbtmx/index.vue

@@ -1,40 +1,15 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="110px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
       <el-form-item label="申请人姓名" prop="sqrXm">
-        <el-input
-          v-model="queryParams.sqrXm"
-          placeholder="请输入申请人姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.sqrXm" placeholder="请输入申请人姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="申请人身份证号" prop="sqrZjhm">
-        <el-input
-          v-model="queryParams.sqrZjhm"
-          placeholder="请输入申请人身份证号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.sqrZjhm" placeholder="请输入申请人身份证号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -49,17 +24,14 @@
           v-hasPermi="['business:glbtmx:export']"
         >导出</el-button>
       </el-col> -->
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="glbtmxList">
       <el-table-column label="序号" align="center">
         <template slot-scope="scope">
           {{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+              (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
           }}
         </template>
       </el-table-column>
@@ -79,49 +51,26 @@
       <el-table-column label="发放金额" align="center" prop="ffje" />
       <el-table-column label="补发金额" align="center" prop="bfje" />
       <el-table-column label="总金额" align="center" prop="zje" />
-      <el-table-column label="市发放金额" align="center" prop="cffje" v-if="level === 'qx'"/>
-      <el-table-column label="市补发金额" align="center" prop="cbfje" v-if="level === 'qx'"/>
-      <el-table-column label="市总金额" align="center" prop="czje" v-if="level === 'qx'"/>
-      <el-table-column label="省发放金额" align="center" prop="sffje" v-if="level === 'qx'|| level === 'ds'"/>
-      <el-table-column label="省补发金额" align="center" prop="sbfje" v-if="level === 'qx'|| level === 'ds'"/>
-      <el-table-column label="省总金额" align="center" prop="szje" v-if="level === 'qx'|| level === 'ds'"/>
-      <el-table-column label="合计" align="center" prop="hj" v-if="level === 'qx'|| level === 'ds'"/>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        fixed="right"
-      >
+      <el-table-column label="市发放金额" align="center" prop="cffje" v-if="level === 'qx'" />
+      <el-table-column label="市补发金额" align="center" prop="cbfje" v-if="level === 'qx'" />
+      <el-table-column label="市总金额" align="center" prop="czje" v-if="level === 'qx'" />
+      <el-table-column label="省发放金额" align="center" prop="sffje" v-if="level === 'qx' || level === 'ds'" />
+      <el-table-column label="省补发金额" align="center" prop="sbfje" v-if="level === 'qx' || level === 'ds'" />
+      <el-table-column label="省总金额" align="center" prop="szje" v-if="level === 'qx' || level === 'ds'" />
+      <el-table-column label="合计" align="center" prop="hj" v-if="level === 'qx' || level === 'ds'" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:glbtmx:query']"
-            >详情</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:glbtmx:query']">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 详情信息对话框 -->
-    <el-dialog
-      v-dialog-drag
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-      custom-class="custom"
-    >
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" append-to-body custom-class="custom">
       <h3>申请信息</h3>
       <table class="table">
         <tr>
@@ -176,6 +125,10 @@
         <tr>
           <td>开户名称</td>
           <td>{{ form.khmc }}</td>
+          <td>开始发放月份</td>
+          <td>{{ form.ffyf }}</td>
+        </tr>
+        <tr>
           <td>附件</td>
           <td>
             <file-upload v-model="form.fj" :isFile="false"></file-upload>
@@ -396,6 +349,7 @@ export default {
         dbrLxdh: null,
         gx: null,
         isBf: null,
+        ffyf: null,
         bfys: null,
         bfje: null,
         bfjeCity: null,
@@ -409,6 +363,15 @@ export default {
         mzShjg: null,
         mzShyj: null,
         mzShsj: null,
+        tfsqShjg: null,
+        tfsqShyj: null,
+        tfsqShsj: null,
+        tfjdShjg: null,
+        tfjdShyj: null,
+        tfjdShsj: null,
+        tfmzShjg: null,
+        tfmzShyj: null,
+        tfmzShsj: null,
         tfdbrXm: null,
         tfbdrLxdh: null,
         tfsj: null,

ruoyi-ui/src/views/business/btgl/glbtxm/index.vue

@@ -16,7 +16,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['business:glbtxm:add']">新增</el-button>
+          v-hasPermi="['business:glbtxm:add']">新增</el-button> 
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -292,6 +292,8 @@ export default {
         xmmc: null,
         xmbh: null,
         qyrq: null,
+        xzqh: null,
+        xzqhName: null,
         tyrq: null,
         btzjE: 0,
         btzjN: 0,