From 898df6954eab87162f3eb795863632d1f1f95b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 24 Aug 2022 10:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        | 11 ++-
 src/views/sunVillage_info/list_finance.vue    | 13 ++-
 .../sunVillage_info/list_finance_ranking.vue  | 86 ++++++++-----------
 .../sunVillage_info/list_tourists_ranking.vue | 19 ++--
 4 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index c27f492e..c0041c47 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -266,7 +266,7 @@ export function majorEventOpenRemove(id) {
 // 查询零工登记列表
 export function listOddjob(query) {
   return request({
-    url: '/subcontract/oddjob/list',
+    url: '/villageAffairs/public/oddjobList',
     method: 'get',
     params: query
   })
@@ -305,3 +305,12 @@ export function delOddjob(id) {
     method: 'get'
   })
 }
+
+// 财务公开榜
+export function financialAmountPublicMonthList(query) {
+  return request({
+    url: '/villageAffairs/public/financialAmountPublicMonthList',
+    method: 'get',
+    params: query // ?bookId=<账套ID 必填>&yearMonth=<查询年月 必填 yyyy-MM>
+  })
+}
diff --git a/src/views/sunVillage_info/list_finance.vue b/src/views/sunVillage_info/list_finance.vue
index 52ef4eae..1476f4c0 100644
--- a/src/views/sunVillage_info/list_finance.vue
+++ b/src/views/sunVillage_info/list_finance.vue
@@ -39,15 +39,15 @@
                 </div>
                 <div class="operation">
                     <!-- delete 删除 edit编辑 view查看 -->
+                  <div class="opera_btn list" @click="goRanking(item.id,item.openNy)">
+                    <i class="icon "></i>
+                  </div>
                     <div class="opera_btn edit" @click="goEdit(item.id)" v-show="showBtn">
                         <i class="icon "></i>
                     </div>
                     <div class="opera_btn delete" @click="goRemove(item.id)" v-show="showBtn">
                         <i class="icon"></i>
                     </div>
-                    <div class="opera_btn list" @click="goRanking(item.id,item.openNy)" v-show="!showBtn">
-                        <i class="icon "></i>
-                    </div>
                     <div class="opera_btn view" @click="goDetail(item.id)" v-show="!showBtn">
                         <i class="icon "></i>
                     </div>
