确权调查测试问题修改

src/views/contracted/index.vue

@@ -55,9 +55,9 @@
               </div>
             </div>
           </div>
-          <template #right>
+          <!-- <template #right>
             <div class="operation">
-              <!-- delete 删除 edit编辑 view查看 list榜单 -->
+              delete 删除 edit编辑 view查看 list榜单
               <div class="opera_btn">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
@@ -75,7 +75,7 @@
                 <p>线下合同</p>
               </div>
             </div>
-          </template>
+          </template> -->
         </van-swipe-cell>
       </van-list>
     </div>
@@ -122,6 +122,12 @@
         });
       },
       goDetail(item){
+        // 调查任务完成状态：已完成标记为1，未完成标记为2
+        let status = '1';
+        if (item.surStatus === 'UNFINISHED') {
+          status = '2';
+        }
+        Cookies.set('taskStatus', status, { expires: 30 });
         this.$router.push({path:'/contracted/village/contractor', query: { deptId: item.deptId, deptName: item.deptName }})
       },
       onSelect(action) {

src/views/contracted/village/contractor/contractWord.vue

@@ -8,7 +8,7 @@
         </div>
       </template>
     </van-nav-bar> -->
-    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
+    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus" :task-status="taskStatus"></contractor-header>
 
     <div class="tap_block">
       <p @click="skip('contractedVillageContractorDetail')">承包方</p>
@@ -152,7 +152,7 @@
         <van-field v-model="form.cbdkzs" label="承包地块数：" placeholder="请输入承包地块数" required :rules="[{ required: true }]" :border="false" input-align="left" type="digit" />
         <van-field v-model="form.htzmjm" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
       </van-form>
-      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
+      <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
     </div>
 
 
@@ -182,10 +182,12 @@
         showCbqxz: false,         // 控制承包结束时间弹出层的显示和隐藏
         minDate: new Date(1978, 0, 1),
         maxDate: new Date(2100, 11, 31),
-        isDisabled: false
+        isDisabled: false,
+        taskStatus: null,         // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("jyq_method").then(response => {
         this.cbfsOptions = response.data;
       });

src/views/contracted/village/contractor/contractor.vue

@@ -20,7 +20,7 @@
         @search="onSearch"
       ></van-search>
 
-      <div class="search_btn" @click="addContractor">
+      <div class="search_btn" @click="addContractor" v-if="taskStatus === '2'">
         <p class="active"> + 新增</p>
       </div>
 
@@ -61,7 +61,7 @@
               <div class="opera_btn view" v-if="surveyStatus === '2'" @click="handleViewRemark(item.id)">
                 <p>挂起原因</p>
               </div>
-              <div class="opera_btn delete" @click="deleteContractor(item.id, index)">
+              <div class="opera_btn delete" v-if="taskStatus === '2'" @click="deleteContractor(item.id, index)">
                 <p>删除</p>
               </div>
             </div>
@@ -114,9 +114,12 @@
         showRemark: false,
         // 异常备注信息
         remark: null,
+        // 调查任务的完成状态：1表示已完成，2表示未完成
+        taskStatus: null,
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.queryParams.deptId = this.$route.query.deptId;
       this.getDicts("confirmed_survey_status").then(response => {
         this.surveyStatusOptions = response.data;

src/views/contracted/village/contractor/contractorDetail.vue

@@ -8,7 +8,7 @@
         </div>
       </template>
     </van-nav-bar> -->
-    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
+    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus" :task-status="taskStatus"></contractor-header>
 
     <div class="tap_block">
       <p class="active">承包方</p>
@@ -72,7 +72,7 @@
         <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" />
       </van-form>
-      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
+      <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
     </div>
 
 
@@ -98,15 +98,12 @@
         contractorTypeOptions: [],
         // 承包方证件类型字典
         credentialTypeOptions: [],
+        // 调查任务的完成状态：1表示已完成，2表示未完成
+        taskStatus: null,
       };
     },
