From 5fefdcd03cd36d841a20b8af8eca895f86b3e9ca Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Mon, 19 Dec 2022 11:38:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bankAgriculture/paymentApproval/approvalAdd.vue       | 8 ++++----
 .../bankAgriculture/paymentApproval/approvalDetail.vue    | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail11.vue  | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail12.vue  | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail2.vue   | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail3.vue   | 4 ++--
 .../bankAgriculture/paymentApproval/approvalModify.vue    | 4 ++--
 .../bankAgriculture/paymentApproval/approvalAdd.vue       | 6 +++---
 .../bankAgriculture/paymentApproval/approvalDetail.vue    | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail11.vue  | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail12.vue  | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail2.vue   | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail3.vue   | 4 ++--
 .../bankAgriculture/paymentApproval/approvalModify.vue    | 6 +++---
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
index 6a2fc6e5..6a3aefb3 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -289,7 +289,7 @@
           </van-popup>-->
         </div>
       </div>
-      <p class="main_title"  v-if="isModifyOrder">上传附件</p>
+      <p class="main_title"  v-if="isModifyOrder" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;"  v-if="isModifyOrder">
         <van-cell value="收据" />
         <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
@@ -306,10 +306,10 @@
         </van-row>
         <van-row v-else>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保存修改</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">修<i style="margin-right: 1em;"></i>改</van-button>
           </van-col>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">提<i style="margin-right: 1em;"></i>交</van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
@@ -372,7 +372,7 @@
         fileList1:[],
         fileList2:[],
         fileList3:[],
-        capitalExpenditureType:'',
+        capitalExpenditureType:'结算类',
         payee:'',
         bankType:'',
 
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
index 60801d7a..aa142b4e 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -72,8 +72,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue
index f8a65da3..3ed0973e 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue
@@ -64,8 +64,8 @@
         <van-field readonly label="申请使用金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="资金用途" v-model="item.remark" input-align="right" label-width="auto"/>
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail12.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail12.vue
index ea8f1090..7218a084 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail12.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail12.vue
@@ -116,8 +116,8 @@
         <van-field readonly label="负责人全称" v-model="item.leader" input-align="right" label-width="auto"/>
         <van-field readonly label="资金用途" v-model="item.remark" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
 
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail2.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail2.vue
index 6851ed3d..8afddfc9 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail2.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail2.vue
@@ -69,8 +69,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail3.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail3.vue
index 9247a86a..8aee54bd 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail3.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail3.vue
@@ -56,8 +56,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
index 1bccbd2e..55402962 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
@@ -288,7 +288,7 @@
           </van-popup>
         </div>
       </div>
-      <p class="main_title">上传附件</p>
+      <p class="main_title" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的保存按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;">
         <van-cell value="收据" />
         <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
@@ -303,7 +303,7 @@
             <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
           </van-col>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">提<i style="margin-right: 1em;"></i>交</van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
index 1b75a5ed..7772e862 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -289,7 +289,7 @@
           </van-popup>-->
         </div>
       </div>
-      <p class="main_title" v-if="isModifyOrder">上传附件</p>
+      <p class="main_title"  v-if="isModifyOrder" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;" v-if="isModifyOrder">
         <van-cell value="收据" />
         <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
@@ -307,7 +307,7 @@
         </van-row>
         <van-row v-else>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保存修改</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">修<i style="margin-right: 1em;"></i>改</van-button>
           </van-col>
           <van-col span="12" align="center">
             <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
@@ -373,7 +373,7 @@
         fileList1:[],
         fileList2:[],
         fileList3:[],
-        capitalExpenditureType:'',
+        capitalExpenditureType:'结算类',
         payee:'',
         bankType:'',
 
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
index 52b542e0..08ee0d72 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -72,8 +72,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
index 96329060..28f4dc36 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
@@ -64,8 +64,8 @@
         <van-field readonly label="申请使用金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="资金用途" v-model="item.remark" input-align="right" label-width="auto"/>
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue
index 7bfab55f..69264bdd 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue
@@ -116,8 +116,8 @@
         <van-field readonly label="负责人全称" v-model="item.leader" input-align="right" label-width="auto"/>
         <van-field readonly label="资金用途" v-model="item.remark" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
 
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
index 9d1e7f89..86371c7c 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
@@ -69,8 +69,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail3.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail3.vue
index 662c2e0e..8aed358f 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail3.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail3.vue
@@ -56,8 +56,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index 054bfc00..e6e3da4b 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -288,7 +288,7 @@
           </van-popup>
         </div>
       </div>
-      <p class="main_title">上传附件</p>
+      <p class="main_title"  v-if="isModifyOrder" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的保存按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;">
         <van-cell value="收据" />
         <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
@@ -303,7 +303,7 @@
             <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
           </van-col>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">提<i style="margin-right: 1em;"></i>交</van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
@@ -445,7 +445,7 @@
           this.payerOptions[index].value = res.id;
         })
       });
-      this.getFileList();
+      this.getDictionaries();
     },
 
     methods: {