@@ -298,7 +298,7 @@
             display: flex;
             margin-bottom: 20px;
             .info{
-                flex:0 0 510px;
+                flex:0 0 450px;
                 .title{
                     display: flex;
                     font-size: 32px;
@@ -351,7 +351,7 @@
                 flex: 1;
                 display: flex;
                 align-items: center;
-                justify-content: flex-end;
+                justify-content: space-between;
                 text-align: right;
                 .opera_btn{
                     width: 52px;
@@ -360,10 +360,8 @@
                     display: flex;
                     align-items: center;
                     justify-content:center;
-
                     &.delete{
                         background:#df0707;
-                        margin-left: 28px;
                         .icon{
                             width: 22px;
                             height: 29px;
@@ -384,7 +382,6 @@
                     }
                      &.view{
                         background: #3494ff;
-                        margin-left: 28px;
                         .icon {
                             width: 29px;
                             height: 21px;
diff --git a/src/views/sunVillage_info/list_finance_ranking.vue b/src/views/sunVillage_info/list_finance_ranking.vue
index f84290f8..6787a37b 100644
--- a/src/views/sunVillage_info/list_finance_ranking.vue
+++ b/src/views/sunVillage_info/list_finance_ranking.vue
@@ -18,27 +18,15 @@
     <!--            <div>￥200</div>-->
     <!--          </div>-->
     <!--        </div>-->
-    <p class="top_head_title">崖西镇崖后村2022年7月份集体用工情况公布榜</p>
+    <p class="top_head_title">{{deptName}}{{yearMonth[0]}}年{{yearMonth[1]}}月份经济收支情况公布榜</p>
 
     <div class="center_box">
       <div class="name_box">
         <van-row>
           <van-col :span="24">姓名</van-col>
         </van-row>
-        <van-row>
-          <van-col :span="24">庞东旭</van-col>
-        </van-row>
-        <van-row>
-          <van-col :span="24">庞东旭</van-col>
-        </van-row>
-        <van-row>
-          <van-col :span="24">庞东旭</van-col>
-        </van-row>
-        <van-row>
-          <van-col :span="24">庞东旭</van-col>
-        </van-row>
-        <van-row>
-          <van-col :span="24">庞东旭</van-col>
+        <van-row v-for="(item,index) in applicationList">
+          <van-col :span="24">{{item.voucherSummary}}</van-col>
         </van-row>
         <div class="name_bg"></div>
         <img src="../../assets/images/sunVillage_info/name_icon.png" class="name_icon"/>
@@ -49,25 +37,9 @@
             <van-col :span="12">收入金额</van-col>
             <van-col :span="12">支出金额</van-col>
           </van-row>
-          <van-row>
-            <van-col :span="12">￥392.96</van-col>
-            <van-col :span="12">￥392.96</van-col>
-          </van-row>
-          <van-row>
-            <van-col :span="12"></van-col>
-            <van-col :span="12">￥392.96</van-col>
-          </van-row>
-          <van-row>
-            <van-col :span="12"></van-col>
-            <van-col :span="12">￥392.96</van-col>
-          </van-row>
-          <van-row>
-            <van-col :span="12"></van-col>
-            <van-col :span="12">￥392.96</van-col>
-          </van-row>
-          <van-row>
-            <van-col :span="12"></van-col>
-            <van-col :span="12">￥392.96</van-col>
+          <van-row v-for="(item,index) in applicationList">
+            <van-col :span="12"><template v-if="item.jieAmount">￥{{item.jieAmount}}</template></van-col>
+            <van-col :span="12"><template v-if="item.daiAmount">￥{{item.daiAmount}}</template></van-col>
           </van-row>
       </div>
 
@@ -76,15 +48,15 @@
     <div class="bottom_box">
       <p>本月合计：</p>
       <van-row>
-        <van-col :span="12">￥392.96</van-col>
-        <van-col :span="12">￥3920.96</van-col>
+        <van-col :span="12">￥{{applicationSummary.jie}}</van-col>
+        <van-col :span="12">￥{{applicationSummary.dai}}</van-col>
       </van-row>
     </div>
   </div>
 </template>
 
 <script>
-  import { financePublicList,openRemove } from "@/api/sunVillage_info/fixedAssets";
+  import { financialAmountPublicMonthList } from "@/api/sunVillage_info/fixedAssets";
   import Cookies from "js-cookie";
   import request from '@/utils/request'
   export default {
@@ -94,6 +66,7 @@
         applicationList:[],
         applicationListSecond:[],
         assetStatusOptions:[],
+        applicationSummary:[],
         auditStatus:[],
         loading: false,
         finished: false,
@@ -103,34 +76,35 @@
         listLength:'0',
         searchInput:'',
         queryParams:{
-          pageNum:1,
-          pageSize:10,
-          orderByColumn:'createTime',
-          isAsc:'desc',
-          year:'',
+          yearMonth:'',
+          bookId:'',
+          deptId:'',
+          all: false
         },
         uploadFiles1:[],
         projectId:'',
         projectIndex:'',
         showBtn:true,
+        yearMonth:[],
+        deptName:''
       };
     },
     created() {
       this.queryParams.bookId = Cookies.get('bookId');
       this.queryParams.deptId = Cookies.get('deptId');
-      if (this.$route.query.type == 'code'){
-        this.showBtn = false;
-      }
+      this.deptName = Cookies.get('deptName');
+      this.queryParams.yearMonth = this.$route.query.time;
+      this.yearMonth = this.$route.query.time.split('-')
+      this.getList()
     },
     methods: {
       getList(){
         var _this = this;
         setTimeout(() => {
           console.log(_this.queryParams)
-          financePublicList(_this.queryParams).then(response => {
-            _this.listLength = response.total;
+          financialAmountPublicMonthList(_this.queryParams).then(response => {
             _this.applicationList = response.rows;
-
+            _this.applicationSummary = response.summary;
             if(_this.applicationList.length >= response.total){
               _this.finished = true;
               return;
@@ -492,8 +466,14 @@
     }
     .van-col{
       font-size: 16PX;
-      padding: 10PX 15PX;
+      padding: 0PX 15PX;
       text-align: center;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      word-break: break-all;
+      overflow: hidden;
+      line-height: 41PX;
     }
   }
   .center_box{
@@ -512,8 +492,14 @@
     }
     .van-col{
       font-size: 16PX;
-      padding: 10PX 15PX;
+      padding: 0PX 15PX;
       text-align: center;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      word-break: break-all;
+      overflow: hidden;
+      line-height: 41PX;
     }
   }
   .clear{
diff --git a/src/views/sunVillage_info/list_tourists_ranking.vue b/src/views/sunVillage_info/list_tourists_ranking.vue
index 8b399cf3..b2c95e21 100644
--- a/src/views/sunVillage_info/list_tourists_ranking.vue
+++ b/src/views/sunVillage_info/list_tourists_ranking.vue
@@ -18,7 +18,7 @@
 <!--            <div>￥200</div>-->
 <!--          </div>-->
 <!--        </div>-->
-        <p class="top_head_title">崖西镇崖后村2022年7月份集体用工情况公布榜</p>
+        <p class="top_head_title">{{deptName}}{{yearMonth[0]}}年{{yearMonth[1]}}月份集体用工情况公布榜</p>
 
       <div class="center_box">
         <div class="name_box">
@@ -97,25 +97,24 @@
         listLength:'0',
         searchInput:'',
         queryParams:{
-          pageNum:1,
-          pageSize:10,
-          orderByColumn:'createTime',
-          isAsc:'desc',
-          year:'',
+          yearMonth:'',
+          bookId:'',
+          deptId:'',
         },
         uploadFiles1:[],
         projectId:'',
         projectIndex:'',
         showBtn:true,
+        yearMonth:[]
       };
     },
     created() {
       this.queryParams.bookId = Cookies.get('bookId');
       this.queryParams.deptId = Cookies.get('deptId');
-      if (this.$route.query.type == 'code'){
-        this.showBtn = false;
-      }
-      this.getList();
+      this.deptName = Cookies.get('deptName');
+      this.queryParams.yearMonth = this.$route.query.time;
+      this.yearMonth = this.$route.query.time.split('-')
+      this.getList()
     },
     methods: {
       getList(){