-    watch: {
-      '$route': function() {
-        window.location.reload();
-      }
-    },
     created() {
-      console.log(this.$route.params);
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("cbf_type").then(response => {
         this.contractorTypeOptions = response.data;
       });

src/views/contracted/village/contractor/contractorFamily.vue

@@ -8,7 +8,7 @@
         </div>
       </template>
     </van-nav-bar> -->
-    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
+    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus" :task-status="taskStatus"></contractor-header>
 
     <div class="tap_block">
       <p @click="skip('contractedVillageContractorDetail')">承包方</p>
@@ -41,7 +41,7 @@
           </div>
           <p class="item_right">{{ item.sfgyr }}</p>
         </div>
-        <template #right v-if="$route.params.surveyStatus!=='3'">
+        <template #right v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">
           <div class="operation">
             <!-- delete 删除 edit编辑 view查看 list榜单 -->
             <div class="opera_btn edit" @click="householdDivision(item, index)">
@@ -60,7 +60,7 @@
         </template>
       </van-swipe-cell>
       <!-- getDetail不加(), 第一个参数默认传递的是event，getDetail加(), 需要手动传递$event -->
-      <p class="btn" @click="goDetail()" v-if="$route.params.surveyStatus!=='3'">新增</p>
+      <p class="btn" @click="goDetail()" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">新增</p>
     </div>
     <van-popup v-model="showContractorPopup" position="bottom">
       <van-picker
@@ -96,10 +96,12 @@
         familyList: [],                 // 家庭成员列表
         contractorList: [],             // 承包方列表
         showContractorPopup: false,     // 控制承包方信息弹出层的显示和隐藏
-        transferMemberId: null          // 转出的成员ID
+        transferMemberId: null,         // 转出的成员ID
+        taskStatus: null,               // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getList();
       this.getContractorList();
     },

src/views/contracted/village/contractor/contractorFamilyDetail.vue

@@ -103,7 +103,7 @@
         <!-- <van-field v-model="form.cycgfs" label="持股份数：" type="number" placeholder="请输入持股份数" :border="false" input-align="right" />
         <van-field v-model="form.gqzbh" label="股权编号：" placeholder="请输入股权编号" :border="false" input-align="right" /> -->
       </van-form>
-      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
+      <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
     </div>
 
 
@@ -130,9 +130,11 @@
         familyStatusOptions: [],        // 家庭身份字典
         familyStatusText: null,         // 家庭身份标签名
         showFamilyStatus: false,        // 控制家庭身份字典弹出层的显示和隐藏
+        taskStatus: null,               // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("sys_user_sex").then(response => {
         this.cyxbOptions = response.data;
       });

src/views/contracted/village/contractor/contractorHeader.vue

