Merge remote-tracking branch 'origin/master'

src/permission.js

@@ -115,12 +115,12 @@ const whiteList = [
   '/sunVillage_info/fixedAssets', //固定资产
   '/sunVillage_info/information',  //合同信息
   '/sunVillage_info/details',   //详情页
-  '/sunVillage_info/index_code',  //详情页
-  '/sunVillage_info/list_finance',   //详情页
-  '/sunVillage_info/list_issues',   //详情页
-  '/sunVillage_info/list_photo',   //详情页
-  '/sunVillage_info/list_contract',   //详情页
-  '/sunVillage_info/list_contract_detail',   //详情页
+  '/sunVillage_info/index_code',  //农户首页
+  '/sunVillage_info/list_finance',   //财务公开
+  '/sunVillage_info/list_issues',   //零工公开
+  '/sunVillage_info/list_photo',   //一张图公开
+  '/sunVillage_info/list_contract',   //合同公开
+  '/sunVillage_info/list_contract_detail',   //合同公开详情页
   '/sunVillage_info/list_tourists_detail',   //详情页
   '/sunVillage_info/list_issues_detail',   //详情页
   '/sunVillage_info/list_finance_detail',  //详情页

src/views/sunVillage_info/index.vue

@@ -53,6 +53,8 @@
                     <p style="font-weight: bold;font-size: 18px;display: inline-block">阳光村务</p>
                   </template>
                 </van-cell>
+                <router-link :to="{name:'sunVillageInfoListContract',query:{typeX:'2'}}" class="nav_item n_13">党务公开</router-link>
+                <router-link :to="{name:'sunVillageInfoListContract',query:{typeX:'3'}}" class="nav_item n_14">村务公开</router-link>
                 <router-link :to="{name:'sunVillageInfoListFinance'}" class="nav_item n_1">财务公开榜</router-link>
                 <router-link :to="{name:'sunVillageInfoListTourists'}" class="nav_item n_2">零工公开榜</router-link>
                 <router-link :to="{name:'sunVillageInfoListRegister'}" class="nav_item n_8">零工登记</router-link>
@@ -60,7 +62,7 @@
                 <router-link :to="{name:'sunVillageInfoListIssues'}" class="nav_item n_3">重大事项</router-link>
                 <router-link :to="{name:'sunVillageInfoListVote'}" class="nav_item n_5">发布投票</router-link>
                 <router-link :to="{name:'sunVillageInfoListPhoto'}" class="nav_item n_11">村庄图公开</router-link>
-                <router-link :to="{name:'sunVillageInfoListContract'}" class="nav_item n_12">合同公开</router-link>
+                <router-link :to="{name:'sunVillageInfoListContract',query:{typeX:'1'}}" class="nav_item n_12">合同公开</router-link>
               </div>
             </div>
 
@@ -397,6 +399,16 @@
                     background-size: 50%;
                     margin-bottom: 20PX;
                 }
