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

fhKeeper/formulahousekeeper/inva_4_tivo/about.html

@@ -59,8 +59,8 @@
                 <div class="flexs">
                     <ul class="navigationUl fonsColorBai auss">
                         <!-- <li class="til"><a href="#">咨询客服</a></li> -->
-                        <li class="til"><a href="http://worktime.ttkuaiban.com/#/register">立即注册</a></li>
-                        <li class="til"><a href="http://worktime.ttkuaiban.com/#/login">后台登录</a></li>
+                        <!-- <li class="til"><a href="http://worktime.ttkuaiban.com/#/register">立即注册</a></li>
+                        <li class="til"><a href="http://worktime.ttkuaiban.com/#/login">后台登录</a></li> -->
                     </ul>
                 </div>
             </div>
@@ -110,7 +110,7 @@
                         <h2>联系我们</h2>
                         <p>
                             邮编：211001<br>
-                            地址：南京市江宁区秣周东路12号未来网络小镇3号楼P346室<br>
+                            地址：南京市江宁区秣周东路12号未来网络小镇4号楼U403室<br>
                             联系电话：15895914665<br>
                             邮箱：quyueting@huoshishanxin.com<br>
                             QQ: 3052894409<br>

fhKeeper/formulahousekeeper/inva_4_tivo/css/customer.css