@@ -48,7 +48,7 @@
 
   export default {
     name: 'contractedVillageHeader',
-    props: ['deptId', 'contractorCode', 'contractorName', 'surveyStatus'],
+    props: ['deptId', 'contractorCode', 'contractorName', 'surveyStatus', 'taskStatus'],
     components: {
       vueEsign
     },
@@ -75,10 +75,11 @@
     },
     created() {
       this.height = window.screen.height * 1.28 - 20;
-      if (this.surveyStatus === '3') {
-        this.showBtn = false;
-      } else {
+      if (this.taskStatus === '2' && this.surveyStatus !== '3') {
         this.showBtn = true;
+
+      } else {
+        this.showBtn = false;
       }
     },
     methods: {

src/views/contracted/village/contractor/contractorLand.vue

@@ -8,7 +8,7 @@
         </div>
       </template>
     </van-nav-bar> -->
-    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
+    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus" :task-status="taskStatus"></contractor-header>
 
     <div class="tap_block">
       <p @click="skip('contractedVillageContractorDetail')">承包方</p>
@@ -21,7 +21,7 @@
       <div class="function_btn1" @click="skip('contractedVillageContractorLandMap')">
         <p class="active">进入地图 <span class="sanjiao-right"></span></p>
       </div>
-      <div class="function_btn2" @click="goDetail()" v-if="$route.params.surveyStatus!=='3'">
+      <div class="function_btn2" @click="goDetail()" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">
         <p class="active"> + 新增</p>
       </div>
     </div>
@@ -49,7 +49,7 @@
             <p>北:{{ item.dkbz }}</p>
           </div>
         </div>
-        <template #right v-if="$route.params.surveyStatus!=='3'">
+        <template #right v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">
           <div class="operation">
             <!-- delete 删除 edit编辑 view查看 list榜单 -->
             <div class="opera_btn edit" @click="transferLand(item.id)">
@@ -97,10 +97,12 @@
         landList: [],                   // 承包地块列表
         contractorList: [],             // 承包方列表
         showContractorPopup: false,     // 控制承包方信息弹出层的显示和隐藏
-        transferLandId: null            // 转出的承包地块ID
+        transferLandId: null,           // 转出的承包地块ID
+        taskStatus: null,               // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getList();
       this.getContractorList();
     },

src/views/contracted/village/contractor/contractorLandDetail.vue

@@ -114,7 +114,7 @@
           <common-map ref="contractedLandMap" :minMapZoom="15" :maxMapZoom="18" :allowDraw="true" @drawFinished="onMapDrawFinished" />
         </div>
       </van-form>
-      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
+      <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
     </div>
 
 
@@ -149,9 +149,11 @@
         showLandPurpose: false,           // 控制土地用途字典弹出层的显示和隐藏
         sfjbntOptions: [],                // 是否基本农田字典
         landList: [],                     // 地块信息列表
+        taskStatus: null,                 // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("land_use").then(response => {
         this.tdlylxOptions = response.data;
       });

src/views/contracted/village/contractor/contractorLandMap.vue

@@ -9,7 +9,18 @@
       </template>
     </van-nav-bar>
 
-    <div class="mapBox" id="contractedLandMapBox"></div>
+    <div style="position:relative;">
+      <div class="mapBox" id="contractedLandMapBox"></div>
+      <div class="legend_main">
+        <div class="legend">
+          <p class="legend_tt">图例
+            <img src="../../../../../static/images/contracted/map_icon_01.png" alt="">
+          </p>
+          <div><i></i><p>地块</p></div>
+          <div><i></i><p>承包地块</p></div>
+        </div>
+      </div>
+    </div>
 
     <div class="contractedLandPopup">
       <van-dialog v-model="open" title="承包地信息" :show-confirm-button="false" :show-cancel-button="true" cancel-button-text="关闭">
@@ -310,4 +321,47 @@
     transform: translateX(-4vw);
   }
 
+  .legend_main{
+    position: absolute;
+    top: 5vh;
+    right: 0;
+  }
+
+  .legend_tt{
+    font-size: 16PX;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    img{
+      width: 20PX;
+    }
+  }
+
+  .legend{
+    background: rgba(255,255,255,.5);
+    padding: 2vh;
+    border-radius: 10PX;
+    div{
+      display: flex;
+      align-items: center;
+      margin-top: 2vh;
+      i{
+        display: block;
+        width: 15PX;
+        height: 15PX;
+        border: 1px solid;
+        border-radius: 3PX;
+        margin-right: 10PX;
+      }
+      &:nth-child(2) i{
+        background: rgba(22,233,15,.7);
+        border-color: rgba(22,233,15,1);
+      }
+      &:nth-child(3) i{
+        background: rgba(255,84,87,.7);
+        border-color: rgba(255,84,87,1);
+      }
+    }
+  }
+
 </style>

src/views/contracted/village/employer/employer.vue

@@ -54,7 +54,7 @@
         <van-field label="签字图片：" readonly :border="false" label-width="auto" />
         <img :src="'/api'+form.fbfdcqz" width="100%" alt="" />
       </van-form>
-      <div class="btn_main">
+      <div class="btn_main" v-if="taskStatus === '2'">
         <p class="btn" @click="submitForm">保存</p>
         <p class="btn1" @click="handleSign">签字</p>
       </div>
