Przeglądaj źródła

2022.8.8 从相册选择

ggooalice 2 lat temu
rodzic
commit
44cd0347a2

+ 3 - 3
fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -197,7 +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-checkbox v-model="dialogData.choseFromAlbum">是否开启从相册选择</el-checkbox></el-form-item>
                 <el-form-item>
                     日报审核模式:
                     <el-select v-model="dialogData.reportAuditType" size="small">
@@ -342,7 +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,'choseFromAlbum',res.data.choseFromAlbum ? true : false)
                             this.$set(this.dialogData,'reportAuditType',res.data.reportAuditType)
                         }else{
                             this.$message({
@@ -591,7 +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,
+                    choseFromAlbum: this.dialogData.choseFromAlbum ? 1 : 0,
                     reportAuditType: this.dialogData.reportAuditType
                 },res => {
                     if(res.code == 'ok'){

+ 16 - 13
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -51,7 +51,7 @@
     <!-- 内容主体区域 -->
   <div class="contents" v-if="allWrong">
     <div class="headine headConCon" ref="headine" :style="'width:'+(windowWidth - 400)+'px'">
-      <h3 ref="headHe" style="padding-left: 10px">{{shuz[ins]}}</h3>
+      <h3 ref="headHe" style="padding-left: 10px;float:left;">{{shuz[ins]}}</h3>
       <div class="headScreen">
       <!-- 客户项目利润表的筛选 -->
         <template v-if="ins == 4">
@@ -102,6 +102,11 @@
             <el-option v-for="(item, index) in selUserList" :key="index" :label="item.name" :value="item.id"></el-option>
           </el-select>
 
+          <!-- 待审核筛选切换 -->
+          <el-radio-group v-model="stateKey" size="small" v-if="ins == 10" style="margin-left:10px;margin-top:-3.33px" @change="getAuditRateList">
+            <el-radio-button :label="0">部门待审核</el-radio-button>
+            <el-radio-button :label="1">项目待审核</el-radio-button>
+          </el-radio-group>
           <!-- 项目阶段筛选 -->
           <el-select v-if="ins == 5" multiple v-model="stageNames" @visible-change="visibleSelcts" @clear="visibleSelcts(false)" clearable size="small" filterable collapse-tags placeholder="请选择阶段" style="margin-left:10px;">
             <el-option v-for="item in firstStages" :key="item" :label="item" :value="item"></el-option>
@@ -734,7 +739,7 @@ export default {
       shuz: ["项目报表","项目任务报表","项目成本报表",
       "项目收支平衡表(利润表)","客户项目利润报表","项目阶段工时表",
       "加班情况统计表","工时成本预警表","人员工时分配表",
-      "员工填报及时率统计","日报待审核统计","项目成本基线表"],
+      "员工填报及时率统计","日报待审核统计","人员工时统计表","任务分组工时表","项目成本基线表"],
       ins: 10000,
       user: JSON.parse(sessionStorage.user),
       overTimeList: [], // 项目加班情况统计列表
@@ -776,6 +781,8 @@ export default {
       groupSize: 20,
       groupTotal: 0,
 
+      stateKey: 0,
+
       outputValueList: [],
       outputValueTitle: []
     };
@@ -964,8 +971,6 @@ export default {
           }
           
         });
-
-        // console.log(sums, 123)
         this.$nextTick(()=>{ this.$refs.tab.doLayout()})
         return sums;
       },
@@ -1320,7 +1325,6 @@ export default {
         startDate: this.rangeDatas[0],
         endDate: this.rangeDatas[1],
       }
-      // console.log(this.userId == false)
       if(this.userId) {
         obj.userId = this.userId
       }
@@ -1380,7 +1384,6 @@ export default {
         pageSize: this.size,
         projectId: this.proJuctId
       }
-      console.log(this.taskTypeId)
       if(this.taskTypeId != 'null' && this.taskTypeId != null && this.taskTypeId != '') {
         ginseng.taskType = this.taskTypeId
       }
@@ -1423,7 +1426,6 @@ export default {
         });
     },
     visibleSelcts(e){
-      console.log('show show way',e);
       if(!e){
         this.getProjectStages(true)
       }
@@ -1453,7 +1455,6 @@ export default {
         res => {
             if (res.code == "ok") {
                 this.list5 = res.data.records;
-                // console.log(this.list);
                 this.total = res.data.total;
                 this.stages = res.data.stages;
                 if(!e){
@@ -1575,7 +1576,8 @@ export default {
         startDate: this.rangeDatas[0],
         endDate: this.rangeDatas[1],
         pageIndex: this.page,
-        pageSize: this.size
+        pageSize: this.size,
+        stateKey: this.stateKey
       }
       if(this.userId){
         parameter.userId = this.userId
@@ -1866,13 +1868,11 @@ export default {
         this.selUserList = this.userList
         this.userId = ''
       }
-      // console.log(this.customerId);
       this.getList()
       }
     },
     // 成本查看明细
     costBtn(item) {
-      // console.log(item, '明细')
       this.dialogVisibleDetails = true
       this.listLoading = true
       this.http.post('/project/getOvertimeDetail', {
@@ -1884,7 +1884,6 @@ export default {
       res => {
           this.listLoading = false
           if (res.code == "ok") {
-              // console.log(res.data, '看看详情数据')
               this.detailsList = res.data
           } else {
               this.$message({
@@ -1929,7 +1928,11 @@ export default {
 }
 /* 头部筛选 */
 .headScreen{
-  display: inline-block;
+  float: left;
+  display: flex;
+  height: 46.4px;
+  justify-content: space-between;
+  align-items: center;
   padding-left: 60px;
 }
 /* /费用报销标题 */

+ 2 - 2
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 && user.timeType.takePhoto" type="primary" size="large" @click="takePhoto(index)">拍照上传</van-tag>
+                        <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;" 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>
@@ -573,7 +573,7 @@
                 wx.chooseImage({
                     count: 9, // 默认9
                     sizeType: ['compressed'], // 可以指定是原图还是压缩图,默认二者都有
-                    sourceType: ['camera'], // 可以指定来源是相册还是相机,默认二者都有
+                    sourceType: that.user.timeType.choseFromAlbum == 1 ? ['camera','album'] : ['camera'], // 可以指定来源是相册还是相机,默认二者都有
                     defaultCameraMode: "batch", //表示进入拍照界面的默认模式,目前有normal与batch两种选择,normal表示普通单拍模式,batch表示连拍模式,不传该参数则为normal模式。从3.0.26版本开始支持front和batch_front两种值,其中front表示默认为前置摄像头单拍模式,batch_front表示默认为前置摄像头连拍模式。(注:用户进入拍照界面仍然可自由切换两种模式)
                     isSaveToAlbum: 0, //整型值,0表示拍照时不保存到系统相册,1表示自动保存,默认值是1
                     success: function (res) {