Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/BasicDocuments.vue

@@ -580,6 +580,8 @@
                         </div>
                     </template>
                 </div>
+                
+                <div style="margin-top: 102px;" class="page_fdd" v-if="isShowAttachment&&GetDetail.IsUploadPic===1">
                     <div v-if="saveMsg.length>0">
                         <div class="_addUpload_box _addUpload_box_btm clearfix" >
                           <template v-for="(file,fIndex) in saveMsg">
@@ -601,7 +603,6 @@
                       <div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=''">
                         <img :src="picObj" style="margin-top: 80px;"/>
                     </div>
-                <div style="margin-top: 80px;" class="page_fdd" v-if="isShowAttachment&&GetDetail.IsUploadPic===1">
                     <div class="_pic_upload">
                       <el-upload
                         drag
@@ -2631,7 +2632,6 @@ export default {
                 }
             }
         
-        
             let imgArr = [];
             this.uploadImgList.forEach(x=>{
                 imgArr.push(x.src);
@@ -2820,6 +2820,7 @@ export default {
             this.apipost('Financial_post_GetDetail',{ID:id,Type:2}, res => {
                 if(res.data.resultCode == 1) {
                     let data= res.data.data;
+                    this.benMoney = 0
                     data.DetailList.forEach(x=>{
                         x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
                         x.Money = Math.round(x.Money * 100) / 100