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

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:'',
 

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>

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>

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>
 
 

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>

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>

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>

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,10 +307,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>
@@ -373,7 +373,7 @@
         fileList1:[],
         fileList2:[],
         fileList3:[],
-        capitalExpenditureType:'',
+        capitalExpenditureType:'结算类',
         payee:'',
         bankType:'',
 

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>

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>

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>
 
 

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>

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>

src/views/yinnong/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>
@@ -445,7 +445,7 @@
           this.payerOptions[index].value = res.id;
         })
       });
-      this.getFileList();
+      this.getDictionaries();
     },
 
     methods: {