@@ -94,7 +94,7 @@ html {font-size: 10px; -webkit-text-size-adjust:none; -webkit-tap-highlight-colo
     content:"";
     height: .125rem;
     width: 100%;
-    bottom: 1rem;
+    bottom: 0rem;
     left: 0;
     background: #37B8FF;
     position: absolute;
@@ -138,7 +138,7 @@ html {font-size: 10px; -webkit-text-size-adjust:none; -webkit-tap-highlight-colo
     content:"";
     height: .125rem;
     width: 100%;
-    bottom: 1rem;
+    bottom: 0rem;
     left: 0;
     background: #37B8FF;
     position: absolute;

fhKeeper/formulahousekeeper/inva_4_tivo/css/followup.css

@@ -81,7 +81,7 @@ html {font-size: 10px; -webkit-text-size-adjust:none; -webkit-tap-highlight-colo
     top: 6.25rem;
     left: 0;
     background: #fff;
-    height: 18.75rem;
+    height: 20.75rem;
     border-top: .0625rem solid rgb(163, 163, 163);
     box-shadow: 1px 3px 5px 0px #ddd;
 }
@@ -94,7 +94,7 @@ html {font-size: 10px; -webkit-text-size-adjust:none; -webkit-tap-highlight-colo
     content:"";
     height: .125rem;
     width: 100%;
-    bottom: 1rem;
+    bottom: 0rem;
     left: 0;
     background: #37B8FF;
     position: absolute;

fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css

@@ -157,7 +157,7 @@
     left: 0;
     background: #fff;
     /* height: 18.75rem; */
-    height: 23.1rem;
+    height: 26.1rem;
     border-top: .0625rem solid rgb(163, 163, 163);
 }
 .connont {

fhKeeper/formulahousekeeper/inva_4_tivo/css/projectt.css

@@ -822,7 +822,7 @@ html {font-size: 10px; -webkit-text-size-adjust:none; -webkit-tap-highlight-colo
     top: 6.25rem;
     left: 0;
     background: #fff;
-    height: 18.75rem;
+    height: 20.75rem;
     border-top: .0625rem solid rgb(163, 163, 163);
     box-shadow: 1px 3px 5px 0px #ddd;
 }
@@ -879,7 +879,7 @@ html {font-size: 10px; -webkit-text-size-adjust:none; -webkit-tap-highlight-colo
     content:"";
     height: .125rem;
     width: 100%;
-    bottom: 1rem;
+    bottom: 0rem;
     left: 0;
     background: #37B8FF;
     position: absolute;

fhKeeper/formulahousekeeper/inva_4_tivo/customer.html

@@ -20,7 +20,7 @@
             <div class="navigationBarBack" id="all"></div>
             <div class="navigationTitle abc" id="abc">
                 <div class="flexs">
-                    <div class="inBlock"><a href="./index.html"><img id="loGo" src="./image/logo.jpg" alt=""></a></div>
+                    <div class="inBlock"><a href="./index.html"><img id="loGo" src="./image/logo.png" alt=""></a></div>
                     <div class="inBlock">
                         <ul class="navigationUl fonsColorBai aus">
                             <li class="til" id="productHov">产品矩阵</li>
@@ -301,10 +301,10 @@
                             <p>CRM系统使我们更便捷地处理客户信息，<br/>
                                 进行针对性地跟进、更精准提供服务，<br/>
                                 客户维护效率大大提升。</p>
-                            <div class="evaluationConLiRightBtn">
+                            <!-- <div class="evaluationConLiRightBtn">
                                 <span>了解更多</span>
                                 <img src="./image/customer/xiaojianto.png" alt="">
-                            </div>
+                            </div> -->
                         </div>
                     </div>
 
@@ -316,10 +316,10 @@
                                 购买记录和与客户的沟通记录，
                                 并让公司中需要这些数据的任何人都可以在授权后轻松访问、
                                 并且可以提供更好的客户体验，从而提高客户满意度</p>
-                            <div class="evaluationConLiRightBtn">
+                            <!-- <div class="evaluationConLiRightBtn">
                                 <span>了解更多</span>
                                 <img src="./image/customer/xiaojianto.png" alt="">
-                            </div>
+                            </div> -->
                         </div>
                     </div>
 
@@ -331,10 +331,10 @@
                                 自动化关键任务并在一个集中界面分析所有销售数据，
                                 从而潜在地提高销售额和生产力，可以帮助建立一个规范的渐进的销售流程，
                                 您的员工每次都可以依赖该流程</p>
-                            <div class="evaluationConLiRightBtn">
+                            <!-- <div class="evaluationConLiRightBtn">
                                 <span>了解更多</span>
                                 <img src="./image/customer/xiaojianto.png" alt="">
-                            </div>
+                            </div> -->
                         </div>
                     </div>
 
@@ -345,10 +345,10 @@
                             <p>成百上千个联系人的列表可能会让你的系统变得笨拙和低效。
                                 客户管家会自动细分联系人列表，以便在任何给定时间轻松找到想要联系的人。
                                 您可以按各种筛选条件等对联系人进行排序。</p>
-                            <div class="evaluationConLiRightBtn">
+                            <!-- <div class="evaluationConLiRightBtn">
                                 <span>了解更多</span>
                                 <img src="./image/customer/xiaojianto.png" alt="">
-                            </div>
+                            </div> -->
                         </div>
                     </div>
                 </div>

fhKeeper/formulahousekeeper/inva_4_tivo/followup.html

@@ -20,7 +20,7 @@
             <div class="navigationBarBack" id="all"></div>
             <div class="navigationTitle abc" id="abc">
                 <div class="flexs">
-                    <div class="inBlock"><a href="./index.html"><img id="loGo" src="./image/logo.jpg" alt=""></a></div>
+                    <div class="inBlock"><a href="./index.html"><img id="loGo" src="./image/logo.png" alt=""></a></div>
                     <div class="inBlock">
                         <ul class="navigationUl fonsColorBai aus">
                             <li class="til" id="productHov">产品矩阵</li>

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -16,7 +16,7 @@
     <script src="js/jquery1.42.min.js"></script>
     <script src="js/jquery.SuperSlide.2.1.3.js"></script>
     <!-- 统计文件 -->
-    <script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script>
+    <!-- <script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script>
     <script>LA.init({id: "Jk62Sh8gvUhl1xcU",ck: "Jk62Sh8gvUhl1xcU"})</script>
     <script>
         let str = (navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)) ? 'app': 'pc';
@@ -28,7 +28,7 @@
             let url = urlArr[0] + 'ttkuaiban.com/homemovement.html'
             window.location.replace(url)
         }
-    </script>
+    </script> -->
     <script>
         function bodyScale() {
             var devicewidth = document.documentElement.clientWidth;

fhKeeper/formulahousekeeper/inva_4_tivo/js/customer.js

@@ -11,10 +11,12 @@ $(window).scroll(function () {
         $('#all').removeClass('hanAll')
         $('#abc').addClass('abc')
         $('#navigationBar').removeClass('white')
+        $("#loGo").attr("src", './image/logo.png')
     } else {
         $("#all").addClass("hanAll");
         $("#abc").removeClass("abc");
         $("#navigationBar").addClass("white");
+        $("#loGo").attr("src", './image/logo.jpg')
     }
 
     // 客户管家滚动计算

fhKeeper/formulahousekeeper/inva_4_tivo/js/followup.js

@@ -11,10 +11,12 @@ $(window).scroll(function () {
         $('#all').removeClass('hanAll')
         $('#abc').addClass('abc')
         $('#navigationBar').removeClass('white')
+        $("#loGo").attr("src", './image/logo.png')
     } else {
         $("#all").addClass("hanAll");
         $("#abc").removeClass("abc");
         $("#navigationBar").addClass("white");
+        $("#loGo").attr("src", './image/logo.jpg')
     }
     // 智能随访滚动计算
     if(currentTop > collaborationTeamHight && currentTop < (collaborationTeamHight + screenHeight)) {

fhKeeper/formulahousekeeper/inva_4_tivo/js/index.js

@@ -57,7 +57,7 @@ if(document.documentElement.clientWidth < 1900) {
     znyqss = znyq * scale
     jiesaoss = jiesao * scale
     tooltips = tooltipsOffTop * scale
-} else {
+} else { 
     filss = fill
     tooltips = tooltipsOffTop
 }

fhKeeper/formulahousekeeper/inva_4_tivo/js/project.js

@@ -11,9 +11,11 @@ $(window).scroll(function () {
     if(currentTop < 2) {
         $('#all').removeClass('hanAll')
         $('#abc').addClass('abc')
+        // $("#loGo").attr("src", './image/logo.png')
     } else {
         $("#all").addClass("hanAll");
         $("#abc").removeClass("abc");
+        // $("#loGo").attr("src", './image/logo.jpg')
     }
     // 团队协作滚动计算
     if(currentTop > collaborationTeamHeight && currentTop < (collaborationTeamHeight + screenHeight)) {

fhKeeper/formulahousekeeper/inva_4_tivo/workshop.html

@@ -62,7 +62,7 @@
           <div class="navigationBarBack" id="all"></div>
           <div class="navigationTitle abc" id="abc">
               <div class="flexs">
-                  <div class="inBlock"><a href="./index.html"><img id="loGo" src="./image/logo.jpg" alt=""></a></div>
+                  <div class="inBlock"><a href="./index.html"><img id="loGo" src="./image/logo.png" alt=""></a></div>
                   <div class="inBlock">
                       <ul class="navigationUl fonsColorBai aus">
                           <li class="til" id="productHov">产品矩阵</li>

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/statistic/index.vue

@@ -38,16 +38,16 @@
           <!-- 部门筛选 -->
           <el-cascader v-model="departmentIdArray" :options="departmentList" :placeholder="$t('qing-xuan-ze-bu-men')"
             :props="{ checkStrictly: true,expandTrigger: 'hover',multiple: ins == 6 ? true : false }" collapse-tags :show-all-levels="false" clearable
-            @change="selcts()" size="small" style="margin-bottom: 10px"
+            @change="selcts()" size="small" style="margin-bottom: 10px;width:180px"
           ></el-cascader>
 
           <!-- 人员筛选 -->
-          <el-select v-if="ins!=4" v-model="userId" :placeholder="$t('pleaseselectpersonnel')" @change="selcts()" clearable filterable size="small" style="width:200px">
+          <el-select v-if="ins!=4" v-model="userId" :placeholder="$t('pleaseselectpersonnel')" @change="selcts()" clearable filterable size="small" style="width:120px">
             <el-option v-for="(item, index) in selUserList" :key="index" :label="item.name" :value="item.id"></el-option>
           </el-select>
 
           <!-- 产品筛选 -->
-          <el-select v-if="ins == 2"  v-model="productId" :placeholder="'请选择'" @change="selcts()" clearable filterable size="small" style="width:200px">
+          <el-select v-if="ins == 2"  v-model="productId" :placeholder="'请选择'" @change="selcts()" clearable filterable size="small" style="width:140px">
             <el-option v-for="(item, index) in productList" :key="index" :label="item.name" :value="item.id"></el-option>
           </el-select>
 
@@ -57,23 +57,23 @@
               <span class="demonstration" style="color:#999;padding:0 10px">
                 {{ ins == 15 ? $t('xiang-mu-chuang-jian-shi-jian-duan') : $t('message.period') }}
               </span>
-              <el-date-picker v-model="rangeDatas" type="daterange" value-format="yyyy-MM-dd" :placeholder="$t('selectstartdate')" @change="picks()" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" style="width:300px" :clearable="ins == 15" size="small"> </el-date-picker>
+              <el-date-picker v-model="rangeDatas" type="daterange" value-format="yyyy-MM-dd" :placeholder="$t('selectstartdate')" @change="picks()" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" style="width:240px" :clearable="ins == 15" size="small"> </el-date-picker>
             </span>
           </template>
 
           <br />
           <!-- 车辆序号 -->
-          <el-input v-if="ins == 2" v-model="vehicleNum" placeholder="请输入车辆序号" @change="selcts()"  size="small" style="width:200px"></el-input>
+          <el-input v-if="ins == 2" v-model="vehicleNum" placeholder="请输入车辆序号" @change="selcts()"  size="small" style="width:140px"></el-input>
 
           <!-- 钢印号-->
-          <el-input v-if="ins == 2" v-model="steelNum" placeholder="请输入钢印号" @change="selcts()" size="small" style="width:200px"></el-input>
+          <el-input v-if="ins == 2" v-model="steelNum" placeholder="请输入钢印号" @change="selcts()" size="small" style="width:140px"></el-input>
           
       </div>
       <p :style="`${ins == 9 ? 'width:20%' : ins == 14 ? 'width: 20%' : 'width: 10%'}`" class="tableRightBtn">
         <el-button type="primary" @click="exportExcel" size="mini">{{ $t('reporderived') }}</el-button>
       </p>
     </div>
-    <div ref="staff" style="margin: 5px 0px 0px 10px; width: 98%">
+    <div ref="staff" style="margin: 5px;">
         <div class="staff" ref="tabless" :style="'width:'+(windowWidth - 430)+'px'">
             <!-- 人员工时工价表 -->
             <el-table v-if="ins == 0"  key="1" border :data="personWorkHoursWagesList" highlight-current-row v-loading="listLoading" :height="+tableHeight - 1" style="width: 100%;">
@@ -1107,8 +1107,8 @@ export default {
         this.$refs.sid.style.left = '201px'
         this.$refs.side.style.left = '1px'
         this.$refs.sideI.className = 'el-icon-arrow-right'
-        this.$refs.staff.style.margin = '5px 0px 0px 5px'
-        this.$refs.staff.style.width = '100%'
+        // this.$refs.staff.style.margin = '5px 0px 0px 5px'
+        // this.$refs.staff.style.width = '100%'
         this.$refs.headHe.style.paddingLeft = '10px'
         this.$refs.headine.style.width = (this.windowWidth - 200)+'px'
         this.$refs.tabless.style.width = (this.windowWidth - 200)+'px'
@@ -1117,8 +1117,8 @@ export default {
         this.$refs.sid.style.left = '400px'
         this.$refs.side.style.left = '-19px'
         this.$refs.sideI.className = 'el-icon-arrow-left'
-        this.$refs.staff.style.margin = '5px 0px 0px 10px'
-        this.$refs.staff.style.width = '98%'
+        // this.$refs.staff.style.margin = '5px 0px 0px 10px'
+        // this.$refs.staff.style.width = '98%'
         this.$refs.headHe.style.paddingLeft = '10px'
         this.$refs.headine.style.width = (this.windowWidth - 400)+'px'
         this.$refs.tabless.style.width = (this.windowWidth - 400)+'px'
@@ -1222,9 +1222,9 @@ export default {
   margin-left: 15px !important;
 }
 .headConCon {
-  position: fixed;
+  // position: fixed;
   /* width: 99%; */
-  top: 60px;
+  // top: 60px;
 }
 .headine {
   /* width: 100%; */
@@ -1323,8 +1323,8 @@ export default {
   border-top: 1px solid #fff;
   border-right: 1px solid #fff;
   background: #fff;
-  position: fixed;
-  top: 110px;
+  // position: fixed;
+  // top: 110px;
 }
 
 .colorText {
@@ -1397,7 +1397,7 @@ export default {
 
 /* 右边整体页面 */
 .contents {
-  height: 100%;
+  height: 100vh;
   width: 100%;
   /* padding: 30px; */
   background: #F7F7F7;

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

@@ -6,7 +6,7 @@
             <van-calendar v-model="costDateShow" type="range" :allow-same-day="true" :show-confirm="false" @confirm="dateConfirm" :min-date="minDate" :max-date="maxDate" />
             <van-tabs v-model="active" @change="activeChange" background="#20a0ff" title-active-color="#fff" title-inactive-color="#3c3c45" style="height:1.17333rem;">
                 <van-tab title="项目"></van-tab>
-                <van-tab title="项目分类"></van-tab>
+                <van-tab title="项目分类" v-if="user.companyId != '1071'"></van-tab>
             </van-tabs>
         </van-sticky>
     </div>
@@ -82,7 +82,8 @@ export default {
             costDateTitle: '',
             costDate: [],
             costDateShow: false,
-            timeCostList: []
+            timeCostList: [],
+            user: JSON.parse(localStorage.userInfo),
         }
     },
     mounted() {

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

@@ -60,7 +60,7 @@
                     </van-popup>
                     <!--任务分组 -->
                     <van-field  readonly  name="groupId" v-if="user.company.packageProject==1&&item.taskGroups != null && item.taskGroups.length > 0" clickable 
-                        :value="item.groupName" label="任务分组" placeholder="请选择任务分组" 
+                        :value="item.groupName" :label="user.timeType.enableNewWeeklyfill == 1 ? '分组' : '任务分组'" :placeholder="user.timeType.enableNewWeeklyfill == 1 ? '请选择分组' : '请选择任务分组'" 
                     @click="clickPickTaskGroup(index, item)" />
                     <van-popup v-model="item.showPickerTaskGroup" position="bottom">
                         <van-picker show-toolbar :columns="item.taskGroups" value-key="name" @confirm="choseTaskGroup" 
@@ -291,7 +291,7 @@
                         icon="plus" color="#ffffff" ><span style="color:#999;text-align:center;padding: 0 5px;"> 添加工时  </span></van-tag>
                     </div>
                     
-                    <div class="overtime" v-if="((user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)) || (isCorpWX&&canEdit))">
+                    <div class="overtime" v-if="((user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)) || (isCorpWX&&canEdit)) && user.timeType.enableNewWeeklyfill != 1">
                         <div class="overTimeClas">
                             <van-checkbox  v-model="item.isOvertime" style="width: 4.3rem;">加班</van-checkbox>
                             <van-field v-model="item.overtimeHours" type="number" :disabled="item.isOvertime==null||item.isOvertime==0"
@@ -621,7 +621,7 @@
                             if (res.data.askLeaveTime) {
                                 this.kaoqinText += ' | 请假'+res.data.askLeaveTime+'h';
                             }
-                            if((this.user.timeType.showDdCardtime == 1 || this.user.timeType.showCorpwxCardtime == 1) && this.reportTimeType.type == 1){
+                            if((this.user.timeType.showDdCardtime == 1 || this.user.timeType.showCorpwxCardtime == 1)){
                                 this.$set(this.currentForm,'cardtime',res.data.workHours)
                             }
                         }else {
@@ -827,7 +827,7 @@
 
                 this.showPickerUserddp = false;
                 //获取子项目
-                if(this.user.timeType.mainProjectState != 1){
+                if(this.user.timeType.mainProjectState != 1 && this.user.timeType.enableNewWeeklyfill != 1){
                     this.getSubprojectList(this.currentForm.domains[this.proIdx]);
                 }
                 //加载项目相关的工程进度
@@ -835,19 +835,21 @@
                     this.getProjectProfessions(this.currentForm.domains[this.proIdx],index);
                 }
                 //获取任务分组
-                this.getTaskGroups(this.currentForm.domains[this.proIdx], this.proIdx);
-
-                // 获取1相关维度
-                this.getTaskList(domainItem.projectId)
-
-                //获取相关日报提交选择人
-                domainItem.projectAuditorId = null;
-                domainItem.projectAuditorName = null;
-                domainItem.auditUserList = null;
-                //获取项目审核人
-                var curProject = this.project.filter(p=>p.id == domainItem.projectId)[0];
-                if (this.user.timeType.reportAuditType == 0) {
-                    this.getProjectAuditorList(domainItem, index);
+                if(this.user.timeType.enableNewWeeklyfill == 1) { // 针对物奇获取项目分组
+                    this.getProjectGroup(this.currentForm.domains[this.proIdx], this.proIdx)
+                } else {
+                    this.getTaskGroups(this.currentForm.domains[this.proIdx], this.proIdx);
+                    // 获取1相关维度
+                    this.getTaskList(domainItem.projectId)
+                    //获取相关日报提交选择人
+                    domainItem.projectAuditorId = null;
+                    domainItem.projectAuditorName = null;
+                    domainItem.auditUserList = null;
+                    //获取项目审核人
+                    var curProject = this.project.filter(p=>p.id == domainItem.projectId)[0];
+                    if (this.user.timeType.reportAuditType == 0) {
+                        this.getProjectAuditorList(domainItem, index);
+                    }
                 }
             },
             //获取项目下的任务分组
@@ -1364,6 +1366,9 @@
             },
             clickPickTaskGroup(i, item) {
                 // if (!this.canEdit) return;
+                if(this.user.timeType.enableNewWeeklyfill == 1) {
+                    return
+                }
                 this.clickIndex = i;
                 item.showPickerTaskGroup = true;
                 this.$forceUpdate();
@@ -1617,6 +1622,22 @@
             // 提交日报
             submitReport() {
                 this.form[this.inbtn] = this.currentForm
+
+                // 针对物奇做的判断
+                if(this.user.timeType.enableNewWeeklyfill == 1){
+                    const { allday } = this.user.timeType // 系统设置的每日工作时间
+                    const { next, error, group } = this.judgeStrange(this.form)
+                    if(!next){
+                        if(error.length > 0) {
+                            this.$toast(`【${error.join('、')}】填写工时合计非 ${allday} 小时`)
+                        } else {
+                            this.$toast(`${group.join('、')} 请选择项目分组`)
+                        }
+                        
+                        return
+                    }
+                }
+
                 //检查子项目
                 if (this.user.timeType.subProMustFill == 1) {
                     for(let i in this.form){
@@ -1951,7 +1972,6 @@
 
                 }
                 
-                // return
                 const toast = this.$toast.loading({
                     forbidClick: true,
                     duration: 0
@@ -2037,6 +2057,127 @@
                         alert(JSON.stringify(res));
                     }
                 });
+            },
+
+            // 针对物奇定制私人按周填报写的方法
+            async getProjectGroup(domainItem, index) {
+                const { data } = await this.$axios.post("/task-group/listProjectGroupAndAuditor", {projectId: domainItem.projectId})
+                if(!data) {
+                    return
+                }
+                if(data.length == 0) {
+                    this.$toast.fail('分组未设置，请联系该项目管理人员');
+                }
+                if(data.length == 1) {
+                    domainItem.groupId = data[0].id;
+                    domainItem.groupName = data[0].name;
+                    domainItem.projectAuditorId = data[0].inchargerId;
+                    domainItem.projectAuditorName = data[0].inchargerName;
+                    if (!data[0].inchargerId) {
+                        this.$toast.fail(`【${data[0].name}】分组未设置审批人，请联系该项目管理人员`);
+                    }
+                }
+                const newArr = data.map(item => {
+                    const { inchargerId, inchargerName } = item;
+                    return {
+                        auditorId: inchargerId,
+                        auditorName: inchargerName
+                    };
+                });
+
+                domainItem.taskGroups = data;
+                domainItem.auditUserList = newArr;
+                this.$forceUpdate();
+            },
+            // 提交数据物奇的判断
+            judgeStrange(from) {
+                console.log(from, '<======== 要判断的fom表单')
+                const newFrom = JSON.parse(JSON.stringify(from))
+                const arrList = Object.values(newFrom).flatMap(({ domains, createDate }) =>
+                    domains.map(({ workingTime, projectId, projectName, groupId }) => ({
+                        dateTime: createDate,
+                        workingTime,
+                        projectId,
+                        projectName,
+                        groupId,
+                        weeks: this.getNewWeek(createDate)
+                    }))
+                );
+                console.log(arrList, '<==== 判断的数据')
+                let { strArr, groupArr } = this.judgmentData(arrList)
+                let strDataArr = this.getWeek(strArr);
+                let strGroupArr = groupArr
+
+                if(strDataArr.length > 0 || strGroupArr.length > 0) {
+                    return {
+                        next: false,
+                        error: [...new Set(strDataArr)],
+                        group: [...new Set(strGroupArr)]
+                    }
+                } else {
+                    return {
+                        next: true,
+                        error: [],
+                        group: []
+                    }
+                }
+            },
+            // 判断是否小于系统设置的每日工作时间
+            judgmentData(data) {
+                const { allday } = this.user.timeType // 系统设置的每日工作时间
+                const result = [];
+                data.forEach((item) => {
+                    const date = item.dateTime;
+                    const index = result.findIndex((arr) => arr[0].dateTime === date);
+
+                    if (index === -1) {
+                        result.push([item]);
+                    } else {
+                        result[index].push(item);
+                    }
+                });
+
+                const strArr = result
+                    .filter((arr) => arr[0].projectId)
+                    .filter(
+                        (arr) => arr.reduce((sum, item) => sum + (+item.workingTime || 0), 0) != allday
+                    )
+                    .map((arr) => arr[0].dateTime);
+
+                const groupArr = data
+                    .filter(item => item.projectId && !item.groupId)
+                    .map(({ dateTime, weeks, projectName }) => `【${dateTime} ${weeks} 中的 （${projectName}）项目】`);
+
+                return { strArr, groupArr }
+            },
+            // YYYY-MM-DD 转成 周几
+            getWeek(arr) {
+                const weekArr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+                for (let i = 0; i < arr.length; i++) {
+                    const date = new Date(arr[i]);
+                    const week = weekArr[date.getDay()];
+                    arr[i] = `${arr[i]} ${week}`;
+                }
+                return arr;
+            },
+            getNewWeek(data) {
+                const weekArr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+                const date = new Date(data);
+                return weekArr[date.getDay()];
+            },
+            // 重新定义获取接口
+            async newPost(url, param) {
+                return new Promise((resolve, reject) => {
+                    this.$axios.post(url, param,
+                        res => {
+                            resolve(res)
+                        },
+                        error => {
+                            this.$toast.fail(error);
+                            reject(error)
+                        }
+                    )
+                });
             }
         },
         

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

@@ -185,7 +185,9 @@
                 for (var i in list) {
                     if(list[i].name == '工时报告') {
                         this.routers.push({name: '查看日报',url: '/calendar',icon: 'description'})
-                        this.routers.push({name: '填写日报',url: '/edit',icon: 'edit'})
+                        if(this.user.companyId != '1071') { // 针对物奇公司去掉填写日报
+                            this.routers.push({name: '填写日报',url: '/edit',icon: 'edit'})
+                        }
                         // if (this.user.companyId == 817 || this.user.companyId == 7 || this.user.companyId == 10) {
                             this.routers.push({name: '按周填报',url: '/weekEdit',icon: 'records'})
                         // }