From d9963966e97070ccc96907db6d396f0ddfd93b88 Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Sun, 8 Oct 2023 10:58:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=93=B6=E5=86=9C=EF=BC=9A=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paymentApproval/approvalAdd.vue           | 33 ++++++++++++++++++-
 .../paymentApproval/approvalModify.vue        | 33 ++++++++++++++++++-
 .../paymentApproval/approvalAdd.vue           | 33 ++++++++++++++++++-
 .../paymentApproval/approvalModify.vue        | 33 ++++++++++++++++++-
 4 files changed, 128 insertions(+), 4 deletions(-)

diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
index 9ab21e15..8d31e97d 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -112,11 +112,42 @@
           label="转账附言"
           v-model="form.remark"
           type="textarea"
-          placeholder="请输入转账附言"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
           input-align="right"
           rows="3"
           label-width="auto"
+          maxlength="10"
           required
+          show-word-limit
+          v-show="form.bankType == '5'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          maxlength="20"
+          required
+          show-word-limit 
+          v-show="form.bankType == '6'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          maxlength="30"
+          required
+          show-word-limit 
+          v-show="form.bankType != '5' && form.bankType != '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
       </div>
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
index 6978f20e..fb7bf4c6 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
@@ -107,11 +107,42 @@
           label="转账附言"
           v-model="form.remark"
           type="textarea"
-          placeholder="请输入转账附言"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
           input-align="right"
           rows="3"
           label-width="auto"
+          maxlength="10"
           required
+          show-word-limit
+          v-show="form.bankType == '5'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          maxlength="20"
+          required
+          show-word-limit 
+          v-show="form.bankType == '6'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          maxlength="30"
+          required
+          show-word-limit 
+          v-show="form.bankType != '5' && form.bankType != '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
       </div>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
index 18d9cc03..0f2c1704 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -107,11 +107,42 @@
           label="转账附言"
           v-model="form.remark"
           type="textarea"
-          placeholder="请输入转账附言"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
           input-align="right"
           rows="3"
           label-width="auto"
+          maxlength="10"
           required
+          show-word-limit
+          v-show="form.bankType == '5'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          maxlength="20"
+          required
+          show-word-limit 
+          v-show="form.bankType == '6'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          maxlength="30"
+          required
+          show-word-limit 
+          v-show="form.bankType != '5' && form.bankType != '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
       </div>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index 613f5b66..8a481290 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -107,11 +107,42 @@
           label="转账附言"
           v-model="form.remark"
           type="textarea"
-          placeholder="请输入转账附言"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
           input-align="right"
           rows="3"
           label-width="auto"
+          maxlength="10"
           required
+          show-word-limit
+          v-show="form.bankType == '5'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          maxlength="20"
+          required
+          show-word-limit 
+          v-show="form.bankType == '6'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          maxlength="30"
+          required
+          show-word-limit 
+          v-show="form.bankType != '5' && form.bankType != '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
       </div>

From f114fb867cefaea373c86b5cbd50931207a6f1ce Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Sun, 8 Oct 2023 14:43:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?CSS=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_cbf.vue            | 2 +-
 src/views/sunVillage_info/list_cbfsq.vue          | 2 +-
 src/views/sunVillage_info/list_multipleLotsNh.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/sunVillage_info/list_cbf.vue b/src/views/sunVillage_info/list_cbf.vue
index a882a5eb..5547ab77 100644
--- a/src/views/sunVillage_info/list_cbf.vue
+++ b/src/views/sunVillage_info/list_cbf.vue
@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <div
       class="header_main"
-      :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
+      :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head_green.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
     >
       承包合同
       <div class="return_btn" @click="onClickLeft"></div>
diff --git a/src/views/sunVillage_info/list_cbfsq.vue b/src/views/sunVillage_info/list_cbfsq.vue
index d5381eae..b89648b5 100644
--- a/src/views/sunVillage_info/list_cbfsq.vue
+++ b/src/views/sunVillage_info/list_cbfsq.vue
@@ -456,7 +456,7 @@
     width: 100vw;
   .header_main {
     height: 116px;
-    background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background: url('../../assets/images/sunVillage_info/list_head_green.png') no-repeat;
     background-size: 100% 100%;
     position: fixed;
     top: 0;
diff --git a/src/views/sunVillage_info/list_multipleLotsNh.vue b/src/views/sunVillage_info/list_multipleLotsNh.vue
index 7c40c27a..448b7a5c 100644
--- a/src/views/sunVillage_info/list_multipleLotsNh.vue
+++ b/src/views/sunVillage_info/list_multipleLotsNh.vue
@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <div
       class="header_main"
-      :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
+      :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head_green.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
     >
       标段合同
       <div class="return_btn" @click="onClickLeft"></div>

From e45b5c9e42ed43df7d5a4d9d1d0ba09e75948fcb Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Sun, 8 Oct 2023 16:44:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=E4=B8=8A=E5=88=92=E5=88=86=E9=A1=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 886fe8f1..245656c8 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -414,7 +414,6 @@
           rhhcList(params).then(res => {
             this.list1 =  res.data.zjdzdxxList;
             if(res.data.zjdzdxxList.length>0&&res.data.zjdzdxxList.length<res.data.zjdzs){
-              this.countyhc++
               this.loading2 = false
               this.finished2 = false;
             }else{