2022.8.8 拍照上传控制

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -197,6 +197,7 @@
                 <el-form-item><el-checkbox v-model="dialogData.onlyImportreport">是否仅使用导入日报审核（不要项目审核）</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.projectLevelState">是否开启项目级别自定义</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.outputValueStatus">是否开启项目产值字段</el-checkbox></el-form-item>
+                <el-form-item><el-checkbox v-model="dialogData.takePhoto">是否开启拍照上传功能</el-checkbox></el-form-item>
                 <el-form-item>
                     日报审核模式：
                     <el-select v-model="dialogData.reportAuditType" size="small">
@@ -341,6 +342,7 @@
                             this.$set(this.dialogData,'onlyImportreport',res.data.onlyImportreport ? true : false)
                             this.$set(this.dialogData,'projectLevelState',res.data.projectLevelState ? true : false)
                             this.$set(this.dialogData,'outputValueStatus',res.data.outputValueStatus ? true : false)
+                            this.$set(this.dialogData,'takePhoto',res.data.takePhoto ? true : false)
                             this.$set(this.dialogData,'reportAuditType',res.data.reportAuditType)
                         }else{
                             this.$message({
@@ -589,6 +591,7 @@
                     onlyImportreport: this.dialogData.onlyImportreport ? 1 : 0,
                     projectLevelState: this.dialogData.projectLevelState ? 1 : 0,
                     outputValueStatus: this.dialogData.outputValueStatus ? 1 : 0,
+                    // takePhoto: this.dialogData.takePhoto ? 1 : 0,
                     reportAuditType: this.dialogData.reportAuditType
                 },res => {
                     if(res.code == 'ok'){

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

@@ -246,7 +246,7 @@
                             placeholder="请输入加班时长" style="width: 5rem"></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" size="large" @click="takePhoto(index)">拍照上传</van-tag>
+                        <van-tag style="position:absolute;right:10px;" v-if="isCorpWX&&item.canEdit && user.timeType.takePhoto" 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> -->
                     </div>
@@ -278,7 +278,7 @@
             </div>
             <div style="text-align:center;" >
             <van-tag size="large" style="text-align:center;margin:10px;padding:12px;margin-bottom:120px;border: 1px solid #20a0ff;"
-                :disabled="!canEdit" @click="addNewPro" 
+                 @click="addNewPro" 
                 icon="plus" color="#ffffff" ><span style="color:#999;text-align:center;padding: 0 50px;"> + 新增{{user.companyId==781?'任务':'项目'}}  </span></van-tag>
             </div>  
             <div class="form_btn" style="position:fixed; bottom:0px;width:100%;">
@@ -292,9 +292,10 @@
                         <van-loading type="spinner" v-if="!flgLg" />
                     </van-button>
                 </div>
-                 <van-button v-if="canDeleteReport" 
+                <van-button v-if="canDeleteReport" 
                         square block type="default" @click="deleteReport" native-type="button" 
                     style=""> 删除 </van-button>
+                <van-button  v-if="canCancelInDialog" block type="default" @click="cancel"> 撤销 </van-button>
                 <!-- <div v-if="canEdit&&form.domains.length>0 && form.domains[0].id != null"
                     style="display:block;padding-top:30px;font-size:15px;color:#666;margin:0 auto;text-align:center;padding-bottom:10px;background:#ffffff;" 
                     @click="deleteReport"> 删除 </div> -->
@@ -302,9 +303,7 @@
                     style="margin-top:10px;"> 删除 </van-button> -->
             </div>
         </van-form>
-        <div style="position:fixed; bottom:0px;width:100%;">
-            <van-button  v-if="canCancelInDialog" block type="default" @click="cancel"> 撤销 </van-button>
-        </div>
+        
         
         <div class="form_tip" v-if="!canEdit && !canCancel"> 已审核无法修改 </div>
 
@@ -1276,6 +1275,8 @@
                 }
                 this.form.domains.push(item)
                 this.canEdit = true
+                this.$forceUpdate()
+                console.log('cancanneed',this.flgLg);
             },
 
             // 移除项目