+                &.n_13 {
+                    background: url('../../assets/images/sunVillage_info/index_block_13.png') no-repeat center top;
+                    background-size: 50%;
+                    margin-bottom: 20PX;
+                }
+                &.n_14 {
+                    background: url('../../assets/images/sunVillage_info/index_block_14.png') no-repeat center top;
+                    background-size: 50%;
+                    margin-bottom: 20PX;
+                }
 
 
                 &.n_01 {

src/views/sunVillage_info/index_code.vue

@@ -15,24 +15,42 @@
         <div class="index_info">
             <div class="title"></div>
             <div class="nav_list">
+
+              <!--党务-->
+              <router-link :to="{name:'sunVillageInfoListContract',query:{type:'code',typeX:'2'}}" class="nav_item n1">
+                <img src="../../assets/images/sunVillage_info/index_code_btn_6.png">
+              </router-link>
+
+              <!--村务-->
+              <router-link :to="{name:'sunVillageInfoListContract',query:{type:'code',typeX:'3'}}" class="nav_item n2">
+                <img src="../../assets/images/sunVillage_info/index_code_btn_7.png">
+              </router-link>
+
+              <!--财务-->
               <router-link :to="{name:'sunVillageInfoListFinance',query:{type:'code'}}" class="nav_item n1">
                 <img src="../../assets/images/sunVillage_info/index_code_btn_1.png">
               </router-link>
+
+              <!--零工-->
               <router-link :to="{name:'sunVillageInfoListTourists',query:{type:'code'}}" class="nav_item n2">
                 <img src="../../assets/images/sunVillage_info/index_code_btn_2.png">
               </router-link>
 
               <!--合同-->
-              <router-link :to="{name:'sunVillageInfoListContract',query:{type:'code'}}" class="nav_item n1">
+              <router-link :to="{name:'sunVillageInfoListContract',query:{type:'code',typeX:'1'}}" class="nav_item n1">
                 <img src="../../assets/images/sunVillage_info/index_code_btn_5.png">
               </router-link>
 
-              <router-link :to="{name:'sunVillageInfoListPhoto',query:{type:'code'}}" class="nav_item n2">
+              <!--村庄图-->
+              <router-link :to="{name:'sunVillageInfoListPhoto',query:{type:'code'}}" class="nav_item n1">
                 <img src="../../assets/images/sunVillage_info/index_code_btn_4.png">
               </router-link>
-              <router-link :to="{name:'sunVillageInfoListIssues',query:{type:'code'}}" class="nav_item n3">
+
+              <!--重大事项-->
+              <router-link :to="{name:'sunVillageInfoListIssues',query:{type:'code'}}" class="nav_item n2">
                 <img src="../../assets/images/sunVillage_info/index_code_btn_3.png">
               </router-link>
+
             </div>
         </div>
         <div class="footer">

src/views/sunVillage_info/list_contract.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="home_wrapper">
     <div class="header_main">
-      合同公开
+      {{queryParams.otherType=='1'?'合同':queryParams.otherType=='2'?'党务':queryParams.otherType=='3'?'村务':''}}公开
       <div class="return_btn" @click="onClickLeft"></div>
       <div class="add_btn" @click="goAdd" v-show="showBtn"></div>
     </div>
@@ -28,7 +28,7 @@
             <div class="info" @click="goDetail(item.id)">
               <div class="title">
                 <i class="icon_box"></i>
-                <p class="news_title">{{item.deptName}}{{item.otherType}}</p>
+                <p class="news_title">{{item.otherName}}</p>
                 <p class="tips_mark" v-if="index==0">新</p>
               </div>
               <div class="time">
@@ -92,16 +92,13 @@
       };
     },
     created() {
-      this.houseGetDicts("picture_type").then((response) => {
-        this.pictureTypeOptions = response.data;
-      });
       this.houseGetDicts("other_gk_type").then((response) => {
         this.otherGkTypeOptions = response.data;
       });
       this.queryParams.bookId = Cookies.get('bookId');
       this.queryParams.deptId = Cookies.get('deptId');
+      this.queryParams.otherType = this.$route.query.typeX;
       if (this.$route.query.type == 'code'){
-        this.queryParams.otherType = 1;
         this.showBtn = false;
       }
     },
@@ -170,13 +167,13 @@
           });
       },
       goAdd(){
-        this.$router.push('/sunVillage_info/list_contract_add')
+        this.$router.push({path: '/sunVillage_info/list_contract_add', query: {type: this.$route.query.typeX}})
       },
       goDetail(id){
-        this.$router.push({path:'/sunVillage_info/list_contract_detail',query: {id:id,type:'tourists'}})
+        this.$router.push({path:'/sunVillage_info/list_contract_detail',query: {id:id,type:this.$route.query.typeX}})
       },
       goEdit(id){
-        this.$router.push({path:'/sunVillage_info/list_contract_edit',query: {id:id,type:'finance'}})
+        this.$router.push({path:'/sunVillage_info/list_contract_edit',query: {id:id,type:this.$route.query.typeX}})
       },
       goRanking(id,time){
         this.$router.push({path:'/sunVillage_info/list_tourists_ranking',query: {id:id,time:time}})

src/views/sunVillage_info/list_contract_add.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="home_wrapper">
     <div class="header_main">
-      新增合同公开
+      新增{{form.otherType=='1'?'合同':form.otherType=='2'?'党务':form.otherType=='3'?'村务':''}}公开
       <div class="return_btn" @click="onClickLeft"></div>
       <div class="add_btn"></div>
     </div>
@@ -19,7 +19,7 @@
           label-width="auto"
           required
           :border="false"
-          :rules="[{ required: true , message:'请选择购建时间' }]"
+          :rules="[{ required: true , message:'请选择公开日期' }]"
         >
           <template #label>
             <img src="../../assets/images/sunVillage_info/add_tit_icon_01.png" width="18">
@@ -36,18 +36,23 @@
           />
         </van-popup>
 
+        <van-field required :rules="[{ required: true }]" v-model="form.otherName" placeholder="请输入公开标题" input-align="right" :border="false" >
+          <template #label>
+            <img src="../../assets/images/sunVillage_info/add_icon_1.png" width="18">
+            <p style="margin-left: 5px;">公开标题</p>
+          </template>
+        </van-field>
+        <!--@click="showPictureType = true"-->
         <van-field
           readonly
           clickable
           placeholder="请选择"
           v-model="form.otherTypeText"
-          @click="showPictureType = true"
           input-align="right"
-          right-icon="arrow-down"
           label-width="auto"
           required
           :border="false"
-          :rules="[{ required: true , message:'请选择一张图类型' }]"
+          :rules="[{ required: true , message:'请选择类型' }]"
         >
           <template #label>
             <img src="../../assets/images/sunVillage_info/add_tit_icon_02.png" width="18">
@@ -125,6 +130,7 @@
           openAt:this.format(new Date(),'yyyy-MM-dd'),
           openPic:'',
           openFile:'',
+          otherName:''
         },
         openPic:[],
         otherGkTypeOptions:[],
