2022.6.2

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

@@ -41,9 +41,13 @@
   <div class="contents">
     <div class="headine" ref="headine">
       <h3 ref="headHe" style="padding-left: 210px">{{shuz[ins]}}</h3>
-      <div class="headScreen" v-if="ins != 4 && ins != 6">
+      <div class="headScreen" v-if="ins != 6">
+        <el-select v-model="costomerId" placeholder="请选择客户" clearable filterable size="small" @change="selcts()" v-if="ins == 4" style="margin-right:20px">
+          <el-option v-for="(item) in costomerList" :key="item.id" :label="item.customerName" :value="item.id">
+          </el-option>
+        </el-select>
         <el-select v-model="proJuctId" placeholder="请选择项目" clearable filterable size="small" @change="selcts()">
-          <el-option v-for="(item, index) in proListOvertime" :key="index" :label="item.projectName + (item.projectCode ? item.projectCode : '')" :value="item.id">
+          <el-option v-for="(item) in proListOvertime" :key="item.id" :label="item.projectName + (item.projectCode ? item.projectCode : '')" :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>
           </el-option>
@@ -585,6 +589,9 @@ export default {
       baseCostList: [],
       baseCostColumns: [],
       proListOvertime: [], // 加班情况项目筛选
+
+      costomerList: [],
+      costomerId: ''
     };
   },
   computed: {},
@@ -602,6 +609,7 @@ export default {
     this.getProjectListOvertime()
     this.getProjectList();
     this.getUserList()
+    this.getCostomerList()
   },
   filters: {
       
@@ -835,6 +843,7 @@ export default {
       this.list = [];
       this.page = 1;
       this.pageSize = 20;
+      this.costomerId = ''
       this.$forceUpdate()
       this.getList();
     },
@@ -843,6 +852,8 @@ export default {
       this.http.post('/project/getCustomerProjectInAndOut', {
                     pageIndex: this.page,
                     pageSize: this.size,
+                    projectId: this.proJuctId,
+                    customerId: this.costomerId
                     },
         res => {
             if (res.code == "ok") {
@@ -1127,6 +1138,25 @@ export default {
             });
         });
     },
+    // 获取客户列表
+    getCostomerList(){
+      this.http.post('/customer-info/getAll',{},
+      res => {
+        if(res.code == 'ok'){
+          this.costomerList = res.data
+        }else {
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          })
+        }
+      },err => {
+        this.$message({
+          message: err,
+          type: 'error'
+        })
+      })
+    },
     // 点击侧边栏事件
     side() {
       if(this.$refs.side.style.left < '0px') {
@@ -1160,7 +1190,7 @@ export default {
     　  return  _this.gettime
     },
     selcts() {
-      console.log(this.proJuctId);
+      console.log(this.costomerId);
       this.getList()
     },
     // 成本查看明细

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

@@ -12,7 +12,7 @@
       
       </div>
       <!-- 时间段筛选  -->
-      <div class="head_date">
+      <div class="head_date" v-if="isDataLoaded">
       <span>时间段</span>
       <el-date-picker
         style="margin-left:9px;width:17vw"
@@ -82,7 +82,7 @@
       </el-table-column>
       <el-table-column label="人员需求" prop="membReq" min-width="280"></el-table-column>
       <el-table-column label="任务需求" prop="taskReq" min-width="280"></el-table-column>
-      <el-table-column label="操作" width="120" align="center">
+      <el-table-column label="操作" width="120" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button @click="demandEdit(scope.row)" size="small">修改</el-button>
         </template>
@@ -312,8 +312,8 @@ export default {
         console.log(row);
         this.demandEditDialog = true
         this.editParameter = JSON.parse(JSON.stringify(row))
-        this.editDate1 = this.editParameter.reStartDate
-        this.editDate2 = this.editParameter.reEndDate
+        this.editDate1 = this.editParameter.startDate
+        this.editDate2 = this.editParameter.endDate
         // console.log('edit',this.demandEditDialog);
       },
       demandEditSure(){
@@ -524,6 +524,7 @@ export default {
     let endmonth = udate.getMonth() + 1
     let enddate = udate.getFullYear() + "-" + (endmonth < 10 ? "0" + endmonth : endmonth) + "-" + (udate.getDate() < 10 ? "0" + udate.getDate() : udate.getDate())
     this.valueDate = [startdate,enddate]
+    this.valueDate2 = this.valueDate
     this.reqpar2 = this.valueDate
     // console.log("date",this.valueDate);
     this.getList();