@@ -102,6 +102,7 @@
         credentialTypeOptions: [],        // 证件类型字典
         credentialTypeText: null,         // 证件类型标签名
         showCredentialType: false,        // 控制证件类型字典弹出层的显示和隐藏
+        taskStatus: null,                 // 调查任务的完成状态：1表示已完成，2表示未完成
 
         // 控制签字面板的显示和隐藏
         showSignPopup: false,
@@ -117,6 +118,7 @@
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.height = window.screen.height * 1.28 - 20;
       this.getDicts("cert_type").then(response => {
         this.credentialTypeOptions = response.data;

src/views/contracted/village/map/map.vue

@@ -25,7 +25,7 @@
           <div><i></i><p>开荒地</p></div>
           <div><i></i><p>其他地</p></div>
         </div>
-        <div class="legend_second" >
+        <div class="legend_second" v-if="taskStatus === '2'">
           <p class="legend_tt" id="drawLandPolygon">
             <img src="../../../../../static/images/contracted/map_icon_02.png" alt="">画图
           </p>
@@ -161,7 +161,7 @@
         </van-form>
         <div class="footer_main">
           <van-button type="default" hairline size="large" @click="closePopup">关闭弹窗</van-button>
-          <van-button type="danger" hairline size="large" @click="deleteLand(form.id)" v-if="showDeleteBtn">删除地块</van-button>
+          <van-button type="danger" hairline size="large" @click="deleteLand(form.id)" v-if="taskStatus === '2' && showDeleteBtn">删除地块</van-button>
           <van-button type="info" hairline size="large" @click="saveLand" v-if="showSaveBtn">保存信息</van-button>
         </div>
     </van-dialog>
@@ -211,9 +211,11 @@
         showSaveBtn: false,               // 控制保存按钮的显示隐藏
         showDeleteBtn: false,             // 控制删除按钮的显示隐藏
         isDisabled: false,                // 是否禁用
+        taskStatus: null,                 // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("land_ownership").then(response => {
         this.syqxzOptions = response.data;
       });

src/views/contracted/village/massif/massif.vue

@@ -20,7 +20,7 @@
         @search="onSearch"
       ></van-search>
 
-      <div class="search_btn" @click="goDetail()">
+      <div class="search_btn" @click="goDetail()" v-if="taskStatus === '2'">
         <p class="active"> + 新增</p>
       </div>
 
@@ -55,7 +55,7 @@
             <van-col span="10">{{ item.dkmc }}</van-col>
             <van-col span="5" style="color: #f78200">{{ item.scmjm }}</van-col>
           </van-row>
-          <template #right>
+          <template #right v-if="taskStatus === '2'">
             <van-button square type="danger" text="删除" native-type="button" @click="deleteLand(item.id, index)" />
           </template>
         </van-swipe-cell>
@@ -93,9 +93,12 @@
         totalNum: 0,
         // 地块列表
         landList: [],
+        // 调查任务的完成状态：1表示已完成，2表示未完成
+        taskStatus: null,
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.queryParams.deptId = this.$route.query.deptId;
       this.getDicts("land_type").then(response => {
         this.dklbOptions = response.data;

src/views/contracted/village/massif/massifDetail.vue

@@ -145,7 +145,7 @@
           <common-map ref="landMap" :minMapZoom="15" :maxMapZoom="18" :allowDraw="true" @drawFinished="onMapDrawFinished" />
         </div>
       </van-form>
-      <p class="btn" @click="submitForm">保存</p>
+      <p class="btn" @click="submitForm" v-if="taskStatus === '2'">保存</p>
     </div>
 
 
@@ -208,9 +208,11 @@
         tdlylxText: null,                 // 土地利用类型标签名
         showLandType: false,              // 控制土地利用类型字典弹出层的显示和隐藏
         sfjbntOptions: [],                // 是否基本农田字典
+        taskStatus: null,                 // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("land_ownership").then(response => {
         this.syqxzOptions = response.data;
       });