2022.6.2

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -2,8 +2,8 @@ var path = require('path')
 
 //  var ip = '127.0.0.1'
 // var ip = '192.168.2.39'
-var ip = '192.168.2.2'
-// var ip = '192.168.2.39'
+// var ip = '192.168.2.2'
+var ip = '192.168.2.39'
 // var ip = '192.168.2.12'// var ip = '47.100.37.243' 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip

fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -12,10 +12,10 @@
       
       </div>
       <!-- 时间段筛选  -->
-      <div class="head_date" v-if="isDataLoaded">
+      <div class="head_date">
       <span>时间段</span>
       <el-date-picker
-        style="margin-left:9px;width:18vw"
+        style="margin-left:9px;width:17vw"
         size="small"
         v-model="valueDate"
         type="daterange"
@@ -50,8 +50,8 @@
           :label="reqpar1 ? item.projectName : item.name"
           :value="item.id"
           >
-          <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
-          <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
+          <span v-if="reqpar1" style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
+          <span v-if="reqpar1" style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
         </el-option>
       </el-select>
       </div>
@@ -98,6 +98,22 @@
     <!-- 资源需求修改 -->
   <el-dialog v-if="demandEditDialog" width="500px" append-to-body :visible.sync="demandEditDialog" :title="'修改 - ' + editParameter.projectName">
     <el-form label-width="150">
+      <el-form-item label="开始时间">
+        <el-date-picker
+        style="width:350px"
+        v-model="editDate1"
+        type="date"
+        placeholder="请选择开始时间"
+        value-format="yyyy-MM-dd"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间">
+        <el-date-picker
+        style="width:350px"
+        v-model="editDate2"
+        type="date"
+        placeholder="请选择结束时间"
+        value-format="yyyy-MM-dd"></el-date-picker>
+      </el-form-item>
       <el-form-item label="人员需求">
         <el-input style="width:350px" v-model="editParameter.membReq" clearable></el-input>
       </el-form-item>
@@ -148,6 +164,8 @@ export default {
 
       demandEditDialog: false,
       editParameter: {},
+      editDate1: '',
+      editDate2: '',
       taskgroupList: [],
       valuex2: ''
 
@@ -250,7 +268,11 @@ export default {
       // 时间段改变
       dateupdata(){
         this.reqpar2 = this.valueDate
-        this.getList()
+        if(this.isDataLoaded){
+          this.getList()
+        }else {
+          this.getDemandList()
+        }
       },
       // 人员/项目筛选改变
       optupdata(){
@@ -282,11 +304,18 @@ export default {
       },
       // 资源需求修改
       demandEdit(row){
+        console.log(row);
         this.demandEditDialog = true
         this.editParameter = JSON.parse(JSON.stringify(row))
+        this.editDate1 = this.editParameter.reStartDate
+        this.editDate2 = this.editParameter.reEndDate
         // console.log('edit',this.demandEditDialog);
       },
       demandEditSure(){
+        this.editParameter.startDate = this.editDate1
+        this.editParameter.endDate = this.editDate2
+        delete this.editParameter.reStartDate
+        delete this.editParameter.reEndDate
         this.http.post('/project-requirement/addOrMod',this.editParameter,
         res => {
           if(res.code == 'ok'){
@@ -431,6 +460,8 @@ export default {
         let parameter = {
           pageIndex: this.pageIndex,
           pageSize: this.pageSize,
+          reStartDate: this.reqpar2[0],
+          reEndDate: this.reqpar2[1]
         }
         if(this.valuex != ''){
           parameter.projectId = this.valuex

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

@@ -244,7 +244,7 @@
                     <div v-if="falsss" style="display: inline-block;">总{{jsDay}} 天, 共{{jsTime}} 小时</div>
                     <div v-if="isBatch!=0" style="display: inline-block;">总{{jsDay}} 天, 共{{jsTime}} 小时</div>
                     <span v-if="reportTimeType.type == 3" style="margin-left:30px;">{{isBatch==0?'总':'每日'}}时长:</span>
-                    <el-input-number :disabled="!canEdit" v-if="reportTimeType.type == 3" style="margin-left:10px;" @change="changeAllTime"
+                    <el-input-number :disabled="!canEdit || user.timeType.lockWorktime" v-if="reportTimeType.type == 3" style="margin-left:10px;" @change="changeAllTime"
                         v-model="reportTimeType.allday" :precision="1" :step="0.5" :max="12" :min="0.5"></el-input-number>
                     <span v-if="reportTimeType.type == 3">小时</span>