Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

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{

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>

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>

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>

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;

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>

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>

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>