Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

src/api/onlineHome/finacial.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 查收入数据
+export function getFinancialIn(data) {
+  return request({
+    url: '/finance/open/getFinancialIn',
+    method: 'get',
+    params: data
+  })
+}
+// 查支出数据
+export function getFinancialOut(data) {
+  return request({
+    url: '/finance/open/getFinancialOut',
+    method: 'get',
+    params: data
+  })
+}
+// 查收支数据
+export function getFinancialInAndOut(data) {
+  return request({
+    url: '/finance/open/getFinancialInAndOut',
+    method: 'get',
+    params: data
+  })
+}

src/api/onlineHome/my.js

@@ -0,0 +1,30 @@
+import request from '@/utils/request'
+
+//新增投诉建议
+export function adviceAdd(query) {
+    return request({
+        url: '/service/advice/add',
+        method: 'post',
+        data: query
+    })
+}
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'post',
+    params: data
+  })
+}
+// 上传投诉建议照片
+export function uploadFileBase(data) {
+  return request({
+    url: '/common/upload',
+    method: 'post',
+    data: data
+  })
+}

src/api/onlineHome/threeAffairs.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询三务公开列表
+export function listAffairs(query) {
+  return request({
+    url: '/service/affairs/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询三务公开详细
+export function getAffairs(id) {
+  return request({
+    url: '/service/affairs/get/' + id,
+    method: 'get'
+  })
+}
+
+// 新增三务公开
+export function addAffairs(data) {
+  return request({
+    url: '/service/affairs/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改三务公开
+export function updateAffairs(data) {
+  return request({
+    url: '/service/affairs/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除三务公开
+export function delAffairs(id) {
+  return request({
+    url: '/service/affairs/remove/' + id,
+    method: 'get'
+  })
+}
+
+// 导出三务公开
+export function exportAffairs(query) {
+  return request({
+    url: '/service/affairs/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/onlineHome/villageAffairs.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询三务公开列表
+export function listVillageAffairs(query) {
+  return request({
+    url: '/service/villageAffairs/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询三务公开详细
+export function getVillageAffairs(id) {
+  return request({
+    url: '/service/villageAffairs/get/' + id,
+    method: 'get'
+  })
+}
+

src/permission.js

@@ -38,22 +38,7 @@ const whiteList = [
   '/circulationList',
   '/circulationAdd',
   '/onlineHomeLogin',
-  '/onlineHomeIndex',
-  '/onlineHome/publicity',
-  '/onlineHome/workbench',
-  '/onlineHome/home',
-  '/onlineHome/my',
-  '/onlineHome/threeAffairs',
-  '/onlineHome/homePoll',
-  '/onlineHome/incomeDetail',
-  '/onlineHome/inAndOutDetail',
-  '/onlineHome/expenditureDetail',
-  '/onlineHome/mailList',
-  '/onlineHome/password',
-  '/onlineHome/livePay',
-  '/onlineHome/advice',
-  '/onlineHome/done',
-  '/onlineHome/personalPicture',
+
 ]
 
 router.beforeEach((to, from, next) => {
@@ -78,11 +63,14 @@ router.beforeEach((to, from, next) => {
           next()
         }).catch(err => {
           store.dispatch('LogOut').then(() => {
+            console.log(to.path)
             // Message.error(err)
             if ('/authenticRight/index'.indexOf(to.path) !== -1) {
               next({ path: '/authenticRight/login' })
             } else if ('/homestead/index'.indexOf(to.path) !== -1) {
               next({ path: '/homestead/login' })
+            } else if (to.path.indexOf('/onlineHome') !== -1) {
+              next(`/onlineHomeLogin`)
             } else {
               next({ path: '/' })
             }
@@ -93,6 +81,7 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
+    console.log(to.path)
     // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入
@@ -102,6 +91,8 @@ router.beforeEach((to, from, next) => {
         next(`/authenticRight/login?redirect=${to.fullPath}`)
       } else if ('/homestead/index'.indexOf(to.path) !== -1) {
         next(`/homestead/login?redirect=${to.fullPath}`)
+      } else if (to.path.indexOf('/onlineHome') !== -1) {
+        next(`/onlineHomeLogin`)
       } else {
         next(`/login?redirect=${to.fullPath}`)
       }

src/router/index.js

@@ -599,6 +599,43 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/circulation/circulationAdd'], resolve)
   }
+  ,
+  {
+    path: '/onlineHome/zcfg',
+    name: 'zcfg',
+    meta: {
+      title: '政策法规',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/zcfg'], resolve)
+  },
+  {
+    path: '/onlineHome/hnzc',
+    name: 'hnzc',
+    meta: {
+      title: '惠农政策',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/hnzc'], resolve)
+  },
+  {
+    path: '/onlineHome/gzdt',
+    name: 'gzdt',
+    meta: {
+      title: '工作动态',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/gzdt'], resolve)
+  },
+  {
+    path: '/onlineHome/zdjs',
+    name: 'zdjs',
+    meta: {
+      title: '制度建设',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/zdjs'], resolve)
+  }
 ];
 
 

src/views/authenticRight/index.vue

@@ -527,7 +527,7 @@
         queryParams:{
           // 分页
           pageNum: 1,
-          pageSize: 10,
+          pageSize: 30,
           // 查询排序
           //orderByColumn: "id",
           //isAsc: "desc",
@@ -545,7 +545,7 @@
         queryform:{
           // 分页
           pageNum: 1,
-          pageSize: 10,
+          pageSize: 30,
           // 查询排序
           //orderByColumn: "id",
           //isAsc: "desc",
@@ -855,7 +855,7 @@
       reset(){
         this.queryform={
           pageNum: 1,
-          pageSize: 10,
+          pageSize: 30,
           // 查询排序
           //orderByColumn: "id",
           //isAsc: "desc",

src/views/onlineHome/advice.vue

@@ -13,7 +13,7 @@
                 <h3 style="">类型：</h3>
               </van-col>
               <van-col span="10" >
-                <van-radio-group v-model="radio" direction="horizontal">
+                <van-radio-group v-model="form.type" direction="horizontal">
                   <van-radio name="1">投诉</van-radio>
                   <van-radio name="2">建议</van-radio>
                 </van-radio-group>
@@ -26,7 +26,7 @@
             <van-row>
               <van-col span="24">
                 <van-field
-                  v-model="message"
+                  v-model="form.adviceContent"
                   rows="7"
                   autosize
                   type="textarea"
@@ -44,14 +44,18 @@
           <template #title>
             <van-row style="">
               <van-col span="23" :offset="1">
-                <van-uploader :after-read="afterRead" v-model="fileList" multiple/>
+                <van-field name="uploader" label="">
+                  <template #input>
+                    <van-uploader :after-read="afterRead" :before-delete="deleteFile" v-model="fileList" multiple :max-count="5" />
+                  </template>
+                </van-field>
               </van-col>
             </van-row>
           </template>
         </van-cell>
       </van-cell-group>
       <van-row style="text-align: center;margin-top: 40px">
-        <van-button color="#1D6FE9" style="border-radius: 6px;width: 90%;margin: 0 auto">提交</van-button>
+        <van-button color="#1D6FE9" style="border-radius: 6px;width: 90%;margin: 0 auto" @click="adviceAdd">提交</van-button>
       </van-row>
       <onlineHomeIndex></onlineHomeIndex>
     </div>
@@ -59,6 +63,11 @@
 
 <script>
     import onlineHomeIndex from "../onlineHomeIndex";
+    import {adviceAdd} from "../../api/onlineHome/my";
+    import * as Toast from "vant";
+    import {uploadFileBase} from "../../api/authenticRight";
+    import {Dialog} from "vant";
+    import {base64Attach, deleteUserImg} from "../../api/user";
 
     export default {
       components: {
@@ -67,15 +76,76 @@
         name: "advice",
       data() {
         return {
-          radio: '',
-          message:'',
-          fileList:[]
+          form:{
+            id:'',
+            type: '1',
+            adviceContent:'',
+            url:[],
+            files:[],
+          },
+          file: {
+            files:[],
+            fileType:'',
+            bizPath:'advice',
+            tableName:'t_sys_advice',
+            tableId:''
+          },
+          fileList:[],
+          upLoadList:[],
         };
-      },  methods: {
+      },
+      created() {
+        this.reset();
+      },
+      methods: {
+        reset(){
+          this.form={
+            id:'',
+            type: '1',
+            adviceContent:'',
+            url:[],
+            files:[],
+          }
+        },
         afterRead(file) {
           // 此时可以自行将文件上传至服务器
-          console.log(file);
+          for ( let i = 0 ; i < this.fileList.length ; i++){
+            if(this.fileList[i].url == undefined&&this.fileList!='') {
+              this.fileList[i] = {url:this.fileList[i].content, id: '', isImage: true};
+            }
+          }
         },
+        deleteFile(elIndex){
+          if(elIndex.id != ''){
+            deleteUserImg(elIndex.id).then(response => {});
+          }
+          return (file, name) => {
+            let fileIndex = name.index
+            this.fileList[elIndex].splice(fileIndex, 1)
+            this.upLoadList[elIndex].splice(fileIndex, 1)
+          }
+        },
+        adviceAdd(){
+          adviceAdd(this.form).then(res => {
+            this.file.tableId = res.data;
+            for(let i = 0 ; i < this.fileList.length ; i++){
+              this.file.files.push(this.fileList[i].url);
+            }
+            base64Attach(this.file).then(response => {
+              if (response.code == 200){
+                Dialog.confirm({
+                  title: '系统提示',
+                  message: '发布成功',
+                  confirmButtonText: '确定',
+                  showCancelButton:false
+                }).then(() => {
+                  self.location=document.referrer;
+                })
+              }
+            });
+
+          });
+        }
       },
     }
 </script>

src/views/onlineHome/expenditureDetail.vue

@@ -6,210 +6,161 @@
       @click-left="$router.back(-1)"
     />
     <van-row style="margin-top: 20px">
-      <van-col span="16" :offset="2">
-        <h3>北行庄村账套</h3>
+      <van-col span="9" :offset="2">
+        <h3>{{$store.state.user.bookName}}</h3>
       </van-col>
-      <van-col span="6">
-        <van-button size="mini" round>&nbsp日期选择<van-icon name="arrow-down" /></van-button>
+      <van-col span="10" :offset="2">
+        <van-field placeholder="日期选择" v-model="date" @click="show = true" :disabled="true" right-icon="arrow-down" style=" border-radius: 10px;padding: 0 0 0 5px;text-align: center"/>
+        <van-calendar v-model="show" type="range" :min-date="minDate" :max-date="maxDate" :show-confirm="false" @confirm="onConfirm"/>
       </van-col>
     </van-row>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+    <van-cell-group  v-for="(item,index) in list" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
       <van-cell>
         <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
+          <p style="line-height: 50px;font-size: 16px">{{item.id}}</p>
         </template>
         <template #title>
           <van-row>
             <van-col span="11" :offset="1">
-              <p>除草修路费</p>
+              <p>{{item.voucherSummary}}</p>
             </van-col>
             <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
+              <p v-if="item.out" style="color:#E50000;text-align: right">-{{item.out}}</p>
+              <p v-if="item.in" style="color:#0AA214;text-align: right">{{item.in}}</p>
             </van-col>
           </van-row>
         </template>
         <template #label>
           <van-row>
             <van-col span="9" :offset="1">
-              <p>经营支出</p>
+              <p>{{item.subjectName}}</p>
             </van-col>
             <van-col span="5" :offset="2">
-              记27
+              {{item.num}}
             </van-col>
             <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
+              <p style="text-align: right">{{item.bookDate}}</p>
             </van-col>
           </van-row>
         </template>
       </van-cell>
     </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+    <van-cell-group  v-if="list.length==0" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
       <van-cell>
         <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
+          <p style="line-height: 50px;font-size: 16px"></p>
         </template>
         <template #title>
           <van-row>
             <van-col span="11" :offset="1">
-              <p>除草修路费</p>
+              <p> 暂无数据 </p>
             </van-col>
             <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营支出</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>除草修路费</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营支出</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>除草修路费</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营支出</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>除草修路费</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营支出</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>除草修路费</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
+
             </van-col>
           </van-row>
         </template>
         <template #label>
           <van-row>
             <van-col span="9" :offset="1">
-              <p>经营支出</p>
+
             </van-col>
             <van-col span="5" :offset="2">
-              记27
+
             </van-col>
             <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
+
             </van-col>
           </van-row>
         </template>
       </van-cell>
     </van-cell-group>
+    <!-- <van-datetime-picker
+       v-model="currentDate1"
+       type="year-month"
+       title="开始时间"
+       :formatter="formatter"
+     />
+     <van-datetime-picker
+       v-model="currentDate2"
+       type="year-month"
+       title="截止时间"
+       :formatter="formatter"
+     />-->
     <onlineHomeIndex></onlineHomeIndex>
   </div>
 </template>
 
 <script>
-    import onlineHomeIndex from "../onlineHomeIndex";
+  import onlineHomeIndex from "../onlineHomeIndex";
+  import {getFinancialOut} from "../../api/onlineHome/finacial";
 
-    export default {
-      components: {
-        onlineHomeIndex
+  export default {
+    components: {
+      onlineHomeIndex
+    },
+    name: "incomeDetail",
+    data() {
+      return {
+        activeName: 'a',
+        list: [],
+        loading: false,
+        finished: false,
+        result:[],
+        date: null,
+        show: false,
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          deptId:this.$store.state.user.loginDeptId,
+          bookType:this.$store.getters.bookType,
+          beginTime: "",
+          endTime: ""
+          // 查询排序
+          //orderByColumn: "id",
+          //isAsc: "desc",
+        },
+        currentDate1:null,
+        currentDate2:null,
+        minDate: new Date(2000, 0, 1),
+        maxDate: new Date(2050, 0, 31),
+      };
+    },
+    created() {
+    },
+    methods: {
+      formatDate(date) {
+        let month = `${date.getMonth() + 1}`
+        if(month.indexOf('0')<0){
+          month = '0'+month
+        }
+        return `${date.getFullYear() + 1}-`+month ;
       },
-        name: "expenditureDetail"
-    }
+      onConfirm(date) {
+        const [start, end] = date;
+        this.show = false;
+        this.date = `${this.formatDate(start)} ~ ${this.formatDate(end)}`;
+        this.queryParams.beginTime = '${this.formatDate(start)}'
+        this.queryParams.endTime = '${this.formatDate(end)}'
+        this.getList();
+      },
+      getList(){
+        this.loading = true;
+        getFinancialOut(this.queryParams).then(res =>{
+          this.list = res.rows
+          this.loading = false;
+          this.total = res.total
+        })
+      },
+    },
+  }
 </script>
 
 <style scoped>
   >>>.van-cell::after {
     border-bottom: none;
   }
+  input::-ms-input-placeholder{text-align: center;}
+  input::-webkit-input-placeholder{text-align: center;}
 </style>

src/views/onlineHome/gzdt.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      title="工作动态"
+      left-arrow
+      @click-left="$router.back(-1)"
+    />
+    <van-list>
+      <van-cell v-for="item in list" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+        <template #title>
+          <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
+        </template>
+        <template #label>
+          <van-row>
+            <van-col span="12"><p style="font-size: 12px">发布人/单位：{{item.issuedBy}}</p></van-col>
+            <van-col span="12"><p style="font-size: 12px;text-align: right">发布时间：{{item.issuedDate}}</p></van-col>
+          </van-row>
+        </template>
+      </van-cell>
+    </van-list>
+    <van-cell v-if="list.length==0"  is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <template #title>
+        <p style="display:inline-block;background: #dddddd;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">暂无数据</p>
+      </template>
+      <template #label>
+        <van-row>
+          <van-col span="12"><p style="font-size: 12px"></p></van-col>
+          <van-col span="12"><p style="font-size: 12px;text-align: right"></p></van-col>
+        </van-row>
+      </template>
+    </van-cell>
+    <onlineHomeIndex></onlineHomeIndex>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../onlineHomeIndex";
+    import {getAffairs, listAffairs} from "../../api/onlineHome/threeAffairs";
+    import {listVillageAffairs} from "../../api/onlineHome/villageAffairs";
+
+    export default {
+      components: {
+        onlineHomeIndex
+      },
+        name: "gzdt",
+      data() {
+        return {
+          list: [],
+          loading: false,
+          finished: false,
+          // 查询参数
+          queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            title: null,
+            villageAffairsType: null,
+            deptId: null,
+            isWechat: null,
+            status: null,
+          },
+        };
+      },
+      created() {
+        this.getList(3);
+      },
+      methods: {
+        getList(name,title) {
+          this.loading = true;
+          this.queryParams.villageAffairsType = name
+          listVillageAffairs(this.queryParams).then(response => {
+            this.list3 = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        },
+      },
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/onlineHome/hnzc.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      title="惠农政策"
+      left-arrow
+      @click-left="$router.back(-1)"
+    />
+    <van-list>
+      <van-cell v-for="item in list" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+        <template #title>
+          <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
+        </template>
+        <template #label>
+          <van-row>
+            <van-col span="12"><p style="font-size: 12px">发布人/单位：{{item.issuedBy}}</p></van-col>
+            <van-col span="12"><p style="font-size: 12px;text-align: right">发布时间：{{item.issuedDate}}</p></van-col>
+          </van-row>
+        </template>
+      </van-cell>
+    </van-list>
+    <van-cell v-if="list.length==0"  is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <template #title>
+        <p style="display:inline-block;background: #dddddd;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">暂无数据</p>
+      </template>
+      <template #label>
+        <van-row>
+          <van-col span="12"><p style="font-size: 12px"></p></van-col>
+          <van-col span="12"><p style="font-size: 12px;text-align: right"></p></van-col>
+        </van-row>
+      </template>
+    </van-cell>
+    <onlineHomeIndex></onlineHomeIndex>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../onlineHomeIndex";
+    import {getAffairs, listAffairs} from "../../api/onlineHome/threeAffairs";
+    import {listVillageAffairs} from "../../api/onlineHome/villageAffairs";
+
+    export default {
+      components: {
+        onlineHomeIndex
+      },
+        name: "hnzc",
+      data() {
+        return {
+          list: [],
+          loading: false,
+          finished: false,
+          // 查询参数
+          queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            title: null,
+            villageAffairsType: null,
+            deptId: null,
+            isWechat: null,
+            status: null,
+          },
+        };
+      },
+      created() {
+        this.getList(2);
+      },
+      methods: {
+        getList(name,title) {
+          this.loading = true;
+          this.queryParams.villageAffairsType = name
+          listVillageAffairs(this.queryParams).then(response => {
+            this.list = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        },
+      },
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/onlineHome/home.vue

@@ -72,17 +72,29 @@
             />
           </template>
         </van-cell>
-        <van-cell title="村规民约" is-link >
-          <template #icon>
-            <van-image
-              fit="contain"
-              height="22"
-              style="margin-right: 15px"
-              src="../../../static/images/onlineHome/home6.png"
-            />
-          </template>
-        </van-cell>
+        <van-collapse v-model="activeName" :border="false">
+          <van-collapse-item title="村规民约" name="1" accordion id="rules">
+            <template #icon>
+              <van-image
+                fit="contain"
+                height="22"
+                width="22"
+                style="margin-right: 22px;margin-left:10px;"
+                src="../../../static/images/onlineHome/home6.png"
+              />
+            </template>
+            <template #default>
+              <van-cell-group :border="false">
+                <van-cell title="政策法规" is-link to="zcfg"/>
+                <van-cell title="惠农政策" is-link to="hnzc"/>
+                <van-cell title="工作动态" is-link to="gzdt"/>
+                <van-cell title="制度建设" is-link to="zdjs"/>
+              </van-cell-group>
+            </template>
+          </van-collapse-item>
+        </van-collapse>
       </van-cell-group>
+
       <onlineHomeIndex></onlineHomeIndex>
     </div>
 </template>
@@ -93,7 +105,12 @@
       components: {
         onlineHomeIndex
       },
-        name: "home"
+        name: "home",
+      data() {
+        return {
+          activeName: [],
+        };
+      },
     }
 </script>
 
@@ -105,4 +122,8 @@
     text-align: center;
     background-color: #39a9ed;
   }
+>>> #rules .van-collapse-item__content{
+padding-top: 0;
+  padding-bottom: 0;
+}
 </style>

src/views/onlineHome/homePoll.vue

@@ -54,7 +54,7 @@
         <p style="display: inline-block">3人已参与</p>
       </van-col>
     </van-row>
-    <van-checkbox-group v-model="result" :max="1" style="margin-top: 20px">
+    <van-checkbox-group v-model="result"  style="margin-top: 20px">
       <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
         <van-cell title="选项1">
           <template #icon>
@@ -65,70 +65,7 @@
               src="../../../static/images/onlineHome/home3.png"
             />
           </template>
-          <van-checkbox name="a" style="float: right"></van-checkbox>
-        </van-cell>
-        <van-row>
-          <van-col span="15" :offset="2" style="    margin-top: 7px;">
-            <van-progress :percentage="87" :show-pivot="false"/>
-          </van-col>
-          <van-col span="5" :offset="2">
-            57票 87%
-          </van-col>
-        </van-row>
-      </van-cell-group>
-      <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-        <van-cell title="选项1">
-          <template #icon>
-            <van-image
-              fit="contain"
-              height="18"
-              style="margin-right: 10px"
-              src="../../../static/images/onlineHome/home3.png"
-            />
-          </template>
-          <van-checkbox name="b" style="float: right"></van-checkbox>
-        </van-cell>
-        <van-row>
-          <van-col span="15" :offset="2" style="    margin-top: 7px;">
-            <van-progress :percentage="87" :show-pivot="false"/>
-          </van-col>
-          <van-col span="5" :offset="2">
-            57票 87%
-          </van-col>
-        </van-row>
-      </van-cell-group>
-      <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-        <van-cell title="选项1">
-          <template #icon>
-            <van-image
-              fit="contain"
-              height="18"
-              style="margin-right: 10px"
-              src="../../../static/images/onlineHome/home3.png"
-            />
-          </template>
-          <van-checkbox name="c" style="float: right"></van-checkbox>
-        </van-cell>
-        <van-row>
-          <van-col span="15" :offset="2" style="    margin-top: 7px;">
-            <van-progress :percentage="87" :show-pivot="false"/>
-          </van-col>
-          <van-col span="5" :offset="2">
-            57票 87%
-          </van-col>
-        </van-row>
-      </van-cell-group>
-      <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-        <van-cell title="选项1">
-          <template #icon>
-            <van-image
-              fit="contain"
-              height="18"
-              style="margin-right: 10px"
-              src="../../../static/images/onlineHome/home3.png"
-            />
-          </template>
-          <van-checkbox name="d" style="float: right"></van-checkbox>
+          <van-checkbox name="a" style="float: right"/>
         </van-cell>
         <van-row>
           <van-col span="15" :offset="2" style="    margin-top: 7px;">

src/views/onlineHome/inAndOutDetail.vue

@@ -6,205 +6,96 @@
       @click-left="$router.back(-1)"
     />
     <van-row style="margin-top: 20px">
-      <van-col span="16" :offset="2">
-        <h3>北行庄村账套</h3>
+      <van-col span="9" :offset="2">
+        <h3>{{$store.state.user.bookName}}</h3>
       </van-col>
-      <van-col span="6">
-        <van-button size="mini" round>&nbsp日期选择<van-icon name="arrow-down" /></van-button>
+      <van-col span="10" :offset="2">
+        <van-field placeholder="日期选择" v-model="date" @click="show = true" :disabled="true" right-icon="arrow-down" style=" border-radius: 10px;padding: 0 0 0 5px;text-align: center"/>
+        <van-calendar v-model="show" type="range" :min-date="minDate" :max-date="maxDate" :show-confirm="false" @confirm="onConfirm"/>
       </van-col>
     </van-row>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+    <van-cell-group  v-for="(item,index) in list" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
       <van-cell>
         <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
+          <p style="line-height: 50px;font-size: 16px">{{item.id}}</p>
         </template>
         <template #title>
           <van-row>
             <van-col span="11" :offset="1">
-              <p>池塘租赁收租</p>
+              <p>{{item.voucherSummary}}</p>
             </van-col>
             <van-col span="12">
-              <p style="color:#0AA214;text-align: right">180.00</p>
+              <p v-if="item.out" style="color:#E50000;text-align: right">-{{item.out}}</p>
+              <p v-if="item.in" style="color:#0AA214;text-align: right">{{item.in}}</p>
             </van-col>
           </van-row>
         </template>
         <template #label>
           <van-row>
             <van-col span="9" :offset="1">
-              <p>经营收入</p>
+              <p>{{item.subjectName}}</p>
             </van-col>
             <van-col span="5" :offset="2">
-              记27
+              {{item.num}}
             </van-col>
             <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
+              <p style="text-align: right">{{item.bookDate}}</p>
             </van-col>
           </van-row>
         </template>
       </van-cell>
     </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+    <van-cell-group  v-if="list.length==0" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
       <van-cell>
         <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
+          <p style="line-height: 50px;font-size: 16px"></p>
         </template>
         <template #title>
           <van-row>
             <van-col span="11" :offset="1">
-              <p>除草修路费</p>
+              <p> 暂无数据 </p>
             </van-col>
             <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
             </van-col>
           </van-row>
         </template>
         <template #label>
           <van-row>
             <van-col span="9" :offset="1">
-              <p>经营支出</p>
             </van-col>
             <van-col span="5" :offset="2">
-              记27
             </van-col>
             <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>除草修路费</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营支出</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>除草修路费</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营支出</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>除草修路费</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营支出</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>除草修路费</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#E50000;text-align: right">-180.00</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营支出</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
             </van-col>
           </van-row>
         </template>
       </van-cell>
     </van-cell-group>
+    <!-- <van-datetime-picker
+       v-model="currentDate1"
+       type="year-month"
+       title="开始时间"
+       :formatter="formatter"
+     />
+     <van-datetime-picker
+       v-model="currentDate2"
+       type="year-month"
+       title="截止时间"
+       :formatter="formatter"
+     />-->
     <onlineHomeIndex></onlineHomeIndex>
   </div>
 </template>
 
 <script>
   import onlineHomeIndex from "../onlineHomeIndex";
+  import {getFinancialInAndOut} from "../../api/onlineHome/finacial";
 
   export default {
     components: {
       onlineHomeIndex
     },
-    name: "inAndOutDetail",
+    name: "incomeDetail",
     data() {
       return {
         activeName: 'a',
@@ -212,10 +103,52 @@
         loading: false,
         finished: false,
         result:[],
+        date: null,
+        show: false,
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          deptId:this.$store.state.user.loginDeptId,
+          bookType:this.$store.getters.bookType,
+          beginTime: "",
+          endTime: ""
+          // 查询排序
+          //orderByColumn: "id",
+          //isAsc: "desc",
+        },
+        currentDate1:null,
+        currentDate2:null,
+        minDate: new Date(2000, 0, 1),
+        maxDate: new Date(2050, 0, 31),
       };
     },
+    created() {
+    },
     methods: {
-
+      formatDate(date) {
+        let month = `${date.getMonth() + 1}`
+        if(month.indexOf('0')<0){
+          month = '0'+month
+        }
+        return `${date.getFullYear() + 1}-`+month ;
+      },
+      onConfirm(date) {
+        const [start, end] = date;
+        this.show = false;
+        this.date = `${this.formatDate(start)} ~ ${this.formatDate(end)}`;
+        this.queryParams.beginTime = '${this.formatDate(start)}'
+        this.queryParams.endTime = '${this.formatDate(end)}'
+        this.getList();
+      },
+      getList(){
+        this.loading = true;
+        getFinancialInAndOut(this.queryParams).then(res =>{
+          this.list = res.rows
+          this.loading = false;
+          this.total = res.total
+        })
+      },
     },
   }
 </script>
@@ -224,4 +157,6 @@
   >>>.van-cell::after {
     border-bottom: none;
   }
+  input::-ms-input-placeholder{text-align: center;}
+  input::-webkit-input-placeholder{text-align: center;}
 </style>

src/views/onlineHome/incomeDetail.vue

@@ -6,199 +6,90 @@
       @click-left="$router.back(-1)"
     />
     <van-row style="margin-top: 20px">
-      <van-col span="16" :offset="2">
-        <h3>北行庄村账套</h3>
+      <van-col span="9" :offset="2">
+        <h3>{{$store.state.user.bookName}}</h3>
       </van-col>
-      <van-col span="6">
-        <van-button size="mini" round>&nbsp日期选择<van-icon name="arrow-down" /></van-button>
+      <van-col span="10" :offset="2">
+        <van-field placeholder="日期选择" v-model="date" @click="show = true" :disabled="true" right-icon="arrow-down" style=" border-radius: 10px;padding: 0 0 0 5px;text-align: center"/>
+        <van-calendar v-model="show" type="range" :min-date="minDate" :max-date="maxDate" :show-confirm="false" @confirm="onConfirm"/>
       </van-col>
     </van-row>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+    <van-cell-group  v-for="(item,index) in list" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
       <van-cell>
         <template #icon>
-            <p style="line-height: 50px;font-size: 16px">157</p>
+          <p style="line-height: 50px;font-size: 16px">{{item.id}}</p>
         </template>
         <template #title>
           <van-row>
             <van-col span="11" :offset="1">
-              <p>池塘租赁收租</p>
+              <p>{{item.voucherSummary}}</p>
             </van-col>
             <van-col span="12">
-              <p style="color:#0AA214;text-align: right">200</p>
+              <p v-if="item.out" style="color:#E50000;text-align: right">-{{item.out}}</p>
+              <p v-if="item.in" style="color:#0AA214;text-align: right">{{item.in}}</p>
             </van-col>
           </van-row>
         </template>
         <template #label>
           <van-row>
             <van-col span="9" :offset="1">
-              <p>经营收入</p>
+              <p>{{item.subjectName}}</p>
             </van-col>
             <van-col span="5" :offset="2">
-              记27
+              {{item.num}}
             </van-col>
             <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
+              <p style="text-align: right">{{item.bookDate}}</p>
             </van-col>
           </van-row>
         </template>
       </van-cell>
     </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+    <van-cell-group  v-if="list.length==0" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
       <van-cell>
         <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
+          <p style="line-height: 50px;font-size: 16px"></p>
         </template>
         <template #title>
           <van-row>
             <van-col span="11" :offset="1">
-              <p>池塘租赁收租</p>
+              <p> 暂无数据 </p>
             </van-col>
             <van-col span="12">
-              <p style="color:#0AA214;text-align: right">200</p>
             </van-col>
           </van-row>
         </template>
         <template #label>
           <van-row>
             <van-col span="9" :offset="1">
-              <p>经营收入</p>
             </van-col>
             <van-col span="5" :offset="2">
-              记27
             </van-col>
             <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>池塘租赁收租</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#0AA214;text-align: right">200</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营收入</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>池塘租赁收租</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#0AA214;text-align: right">200</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营收入</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>池塘租赁收租</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#0AA214;text-align: right">200</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营收入</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #icon>
-          <p style="line-height: 50px;font-size: 16px">157</p>
-        </template>
-        <template #title>
-          <van-row>
-            <van-col span="11" :offset="1">
-              <p>池塘租赁收租</p>
-            </van-col>
-            <van-col span="12">
-              <p style="color:#0AA214;text-align: right">200</p>
-            </van-col>
-          </van-row>
-        </template>
-        <template #label>
-          <van-row>
-            <van-col span="9" :offset="1">
-              <p>经营收入</p>
-            </van-col>
-            <van-col span="5" :offset="2">
-              记27
-            </van-col>
-            <van-col span="7">
-              <p style="text-align: right">2021-08-06</p>
             </van-col>
           </van-row>
         </template>
       </van-cell>
     </van-cell-group>
+   <!-- <van-datetime-picker
+      v-model="currentDate1"
+      type="year-month"
+      title="开始时间"
+      :formatter="formatter"
+    />
+    <van-datetime-picker
+      v-model="currentDate2"
+      type="year-month"
+      title="截止时间"
+      :formatter="formatter"
+    />-->
     <onlineHomeIndex></onlineHomeIndex>
   </div>
 </template>
 
 <script>
     import onlineHomeIndex from "../onlineHomeIndex";
+    import {getFinancialIn} from "../../api/onlineHome/finacial";
 
     export default {
       components: {
@@ -212,10 +103,53 @@
           loading: false,
           finished: false,
           result:[],
+          date: null,
+          show: false,
+          queryParams: {
+            // 分页
+            pageNum: 1,
+            pageSize: 10,
+            deptId:this.$store.state.user.loginDeptId,
+            bookType:this.$store.getters.bookType,
+            beginTime: "",
+            endTime: ""
+            // 查询排序
+            //orderByColumn: "id",
+            //isAsc: "desc",
+          },
+          currentDate1:null,
+          currentDate2:null,
+          minDate: new Date(2000, 0, 1),
+          maxDate: new Date(2050, 0, 31),
         };
       },
+      created() {
+      },
       methods: {
-
+        formatDate(date) {
+          let month = `${date.getMonth() + 1}`
+          if(month.indexOf('0')<0){
+            month = '0'+month
+          }
+          return `${date.getFullYear() + 1}-`+month ;
+        },
+        onConfirm(date) {
+          const [start, end] = date;
+          this.show = false;
+          this.date = `${this.formatDate(start)} ~ ${this.formatDate(end)}`;
+          this.queryParams.beginTime = '${this.formatDate(start)}'
+          this.queryParams.endTime = '${this.formatDate(end)}'
+          this.getList();
+        },
+        getList(){
+          this.loading = true;
+          getFinancialIn(this.queryParams).then(res =>{
+            this.list = res.rows
+            console.log(res)
+            this.loading = false;
+            this.total=res.total
+          })
+        },
       },
     }
 </script>
@@ -224,4 +158,6 @@
   >>>.van-cell::after {
     border-bottom: none;
   }
+  input::-ms-input-placeholder{text-align: center;}
+  input::-webkit-input-placeholder{text-align: center;}
 </style>

src/views/onlineHome/mailList.vue

@@ -11,7 +11,7 @@
       </van-col>
     </van-row>
     <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell v-for="item in list">
+      <van-cell v-for="(item,index) in list" :key="index">
         <template #icon>
           <p style="color: #fff;line-height:14px;background: #1D6FE9;padding:8px 3px;height: 30px;border-radius: 8px;display: inline-block">{{item.name.substring(item.name.length-2)}}</p>
         </template>
@@ -23,11 +23,13 @@
             <van-col span="5" :offset="1">
               <h3 style="line-height: 30px;color: #878787">{{item.phone}}</h3>
             </van-col>
-            <van-col span="2" :offset="10">
-              <van-image
-                height="30"
-                width="20"
-                src="../../../static/images/onlineHome/phone.png"></van-image>
+            <van-col span="2" :offset="10" >
+              <a :href="'tel:' + item.phone">
+                <van-image
+                  height="30"
+                  width="20"
+                  src="../../../static/images/onlineHome/phone.png" />
+              </a>
             </van-col>
           </van-row>
         </template>
@@ -39,6 +41,8 @@
 
 <script>
   import onlineHomeIndex from "../onlineHomeIndex";
+  import {getInfo} from "../../api/login";
+  import {ListPhones} from "../../api/addressBook/phoneList";
 
   export default {
     components: {
@@ -49,33 +53,29 @@
       return {
         activeName: 'a',
         list: [
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
-          {name:"张友全",phone:"13306311234"},
+
           ],
         loading: false,
         finished: false,
         result:[],
-
       };
     },
+    created() {
+      if(this.list.length==0){
+        this.getList();
+      }
+    },
     methods: {
-
+      callPhone (phoneNumber) {
+        window.location.href = 'tel://' + phoneNumber
+      },
+      getList(){
+        this.loading = true;
+        ListPhones(this.queryParams).then(response => {
+          this.list = response.rows
+          this.loading = false;
+        });
+      },
     },
   }
 </script>

src/views/onlineHome/my.vue

@@ -19,7 +19,7 @@
         </van-cell>
       </van-row>
       <van-cell-group style="width: 96%;margin:-50px 2% 2% 2%;border-radius: 6px;overflow: hidden;padding-top: 20px;padding-bottom: 20px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-        <van-cell title="画像（个人/农户）" is-link to="{path: 'personalPicture', params: { userId: userId }}">
+        <van-cell title="画像（个人/农户）" is-link :to="{path:'personalPicture',params:{id:'1'}}">
           <template #icon>
             <van-image
               fit="contain"
@@ -106,7 +106,6 @@
       },
       created() {
         getInfo().then(response => {
-          console.log(response)
           this.nickName = response.user.nickName
           this.deptName = response.user.dept.deptName
           this.userId = response.user.userId

src/views/onlineHome/password.vue

@@ -6,7 +6,7 @@
     @click-left="$router.back(-1)"
   />
   <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-    <van-field type="password" v-model="oldValue" placeholder="" >
+    <van-field type="password" v-model="user.oldPassword" placeholder="" >
       <template #left-icon>
         <van-image
           height="20"
@@ -17,7 +17,7 @@
         <H4 style="margin-left: 5px">原密码</H4>
       </template>
     </van-field>
-    <van-field type="password" v-model="newValue"  placeholder="" >
+    <van-field type="password" v-model="user.newPassword"  placeholder="" >
       <template #left-icon>
         <van-image
           height="20"
@@ -28,9 +28,20 @@
         <H4 style="margin-left: 5px">新密码</H4>
       </template>
     </van-field>
+    <van-field type="password" v-model="user.confirmPassword"  placeholder="" >
+      <template #left-icon>
+        <van-image
+          height="20"
+          width="16"
+          src="../../../static/images/onlineHome/lock.png"></van-image>
+      </template>
+      <template #label>
+        <H4 style="margin-left: 5px">确认密码</H4>
+      </template>
+    </van-field>
   </van-cell-group>
   <van-row style="text-align: center;margin-top: 40px">
-    <van-button color="#1D6FE9" style="border-radius: 6px;width: 90%;margin: 0 auto">完成</van-button>
+    <van-button color="#1D6FE9" style="border-radius: 6px;width: 90%;margin: 0 auto" @click="submit">完成</van-button>
   </van-row>
   <onlineHomeIndex></onlineHomeIndex>
 </div>
@@ -38,6 +49,7 @@
 
 <script>
     import onlineHomeIndex from "../onlineHomeIndex";
+    import {updateUserPwd} from "../../api/onlineHome/my";
 
     export default {
       components: {
@@ -46,9 +58,46 @@
         name: "password",
       data() {
         return {
-          oldValue: '',
-          newValue: '',
+          user: {
+            oldPassword: undefined,
+            newPassword: undefined,
+            confirmPassword: undefined
+          },
         };
+      },
+      methods: {
+        submit() {
+          console.log(this.user)
+          if(this.user.confirmPassword
+            !=this.user.newPassword){
+            this.$toast({
+              icon: 'error', // 找到自己需要的图标
+              message: '两次密码不同，请重新输入',
+              duration:"1000",
+              onClose:function(){
+                this.user.oldPassword=""
+                this.user.newPassword=""
+                this.user.confirmPassword=""
+                return false;
+              }
+            })
+          }else{
+            updateUserPwd(this.user.oldPassword, this.user.newPassword).then(
+              response => {
+                let _this =this
+                this.$toast({
+                  icon: 'success', // 找到自己需要的图标
+                  message: '修改成功',
+                  duration:"1000",
+                  onClose:function(){
+                    _this.$router.back(-1);
+                  }
+                })
+              }
+            );
+          }
+
+        },
       }
     }
 </script>

src/views/onlineHome/threeAffairs.vue

@@ -5,54 +5,51 @@
       left-arrow
       @click-left="$router.back(-1)"
     />
-    <van-tabs v-model="activeName" title-active-color="#1D6FE9" color="#1D6FE9" line-width="20px" swipeable>
-      <van-tab title="村务" name="a">
+    <van-tabs v-model="activeName" title-active-color="#1D6FE9" color="#1D6FE9" line-width="20px" swipeable @click="getList" @change="getList">
+      <van-tab title="村务" name="1" >
         <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
         >
-          <van-cell v-for="item in list" :key="item" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); min-height: 100px;">
+          <van-cell v-for="item in list1" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
             <template #title>
-              <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item}}</p>
+              <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
             </template>
             <template #label>
-              <p style="font-size: 16px">内容</p>
+              <van-row>
+                <van-col span="12"><p style="font-size: 12px">发布人/单位：{{item.issuedBy}}</p></van-col>
+                <van-col span="12"><p style="font-size: 12px;text-align: right">发布时间：{{item.issuedDate}}</p></van-col>
+              </van-row>
             </template>
           </van-cell>
         </van-list>
       </van-tab>
-      <van-tab title="党务" name="b">
+      <van-tab title="党务" name="2">
         <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
         >
-          <van-cell v-for="item in list" :key="item" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); min-height: 100px;">
+          <van-cell v-for="item in list2" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
             <template #title>
-              <p style="display:inline-block;background: #FF4646;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item}}</p>
+              <p style="display:inline-block;background: #FF4646;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
             </template>
             <template #label>
-              <p style="font-size: 16px">内容</p>
+              <van-row>
+                <van-col span="12"><p style="font-size: 12px">发布人/单位：{{item.issuedBy}}</p></van-col>
+                <van-col span="12"><p style="font-size: 12px;text-align: right">发布时间：{{item.issuedDate}}</p></van-col>
+              </van-row>
             </template>
           </van-cell>
         </van-list>
       </van-tab>
-      <van-tab title="政务" name="c">
+      <van-tab title="政务" name="3">
         <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
         >
-          <van-cell v-for="item in list" :key="item" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); min-height: 100px;">
+          <van-cell v-for="item in list3" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
             <template #title>
-              <p style="display:inline-block;background: #7DDA4F;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item}}</p>
+              <p style="display:inline-block;background: #7DDA4F;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
             </template>
             <template #label>
-              <p style="font-size: 16px">内容</p>
+              <van-row>
+                <van-col span="12"><p style="font-size: 12px">发布人/单位：{{item.issuedBy}}</p></van-col>
+                <van-col span="12"><p style="font-size: 12px;text-align: right">发布时间：{{item.issuedDate}}</p></van-col>
+              </van-row>
             </template>
           </van-cell>
         </van-list>
@@ -64,6 +61,7 @@
 
 <script>
     import onlineHomeIndex from "../onlineHomeIndex";
+    import {getAffairs, listAffairs} from "../../api/onlineHome/threeAffairs";
 
     export default {
       components: {
@@ -72,29 +70,50 @@
         name: "threeAffairs",
       data() {
         return {
-          activeName: 'a',
-          list: [],
+          activeName: 1,
+          list1: [],
+          list2: [],
+          list3: [],
           loading: false,
           finished: false,
+          // 查询参数
+          queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            title: null,
+            openType: null,
+            deptId: null,
+            isWechat: null,
+            status: null,
+          },
         };
       },
+      created() {
+        /** 查询三务公开列表 默认先查第一个村务*/
+        this.getList(1);
+      },
       methods: {
-        onLoad() {
-          // 异步更新数据
-          // setTimeout 仅做示例，真实场景中一般为 ajax 请求
-          setTimeout(() => {
-            for (let i = 0; i < 10; i++) {
-              this.list.push(this.list.length + 1+"标题");
+        getList(name,title) {
+          if(name==1&&this.list1.length>0){
+            return false
+          }else if(name==2&&this.list2.length>0){
+            return false
+          }else if(name==3&&this.list3.length>0){
+            return false
+          }
+          this.loading = true;
+          this.queryParams.openType = name
+          listAffairs(this.queryParams).then(response => {
+            if(name==1){
+              this.list1 = response.rows;
+            }else if(name==2){
+              this.list2 = response.rows;
+            }else if(name==3){
+              this.list3 = response.rows;
             }
-
-            // 加载状态结束
+            this.total = response.total;
             this.loading = false;
-
-            // 数据全部加载完成
-            if (this.list.length >= 40) {
-              this.finished = true;
-            }
-          }, 1000);
+          });
         },
       },
     }

src/views/onlineHome/workbench.vue

@@ -280,7 +280,6 @@
           </van-grid-item>
         </van-grid>
       </van-row>
-      <div style="height:55px"></div>
       <onlineHomeIndex></onlineHomeIndex>
     </div>
 </template>

src/views/onlineHome/zcfg.vue

@@ -0,0 +1,83 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      title="政策法规"
+      left-arrow
+      @click-left="$router.back(-1)"
+    />
+
+    <van-list>
+      <van-cell v-for="item in list" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+        <template #title>
+          <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
+        </template>
+        <template #label>
+          <van-row>
+            <van-col span="12"><p style="font-size: 12px">发布人/单位：{{item.issuedBy}}</p></van-col>
+            <van-col span="12"><p style="font-size: 12px;text-align: right">发布时间：{{item.issuedDate}}</p></van-col>
+          </van-row>
+        </template>
+      </van-cell>
+    </van-list>
+    <van-cell v-if="list.length==0"  is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <template #title>
+        <p style="display:inline-block;background: #dddddd;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">暂无数据</p>
+      </template>
+      <template #label>
+        <van-row>
+          <van-col span="12"><p style="font-size: 12px"></p></van-col>
+          <van-col span="12"><p style="font-size: 12px;text-align: right"></p></van-col>
+        </van-row>
+      </template>
+    </van-cell>
+    <onlineHomeIndex></onlineHomeIndex>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../onlineHomeIndex";
+    import {getAffairs, listAffairs} from "../../api/onlineHome/threeAffairs";
+    import {listVillageAffairs} from "../../api/onlineHome/villageAffairs";
+
+    export default {
+      components: {
+        onlineHomeIndex
+      },
+        name: "zcfg",
+      data() {
+        return {
+          list: [],
+          loading: false,
+          finished: false,
+          // 查询参数
+          queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            title: null,
+            villageAffairsType: null,
+            deptId: null,
+            isWechat: null,
+            status: null,
+          },
+        };
+      },
+      created() {
+        this.getList(1);
+      },
+      methods: {
+        getList(name,title) {
+          this.loading = true;
+          this.queryParams.villageAffairsType = name
+          listVillageAffairs(this.queryParams).then(response => {
+            this.list = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        },
+      },
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/onlineHome/zdjs.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      title="制度建设"
+      left-arrow
+      @click-left="$router.back(-1)"
+    />
+    <van-list>
+      <van-cell v-for="item in list" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+        <template #title>
+          <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.title}}</p>
+        </template>
+        <template #label>
+          <van-row>
+            <van-col span="12"><p style="font-size: 12px">发布人/单位：{{item.issuedBy}}</p></van-col>
+            <van-col span="12"><p style="font-size: 12px;text-align: right">发布时间：{{item.issuedDate}}</p></van-col>
+          </van-row>
+        </template>
+      </van-cell>
+    </van-list>
+    <van-cell v-if="list.length==0"  is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <template #title>
+        <p style="display:inline-block;background: #dddddd;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">暂无数据</p>
+      </template>
+      <template #label>
+        <van-row>
+          <van-col span="12"><p style="font-size: 12px"></p></van-col>
+          <van-col span="12"><p style="font-size: 12px;text-align: right"></p></van-col>
+        </van-row>
+      </template>
+    </van-cell>
+    <onlineHomeIndex></onlineHomeIndex>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../onlineHomeIndex";
+    import {listVillageAffairs} from "../../api/onlineHome/villageAffairs";
+
+    export default {
+      components: {
+        onlineHomeIndex
+      },
+        name: "zdjs",
+      data() {
+        return {
+          list: [],
+          loading: false,
+          finished: false,
+          // 查询参数
+          queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            title: null,
+            villageAffairsType: null,
+            deptId: null,
+            isWechat: null,
+            status: null,
+          },
+        };
+      },
+      created() {
+        this.getList(4);
+      },
+      methods: {
+        getList(name,title) {
+          this.loading = true;
+          this.queryParams.openType = name
+          listVillageAffairs(this.queryParams).then(response => {
+            this.list = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        },
+      },
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/onlineHomeIndex.vue

@@ -29,7 +29,7 @@ export default {
 
 <style scoped lang="scss">
 .app-container {
-  padding: 6% 3% 0;
+  padding-bottom: 64px;
 }
 
 </style>

src/views/onlineHomeLogin.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" :style="{height:height+'px'}">
+  <div class="app-container">
     <div class="title">
       <img style="display: inline-block;margin-right: 10px;" src="../../static/images/onlineHome/OHlogo1.png" alt="">
       <img style="display: inline-block;" src="../../static/images/onlineHome/OHlogoWord.png" alt="">
@@ -128,9 +128,15 @@
     </van-popup>
   </div>
 </template>
-<style>
+<style scoped>
   .app-container{
     background: #fff;
+    height: 100vh;
+  }
+  .title{
+    padding-top: 20%;
+    width: 88%;
+    margin: 0 auto;
   }
   .van-tab--active{
     font-size: .6rem;
@@ -193,15 +199,13 @@ export default {
       codeUrl: "", //验证码
       isSmsLogin: false, //是否手机验证码
       computeTime: 0,
-      height:0,
-
       active:1
     };
   },
   created() {
     this.getCode();
-    this.height = document.body.clientHeight
     this.reset();
+    console.log(this.height)
   },
   methods: {
     reset(){