From 67783bcdf9c6a42206425084134d4b0ec31ecd54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Tue, 1 Aug 2023 16:31:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E6=9D=83APP=20=20=E9=98=B3=E5=85=89?=
 =?UTF-8?q?=E6=9D=91=E5=8A=A1=E5=85=AC=E5=BC=80=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |   9 +
 src/utils/request.js                          |   5 +
 .../village/contractor/contractor.vue         |   6 +-
 .../contracted/village/employer/employer.vue  | 255 ++++++++++++++++++
 .../contracted/village/massif/massif.vue      | 188 +++++++++++++
 .../sunVillage_info/list_finance_add.vue      |   2 +-
 .../sunVillage_info/list_tourists_add.vue     |   2 +-
 7 files changed, 462 insertions(+), 5 deletions(-)
 create mode 100644 src/views/contracted/village/employer/employer.vue
 create mode 100644 src/views/contracted/village/massif/massif.vue

diff --git a/src/router/index.js b/src/router/index.js
index 3bb11c88..ecc1bf1d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5549,6 +5549,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/contracted/village/contractor/contractorLandMap'], resolve)
   },
+  {
+    path: '/contracted/village/employer',
+    name: 'contractedVillageEmployer',
+    meta: {
+      title: '发包方',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/contracted/village/employer/employer'], resolve)
+  },
 ];
 
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 01599d57..a4b60e5f 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -113,6 +113,11 @@ service.interceptors.response.use(res => {
             window.location.href = '/agriculturalTrusteeship/login';
             return;
           }
+          // 土地确权
+          if (window.location.href.indexOf('/contracted') != -1){
+            window.location.href = '/contracted/login';
+            return;
+          }
           // 产权交易
           window.location.href = '/login';
         })
diff --git a/src/views/contracted/village/contractor/contractor.vue b/src/views/contracted/village/contractor/contractor.vue
index a3661854..9ae5b75a 100644
--- a/src/views/contracted/village/contractor/contractor.vue
+++ b/src/views/contracted/village/contractor/contractor.vue
@@ -5,9 +5,9 @@
 
     <div class="tap_block">
       <p class="active">承包方</p>
-      <p>发包方</p>
-      <p>地块</p>
-      <p>地图</p>
+      <p @click="$router.push({path:'/contracted/village/employer'})">发包方</p>
+      <p @click="$router.push({path:'/contracted/village/massif'})">地块</p>
+      <p @click="$router.push({path:'/contracted/village/map'})">地图</p>
     </div>
 
     <div class="search_main">
diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue
new file mode 100644
index 00000000..00870466
--- /dev/null
+++ b/src/views/contracted/village/employer/employer.vue
@@ -0,0 +1,255 @@
+<template>
+  <div class="app-container">
+
+    <van-nav-bar left-arrow fixed placeholder @click-left="onClickLeft" >
+      <template #title>
+        <div class="tb_main">
+          B村
+        </div>
+      </template>
+    </van-nav-bar>
+
+    <div class="tap_block">
+      <p @click="$router.push({path:'/contracted/village/contractor'})">承包方</p>
+      <p class="active">发包方</p>
+      <p @click="$router.push({path:'/contracted/village/massif'})">地块</p>
+      <p @click="$router.push({path:'/contracted/village/map'})">地图</p>
+    </div>
+
+    <div class="list_main">
+      <van-field v-model="value" label="代码：" placeholder="请输入代码" required :border="false" input-align="right" label-width="auto" />
+      <van-field v-model="value" label="名称：" placeholder="请输入名称" required :border="false" input-align="right" label-width="auto" />
+      <van-field v-model="value" label="负责人：" placeholder="请输入负责人" required :border="false" input-align="right" label-width="auto" />
+
+      <van-field v-model="value" label="证件类型："
+        placeholder="请选择证件类型"
+        required
+        :border="false"
+        input-align="right"
+        right-icon="arrow-down"
+        label-width="auto"
+        readonly
+        clickable
+        @click="showType = true"
+      />
+      <van-popup v-model="showType" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="typeOptions"
+          value-key="dictLabel"
+          @confirm="onConfirmTypeOptions"
+          @cancel="showType = false"
+        />
+      </van-popup>
+
+      <van-field v-model="value" label="证件号码：" placeholder="请输入证件号码" required :border="false" input-align="right" label-width="auto" />
+      <van-field v-model="value" label="联系电话：" placeholder="请输入联系电话" required :border="false" input-align="right" label-width="auto" />
+      <van-field v-model="value" label="地址：" placeholder="请输入地址" required :border="false" input-align="right" label-width="auto" />
+      <van-field v-model="value" label="邮编：" placeholder="请输入邮编" required :border="false" input-align="right" label-width="auto" />
+      <van-field v-model="value" label="调查记事：" placeholder="请输入调查记事" required :border="false" input-align="right" label-width="auto" />
+      <van-field readonly v-model="value" label="签字(上传图片)：" :border="false" input-align="right" label-width="auto" />
+
+      <div class="btn_main">
+        <p class="btn">保存</p>
+        <p class="btn1">签字</p>
+      </div>
+    </div>
+
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+  export default {
+    name: "contractedVillageContractor",
+    data() {
+      return {
+        loading:false,
+        finished:true,
+        value:'',
+        showType:false,
+        typeOptions:[{
+          dictLabel:'类型1',
+          dictValue:'1',
+        }],
+      };
+    },
+    created() {
+
+    },
+    methods: {
+      getList(){
+
+      },
+      onSearch(){
+
+      },
+      onConfirmTypeOptions(){
+
+      },
+      onConfirmZjTypeOptions(){
+
+      },
+      onConfirmTDYTOptions(){
+
+      },
+
+    },
+  };
+</script>
+<style scoped lang="scss">
+
+  .app-container{
+    background: #fff url("../../../../../static/images/contracted/contracted_index_bg.png") no-repeat center;
+    background-size: 100% 100%;
+    height: 100vh;
+    padding: 0 4vw;
+    overflow: hidden;
+  }
+
+  /deep/ .van-nav-bar{
+    background: transparent;
+  }
+
+  /deep/ .van-nav-bar .van-icon{
+    color: #000000;
+  }
+
+  /deep/ .van-hairline--bottom::after{
+    border: none;
+  }
+
+  /deep/ .van-search__content{
+    background: rgba(255,255,255,.5);
+  }
+  /deep/ .van-search{
+    padding: 0;
+    flex: 1;
+  }
+
+  /deep/ .van-ellipsis{
+    overflow: initial;
+  }
+
+  .tb_main{
+    position: relative;
+    p{
+      position: absolute;
+      display: inline-block;
+      margin-left: 10PX;
+    }
+  }
+
+  .tb{
+    font-size: 12px;
+    color: #ff8900;
+    background: #daf6e7;
+    border: 1px solid #d7be6e;
+    padding: 2PX 8PX;
+    border-radius: 50PX;
+    margin-right: 5PX;
+  }
+
+  .tap_block{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    background: #ebfaf2;
+    padding: 2PX 4PX;
+    border-radius: 10PX;
+    margin-top: 1vh;
+    .active{
+      background-image: linear-gradient(to right,#c6fe8b,#48e5a2);
+      box-shadow: 0 0 10PX #cccccc;
+      color: #333333;
+    }
+    p{
+      width: 25%;
+      text-align: center;
+      padding: 5PX 0;
+      border-radius: 10PX;
+      color: #666666;
+    }
+  }
+
+  .search_main{
+    display: flex;
+    margin-top: 2vh;
+    .search_btn{
+      background: rgba(255,255,255,.5);
+      width: 25%;
+      border-radius: 50PX;
+      margin-left: 10PX;
+      padding: 2PX;
+      .active{
+        background-image: linear-gradient(to right,#c6fe8b,#48e5a2);
+        color: #333333;
+        border-radius: 50PX;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+      }
+    }
+  }
+
+  .second_tap{
+    display: flex;
+    align-items: center;
+    margin-top: 1vh;
+    p{
+      background: #dbf1ea;
+      border: 1px solid #cdcdcd;
+      color: #5f5f5f;
+      padding: 5PX 15PX;
+      margin-right: 3vw;
+      border-radius: 50PX;
+    }
+    .active{
+      background: #99eecb;
+      border-color: #48e5a2;
+      color: #333333;
+    }
+  }
+
+  .list_main{
+    margin-top: 2vh;
+    overflow-y: scroll;
+    text-align: center;
+    background: #ffffff;
+    border-top-left-radius: 10PX;
+    border-top-right-radius: 10PX;
+    height: 88vh;
+    .btn_main{
+      .btn1{
+        background-image: linear-gradient(to right,#ffd88e,#fc8a0e);
+        box-shadow: 0 0 10PX #cccccc;
+        padding: 10PX 0PX;
+        border-radius: 50PX;
+        display: inline-block;
+        width: 30%;
+        margin-top: 2vh;
+        margin-left: 2vw;
+      }
+      .btn{
+        background-image: linear-gradient(to right,#c6fe8b,#48e5a2);
+        box-shadow: 0 0 10PX #cccccc;
+        padding: 10PX 0PX;
+        border-radius: 50PX;
+        display: inline-block;
+        width: 30%;
+        margin-top: 2vh;
+      }
+    }
+
+  }
+
+  .mapBox{
+    width: 94%;
+    height: 50vw;
+    background-image: linear-gradient(to right,#c6fe8b,#48e5a2);
+    border-radius: 10PX;
+    margin: 2vh auto;
+  }
+
+</style>
diff --git a/src/views/contracted/village/massif/massif.vue b/src/views/contracted/village/massif/massif.vue
new file mode 100644
index 00000000..9ae5b75a
--- /dev/null
+++ b/src/views/contracted/village/massif/massif.vue
@@ -0,0 +1,188 @@
+<template>
+  <div class="app-container">
+
+    <van-nav-bar title="B村" left-arrow fixed placeholder @click-left="onClickLeft" />
+
+    <div class="tap_block">
+      <p class="active">承包方</p>
+      <p @click="$router.push({path:'/contracted/village/employer'})">发包方</p>
+      <p @click="$router.push({path:'/contracted/village/massif'})">地块</p>
+      <p @click="$router.push({path:'/contracted/village/map'})">地图</p>
+    </div>
+
+    <div class="search_main">
+
+      <van-search
+        v-model="value"
+        shape="round"
+        background="transparent"
+        placeholder="请输入姓名搜索"
+        @search="onSearch"
+      ></van-search>
+
+      <div class="search_btn">
+        <p class="active"> + 新增</p>
+      </div>
+
+    </div>
+
+    <div class="second_tap">
+      <p class="active">待调查 1553</p>
+      <p>挂起 527</p>
+      <p>已完成 321</p>
+    </div>
+
+    <div class="list_main">
+      <van-row style="color: #888888;font-size: 14px;">
+        <van-col span="5">姓名</van-col>
+        <van-col span="14">证件号</van-col>
+        <van-col span="5">成员数</van-col>
+      </van-row>
+      <van-swipe-cell v-for="(item,index) in 50">
+        <van-row @click="goDetail">
+          <van-col span="5">张三</van-col>
+          <van-col span="14">230381199770511239</van-col>
+          <van-col span="5" style="color: #f78200">7</van-col>
+        </van-row>
+        <template #right>
+          <van-button square type="danger" text="删除" />
+        </template>
+      </van-swipe-cell>
+    </div>
+
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+  export default {
+    name: "contractedVillageContractor",
+    data() {
+      return {
+        loading:false,
+        finished:true,
+        value:''
+      };
+    },
+    created() {
+
+    },
+    methods: {
+      getList(){
+
+      },
+      onSearch(){
+
+      },
+      goDetail(){
+        this.$router.push({path:'/contracted/village/contractorDetail'});
+      }
+    },
+  };
+</script>
+<style scoped lang="scss">
+
+  .app-container{
+    background: #fff url("../../../../../static/images/contracted/contracted_index_bg.png") no-repeat center;
+    background-size: 100% 100%;
+    height: 100vh;
+    padding: 0 4vw;
+  }
+
+  /deep/ .van-nav-bar{
+    background: transparent;
+  }
+
+  /deep/ .van-nav-bar .van-icon{
+    color: #000000;
+  }
+
+  /deep/ .van-hairline--bottom::after{
+    border: none;
+  }
+
+  /deep/ .van-search__content{
+    background: rgba(255,255,255,.5);
+  }
+  /deep/ .van-search{
+    padding: 0;
+    flex: 1;
+  }
+
+  .tap_block{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    background: #ebfaf2;
+    padding: 2PX 4PX;
+    border-radius: 10PX;
+    margin-top: 1vh;
+    .active{
+      background-image: linear-gradient(to right,#c6fe8b,#48e5a2);
+      box-shadow: 0 0 10PX #cccccc;
+      color: #333333;
+    }
+    p{
+      width: 25%;
+      text-align: center;
+      padding: 5PX 0;
+      border-radius: 10PX;
+      color: #666666;
+    }
+  }
+
+  .search_main{
+    display: flex;
+    margin-top: 2vh;
+    .search_btn{
+      background: rgba(255,255,255,.5);
+      width: 25%;
+      border-radius: 50PX;
+      margin-left: 10PX;
+      padding: 2PX;
+      .active{
+        background-image: linear-gradient(to right,#c6fe8b,#48e5a2);
+        color: #333333;
+        border-radius: 50PX;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+      }
+    }
+  }
+
+  .second_tap{
+    display: flex;
+    align-items: center;
+    margin-top: 1vh;
+    p{
+      background: #dbf1ea;
+      border: 1px solid #cdcdcd;
+      color: #5f5f5f;
+      padding: 5PX 15PX;
+      margin-right: 3vw;
+      border-radius: 50PX;
+    }
+    .active{
+      background: #99eecb;
+      border-color: #48e5a2;
+      color: #333333;
+    }
+  }
+
+  .list_main{
+    margin-top: 2vh;
+    overflow-y: scroll;
+    text-align: center;
+    background: #ffffff;
+    border-top-left-radius: 10PX;
+    border-top-right-radius: 10PX;
+    height: 77vh;
+    overflow-y: scroll;
+    .van-col{
+      padding: 15PX 0;
+    }
+  }
+
+</style>
diff --git a/src/views/sunVillage_info/list_finance_add.vue b/src/views/sunVillage_info/list_finance_add.vue
index 1f4c13e9..6f382a9a 100644
--- a/src/views/sunVillage_info/list_finance_add.vue
+++ b/src/views/sunVillage_info/list_finance_add.vue
@@ -115,6 +115,7 @@
           openNy:this.format(new Date(),'yyyy-MM'),
           openPic:'',
           openFile:'',
+          openName:this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月财务公开'
         },
         openPic:[],
         fileList:[],
@@ -144,7 +145,6 @@
       this.type = this.$route.query.type;
       this.queryParams.bookId = Cookies.get('bookId');
       this.queryParams.deptId = Cookies.get('deptId');
-      this.form.openName = this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月财务公开';
     },
     methods: {
       onSubmit(){
diff --git a/src/views/sunVillage_info/list_tourists_add.vue b/src/views/sunVillage_info/list_tourists_add.vue
index 5656082f..943f8338 100644
--- a/src/views/sunVillage_info/list_tourists_add.vue
+++ b/src/views/sunVillage_info/list_tourists_add.vue
@@ -103,6 +103,7 @@
           openNy:this.format(new Date(),'yyyy-MM'),
           openPic:'',
           openFile:'',
+          openName:this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月零工公开'
         },
         openPic:[],
         fileList:[],
@@ -132,7 +133,6 @@
       this.type = this.$route.query.type;
       this.queryParams.bookId = Cookies.get('bookId');
       this.queryParams.deptId = Cookies.get('deptId');
-      this.form.openName = this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月零工公开';
     },
     methods: {
       onSubmit(){