From 105d51c2101e03ae0e34411638211b6d043d0cf3 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Thu, 21 Sep 2023 19:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=8C=85=E7=BD=91=E7=AD=BE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_cbf.vue  | 28 ++++++++++++++++++-------
 src/views/sunVillage_info/list_cbht.vue |  5 ++---
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/views/sunVillage_info/list_cbf.vue b/src/views/sunVillage_info/list_cbf.vue
index 17ec70cc..e5fafb4b 100644
--- a/src/views/sunVillage_info/list_cbf.vue
+++ b/src/views/sunVillage_info/list_cbf.vue
@@ -22,15 +22,15 @@
           <div class="item" @click="goDetail(item.id)">
             <div class="info">
               <div class="title">
-                <i class="icon_box" v-if="item.secondSigning==null"></i>
-                <i class="icon_box1" v-if="item.secondSigning!=null"></i>
-                <p class="news_title" :style="{'color': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.cbhtbm}}</p>
-                <p class="tips_mark" :style="{'color': item.secondSigning!=null?'#79bc29':'#f8a83d','background': item.secondSigning!=null?'#e8ffcd':'#ffedcd'}">{{item.signingMode}}</p>
-                <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.signingStatus}}</p>
+                <i class="icon_box" v-if="item.signingStatus =='合同筹备' || item.signingStatus =='合同待签' ||item.signingStatus =='单方已签'"></i>
+                <i class="icon_box1" v-if="item.signingStatus =='签字完成' || item.signingStatus =='合同归档'"></i>
+                <p class="news_title" >{{item.cbhtbm}}</p>
+                <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': formatDict(item)}">{{item.signingStatus}}</p>
+                <p class="tips_mark"   :style="{'background': item.signingMode === '线上'?'#F9BE0C':'#08BE4E'}">{{item.signingMode}}</p>
               </div>
               <div class="time">
-                <p style="color:#eb1616;">{{item.cbfmc}}</p>
-                <p style="color:#eb1616;font-weight: bold;">{{item.htzmjm.toFixed(2)}} 亩</p>
+                <p>{{item.cbfmc}}</p>
+                <p>{{item.htzmjm.toFixed(2)}} 亩</p>
               </div>
             </div>
           </div>
@@ -156,6 +156,9 @@
     created() {
       this.height = window.screen.height * 1.28 - 20;
       this.getCbfInfo();
+      this.houseGetDicts("signing_status").then((res) => {
+        this.signingStatusData = res.data;
+      });
       // this.queryParams.cbfbm = JSON.parse(Cookies.get('user')).idcard;
     },
     methods: {
@@ -260,6 +263,15 @@
           this.$notify({ type: 'success', message: '删除成功' });
         });
       },
+      formatDict(item){
+        let colorval = "";
+        this.signingStatusData.map(function (e){
+          if(item.signingStatus === e.dictLabel){
+            colorval =  e.remark;
+          }
+        })
+        return colorval;
+      },
       signaImgFun(url) {
         this.signatureImg = url;
       },
@@ -511,7 +523,7 @@
               background: #ffedcd;
               border-radius: 8px;
               font-size: 24px;
-              color: #f8a83d;
+              color: #ffffff;
               text-align: center;
               line-height: 34px;
               flex-shrink: 0;
diff --git a/src/views/sunVillage_info/list_cbht.vue b/src/views/sunVillage_info/list_cbht.vue
index 001d6dd7..99aae2ba 100644
--- a/src/views/sunVillage_info/list_cbht.vue
+++ b/src/views/sunVillage_info/list_cbht.vue
@@ -30,8 +30,8 @@
           <div class="item" @click="goDetail(item.id)">
             <div class="info">
               <div class="title">
-                <i class="icon_box" v-if="item.firstSigning == null"></i>
-                <i class="icon_box1" v-if="item.firstSigning != null"></i>
+                <i class="icon_box" v-if="item.signingStatus =='合同筹备' || item.signingStatus =='合同待签' ||item.signingStatus =='单方已签'"></i>
+                <i class="icon_box1" v-if="item.signingStatus =='签字完成' || item.signingStatus =='合同归档'"></i>
                 <p class="news_title" >{{item.cbhtbm}}</p>
                 <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': formatDict(item)}">{{item.signingStatus}}</p>
                 <p class="tips_mark"
@@ -202,7 +202,6 @@
         });
       },
       formatDict(item){
-        console.info(this.signingStatusData);
         let colorval = "";
        this.signingStatusData.map(function (e){
           if(item.signingStatus === e.dictLabel){