@@ -145,10 +151,13 @@
     created() {
       this.houseGetDicts("other_gk_type").then((response) => {
         this.otherGkTypeOptions = response.data;
+        this.form.otherTypeText = this.selectDictLabel(response.data, this.$route.query.type);
+        this.form.otherName = Cookies.get('deptName')+this.selectDictLabel(response.data, this.$route.query.type);
       });
       this.type = this.$route.query.type;
       this.queryParams.bookId = Cookies.get('bookId');
       this.queryParams.deptId = Cookies.get('deptId');
+      this.form.otherType = this.$route.query.type;
     },
     methods: {
       onSubmit(){

src/views/sunVillage_info/list_contract_detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="home_wrapper">
     <div class="header_main">
-      合同公开查看
+      查看{{otherType=='1'?'合同':otherType=='2'?'党务':otherType=='3'?'村务':''}}公开
       <div class="return_btn" @click="onClickLeft"></div>
       <div class="add_btn"></div>
     </div>
@@ -14,9 +14,7 @@
           placeholder="请选择"
           v-model="form.openAt"
           input-align="right"
-          right-icon="arrow-down"
           label-width="auto"
-          required
           :border="false"
           :rules="[{ required: true , message:'请选择公开年月' }]"
         >
@@ -35,15 +33,20 @@
           />
         </van-popup>
 
+        <van-field readonly v-model="form.otherName" placeholder="请输入公开标题" input-align="right" :border="false" >
+          <template #label>
+            <img src="../../assets/images/sunVillage_info/add_icon_1.png" width="18">
+            <p style="margin-left: 5px;">公开标题</p>
+          </template>
+        </van-field>
+
         <van-field
           readonly
           clickable
           placeholder="请选择"
           v-model="form.otherType"
           input-align="right"
-          right-icon="arrow-down"
           label-width="auto"
-          required
           :border="false"
           :rules="[{ required: true , message:'请选择一张图类型' }]"
         >
@@ -131,6 +134,7 @@
         },
         openFile2:[],
         openPic2:[],
+        otherType:''
       };
     },
     created() {
@@ -150,6 +154,7 @@
       this.queryParams.bookId = Cookies.get('bookId');
       this.queryParams.deptId = Cookies.get('deptId');
       this.queryParams.id = this.$route.query.id;
+      this.otherType = this.$route.query.type;
       this.getDetail();
     },
     methods: {

src/views/sunVillage_info/list_contract_edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="home_wrapper">
     <div class="header_main">
-      修改合同公开
+      修改{{form.otherType=='1'?'合同':form.otherType=='2'?'党务':form.otherType=='3'?'村务':''}}公开
       <div class="return_btn" @click="onClickLeft"></div>
       <div class="add_btn"></div>
     </div>
@@ -36,6 +36,13 @@
           />
         </van-popup>
 
+        <van-field required :rules="[{ required: true }]" v-model="form.otherName" placeholder="请输入公开标题" input-align="right" :border="false" >
+          <template #label>
+            <img src="../../assets/images/sunVillage_info/add_icon_1.png" width="18">
+            <p style="margin-left: 5px;">公开标题</p>
+          </template>
+        </van-field>
+
         <van-field
           readonly
           clickable
@@ -43,7 +50,6 @@
           v-model="form.otherTypeText"
           @click="showPictureType = true"
           input-align="right"
-          right-icon="arrow-down"
           label-width="auto"
           required
           :border="false"