From ef4af530a2a5e69f27137c298f54d6ccfb269dd3 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Thu, 21 Sep 2023 19:03:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list2.vue      |  2 +-
 src/views/sunVillage_info/list_cbfsq.vue |  4 +++-
 src/views/sunVillage_info/list_cbht.vue  | 25 +++++++++++++++++++-----
 src/views/sunVillage_info/list_fbfsq.vue |  4 +++-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/views/homesteadSurvey/list2.vue b/src/views/homesteadSurvey/list2.vue
index f1e8db04..77442637 100644
--- a/src/views/homesteadSurvey/list2.vue
+++ b/src/views/homesteadSurvey/list2.vue
@@ -56,7 +56,7 @@
         </template>
       </van-search>
       <div style="background:#fff;padding:10px 2.5%;display: flex;justify-content: space-between;">
-        <van-button type="primary" style="width:110px;height: 20px;font-size: 12px;" round @click="onClickWcnh">增加外村农户</van-button>
+        <van-button type="primary" style="width:110px;height: 30px;font-size: 12px;" round @click="onClickWcnh">增加外村农户</van-button>
       </div>
     </van-sticky>
 
diff --git a/src/views/sunVillage_info/list_cbfsq.vue b/src/views/sunVillage_info/list_cbfsq.vue
index 62f63e99..48b9c507 100644
--- a/src/views/sunVillage_info/list_cbfsq.vue
+++ b/src/views/sunVillage_info/list_cbfsq.vue
@@ -11,7 +11,9 @@
       </div>
       <van-field readonly v-model="cbfTypeName" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false" />
       <van-field readonly v-model="form.cbfbm" label="承包方代码" placeholder="承包方代码" input-align="right" :border="false" />
-      <van-field readonly v-model="form.cbfmc" label="承包方名称" placeholder="承包方名称" input-align="right" :border="false" />
+      <van-cell title="承包方名称" style="color: #646566;">
+        <div style="color:#000000; ">{{form.cbfmc}}</div>
+      </van-cell>
       <van-field readonly v-model="zjlxName" label="承包方证件类型" placeholder="承包方证件类型" input-align="right" :border="false" />
       <van-field readonly v-model="form.cbfzjhm" label="承包方证件号码" placeholder="承包方证件号码" input-align="right" :border="false" />
       <van-field readonly v-model="form.lxdh" label="联系电话" placeholder="联系电话" input-align="right" :border="false" />
diff --git a/src/views/sunVillage_info/list_cbht.vue b/src/views/sunVillage_info/list_cbht.vue
index 4f83f96c..202b640b 100644
--- a/src/views/sunVillage_info/list_cbht.vue
+++ b/src/views/sunVillage_info/list_cbht.vue
@@ -32,16 +32,17 @@
               <div class="title">
                 <i class="icon_box" v-if="item.firstSigning == null"></i>
                 <i class="icon_box1" v-if="item.firstSigning != null"></i>
-                <p class="news_title" :style="{'color': item.firstSigning != null ? '#2bc30c' : '#eb1616'}">{{item.cbhtbm}}</p>
+                <p class="news_title">{{item.cbhtbm}}</p>
                 <p class="tips_mark"
                    :style="{'color': item.firstSigning != null ? '#79bc29' : '#f8a83d','background': item.firstSigning != null ? '#e8ffcd' : '#ffedcd'}">
-                  {{item.signingMode}}</p>
-                <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': item.firstSigning != null ? '#2bc30c' : '#eb1616'}">{{item.signingStatus}}</p>
+                {{item.signingMode}}</p>
+
+                <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': formatDict(item)}">{{item.signingStatus}}</p>
               </div>
               <div class="time">
-                <p style="color:#eb1616;">{{item.cbfmc}}</p>
+                <p >{{item.cbfmc}}</p>
 <!--                <p>{{item.cbhtmc}}</p>-->
-                <p style="color:#eb1616;font-weight: bold;">{{item.htzmjm.toFixed(2)}} 亩</p>
+                <p>{{item.htzmjm.toFixed(2)}} 亩</p>
               </div>
             </div>
           </div>
@@ -138,6 +139,7 @@
         htqsShow:false,
         noticeUrl:"",
         fileList: [],
+        signingStatusData:[],
         listLength: '0',
         queryParams: {
           pageNum: 1,
@@ -169,6 +171,9 @@
       if (this.$route.query.type == 'code') {
         this.showBtn = false;
       }
+      this.houseGetDicts("signing_status").then((res) => {
+        this.signingStatusData = res.data;
+      });
       this.height = window.screen.height * 1.28 - 20;
     },
     methods: {
@@ -197,6 +202,16 @@
 
         });
       },
+      formatDict(item){
+        console.info(this.signingStatusData);
+        let colorval = "";
+       this.signingStatusData.map(function (e){
+          if(item.signingStatus === e.dictLabel){
+            colorval =  e.remark;
+          }
+        })
+        return colorval;
+      },
       goDetail(id) {
         this.$router.push({
           path: '/sunVillage_info/list_cbht_detail',
diff --git a/src/views/sunVillage_info/list_fbfsq.vue b/src/views/sunVillage_info/list_fbfsq.vue
index 4f55d878..3fc24b41 100644
--- a/src/views/sunVillage_info/list_fbfsq.vue
+++ b/src/views/sunVillage_info/list_fbfsq.vue
@@ -10,7 +10,9 @@
         <p class="tit">发包方授权</p>
       </div>
       <van-field v-model="form.fbfbm" label="发包方代码" placeholder="发包方代码" input-align="right" :border="false" />
-      <van-field v-model="form.fbfmc" label="发包方名称" placeholder="发包方名称" input-align="right" :border="false" />
+      <van-cell title="发包方名称" style="color: #646566;">
+        <div style="color:#000000; ">{{form.fbfmc}}</div>
+      </van-cell>
       <van-field v-model="form.fbffzrxm" label="负责人名称" placeholder="负责人名称" input-align="right" :border="false" />
       <van-field v-model="form.fzrzjlx" label="证件类型" placeholder="证件类型" input-align="right" :border="false" />
       <van-field v-model="form.fzrzjhm" label="证件号码" placeholder="证件号码" input-align="right" :border="false" />