Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet_h5/src/main.js

@@ -13,13 +13,13 @@ import "@/components/Vant";
 
 import { Form , Toast , Grid, GridItem , DatetimePicker ,
 Picker , Dialog , NumberKeyboard , Sticky , Skeleton ,
-Panel , Divider , List , pullRefresh , SwipeCell, Checkbox, Search, Slider,Stepper,Tag, Calendar, Row, Col, RadioGroup, Radio } from 'vant';
+Panel , Divider , List , pullRefresh , SwipeCell, Checkbox, Search, Slider,Stepper,Tag, Calendar, Row, Col, RadioGroup, Radio, Loading } from 'vant';
 
 Vue.use(Form).use(Toast).use(Grid).use(GridItem).use(DatetimePicker)
 .use(Picker).use(Dialog).use(NumberKeyboard).use(Sticky).use(Skeleton)
 .use(Panel).use(Divider).use(List).use(pullRefresh).use(SwipeCell)
 .use(Checkbox).use(Search).use(Slider).use(Stepper).use(Tag).use(Calendar).use(RadioGroup).use(Radio)
-.use(Row).use(Col);
+.use(Row).use(Col).use(Loading);
 
 // rem
 import "amfe-flexible";

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -254,8 +254,14 @@
             </div>  
             <div class="form_btn" style="position:fixed; bottom:0px;width:100%;">
                 <div style="padding-bottom:10px;">
-                    <van-button v-if="canEdit" square block type="info" @click="isDraft=0" native-type="submit" style="width:50%;float:left;"> 提交 </van-button>
-                    <van-button v-if="canEdit" square block type="default" @click="isDraft=1" native-type="submit" style="width:50%;float:left;"> 暂存 </van-button>
+                    <van-button v-if="canEdit" square block type="info" @click="isDraft=0" native-type="submit" style="width:50%;float:left;">
+                        <div v-if="flgLg">提交</div>
+                        <van-loading type="spinner" v-if="!flgLg" />
+                    </van-button>
+                    <van-button v-if="canEdit" square block type="default" @click="isDraft=1" native-type="submit" style="width:50%;float:left;">
+                        <div v-if="flgLg">暂存</div>
+                        <van-loading type="spinner" v-if="!flgLg" />
+                    </van-button>
                 </div>
                  <van-button v-if="canEdit&&form.domains.length>0 && form.domains[0].id != null" 
                         square block type="default" @click="deleteReport" native-type="button" 
@@ -359,7 +365,8 @@
                 projectss: [],
                 proads: [],
                 userName: '',
-                proIdx: ''
+                proIdx: '',
+                flgLg: true
             };
         },
 
@@ -1345,10 +1352,13 @@
                         return;
                     }
                 }
-                
-
+                if(!this.flgLg) {
+                    return
+                }
+                this.flgLg = false
                 this.$axios.post("/report/editReport", formData)
                 .then(res => {
+                    this.flgLg = true
                     if(res.code == "ok") {
                         toast.clear();
                         this.$toast.success(this.isDraft==0?'提交成功':'暂存成功');
@@ -1357,7 +1367,7 @@
                         toast.clear();
                         this.$toast.fail((this.isDraft==0?'提交失败':'暂存失败')+'：'+res.msg);
                     }
-                }).catch(err=> {toast.clear();});
+                }).catch(err=> {toast.clear(); this.flgLg = true});
             },
             //初始化参数
             initWxConfig() {