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

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

@@ -4991,7 +4991,7 @@
                 const { projectCode = '' } = projectList.find(item => item.id == projectId)
                 this.http.post('/erpOrderInfo/getInfoByProjectId',{
                     projectId: projectCode,
-                    date: this.workForm.createDate
+                    date: this.isBatch == 0 ? this.workForm.createDate : this.workForm.createDate[1]
                 },
                 res => {
                     if (res.code == "ok") {

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

@@ -1178,7 +1178,10 @@ export default {
         },
         getInfoByProjectId(projectCode, index = null, flag = true) {
             const { projectId } = this.form.domains[this.clickIndex];
-            this.$axios.post("/erpOrderInfo/getInfoByProjectId", { projectId: projectCode })
+            this.$axios.post("/erpOrderInfo/getInfoByProjectId", { 
+                projectId: projectCode,
+                date: this.form.createDate
+            })
                 .then(res => {
                     if (res.code == "ok") {
                         if(flag) {

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

@@ -1120,8 +1120,18 @@
                     this.getInfoByProjectId(item.projectCode)
                 }
             },
+            // 标准日期转成 YYYY-MM-DD
+            formatDateToYYYYMMDD(date) {
+                const year = date.getFullYear();
+                const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始
+                const day = String(date.getDate()).padStart(2, '0');
+                return `${year}-${month}-${day}`;
+            },
             getInfoByProjectId(projectCode, index = null, flag = true) {
-                this.$axios.post("/erpOrderInfo/getInfoByProjectId", { projectId: projectCode })
+                this.$axios.post("/erpOrderInfo/getInfoByProjectId", { 
+                    projectId: projectCode,
+                    date: this.formatDateToYYYYMMDD(this.dateRange[this.inbtn])
+                })
                     .then(res => {
                         if (res.code == "ok") {
                             if(flag) {

fhKeeper/formulahousekeeper/timesheet_mld/src/views/project/gantt.vue

@@ -357,9 +357,9 @@ export default {
     // 双击事件
     this.$refs.ganttContainer.addEventListener('dblclick', (event) => {
       const taskIdStr = gantt.locate(event);
-      if(userInfo.projectLeaderType != 1 && userInfo.projectLeaderType != 2 && userInfo.projectLeaderType != 3) {
-        return
-      }
+      // if(userInfo.projectLeaderType != 1 && userInfo.projectLeaderType != 2 && userInfo.projectLeaderType != 3) {
+      //   return
+      // }
       this.showMmeiLaiDeData = {}
       if (taskIdStr && gantt.isTaskExists(taskIdStr)) {
         // 编辑任务

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

@@ -29,9 +29,14 @@
       <div v-if="radio1 == $t('an-xiang-mu-cha-kan')" class="head_taskType">
         <span>{{ $t('ren-wu-lei-xing') }}</span>
         <el-select clearable filterable v-model="taskType" :placeholder="$t('defaultText.pleaseChoose')" size="small" style="margin-left:9px;width:10vw" @change="taskTypeSel()">
-        <el-option :label="$t('other.task')" :value="0"></el-option>
-        <el-option :label="$t('other.milestone')" :value="1"></el-option>
-      </el-select>
+          <el-option v-for="item in typeList" :label="item.name" :value="item.id" :key="item.id">
+            <div style="display: flex;justify-content: space-between;align-items: center;">
+                <!--左边是文字，右边是色块(有color的话)-->
+                <div style="float: left; ">{{ item.name }}</div>
+                <div v-if="item.color" :style="'width:40px;margin-left:20px;height:20px;background-color:'+item.color"></div>
+            </div>
+          </el-option>
+        </el-select>
       </div>
       <!-- 任务分组筛选 -->
       <div v-if="reqpar1" class="head_taskgroup">
@@ -220,6 +225,7 @@ export default {
       valuex2: '',
 
       user: JSON.parse(sessionStorage.getItem("user")),
+      typeList: []
     };
   },
   computed: {},
@@ -240,8 +246,23 @@ export default {
     this.getScreen()
     // this.tasks1 = this.tasks
     this.isDataLoaded = true
+
+    this.getTaskTypeList()
   },
   methods: {
+    getTaskTypeList() {
+      this.http.post('/task-type/list', { companyId: this.user.companyId },
+        res => {
+          if (res.code == "ok") {
+            this.typeList = res.data;
+          } else {
+            this.$message({ message: res.msg, type: "error" });
+          }
+        },
+        error => {
+          this.$message({ message: error, type: "error" });
+        });
+    }, 
     parentLevelOpensPopUpWindowGantt(row) {
       setTimeout(() => {
         this.$refs.ganttTable1.detaliTaskExposure(row);