优化

src/permission.js

@@ -120,6 +120,7 @@ const whiteList = [
   '/sunVillage_info/list_tourists_detail',   //详情页
   '/sunVillage_info/list_issues_detail',   //详情页
   '/sunVillage_info/list_finance_detail',   //详情页
+  '/sunVillage_info/list_finance_ranking',   //详情页
 ]
 
 router.beforeEach((to, from, next) => {

src/router/index.js

@@ -3008,6 +3008,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_finance_detail'], resolve)
   },
+  { ////阳光村务（新）-- 合同信息
+    path: '/sunVillage_info/list_finance_ranking',
+    name: 'sunVillageInfoListFinanceRanking',
+    meta: {
+      title: '收支情况公布榜',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_finance_ranking'], resolve)
+  },
   { ////阳光村务（新）-- 合同信息
     path: '/sunVillage_info/list_tourists_add',
     name: 'sunVillageInfoListTouristsAdd',

src/views/sunVillage_info/list_finance.vue

@@ -45,6 +45,9 @@
                     <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>
@@ -177,6 +180,9 @@
       goDetail(id){
         this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance'}})
       },
+      goRanking(id,time){
+        this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time}})
+      },
       goEdit(id){
         this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}})
       },
@@ -387,6 +393,7 @@
                     }
                      &.view{
                         background: #3494ff;
+                        margin-left: 28px;
                         .icon {
                             width: 29px;
                             height: 21px;
@@ -395,6 +402,16 @@
                             display: block;
                         }
                     }
+                     &.list{
+                        background: #79cf13;
+                        .icon {
+                            width: 29px;
+                            height: 21px;
+                            background: url('../../assets/images/sunVillage_info/list_icon_10.png') no-repeat;
+                            background-size: 100% 100%;
+                            display: block;
+                        }
+                    }
                 }
             }
         }

src/views/sunVillage_info/list_finance_detail.vue

@@ -116,7 +116,6 @@
       getDetail(id){
         financePublicDetail(this.queryParams).then((res) => {
           res.data.openFile = res.data.openFile.split(',')
-          res.data.openPic = res.data.openPic.split(',')
           res.data.openFile.map(rr=>{
             let name = rr.substr(27,rr.length);
             let type = '';
@@ -127,10 +126,16 @@
             }
             this.openFileList.push({name:name,type:type})
           })
-
-          res.data.openPic.map((rrr,i)=>{
-            this.openPic.push({url:this.$store.getters.baseRoutingUrl+rrr})
-          })
+          if (res.data.openPic!=''){
+            this.openPic = res.data.openPic.split(',')
+            this.openPic2 = res.data.openPic.split(',')
+            this.openPic.map((rrr,i)=>{
+              this.openPic[i] = {url:'/api'+rrr}
+            })
+          }
+          // res.data.openPic.map((rrr,i)=>{
+          //   this.openPic.push({url:this.$store.getters.baseRoutingUrl+rrr})
+          // })
 
           this.form = res.data;
         })

src/views/sunVillage_info/list_finance_edit.vue

@@ -157,7 +157,7 @@
             this.openPic = res.data.openPic.split(',')
             this.openPic2 = res.data.openPic.split(',')
             this.openPic.map((rrr,i)=>{
-              this.openPic[i] = {url:this.$store.getters.baseRoutingUrl+rrr}
+              this.openPic[i] = {url:'/api'+rrr}
             })
           }
           that.form = res.data;

src/views/sunVillage_info/list_finance_ranking.vue

