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

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/fillReport.vue

@@ -226,6 +226,7 @@ export default {
         .then(res => {
           this.saving = false;
           if (res.code == "ok") {
+            this.$toast.success('提交成功')
           } else {
             this.$toast.fail(res.msg);
           }

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

@@ -422,7 +422,7 @@
                                 placeholder="请输入加班时长" style="width: 5.2rem" @input="$forceUpdate()"></van-field>
                             <span :class="item.canEdit ? 'overListTime' : 'overListTime hoveOver'">小时</span>
                         </div>
-                        <van-tag style="position:absolute;right:10px;" v-if="isCorpWX && item.canEdit" type="primary"
+                        <van-tag style="position:absolute;right:10px;" v-if="user.companyId != 4281 && isCorpWX && item.canEdit" type="primary"
                             size="large" @click="takePhoto(index)">拍照上传</van-tag>
                         <!-- <van-tag style="position:absolute;right:10px;" type="primary" size="large" @click="takePhoto(index)">拍照上传</van-tag> -->
                         <!-- <van-tag style="position:absolute;right:10px;" type="primary" size="large" @click="takePhoto(index)">拍照上传</van-tag> -->
@@ -2668,7 +2668,7 @@ export default {
         this.timeRange = []
         let i = 0.0; 
         while(true) {
-            if (i < 24) {
+            if (i < 48) {
                 //校验上下限
                 if (i >= this.user.timeType.minReportTime && i <= this.user.timeType.maxReportTime) {
                     this.timeRange.push(i);

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

@@ -362,7 +362,7 @@
                                 placeholder="请输入加班时长" style="width: 5rem"></van-field>
                                 <span :class="'overListTime'">小时</span>    
                             </div>
-                            <van-tag style="position:absolute;right:10px;" v-if="isCorpWX" type="primary" size="large" @click="takePhoto(index)">拍照上传</van-tag>
+                            <van-tag v-if="user.companyId != 4281&& isCorpWX&&canEdit"  style="position:absolute;right:10px;" v-if="isCorpWX" type="primary" size="large" @click="takePhoto(index)">拍照上传</van-tag>
                         </div>
                         <div style="padding:5px;text-align:center;" v-if="!isIOSystem">
                             <span v-for="(p, index) in item.pics"  :key="p" style="margin-right:15px;">