Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/baidu_site/urls.txt

@@ -0,0 +1,19 @@
+https://www.ttkuaiban.com/page-list-1.html
+https://www.ttkuaiban.com/page-list-2.html
+https://www.ttkuaiban.com/article-47.html
+https://www.ttkuaiban.com/article-48.html
+https://www.ttkuaiban.com/article-49.html
+https://www.ttkuaiban.com/article-50.html
+https://www.ttkuaiban.com/article-51.html
+https://www.ttkuaiban.com/article-52.html
+https://www.ttkuaiban.com/article-53.html
+https://www.ttkuaiban.com/article-54.html
+https://www.ttkuaiban.com/article-55.html
+https://www.ttkuaiban.com/article-56.html
+https://www.ttkuaiban.com/article-57.html
+https://www.ttkuaiban.com/article-58.html
+https://www.ttkuaiban.com/article-60.html
+https://www.ttkuaiban.com/article-61.html
+https://www.ttkuaiban.com/article-62.html
+https://www.ttkuaiban.com/article-63.html
+https://www.ttkuaiban.com/article-64.html

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/distribution.vue

@@ -14,7 +14,8 @@
         <div>{{ productSchedulingNum }}</div>
         <div>{{ dates }}</div>
       </div>
-      <van-button @click="batchUnReceive()" :disabled="canBatchOperationsBePerformed" type="info" size="small">批量拒收</van-button>
+      <!-- <van-button @click="batchUnReceive()" :disabled="canBatchOperationsBePerformed" type="info" size="small">批量拒收</van-button> -->
+      <van-button @click="batchUnReceive()" :disabled="!isCanAgree || distributionList.length == 0" type="info" size="small">批量拒收</van-button>
     </div>
     
     <div class="distribution_con contentRoll">
@@ -92,8 +93,8 @@
             <van-button style="margin-right: 10px;" @click="showReassignment()" :disabled="isItPossibleToReassign" type="info" size="small">改派</van-button>
           </template> -->
           
-          <van-button style="margin-right: 10px;" @click="batchReceive()" :disabled="canBatchOperationsBePerformed" type="info" size="small">批量接收</van-button>
-          <van-button @click="cancellationReceiveBatch()" :disabled="canBatchOperationsBePerformed" type="info" size="small">批量取消接收</van-button>
+          <van-button style="margin-right: 10px;" @click="batchReceive()" :disabled="!isCanAgree || distributionList.length == 0" type="info" size="small">批量接收</van-button>
+          <van-button @click="cancellationReceiveBatch()" :disabled="!isCanAgree || distributionList.length == 0" type="info" size="small">批量取消接收</van-button>
           
           <!-- <van-button @click="batchAgree(false)" :disabled="!isCanAgree || distributionList.length == 0" type="danger" size="small" style="margin-left:2vw">批量驳回</van-button> -->
         </div>

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -5246,6 +5246,9 @@ export default {
       return sums;
     },
     adjustWorkingHours(row, title = '', value, filed) {
+      if(this.obtainMonthlyFinancialStatementsRows.status == 1) {
+        return
+      }
       this.adjustWorkingHoursRow = {
         ...row,
         filed,

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1284,7 +1284,7 @@
 
         <!--导出报表条件选择 -->
         <el-dialog :title="$t('textLink.exportWork')" v-if="exportDialog" :visible.sync="exportDialog" customClass="customWidth" width="500px">
-            <el-form ref="form3" :model="exportParam" >
+            <el-form ref="form3" :model="exportParam" label-width="105px">
                 <el-form-item prop="projectId" :label="$t('defaultText.selectProject')">
                     <el-select v-model="exportParam.projectId" :placeholder="$t('other.allProject')"  clearable filterable style="width:350px;">
                         <el-option v-for="item in projectList"  :key="item.id" :label="item.projectName" :value="item.id"></el-option>
@@ -1314,7 +1314,7 @@
                 </el-form-item>
 
                 <el-form-item :label="customConfigurationRow.name" v-if="customConfigurationRow.name">
-                    <el-select v-model="exportParam.plate" placeholder="请选择"  clearable filterable>
+                    <el-select v-model="exportParam.plate" placeholder="请选择"  clearable filterable style="width:350px;">
                         <el-option v-for="item in customConfigurationRow.subUserCustomList || []"  :key="item.id" :label="item.name" :value="item.newId"></el-option>
                     </el-select>
                 </el-form-item>
@@ -7201,6 +7201,14 @@
                         });
                         return
                     }