@@ -0,0 +1,441 @@
+<template>
+    <div class="home_wrapper">
+        <div class="header_main">
+            财务公开榜
+            <div class="return_btn" @click="onClickLeft"></div>
+<!--            <div class="add_btn" v-show="showBtn" @click="goAdd"></div>-->
+        </div>
+        <div class="banner" id="top_view2">
+          <div class="banner_tabs">
+            <div>7月</div>
+          </div>
+          <div class="banner_tabs">
+            <div>支出</div>
+            <div>￥100</div>
+          </div>
+          <div class="banner_tabs">
+            <div>收入</div>
+            <div>￥200</div>
+          </div>
+        </div>
+        <div class="list_main">
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="getList"
+          >
+            <!----1-->
+            <div class="item" v-for="(item,index) in applicationList" :key="index">
+                <div class="info" @click="goDetail(item.id)">
+                    <div class="title">
+                        <i class="icon_box"></i>
+                        <p class="news_title">{{item.openName}}</p>
+                    </div>
+                    <div class="time red green">
+                        +￥100.00
+                    </div>
+                </div>
+<!--                <div class="operation">-->
+<!--                    &lt;!&ndash; delete 删除 edit编辑 view查看 &ndash;&gt;-->
+<!--                    <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 view" @click="goDetail(item.id)" v-show="!showBtn">-->
+<!--                        <i class="icon "></i>-->
+<!--                    </div>-->
+
+<!--                </div>-->
+            </div>
+          </van-list>
+        </div>
+<!--        <div class="bottom_tips">-->
+<!--            <span class="xs">已经到底啦</span>-->
+<!--        </div>-->
+    </div>
+</template>
+
+<script>
+  import { financePublicList,openRemove } from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+  import request from '@/utils/request'
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        applicationList:[],
+        applicationListSecond:[],
+        assetStatusOptions:[],
+        auditStatus:[],
+        loading: false,
+        finished: false,
+        show: false,
+        showTab: false,
+        fileList:[],
+        listLength:'0',
+        searchInput:'',
+        queryParams:{
+          pageNum:1,
+          pageSize:10,
+          orderByColumn:'createTime',
+          isAsc:'desc',
+          year:'',
+        },
+        uploadFiles1:[],
+        projectId:'',
+        projectIndex:'',
+        showBtn:true,
+      };
+    },
+    created() {
+      this.houseGetDicts("asset_status").then((response) => {
+        this.assetStatusOptions = response.data;
+      });
+      this.houseGetDicts("asset_type").then((response) => {
+        this.assetTypeOptions = response.data;
+      });
+      this.houseGetDicts("use_type").then((response) => {
+        this.useTypeOptions = response.data;
+      });
+      console.log(Cookies.get('bookId'))
+      this.queryParams.bookId = Cookies.get('bookId');
+      this.queryParams.deptId = Cookies.get('deptId');
+      if (this.$route.query.type == 'code'){
+        this.showBtn = false;
+      }
+    },
+    methods: {
+      getList(){
+        var _this = this;
+        setTimeout(() => {
+          console.log(_this.queryParams)
+          financePublicList(_this.queryParams).then(response => {
+            _this.listLength = response.total;
+            _this.applicationList = response.rows;
+
+            if(_this.applicationList.length >= response.total){
+              _this.finished = true;
+              return;
+            }else{
+              _this.loading = false;
+              _this.queryParams.pageNum += 1 ;
+            }
+          });
+        }, 1000);
+      },
+      tabClick(year){
+        this.queryParams.year = year ;
+        this.applicationList = [];
+        this.getList();
+      },
+      tabShow(){
+        this.showTab = !this.showTab;
+      },
+      /** 删除按钮操作 */
+      handleDelete(row,index) {
+        let assetStatus = row.assetStatus ? row.assetStatus : data[0].assetStatus;
+        if (assetStatus === '2' || assetStatus === '3') {
+          this.$notify({
+            message: "不允许删除已出售或已报废的资产",
+            type: "warning",
+          });
+          return;
+        }
+        let useType = row.useType;
+        if(useType == 3) {
+          this.$notify({
+            message: "出租或出借的资产不允许删除",
+            type: "warning",
+          });
+          return ;
+        }
+        const ids = row.id || this.ids;
+
+        this.$dialog.alert(
+          {
+            message:'是否确认删除固定资产?',
+            title:"警告",
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+          }
+        )
+          .then(function () {
+            return delPermanent(ids);
+          })
+          .then(() => {
+            this.applicationList.splice(index, 1);
+            this.$notify({ type: 'success', message: '删除成功' });
+          });
+      },
+      goAdd(){
+        this.$router.push('/sunVillage_info/list_finance_add')
+      },
+      goDetail(id){
+        this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance'}})
+      },
+      goEdit(id){
+        this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}})
+      },
+      goRemove(id){
+        this.$dialog.alert({
+          title: '提示',
+          message: '确认删除？',
+        })
+          .then(() => {
+            openRemove(id).then(response => {
+              this.$notify({ type: 'success', message: '删除成功' });
+              this.getList()
+            });
+          })
+          .catch(() => {
+            // on cancel
+          });
+
+      }
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+.home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main{
+        height: 116px;
+        background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+        background-size: 100% 100%;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        font-size: 36px;
+        line-height: 116px;
+        text-align: center;
+        color: #fff;
+        position: relative;
+        .return_btn{
+            width: 24px;
+            height: 43.2px;
+            background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+            background-size: 20px 36px;
+            position: absolute;
+            left: 38px;
+            top: 36px;
+        }
+        .add_btn{
+            width: 56.4px;
+            height: 40.8px;
+            background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+            background-size: 47px 34px;
+            position: absolute;
+            right: 38px;
+            top: 36px;
+        }
+    }
+    .record_main{
+        padding:30px 22px;
+        .record_det{
+            height: 38px;
+            line-height: 38px;
+            display: flex;
+            justify-content:space-between;
+            .year_l{
+                font-size: 30px;
+                display: flex;
+                align-items: center;
+                color: #858585;
+
+                .unit{
+                    padding-left: 5px;
+                }
+                .icon{
+                    width: 23px;
+                    height: 12px;
+                    display: block;
+                    background: url('../../assets/images/sunVillage_info/list_icon_1.png') no-repeat;
+                    background-size: 100% 100%;
+                    margin-bottom: 4px;
+                    margin-right: 8px;
+                    &.zk {
+                        transform: rotate(0deg)
+                    }
+                    &.ss{
+                        transform: rotate(180deg)
+                    }
+
+                }
+            }
+            .total_r{
+                font-size: 26px;
+                letter-spacing: 2px;
+            }
+        }
+        .record_list{
+            display: flex;
+            flex-flow: wrap;
+            margin-top: 12PX;
+            .flex_block{
+                font-size: 30px;
+                color: #878787;
+                padding-right: 30px;
+                &.current{
+                    color: #4199fe;
+                    font-weight: bold;
+                }
+            }
+        }
+    }
+    .list_main{
+        padding:0 22px;
+        .item{
+            height: 100px;
+            border-radius: 30px;
+            background: #fff;
+            box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+            padding:15px 32px;
+            display: flex;
+            margin-bottom: 20px;
+            .info{
+                flex:1;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                .title{
+                    display: flex;
+                    font-size: 32px;
+                    align-items: center;
+                    height: 58px;
+                    .icon_box{
+                        width: 34px;
+                        display: block;
+                        height: 30px;
+                        background: url('../../assets/images/sunVillage_info/list_icon_2.png') no-repeat;
+                        background-size: 100% 100%;
+                        margin-right: 10px;
+                    }
+                    .news_title{
+                        max-width:416px;
+                        overflow: hidden;
+                        white-space: nowrap;
+                        text-overflow: ellipsis;
+                        -o-text-overflow: ellipsis;
+                    }
+                    .tips_mark{
+                        width: 34px;
+                        height: 34px;
+                        background: #fa0c0c;
+                        border-radius: 8px;
+                        font-size: 24px;
+                        color: #fff;
+                        text-align: center;
+                        line-height: 34px;
+                        margin-left: 10px;
+                    }
+                }
+                .red{
+                  color: #fa0c0c;
+                }
+                .green{
+                  color: #4caf50;
+                }
+                .time{
+                    font-size: 32px;
+                    display: flex;
+                    align-items: center;
+                    justify-content: right;
+                    height: 30px;
+                    margin-top: 6px;
+                    .icon_time{
+                        width: 25px;
+                        height: 25px;
+                        background: url('../../assets/images/sunVillage_info/list_icon_4.png') no-repeat;
+                        background-size: 100% 100%;
+                        margin-right: 10px;
+                    }
+                }
+            }
+            .operation{
+                flex: 1;
+                display: flex;
+                align-items: center;
+                justify-content: flex-end;
+                text-align: right;
+                .opera_btn{
+                    width: 52px;
+                    height: 52px;
+                    border-radius: 50%;
+                    display: flex;
+                    align-items: center;
+                    justify-content:center;
+
+                    &.delete{
+                        background:#df0707;
+                        margin-left: 28px;
+                        .icon{
+                            width: 22px;
+                            height: 29px;
+                            background: url('../../assets/images/sunVillage_info/list_icon_7.png') no-repeat;
+                            background-size: 100% 100%;
+                            display: block;
+                        }
+                    }
+                    &.edit{
+                        background: #79cf13;
+                        .icon {
+                            width: 26px;
+                            height: 25px;
+                            background: url('../../assets/images/sunVillage_info/list_icon_6.png') no-repeat;
+                            background-size: 100% 100%;
+                            display: block;
+                        }
+                    }
+                     &.view{
+                        background: #3494ff;
+                        .icon {
+                            width: 29px;
+                            height: 21px;
+                            background: url('../../assets/images/sunVillage_info/list_icon_3.png') no-repeat;
+                            background-size: 100% 100%;
+                            display: block;
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+    .bottom_tips{
+        font-size: 24px;
+         color: #a7a6a6;
+         text-align: center;
+         margin-top: 32px;
+         background: url('../../assets/images/sunVillage_info/list_icon_8.png') center center no-repeat;
+         background-size: 260px 2px;
+         .xs{
+            padding:0 8px;
+            background: #e9e9e9;
+         }
+    }
+    .banner {
+      display: flex;
+      background:#3494ff;
+      color:#fff;
+      text-align: center;
+      margin:3%;
+      border-radius: 10PX;
+    }
+    .banner_tabs{
+      flex:1;
+      padding:10PX 0;
+      font-size: 16PX;
+      div:nth-child(2){
+        font-size: 14PX;
+        margin-top: 5PX;
+      }
+    }
+}
+</style>

src/views/sunVillage_info/list_issues_detail.vue

@@ -135,7 +135,7 @@
           })
 
           res.data.openPic.map((rrr,i)=>{
-            this.openPic.push({url:this.$store.getters.baseRoutingUrl+rrr})
+            this.openPic.push({url:'/api'+rrr})
           })
 
           this.form = res.data;

src/views/sunVillage_info/list_issues_edit.vue

@@ -163,7 +163,7 @@
             this.openPic = res.data.openPic.split(',')
             this.openPic2 = res.data.openPic.split(',')
             this.openPic.map((rrr,i)=>{
-              this.openPic[i] = {url:this.$store.getters.baseRoutingUrl+rrr}
+              this.openPic[i] = {url:'/api'+rrr}
             })
           }
           that.form = res.data;

src/views/sunVillage_info/list_tourists_detail.vue

@@ -129,7 +129,7 @@
           })
 
           res.data.openPic.map((rrr,i)=>{
-            this.openPic.push({url:this.$store.getters.baseRoutingUrl+rrr})
+            this.openPic.push({url:'/api'+rrr})
           })
 
           this.form = res.data;

src/views/sunVillage_info/list_tourists_edit.vue

@@ -157,7 +157,7 @@
             this.openPic = res.data.openPic.split(',')
             this.openPic2 = res.data.openPic.split(',')
             this.openPic.map((rrr,i)=>{
-              this.openPic[i] = {url:this.$store.getters.baseRoutingUrl+rrr}
+              this.openPic[i] = {url:'/api'+rrr}
             })
           }
           that.form = res.data;

src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue

@@ -39,6 +39,7 @@
 
         <van-field label="开户行" required :rules="[{ required: true , message:'请输入开户行' }]" v-model="form.bankDeposit" placeholder="请输入开户行" input-align="right" label-width="auto"/>
         <van-field label="联行号" required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines" placeholder="请输入联行号" input-align="right" label-width="auto"/>
+        <van-field label="机构号" v-model="form.institutionNumber" placeholder="请输入机构号" input-align="right" label-width="auto"/>
 
       </div>
       <div style="padding: 16px 0;">