h5

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

@@ -209,6 +209,7 @@
                 <el-form-item><el-checkbox v-model="dialogData.notAllowedNoAttendance">是否开启考勤为0不可填报</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.stageHasEvtime">是否开启预估工时</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.financeAudit">财务导入是否需要审核</el-checkbox></el-form-item>
+                <el-form-item><el-checkbox v-model="dialogData.includeWeekends">批量填报是否包含周末</el-checkbox></el-form-item>
                 <el-form-item>
                     日报审核模式：
                     <el-select v-model="dialogData.reportAuditType" size="small">
@@ -371,6 +372,7 @@
                             this.$set(this.dialogData,'notAllowedNoAttendance',res.data.notAllowedNoAttendance ? true : false)
                             this.$set(this.dialogData,'stageHasEvtime',res.data.stageHasEvtime ? true : false)
                             this.$set(this.dialogData,'financeAudit',res.data.financeAudit ? true : false)
+                            this.$set(this.dialogData,'includeWeekends',res.data.includeWeekends ? true : false)
                             this.$set(this.dialogData,'reportAuditType',res.data.reportAuditType)
                         }else{
                             this.$message({
@@ -646,6 +648,7 @@
                     reportAutoApprove: this.dialogData.reportAutoApprove ? 1 : 0,
                     notAllowedNoAttendance: this.dialogData.notAllowedNoAttendance ? 1 : 0,
                     stageHasEvtime: this.dialogData.stageHasEvtime ? 1 : 0,
+                    includeWeekends: this.dialogData.includeWeekends ? 1 : 0,
                     reportAuditType: this.dialogData.reportAuditType
                 },res => {
                     if(res.code == 'ok'){

fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/details.vue

@@ -11,9 +11,12 @@
                 clickable
                 required
             >
-                <template #input>{{ formshowText.name }}</template>
+                <template #input>
+                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='formshowText.name'></ww-open-data></span>
+                    <span v-else>{{formshowText.name}}</span>
+                </template>
             </van-field>
-            <van-popup v-model="ownerIdShow" position="bottom" v-if="canEdit && canExamine">
+            <van-popup v-model="ownerIdShow" position="bottom" v-if="false">
                 <van-picker
                     value-key="name"
                     show-toolbar
@@ -310,9 +313,9 @@ export default {
         
         this.getDetail()
         if(this.canEdit){
-            if(this.canExamine){
-                this.getUserList()
-            }
+            // if(this.canExamine){
+            //     this.getUserList()
+            // }
             this.getProjectList()
         }
     },
@@ -489,6 +492,9 @@ export default {
         z-index: 1000;
     }
     .edit_form{
+        .userCheckbox {
+            padding: 10px;
+        }
         padding-bottom: 46px;
         .invoice{
             border: 0.5px solid rgb(135, 195, 255);

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

@@ -12,15 +12,23 @@
             <van-form class="edit_form" label-width="140">
                 <!-- 报销人 -->
                 <van-field v-model="editForm.ownerId" label="报销人" @click="ownerIdShow = true" readonly clickable required>
-                    <template #input>{{formshowText.name}}</template>
+                    <template #input>
+                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='formshowText.name'></ww-open-data></span>
+                        <span v-else>{{formshowText.name}}</span>
+                    </template>
                 </van-field>
                 <van-popup v-model="ownerIdShow" position="bottom" v-if="canExamine">
-                    <van-picker
-                    value-key="name"
-                    show-toolbar
-                    :columns="userList"
-                    @confirm="ownerIdChange"
-                    @cancel="ownerIdShow = false;$forceUpdate();"/>
+                    <div style="minHeight:300px;">
+                        <van-radio-group v-model="userRadio" v-if="user.userNameNeedTranslate == '1'">
+                            <van-radio v-for="item in userList" :key="item.id" :name="item" class="userCheckbox">
+                                <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                            </van-radio>
+                        </van-radio-group>
+                        <van-radio-group v-model="userRadio" v-else>
+                            <van-radio v-for="item in userList" :key="item.id" :name="item" class="userCheckbox">{{item.name}}</van-radio>
+                        </van-radio-group>
+                        <van-button style="width:100%;position: -webkit-sticky;position: sticky;bottom: 0;" @click="ownerIdChange()">确定</van-button>
+                    </div>
                 </van-popup>
                 <!-- 填报日期 -->
                 <van-field v-model="editForm.createDate" label="填报日期" @click="createDateShow = true" readonly clickable required></van-field>
@@ -138,14 +146,20 @@
                 <van-collapse-item v-for="item in billList" :key="item.id" title="标题1" :name="item.id">
                     <template #title>
                         <div class="collapse_label_l">票据编号：{{item.code}}</div>
-                        <div class="collapse_label_r">报销人：{{item.ownerName}}</div>
+                        <div class="collapse_label_r">报销人：
+                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                            <span v-else>{{item.ownerName}}</span>
+                        </div>
                         <div class="collapse_label_l">金额： ￥{{item.totalAmount | numtosum}}</div>
                         <div class="collapse_label_r">状态：<span :class="statusClass[item.status]">{{statusList[item.status]}}</span></div>
                     </template>
                     <div class="wrapper">
                         <div><span>票据编号：</span><span>{{item.code}}</span></div>
                         <div><span>金额：</span><span>￥{{item.totalAmount | numtosum}}</span></div>
-                        <div><span>报销人：</span><span>{{item.ownerName}}</span></div>
+                        <div><span>报销人：</span>
+                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                            <span v-else>{{item.ownerName}}</span>
+                        </div>
                         <div><span>填报日期：</span><span>{{item.createDate}}</span></div>
                         <div><span>发票张数：</span><span>{{item.ticketNum}}</span></div>
                         <div><span>费用类型：</span><span>{{typeList[item.type]}}</span></div>
@@ -167,7 +181,10 @@
                 <van-collapse-item v-for="item in examineList" :key="item.id" title="标题2" :name="item.id">
                     <template #title>
                         <div class="collapse_label_l">票据编号：{{item.code}}</div>
-                        <div class="collapse_label_r">报销人：{{item.ownerName}}</div>
+                        <div class="collapse_label_r">报销人：
+                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                            <span v-else>{{item.ownerName}}</span>
+                        </div>
                         <div class="collapse_label_l">金额： ￥{{item.totalAmount | numtosum}}</div>
                         <div class="collapse_label_r">状态：<span :class="statusClass[item.status]">{{statusList[item.status]}}</span></div>
                         <div class="operation">
@@ -178,7 +195,10 @@
                     <div class="wrapper">
                         <div><span>票据编号：</span><span>{{item.code}}</span></div>
                         <div><span>金额：</span><span>￥{{item.totalAmount | numtosum}}</span></div>
-                        <div><span>报销人：</span><span>{{item.ownerName}}</span></div>
+                        <div><span>报销人：</span>
+                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                            <span v-else>{{item.ownerName}}</span>
+                        </div>
                         <div><span>填报日期：</span><span>{{item.createDate}}</span></div>
                         <div><span>发票张数：</span><span>{{item.ticketNum}}</span></div>
                         <div><span>费用类型：</span><span>{{typeList[item.type]}}</span></div>
@@ -219,6 +239,7 @@ export default {
                 type: 0,
                 remark: ''
             },
+            userRadio: null,
             ownerIdShow: false,
             createDateShow: false,
             typeShow: false,
@@ -289,8 +310,9 @@ export default {
         if(!this.canExamine){
             this.editForm.ownerId = this.user.id
             this.formshowText.name = this.user.name
+        }else{
+            this.getUserList()
         }
-        this.getUserList()
         this.getProjectList()
         this.getExTypeList()
     },
@@ -326,9 +348,9 @@ export default {
         },
 
     // #region 费用报销
-        ownerIdChange(value,key){
-            this.editForm.ownerId = value.id
-            this.formshowText.name = value.name
+        ownerIdChange(){
+            this.editForm.ownerId = this.userRadio.id
+            this.formshowText.name = this.userRadio.name
             this.ownerIdShow = false
         },
         createDateChange(value,key){
@@ -576,6 +598,9 @@ export default {
     margin-top: 46px;
     overflow: auto;
     .edit{
+        .userCheckbox {
+            padding: 10px;
+        }
         padding-bottom: 46px;
         .form_btn{
             z-index: 1000;

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

@@ -11,9 +11,9 @@
             :to="item.url">
             </van-grid-item>
         </van-grid>
-        <div class="tip"  v-if="isCorpWX">
+        <!-- <div class="tip"  v-if="isCorpWX">
             工时报表统计等更多功能，请从PC端企业微信进入
-        </div>
+        </div> -->
         <div class="tip"  v-if="!isCorpWX">
             体验报表统计等更多功能，尽在PC端<br>
             网页用户访问http://worktime.ttkuaiban.com，钉钉用户直接从钉钉PC端进入工时管家

fhKeeper/formulahousekeeper/timesheet_h5/src/views/my/children/center.vue

@@ -16,7 +16,7 @@
                 <van-cell title="账号" :title-style="'flex: 0.5;'" :value="userInfo.phone"></van-cell>
                 <van-cell title="工号" :title-style="'flex: 0.5;'" :value="userInfo.jobNumber"></van-cell>
                 <van-cell title="公司" :title-style="'flex: 0.5;'" :value="userInfo.companyName"></van-cell>
-                <van-cell title="修改密码" isLink to="/my/set"></van-cell>
+                <!-- <van-cell title="修改密码" isLink to="/my/set"></van-cell> -->
             </div>
             <van-cell :title="'绑定'+(isCorpWX?'企业':'')+'微信'" v-if="isCorpWX || isWX" @click="bindWeiXin" style="margin-top:10px;" :title-style="'flex: 2.5;'" label="绑定微信后可接收工时填报提醒">
                 <template>