Merge branch '津贴追加调整' of sckj/mz-cloud into master

ruoyi-ui-gljt/src/views/gljtcx/plzjjlcx/index.vue

@@ -0,0 +1,365 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <dept-tree-one
+          :userId="user.userData.dept.parentId"
+          :isFive="true"
+          :isJl="true"
+          :expandOnClickNode="false"
+          :showCheckbox="false"
+          @handleNodeClick="handleNodeClick"
+        >
+        </dept-tree-one>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="100px"
+        >
+          <el-form-item label="姓名" prop="sqrXm">
+            <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-form-item>
+          <!--<el-form-item label="状态" prop="zt">-->
+          <!--<el-select v-model="queryParams.zt" placeholder="状态" clearable>-->
+          <!--<el-option-->
+          <!--v-for="dict in dictOpt"-->
+          <!--:key="dict.value"-->
+          <!--:label="dict.label"-->
+          <!--:value="dict.value"-->
+          <!--&gt;</el-option>-->
+          <!--</el-select>-->
+          <!--</el-form-item>-->
+
+          <el-form-item label="是否发放" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="是否发放"
+              clearable
+            >
+              <el-option
+                v-for="dict in dict.type.GL012"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发放批次" prop="pcId">
+            <el-select
+              v-model="queryParams.pcId"
+              placeholder="发放批次"
+              clearable
+            >
+              <el-option
+                v-for="dict in pcffList"
+                :key="dict.id"
+                :label="dict.pcmc"
+                :value="dict.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="追加月份" prop="ffyf">
+            <el-date-picker
+              v-model="daterangeSbrq"
+              style="width: 541px"
+              value-format="yyyyMM"
+              type="monthrange"
+              range-separator="-"
+              start-placeholder="开始月份"
+              end-placeholder="结束月份"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="发放时间" prop="ffsj">
+            <el-date-picker
+              v-model="daterangeFfsj"
+              style="width: 541px"
+              value-format="yyyyMMddHHmmss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+          <!--<el-form-item label="暂停确认时间" prop="ztsj">-->
+          <!--<el-date-picker v-model="daterangeZtsj"  value-format="yyyyMMddHHmmss" type="datetimerange"-->
+          <!--range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>-->
+          <!---->
+          <!--</el-form-item>-->
+          <!--<el-form-item label="追缴确认时间" prop="bfsj">-->
+            <!--<el-date-picker-->
+              <!--v-model="daterangeBfsj"-->
+              <!--style="width: 541px"-->
+              <!--value-format="yyyyMMddHHmmss"-->
+              <!--type="datetimerange"-->
+              <!--range-separator="-"-->
+              <!--start-placeholder="开始时间"-->
+              <!--end-placeholder="结束时间"-->
+            <!--&gt;</el-date-picker>-->
+          <!--</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-form-item>
+        </el-form>
+
+        <el-table v-loading="loading" :data="gljtSqList">
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+                (queryParams.pageNum - 1) * queryParams.pageSize +
+                scope.$index +
+                1
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="姓名" align="center" prop="sqrXm" />
+          <el-table-column
+            label="身份证号"
+            align="center"
+            prop="sqrZjhm"
+            width="180"
+          />
+          <el-table-column label="年龄" align="center" prop="age" />
+          <el-table-column
+            label="行政区划"
+            align="center"
+            prop="xzqhName"
+            width="320"
+          />
+          <!--<el-table-column label="发放批次" align="center" prop="pcmc"/>-->
+          <el-table-column label="追加月份" align="center" prop="ffyf">
+            <template v-slot="{ row }">
+              {{ row.ffyf | ffyfFilter }}
+            </template>
+          </el-table-column>
+          <el-table-column label="追加金额" align="center" prop="ffje" />
+
+          <el-table-column label="是否发放" align="center" prop="status">
+            <template slot-scope="scope">
+               <dict-tag :options="dict.type.GL012" :value="scope.row.status" />
+              <!--<div v-if="scope.row.status === '1'">已记账</div>-->
+              <!--<div v-if="scope.row.status === '0'">未记账</div>-->
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="发放时间"
+            align="center"
+            prop="ffsj"
+            width="180"
+          >
+            <template v-slot="{ row }">
+              {{ special(row.ffsj, "time") }}
+            </template>
+          </el-table-column>
+          <el-table-column label="追加描述" align="center" prop="jfms"/>
+          <!--<el-table-column label="状态" align="center" prop="jfms"/>-->
+<!--          <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="handleDy(scope.row)"-->
+<!--              >打印-->
+<!--              </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"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { cxList } from "@/api/gljt/gljtcx";
+import { listPcff } from "@/api/gljt/pcff";
+import {encrypt_ECBdef} from "@/api/tool/sm4";
+import {Constant} from '@/utils/constant';
+import { mapState } from "vuex";
+export default {
+  name: "index",
+  dicts: ["GL012"],
+  computed: {
+    ...mapState(["user"]),
+  },
+  data() {
+    return {
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 高龄津贴申请信息表格数据
+      gljtSqList: [],
+      pcffList: [],
+      daterangeSbrq: [],
+      daterangeFfsj: [],
+      daterangeZtsj: [],
+      daterangeBfsj: [],
+      dictOpt: [
+        { value: "", label: "全部" },
+        { value: "0", label: "暂停未补发" },
+        { value: "1", label: "暂停已补发" },
+      ],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        zt: null,
+        fflx:'3',
+        // zjyy: "1",
+        status: null,
+        pcId: null,
+        sqrXm: null,
+        sqrZjhm: null,
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getListBc();
+  },
+  methods: {
+    handleDy(row) {
+      const id = row.zjsqId ;
+      const tj = JSON.parse(JSON.stringify({id:id}));
+      const sss1 = {tab:{tab:'jtzj',qh:this.user.userData.dept.locationCode.substring(0,6)},sys:{dpt:this.user.userData.dept.deptName+'高龄老年人生活津贴追缴信息表',dt:Date.now()},tj:tj}
+      let ssss=encrypt_ECBdef(JSON.stringify(sss1));
+      let para=encodeURIComponent(ssss);
+
+      // window.open(Constant.DY_URL + "?tj=" + para,"_blank");
+      window.open(Constant.DY_URL+"/getprint?tj="+para,"_blank");
+    },
+    /** 查询高龄津贴批次发放信息列表 */
+    getListBc() {
+      listPcff({ pageNum: 1, pageSize: 10000 }).then((response) => {
+        this.pcffList = response.rows;
+      });
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      if (data && data.code) {
+        this.queryParams.xzqh = data.code;
+      } else {
+        this.queryParams.xzqh = null;
+      }
+      // this.queryParams.xzqhId = data.code
+      // this.queryParams.name = data.name;
+      this.handleQuery();
+    },
+    getTime() {
+      // 获取当前年月日时分秒
+      // 获取当前日期和时间
+      const now = new Date();
+      // 获取年份
+      const year = now.getFullYear();
+      // 获取月份（注意：月份是从0开始的，1月是0，12月是11）
+      const month = String(now.getMonth() + 1).padStart(2, "0");
+      // 获取日期
+      const day = String(now.getDate()).padStart(2, "0");
+      // 获取小时
+      const hours = String(now.getHours()).padStart(2, "0");
+      // 获取分钟
+      const minutes = String(now.getMinutes()).padStart(2, "0");
+      // 获取秒数
+      const seconds = String(now.getSeconds()).padStart(2, "0");
+      return year + month + day + hours + minutes + seconds;
+    },
+    /** 查询高龄津贴申请信息列表 */
+    getList() {
+      this.loading = true;
+      // params：{ beginFfyf：发放月份开始yyyyMM，endFfyf：发放月份结束，beginFfsj：发放时间开始yyyyMMddHHmmss，endFfsj：发放时间结束 } }注：时间开始与结束两两对应，开始与结束同时存在时才进行过滤。
+      this.queryParams.params = {};
+      if (null != this.daterangeSbrq && "" != this.daterangeSbrq) {
+        this.queryParams.params["beginFfyf"] = this.daterangeSbrq[0];
+        this.queryParams.params["endFfyf"] = this.daterangeSbrq[1];
+      }
+      if (null != this.daterangeFfsj && "" != this.daterangeFfsj) {
+        this.queryParams.params["beginFfsj"] = this.daterangeFfsj[0];
+        this.queryParams.params["endFfsj"] = this.daterangeFfsj[1];
+      }
+      // if (null != this.daterangeZtsj && "" != this.daterangeZtsj) {
+      //   this.queryParams.params["beginZtsj"] = this.daterangeZtsj[0];
+      //   this.queryParams.params["endZtsj"] = this.daterangeZtsj[1];
+      // }
+      if (null != this.daterangeBfsj && "" != this.daterangeBfsj) {
+        this.queryParams.params["beginZjsj"] = this.daterangeBfsj[0];
+        this.queryParams.params["endBZjsj"] = this.daterangeBfsj[1];
+      }
+      cxList(this.queryParams).then((response) => {
+        this.gljtSqList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      // if (this.xzqh) {
+      //   this.queryParams.xzqh = this.xzqh[this.xzqh.length - 1];
+      // } else {
+      //   this.queryParams.xzqh = null;
+      // }
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeSbrq = [];
+      this.daterangeFfsj = [];
+      this.daterangeZtsj = [];
+      this.daterangeBfsj = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    translateDict(type, value) {
+      return this.selectDictLabel(this.dict.type[type], value);
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "gljt/gljtSq/export",
+        {
+          ...this.queryParams,
+        },
+        `gljtSq_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+</style>

ruoyi-ui-gljt/src/views/gljttj/dfjttj/index.vue

@@ -24,6 +24,7 @@
           <el-form-item label="发放月份" prop="ffsj">
             <el-date-picker
               v-model="daterangeFfsj"
+              :clearable="false"
               value-format="yyyyMM"
               type="monthrange"
               range-separator="-"
@@ -51,7 +52,7 @@
               plain
               icon="el-icon-download"
               size="mini"
-              @click="handleExport(gljtSqListExlce, '资金发放统计')"
+              @click="handleExport(gljtSqListExlce, '待发津贴统计')"
             >
               导出
             </el-button>
@@ -117,6 +118,23 @@
                 label="金额"
               />
             </el-table-column>
+            <el-table-column align="center" label="追加">
+              <el-table-column prop="80-89plzjcount" align="center" label="人数">
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '0', '3')"
+                  >{{ scope.row["80-89plzjcount"] }}</span
+                  >
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="80-89plzjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
+
           </el-table-column>
           <el-table-column align="center" label="80-89低保">
             <el-table-column align="center" label="当发">
@@ -179,6 +197,27 @@
                 label="金额"
               />
             </el-table-column>
+
+            <el-table-column align="center" label="追加">
+              <el-table-column
+                prop="80-89低保plzjcount"
+                align="center"
+                label="人数"
+              >
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '3', '3')"
+                  >{{ scope.row["80-89低保plzjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="80-89低保plzjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
           </el-table-column>
           <el-table-column align="center" label="90-99">
             <el-table-column align="center" label="当发">
@@ -229,6 +268,22 @@
                 label="金额"
               />
             </el-table-column>
+            <el-table-column align="center" label="追加">
+              <el-table-column prop="90-99plzjcount" align="center" label="人数">
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '1', '3')"
+                  >{{ scope.row["90-99plzjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="90-99plzjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
           </el-table-column>
           <el-table-column align="center" label="90-99低保">
             <el-table-column align="center" label="当发">
@@ -291,6 +346,26 @@
                 label="金额"
               />
             </el-table-column>
+            <el-table-column align="center" label="追加">
+              <el-table-column
+                prop="90-99低保plzjcount"
+                align="center"
+                label="人数"
+              >
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '4', '3')"
+                  >{{ scope.row["90-99低保plzjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="90-99低保zjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
           </el-table-column>
           <el-table-column align="center" label="100以上">
             <el-table-column align="center" label="当发">
@@ -353,6 +428,27 @@
                 label="金额"
               />
             </el-table-column>
+
+            <el-table-column align="center" label="追加">
+              <el-table-column
+                prop="100以上plzjcount"
+                align="center"
+                label="人数"
+              >
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '2', '3')"
+                  >{{ scope.row["100以上plzjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="100以上plzjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
           </el-table-column>
           <el-table-column align="center" label="100以上低保">
             <el-table-column align="center" label="当发">
@@ -415,6 +511,26 @@
                 label="金额"
               />
             </el-table-column>
+            <el-table-column align="center" label="追缴">
+              <el-table-column
+                prop="100以上低保plzjcount"
+                align="center"
+                label="人数"
+              >
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '5', '3')"
+                  >{{ scope.row["100以上低保plzjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="100以上低保plzjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
           </el-table-column>
         </el-table>
 
@@ -637,7 +753,58 @@
             </template>
           </el-table-column>
         </el-table>
-
+        <!-- 追加 -->
+        <el-table
+          v-loading="loading2"
+          :data="gljtSqList2"
+          v-if="queryParams2.fflx == '3'"
+        >
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+              (queryParams2.pageNum - 1) * queryParams2.pageSize +
+              scope.$index +
+              1
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="姓名" align="center" prop="sqrXm" />
+          <el-table-column
+            label="身份证号"
+            align="center"
+            prop="sqrZjhm"
+            width="180"
+          />
+          <el-table-column label="年龄" align="center" prop="age" />
+          <el-table-column
+            label="行政区划"
+            align="center"
+            prop="xzqhName"
+            width="320"
+          />
+          <el-table-column label="追加金额" align="center" prop="ffje" />
+          <el-table-column label="追加月份" align="center" prop="ffyf">
+            <template v-slot="{ row }">
+              {{ row.ffyf | ffyfFilter }}
+            </template>
+          </el-table-column>
+          <el-table-column label="是否发放" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.GL012" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="发放时间"
+            align="center"
+            prop="ffsj"
+            width="180"
+          >
+            <template v-slot="{ row }">
+              {{ special(row.ffsj, "time") }}
+            </template>
+          </el-table-column>
+          <el-table-column label="追加描述" align="center" prop="jfms" />
+        </el-table>
         <pagination
           v-show="total2 > 0"
           :total="total2"
@@ -781,7 +948,7 @@ export default {
             "100以上",
             "100以上低保",
           ];
-          let newYLJGXData2 = ["df", "bf", "zj"];
+          let newYLJGXData2 = ["df", "bf", "zj", "plzj"];
           let newYLJGXData3 = ["count", "amount"];
           if (res.data.streetStats && res.data.streetStats.length > 0) {
             res.data.streetStats.forEach((item) => {
@@ -843,6 +1010,10 @@ export default {
               label: "追缴",
               prop: "zj",
             },
+            {
+              label: "追加",
+              prop: "plzj",
+            },
           ];
           let labelArr3 = [
             {

ruoyi-ui-gljt/src/views/gljttj/jtffpctj/index.vue

@@ -29,6 +29,7 @@
               range-separator="-"
               start-placeholder="开始月份"
               end-placeholder="结束月份"
+              :clearable="false"
             ></el-date-picker>
           </el-form-item>
           <el-form-item>
@@ -51,7 +52,7 @@
               plain
               icon="el-icon-download"
               size="mini"
-              @click="handleExport(gljtSqListExlce, '资金发放统计')"
+              @click="handleExport(gljtSqListExlce, '津贴发放批次统计')"
             >
               导出
             </el-button>
@@ -104,6 +105,18 @@
             </el-table-column>
             <el-table-column prop="zjamount" align="center" label="金额" />
           </el-table-column>
+          <el-table-column align="center" label="追加">
+            <el-table-column prop="plzjcount" align="center" label="人次">
+              <template slot-scope="scope">
+                <span
+                  style="cursor: pointer"
+                  @click="openList(scope.row.pcId, '3')"
+                >{{ scope.row.plzjcount }}</span
+                >
+              </template>
+            </el-table-column>
+            <el-table-column prop="plzjamount" align="center" label="金额" />
+          </el-table-column>
           <el-table-column align="center" label="总数">
             <el-table-column prop="totalcount" align="center" label="人次" />
             <el-table-column prop="totalamount" align="center" label="金额" />
@@ -329,7 +342,58 @@
             </template>
           </el-table-column>
         </el-table>
-
+        <!-- 追加 -->
+        <el-table
+          v-loading="loading2"
+          :data="gljtSqList2"
+          v-if="queryParams2.fflx == '3'"
+        >
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+              (queryParams2.pageNum - 1) * queryParams2.pageSize +
+              scope.$index +
+              1
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="姓名" align="center" prop="sqrXm" />
+          <el-table-column
+            label="身份证号"
+            align="center"
+            prop="sqrZjhm"
+            width="180"
+          />
+          <el-table-column label="年龄" align="center" prop="age" />
+          <el-table-column
+            label="行政区划"
+            align="center"
+            prop="xzqhName"
+            width="320"
+          />
+          <el-table-column label="追加金额" align="center" prop="ffje" />
+          <el-table-column label="追加月份" align="center" prop="ffyf">
+            <template v-slot="{ row }">
+              {{ row.ffyf | ffyfFilter }}
+            </template>
+          </el-table-column>
+          <el-table-column label="是否发放" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.GL012" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="发放时间"
+            align="center"
+            prop="ffsj"
+            width="180"
+          >
+            <template v-slot="{ row }">
+              {{ special(row.ffsj, "time") }}
+            </template>
+          </el-table-column>
+          <el-table-column label="追加描述" align="center" prop="jfms" />
+        </el-table>
         <pagination
           v-show="total2 > 0"
           :total="total2"
@@ -383,9 +447,24 @@ export default {
     };
   },
   mounted() {
+    this.daterangeFfsj=[this.getFormattedMonth(-1),this.getFormattedMonth()];
     this.getList();
   },
   methods: {
+    getFormattedMonth(offset = 0) {
+      const date = new Date();
+      date.setMonth(date.getMonth() + offset); // 设置月份的偏移量
+      const year = date.getFullYear();
+      const month = date.getMonth() + 1; // getMonth() 返回 0-11，需要加 1
+      return `${year}${String(month).padStart(2, "0")}`;
+      // // 获取当前月份
+      // const currentMonthFormatted = getFormattedMonth();
+      // console.log(currentMonthFormatted); // 例如：202310
+      //
+      // // 获取下一个月
+      // const nextMonthFormatted = getFormattedMonth(1);
+      // console.log(nextMonthFormatted); // 例如：202311
+    },
     openList(id, fflx) {
       this.queryParams2.pcId = id;
       this.queryParams2.fflx = fflx;
@@ -394,11 +473,11 @@ export default {
     },
     getList2() {
       this.loading2 = true;
-      // this.queryParams2.params2 = {};
-      // if (null != this.daterangeFfsj2 && "" != this.daterangeFfsj2) {
-      //   this.queryParams2.params2["beginFfyf"] = this.daterangeFfsj2[0];
-      //   this.queryParams2.params2["endFfyf"] = this.daterangeFfsj2[1];
-      // }
+      this.queryParams2.params2 = {};
+      if (null != this.daterangeFfsj2 && "" != this.daterangeFfsj2) {
+        this.queryParams2.params2["beginFfyf"] = this.daterangeFfsj2[0];
+        this.queryParams2.params2["endFfyf"] = this.daterangeFfsj2[1];
+      }
       cxList(this.queryParams2).then((response) => {
         this.gljtSqList2 = response.rows;
         this.total2 = response.total;
@@ -446,12 +525,12 @@ export default {
         .then((res) => {
           this.gljtSqList = [];
           this.loading = false;
-          let newYLJGXData = ["df", "bf", "zj", "total"];
+          let newYLJGXData = ["df", "bf", "zj","plzj", "total"];
           let newYLJGXData2 = ["count", "amount"];
           console.log(res.data.pcList, "res.data.pcList");
           if (res.data.pcList && res.data.pcList.length > 0) {
             res.data.pcList.forEach((item) => {
-              console.log(item, "<------item");
+              // console.log(item, "<------item");
               let data = {};
               newYLJGXData.map((ite) => {
                 newYLJGXData2.map((it) => {
@@ -468,8 +547,8 @@ export default {
           console.log(this.gljtSqList, "this.gljtSqList");
           let keysArr = [
             {
-              label: "地区",
-              prop: "areaName",
+              label: "批次名称",
+              prop: "pcmc",
             },
           ];
           let labelArr1 = [
@@ -486,8 +565,12 @@ export default {
               prop: "zj",
             },
             {
-              label: "total",
-              prop: "总数",
+              label: "追加",
+              prop: "plzj",
+            },
+            {
+              label: "总数",
+              prop: "total",
             },
           ];
           let labelArr2 = [
@@ -506,7 +589,7 @@ export default {
               data: labelArr2.map((ite) => {
                 return {
                   ...ite,
-                  prop: item + ite.prop,
+                  prop: item.prop + ite.prop,
                 };
               }),
             });
@@ -534,7 +617,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.daterangeFfsj = [];
+      this.daterangeFfsj=[this.getFormattedMonth(-1),this.getFormattedMonth()];
+      // this.daterangeFfsj = [];
       this.daterangeFfsj2 = [];
       this.resetForm("queryForm");
       this.handleQuery();

ruoyi-ui-gljt/src/views/gljttj/zjfftj/index.vue

@@ -24,14 +24,13 @@
           <el-form-item label="发放月份" prop="ffsj">
             <el-date-picker
               v-model="daterangeFfsj"
+              :clearable="false"
               value-format="yyyyMM"
               type="monthrange"
               range-separator="-"
               start-placeholder="开始月份"
               end-placeholder="结束月份"
             ></el-date-picker>
-            <!--<el-date-picker v-model="daterangeFfsj" value-format="yyyyMMddHHmmss" type="datetimerange"-->
-            <!--range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>-->
           </el-form-item>
           <el-form-item>
             <el-button
@@ -39,10 +38,10 @@
               icon="el-icon-search"
               size="mini"
               @click="handleQuery"
-              >搜索</el-button
+            >搜索</el-button
             >
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
+            >重置</el-button
             >
           </el-form-item>
         </el-form>
@@ -53,7 +52,7 @@
               plain
               icon="el-icon-download"
               size="mini"
-              @click="handleExport(gljtSqListExlce, '资金发放统计')"
+              @click="handleExport(gljtSqListExlce, '津贴发放统计')"
             >
               导出
             </el-button>
@@ -77,7 +76,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '0', '0')"
-                    >{{ scope.row["80-89dfcount"] }}</span
+                  >{{ scope.row["80-89dfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -93,7 +92,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '0', '1')"
-                    >{{ scope.row["80-89bfcount"] }}</span
+                  >{{ scope.row["80-89bfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -109,7 +108,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '0', '2')"
-                    >{{ scope.row["80-89zjcount"] }}</span
+                  >{{ scope.row["80-89zjcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -119,6 +118,23 @@
                 label="金额"
               />
             </el-table-column>
+            <el-table-column align="center" label="追加">
+              <el-table-column prop="80-89plzjcount" align="center" label="人数">
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '0', '3')"
+                  >{{ scope.row["80-89plzjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="80-89plzjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
+
           </el-table-column>
           <el-table-column align="center" label="80-89低保">
             <el-table-column align="center" label="当发">
@@ -131,7 +147,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '3', '0')"
-                    >{{ scope.row["80-89低保dfcount"] }}</span
+                  >{{ scope.row["80-89低保dfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -151,7 +167,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '3', '1')"
-                    >{{ scope.row["80-89低保bfcount"] }}</span
+                  >{{ scope.row["80-89低保bfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -171,7 +187,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '3', '2')"
-                    >{{ scope.row["80-89低保zjcount"] }}</span
+                  >{{ scope.row["80-89低保zjcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -181,6 +197,27 @@
                 label="金额"
               />
             </el-table-column>
+
+            <el-table-column align="center" label="追加">
+              <el-table-column
+                prop="80-89低保plzjcount"
+                align="center"
+                label="人数"
+              >
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '3', '3')"
+                  >{{ scope.row["80-89低保plzjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="80-89低保plzjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
           </el-table-column>
           <el-table-column align="center" label="90-99">
             <el-table-column align="center" label="当发">
@@ -189,7 +226,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '1', '0')"
-                    >{{ scope.row["90-99dfcount"] }}</span
+                  >{{ scope.row["90-99dfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -205,7 +242,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '1', '1')"
-                    >{{ scope.row["90-99bfcount"] }}</span
+                  >{{ scope.row["90-99bfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -221,7 +258,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '1', '2')"
-                    >{{ scope.row["90-99zjcount"] }}</span
+                  >{{ scope.row["90-99zjcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -231,6 +268,22 @@
                 label="金额"
               />
             </el-table-column>
+            <el-table-column align="center" label="追加">
+              <el-table-column prop="90-99plzjcount" align="center" label="人数">
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '1', '3')"
+                  >{{ scope.row["90-99plzjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="90-99plzjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
           </el-table-column>
           <el-table-column align="center" label="90-99低保">
             <el-table-column align="center" label="当发">
@@ -243,7 +296,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '4', '0')"
-                    >{{ scope.row["90-99低保dfcount"] }}</span
+                  >{{ scope.row["90-99低保dfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -263,7 +316,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '4', '1')"
-                    >{{ scope.row["90-99低保bfcount"] }}</span
+                  >{{ scope.row["90-99低保bfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -283,7 +336,27 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '4', '2')"
-                    >{{ scope.row["90-99低保zjcount"] }}</span
+                  >{{ scope.row["90-99低保zjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="90-99低保zjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
+            <el-table-column align="center" label="追加">
+              <el-table-column
+                prop="90-99低保plzjcount"
+                align="center"
+                label="人数"
+              >
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '4', '3')"
+                  >{{ scope.row["90-99低保plzjcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -305,7 +378,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '2', '0')"
-                    >{{ scope.row["100以上dfcount"] }}</span
+                  >{{ scope.row["100以上dfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -325,7 +398,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '2', '1')"
-                    >{{ scope.row["100以上bfcount"] }}</span
+                  >{{ scope.row["100以上bfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -345,7 +418,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '2', '2')"
-                    >{{ scope.row["100以上zjcount"] }}</span
+                  >{{ scope.row["100以上zjcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -355,6 +428,27 @@
                 label="金额"
               />
             </el-table-column>
+
+            <el-table-column align="center" label="追加">
+              <el-table-column
+                prop="100以上plzjcount"
+                align="center"
+                label="人数"
+              >
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '2', '3')"
+                  >{{ scope.row["100以上plzjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="100以上plzjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
           </el-table-column>
           <el-table-column align="center" label="100以上低保">
             <el-table-column align="center" label="当发">
@@ -367,7 +461,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '5', '0')"
-                    >{{ scope.row["100以上低保dfcount"] }}</span
+                  >{{ scope.row["100以上低保dfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -387,7 +481,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '5', '1')"
-                    >{{ scope.row["100以上低保bfcount"] }}</span
+                  >{{ scope.row["100以上低保bfcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -407,7 +501,7 @@
                   <span
                     style="cursor: pointer"
                     @click="openList(scope.row.areaCode, '5', '2')"
-                    >{{ scope.row["100以上低保zjcount"] }}</span
+                  >{{ scope.row["100以上低保zjcount"] }}</span
                   >
                 </template>
               </el-table-column>
@@ -417,6 +511,26 @@
                 label="金额"
               />
             </el-table-column>
+            <el-table-column align="center" label="追缴">
+              <el-table-column
+                prop="100以上低保plzjcount"
+                align="center"
+                label="人数"
+              >
+                <template slot-scope="scope">
+                  <span
+                    style="cursor: pointer"
+                    @click="openList(scope.row.areaCode, '5', '3')"
+                  >{{ scope.row["100以上低保plzjcount"] }}</span
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="100以上低保plzjamount"
+                align="center"
+                label="金额"
+              />
+            </el-table-column>
           </el-table-column>
         </el-table>
 
@@ -448,9 +562,9 @@
           <el-table-column label="序号" align="center">
             <template slot-scope="scope">
               {{
-                (queryParams2.pageNum - 1) * queryParams2.pageSize +
-                scope.$index +
-                1
+              (queryParams2.pageNum - 1) * queryParams2.pageSize +
+              scope.$index +
+              1
               }}
             </template>
           </el-table-column>
@@ -506,9 +620,9 @@
           <el-table-column label="序号" align="center">
             <template slot-scope="scope">
               {{
-                (queryParams2.pageNum - 1) * queryParams2.pageSize +
-                scope.$index +
-                1
+              (queryParams2.pageNum - 1) * queryParams2.pageSize +
+              scope.$index +
+              1
               }}
             </template>
           </el-table-column>
@@ -574,9 +688,9 @@
           <el-table-column label="序号" align="center">
             <template slot-scope="scope">
               {{
-                (queryParams2.pageNum - 1) * queryParams2.pageSize +
-                scope.$index +
-                1
+              (queryParams2.pageNum - 1) * queryParams2.pageSize +
+              scope.$index +
+              1
               }}
             </template>
           </el-table-column>
@@ -639,6 +753,58 @@
             </template>
           </el-table-column>
         </el-table>
+        <!-- 追加 -->
+        <el-table
+          v-loading="loading2"
+          :data="gljtSqList2"
+          v-if="queryParams2.fflx == '3'"
+        >
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+              (queryParams2.pageNum - 1) * queryParams2.pageSize +
+              scope.$index +
+              1
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="姓名" align="center" prop="sqrXm" />
+          <el-table-column
+            label="身份证号"
+            align="center"
+            prop="sqrZjhm"
+            width="180"
+          />
+          <el-table-column label="年龄" align="center" prop="age" />
+          <el-table-column
+            label="行政区划"
+            align="center"
+            prop="xzqhName"
+            width="320"
+          />
+          <el-table-column label="追加金额" align="center" prop="ffje" />
+          <el-table-column label="追加月份" align="center" prop="ffyf">
+            <template v-slot="{ row }">
+              {{ row.ffyf | ffyfFilter }}
+            </template>
+          </el-table-column>
+          <el-table-column label="是否发放" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.GL012" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="发放时间"
+            align="center"
+            prop="ffsj"
+            width="180"
+          >
+            <template v-slot="{ row }">
+              {{ special(row.ffsj, "time") }}
+            </template>
+          </el-table-column>
+          <el-table-column label="追加描述" align="center" prop="jfms" />
+        </el-table>
         <pagination
           v-show="total2 > 0"
           :total="total2"
@@ -652,255 +818,260 @@
 </template>
 
 <script>
-import { getJfxxTjStatistics } from "@/api/gljt/gljttj";
-import { mapState } from "vuex";
-import { cxList } from "@/api/gljt/gljtcx";
-export default {
-  name: "index",
-  dicts: ["GL012", "GL008"],
-  computed: {
-    ...mapState(["user"]),
-  },
-  data() {
-    return {
-      openXq: false,
-      loading2: false,
-      total2: 0,
-      gljtSqList2: [],
-      queryParams2: {
-        btbz: null,
-        fflx: null,
-        status: "1",
-        pageNum: 1,
-        pageSize: 10,
-      },
-      isShow: false,
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 高龄津贴申请信息表格数据
-      gljtSqList: [],
-      gljtSqListExlce: [],
-      daterangeFfsj: [],
-      // 查询参数
-      queryParams: {
-        xzqh: null,
-        status: "1",
-      },
-    };
-  },
-  mounted() {
-    this.daterangeFfsj=[this.getFormattedMonth(-1),this.getFormattedMonth()];
-    this.getList();
-  },
-  methods: {
-    getFormattedMonth(offset = 0) {
-      const date = new Date();
-      date.setMonth(date.getMonth() + offset); // 设置月份的偏移量
-      const year = date.getFullYear();
-      const month = date.getMonth() + 1; // getMonth() 返回 0-11，需要加 1
-      return `${year}${String(month).padStart(2, "0")}`;
-      // // 获取当前月份
-      // const currentMonthFormatted = getFormattedMonth();
-      // console.log(currentMonthFormatted); // 例如：202310
-      //
-      // // 获取下一个月
-      // const nextMonthFormatted = getFormattedMonth(1);
-      // console.log(nextMonthFormatted); // 例如：202311
-    },
-    openList(xzqh, btbz, fflx) {
-      this.queryParams2.xzqh = xzqh;
-      this.queryParams2.btbz = btbz;
-      this.queryParams2.fflx = fflx;
-      this.openXq = true;
-      this.queryParams2.params = {};
-      if (null != this.daterangeFfsj && "" != this.daterangeFfsj) {
-        this.queryParams2.params["beginDfyf"] = this.daterangeFfsj[0];
-        this.queryParams2.params["endDfyf"] = this.daterangeFfsj[1];
-      }
-      this.getList2();
-    },
-    getList2() {
-      this.loading2 = true;
-      cxList(this.queryParams2).then((response) => {
-        this.gljtSqList2 = response.rows;
-        this.total2 = response.total;
-        this.loading2 = false;
-      });
+  import { getJfxxTjStatistics } from "@/api/gljt/gljttj";
+  import { mapState } from "vuex";
+  import { cxList } from "@/api/gljt/gljtcx";
+
+  export default {
+    name: "index",
+    dicts: ["GL012", "GL008"],
+    computed: {
+      ...mapState(["user"]),
     },
-    // 节点单击事件
-    handleNodeClick(data) {
-      if (data && data.code) {
-        this.queryParams.xzqh = data.code;
-      } else {
-        this.queryParams.xzqh = null;
-      }
-      // this.queryParams.xzqhId = data.code
-      // this.queryParams.name = data.name;
-      this.handleQuery();
+    data() {
+      return {
+        openXq: false,
+        loading2: false,
+        total2: 0,
+        gljtSqList2: [],
+        queryParams2: {
+          btbz: null,
+          fflx: null,
+          status: "1",
+          pageNum: 1,
+          pageSize: 10,
+        },
+        isShow: false,
+        loading: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 高龄津贴申请信息表格数据
+        gljtSqList: [],
+        gljtSqListExlce: [],
+        daterangeFfsj: [],
+        // 查询参数
+        queryParams: {
+          xzqh: null,
+          status: "1",
+        },
+      };
     },
-    getTime() {
-      // 获取当前年月日时分秒
-      // 获取当前日期和时间
-      const now = new Date();
-      // 获取年份
-      const year = now.getFullYear();
-      // 获取月份（注意：月份是从0开始的，1月是0，12月是11）
-      const month = String(now.getMonth() + 1).padStart(2, "0");
-      // 获取日期
-      const day = String(now.getDate()).padStart(2, "0");
-      // 获取小时
-      const hours = String(now.getHours()).padStart(2, "0");
-      // 获取分钟
-      const minutes = String(now.getMinutes()).padStart(2, "0");
-      // 获取秒数
-      const seconds = String(now.getSeconds()).padStart(2, "0");
-      return year + month + day + hours + minutes + seconds;
+    mounted() {
+      this.daterangeFfsj=[this.getFormattedMonth(-1),this.getFormattedMonth()];
+      this.getList();
     },
-    /** 查询高龄津贴申请信息列表 */
-    getList() {
-      this.loading = true;
-      // params：{ beginFfyf：发放月份开始yyyyMM，endFfyf：发放月份结束，beginFfsj：发放时间开始yyyyMMddHHmmss，endFfsj：发放时间结束 } }注：时间开始与结束两两对应，开始与结束同时存在时才进行过滤。
-      this.queryParams.params2 = {};
-      if (null != this.daterangeFfsj && "" != this.daterangeFfsj) {
-        this.queryParams.params2["beginFfyf"] = this.daterangeFfsj[0];
-        this.queryParams.params2["endFfyf"] = this.daterangeFfsj[1];
-      }
-      getJfxxTjStatistics(this.queryParams)
-        .then((res) => {
-          this.gljtSqList = [];
-          // this.gljtSqList = res.rows;
-          this.loading = false;
-          let newYLJGXData = [
-            "80-89",
-            "80-89低保",
-            "90-99",
-            "90-99低保",
-            "100以上",
-            "100以上低保",
-          ];
-          let newYLJGXData2 = ["df", "bf", "zj"];
-          let newYLJGXData3 = ["count", "amount"];
-          if (res.data.streetStats && res.data.streetStats.length > 0) {
-            res.data.streetStats.forEach((item) => {
-              let data = {};
-              newYLJGXData.map((ite) => {
-                newYLJGXData2.map((it) => {
-                  newYLJGXData3.map((i) => {
-                    data[ite + it + i] = item[ite][it][i];
+    methods: {
+      getFormattedMonth(offset = 0) {
+        const date = new Date();
+        date.setMonth(date.getMonth() + offset); // 设置月份的偏移量
+        const year = date.getFullYear();
+        const month = date.getMonth() + 1; // getMonth() 返回 0-11，需要加 1
+        return `${year}${String(month).padStart(2, "0")}`;
+        // // 获取当前月份
+        // const currentMonthFormatted = getFormattedMonth();
+        // console.log(currentMonthFormatted); // 例如：202310
+        //
+        // // 获取下一个月
+        // const nextMonthFormatted = getFormattedMonth(1);
+        // console.log(nextMonthFormatted); // 例如：202311
+      },
+      openList(xzqh, btbz, fflx) {
+        this.queryParams2.xzqh = xzqh;
+        this.queryParams2.btbz = btbz;
+        this.queryParams2.fflx = fflx;
+        this.openXq = true;
+        this.queryParams2.params = {};
+        if (null != this.daterangeFfsj && "" != this.daterangeFfsj) {
+          this.queryParams2.params["beginDfyf"] = this.daterangeFfsj[0];
+          this.queryParams2.params["endDfyf"] = this.daterangeFfsj[1];
+        }
+        this.getList2();
+      },
+      getList2() {
+        this.loading2 = true;
+        cxList(this.queryParams2).then((response) => {
+          this.gljtSqList2 = response.rows;
+          this.total2 = response.total;
+          this.loading2 = false;
+        });
+      },
+      // 节点单击事件
+      handleNodeClick(data) {
+        if (data && data.code) {
+          this.queryParams.xzqh = data.code;
+        } else {
+          this.queryParams.xzqh = null;
+        }
+        // this.queryParams.xzqhId = data.code
+        // this.queryParams.name = data.name;
+        this.handleQuery();
+      },
+      getTime() {
+        // 获取当前年月日时分秒
+        // 获取当前日期和时间
+        const now = new Date();
+        // 获取年份
+        const year = now.getFullYear();
+        // 获取月份（注意：月份是从0开始的，1月是0，12月是11）
+        const month = String(now.getMonth() + 1).padStart(2, "0");
+        // 获取日期
+        const day = String(now.getDate()).padStart(2, "0");
+        // 获取小时
+        const hours = String(now.getHours()).padStart(2, "0");
+        // 获取分钟
+        const minutes = String(now.getMinutes()).padStart(2, "0");
+        // 获取秒数
+        const seconds = String(now.getSeconds()).padStart(2, "0");
+        return year + month + day + hours + minutes + seconds;
+      },
+      /** 查询高龄津贴申请信息列表 */
+      getList() {
+        this.loading = true;
+        // params：{ beginFfyf：发放月份开始yyyyMM，endFfyf：发放月份结束，beginFfsj：发放时间开始yyyyMMddHHmmss，endFfsj：发放时间结束 } }注：时间开始与结束两两对应，开始与结束同时存在时才进行过滤。
+        this.queryParams.params2 = {};
+        if (null != this.daterangeFfsj && "" != this.daterangeFfsj) {
+          this.queryParams.params2["beginFfyf"] = this.daterangeFfsj[0];
+          this.queryParams.params2["endFfyf"] = this.daterangeFfsj[1];
+        }
+        getJfxxTjStatistics(this.queryParams)
+          .then((res) => {
+            this.gljtSqList = [];
+            // this.gljtSqList = res.rows;
+            this.loading = false;
+            let newYLJGXData = [
+              "80-89",
+              "80-89低保",
+              "90-99",
+              "90-99低保",
+              "100以上",
+              "100以上低保",
+            ];
+            let newYLJGXData2 = ["df", "bf", "zj", "plzj"];
+            let newYLJGXData3 = ["count", "amount"];
+            if (res.data.streetStats && res.data.streetStats.length > 0) {
+              res.data.streetStats.forEach((item) => {
+                let data = {};
+                newYLJGXData.map((ite) => {
+                  newYLJGXData2.map((it) => {
+                    newYLJGXData3.map((i) => {
+                      data[ite + it + i] = item[ite][it][i];
+                    });
                   });
                 });
+                this.gljtSqList.push({
+                  ...data,
+                  areaName: item.areaName,
+                  areaCode: item.areaCode,
+                });
               });
-              this.gljtSqList.push({
-                ...data,
-                areaName: item.areaName,
-                areaCode: item.areaCode,
+            }
+            let dataone = {};
+            newYLJGXData.map((ite) => {
+              newYLJGXData2.map((it) => {
+                newYLJGXData3.map((i) => {
+                  dataone[ite + it + i] = res.data[ite][it][i];
+                });
               });
             });
-          }
-          let dataone = {};
-          newYLJGXData.map((ite) => {
-            newYLJGXData2.map((it) => {
-              newYLJGXData3.map((i) => {
-                dataone[ite + it + i] = res.data[ite][it][i];
-              });
+            this.gljtSqList.push({
+              ...dataone,
+              areaCode: res.data.areaCode,
+              areaName:
+                !res.data.streetStats || res.data.streetStats.length === 0
+                  ? res.data.areaName
+                  : "总计",
             });
-          });
-          this.gljtSqList.push({
-            ...dataone,
-            areaCode: res.data.areaCode,
-            areaName:
-              !res.data.streetStats || res.data.streetStats.length === 0
-                ? res.data.areaName
-                : "总计",
-          });
-          let keysArr = [
-            {
-              label: "地区",
-              prop: "areaName",
-            },
-          ];
-          let labelArr1 = [
-            "80-89",
-            "80-89低保",
-            "90-99",
-            "90-99低保",
-            "100以上",
-            "100以上低保",
-          ];
-          let labelArr2 = [
-            {
-              label: "当发",
-              prop: "df",
-            },
-            {
-              label: "补发",
-              prop: "bf",
-            },
-            {
-              label: "追缴",
-              prop: "zj",
-            },
-          ];
-          let labelArr3 = [
-            {
-              label: "人数",
-              prop: "count",
-            },
-            {
-              label: "金额",
-              prop: "amount",
-            },
-          ];
-          labelArr1.forEach((item) => {
-            keysArr.push({
-              label: item,
-              prop: item,
-              data: labelArr2.map((ite) => {
-                return {
-                  ...ite,
-                  prop: item + ite.prop,
-                  data: labelArr3.map((it) => {
-                    return { ...it, prop: item + ite.prop + it.prop };
-                  }),
-                };
-              }),
+            let keysArr = [
+              {
+                label: "地区",
+                prop: "areaName",
+              },
+            ];
+            let labelArr1 = [
+              "80-89",
+              "80-89低保",
+              "90-99",
+              "90-99低保",
+              "100以上",
+              "100以上低保",
+            ];
+            let labelArr2 = [
+              {
+                label: "当发",
+                prop: "df",
+              },
+              {
+                label: "补发",
+                prop: "bf",
+              },
+              {
+                label: "追缴",
+                prop: "zj",
+              },
+              {
+                label: "追加",
+                prop: "plzj",
+              },
+            ];
+            let labelArr3 = [
+              {
+                label: "人数",
+                prop: "count",
+              },
+              {
+                label: "金额",
+                prop: "amount",
+              },
+            ];
+            labelArr1.forEach((item) => {
+              keysArr.push({
+                label: item,
+                prop: item,
+                data: labelArr2.map((ite) => {
+                  return {
+                    ...ite,
+                    prop: item + ite.prop,
+                    data: labelArr3.map((it) => {
+                      return { ...it, prop: item + ite.prop + it.prop };
+                    }),
+                  };
+                }),
+              });
             });
+            this.gljtSqListExlce = {
+              keys: keysArr,
+              vales: this.gljtSqList,
+            };
+            console.log(this.gljtSqListExlce);
+          })
+          .catch((res) => {
+            this.loading = false;
           });
-          this.gljtSqListExlce = {
-            keys: keysArr,
-            vales: this.gljtSqList,
-          };
-          console.log(this.gljtSqListExlce);
-        })
-        .catch((res) => {
-          this.loading = false;
-        });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      // this.queryParams.pageNum = 1;
-      // if (this.xzqh) {
-      //   this.queryParams.xzqh = this.xzqh[this.xzqh.length - 1];
-      // } else {
-      //   this.queryParams.xzqh = null;
-      // }
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      // this.daterangeFfsj = [];
-      this.daterangeFfsj=[this.getFormattedMonth(-1),this.getFormattedMonth()];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    translateDict(type, value) {
-      return this.selectDictLabel(this.dict.type[type], value);
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        // this.queryParams.pageNum = 1;
+        // if (this.xzqh) {
+        //   this.queryParams.xzqh = this.xzqh[this.xzqh.length - 1];
+        // } else {
+        //   this.queryParams.xzqh = null;
+        // }
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        // this.daterangeFfsj = [];
+        this.daterangeFfsj=[this.getFormattedMonth(-1),this.getFormattedMonth()];
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      translateDict(type, value) {
+        return this.selectDictLabel(this.dict.type[type], value);
+      },
     },
-  },
-};
+  };
 </script>
 <style scoped lang="scss">
 </style>

ruoyi-ui-gljt/src/views/index.vue

@@ -92,7 +92,10 @@
               <el-table-column prop="zjcount" align="center" label="数量"/>
               <el-table-column prop="zjamount" align="center" label="金额"/>
             </el-table-column>
-
+            <el-table-column  align="center" label="追加">
+              <el-table-column prop="plzjcount" align="center" label="数量"/>
+              <el-table-column prop="plzjamount" align="center" label="金额"/>
+            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -246,7 +249,7 @@
           //   })
           // }
 
-          let objLabel=["bf","dqff","zj"]
+          let objLabel=["bf","dqff","zj","plzj"]
           if(res.data.streetStats&&res.data.streetStats.length>0)
           {
             res.data.streetStats.forEach(item=>{