+
+                    if(taskGroupRow.name.indexOf('入库后工时') != '-1' && extraField4) {
+                        this.$message({
+                            message: `入库后工时不能关联工单`,
+                            type: "error"
+                        });
+                        return
+                    }
                 }
                 
                 this.tianxieDialogVisible = false
@@ -9026,6 +9034,14 @@
                                     });
                                     return
                                 }
+
+                                if(taskGroupRow.name.indexOf('入库后工时') != '-1' && extraField4) {
+                                    this.$message({
+                                        message: `入库后工时不能关联工单`,
+                                        type: "error"
+                                    });
+                                    return
+                                }
                             }
                         }
 

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

@@ -2380,7 +2380,7 @@ export default {
                 const extraField4 = this.form.domains[this.clickIndex].extraField4
                 const extraField5 = this.form.domains[this.clickIndex].extraField5
                 console.log(this.form.domains[this.clickIndex])
-                if((value.name.indexOf('出差工时') != -1 || value.name.indexOf('研发工时') != -1) && (extraField4 || extraField5)) {
+                if((value.name.indexOf('出差工时') != -1 || value.name.indexOf('研发工时') != -1 || value.name.indexOf('入库后工时') != -1) && (extraField4 || extraField5)) {
                     this.form.domains[this.clickIndex].extraField4 = ''
                     this.form.domains[this.clickIndex].extraField5 = ''
                 }
@@ -2390,7 +2390,7 @@ export default {
                     this.doYouWantToDisplayTheWorkOrder = true
                 }
 
-                if(value.name.indexOf('出差工时') != -1) {
+                if(value.name.indexOf('出差工时') != -1 || value.name.indexOf('入库后工时') != -1) {
                    this.doYouWantToDisplayTheWorkOrderGongdan = false 
                 } else {
                     this.doYouWantToDisplayTheWorkOrderGongdan = true
@@ -2736,7 +2736,7 @@ export default {
             if (this.user.timeType.subProMustFill == 1) {
                 for (var p in this.form.domains) {
                     var oneProItem = this.form.domains[p]
-                    if (oneProItem.subProjectList.length > 0 && !oneProItem.subProjectId) {
+                    if (oneProItem.subProjectList && oneProItem.subProjectList.length > 0 && !oneProItem.subProjectId) {
                         //没有选择子项目
                         this.$toast('子项目必填，请检查')
                         return

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

@@ -1818,7 +1818,7 @@
                     const extraField4 = domainItem.extraField4
                     const extraField5 = domainItem.extraField5
                     console.log(domainItem)
-                    if((value.name.indexOf('出差工时') != -1 || value.name.indexOf('研发工时') != -1) && (extraField4 || extraField5)) {
+                    if((value.name.indexOf('出差工时') != -1 || value.name.indexOf('研发工时') != -1 || value.name.indexOf('入库后工时') != -1) && (extraField4 || extraField5)) {
                         this.currentForm.domains[this.clickIndex].extraField4 = ''
                         this.currentForm.domains[this.clickIndex].extraField5 = ''
                     }
@@ -1828,7 +1828,7 @@
                         this.doYouWantToDisplayTheWorkOrder = true
                     }
 
-                    if(value.name.indexOf('出差工时') != -1) {
+                    if(value.name.indexOf('出差工时') != -1 || value.name.indexOf('入库后工时') != -1) {
                         this.doYouWantToDisplayTheWorkOrderGongdan = false 
                     } else {
                         this.doYouWantToDisplayTheWorkOrderGongdan = true
@@ -1836,7 +1836,10 @@
 
                     const { reportExtraField4Name, reportExtraField5Name } = this.user.timeType
                     if((reportExtraField4Name || reportExtraField5Name) && value.id) {
-                        this.getInfoByProjectId(this.currentForm.domains[this.clickIndex].projectCode, value.id)
+                        console.log('kaishi1zhix1', this.currentForm.domains[this.clickIndex])
+                        const projectId = this.currentForm.domains[this.clickIndex].projectId
+                        const row = this.projectss.find(item => item.id == projectId)
+                        this.getInfoByProjectId((this.currentForm.domains[this.clickIndex].projectCode || row.projectCode), value.id)
                     }
                 }