Explorar o código

提交工时管家工单相关需求调整PC

Lijy hai 1 semana
pai
achega
63fa075c3d

+ 20 - 6
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -5128,9 +5128,7 @@
                             this.workForm.domains[index].extraField4 = ''
                             this.workForm.domains[index].extraField5 = ''
                         }
-                        if((res.data.orderIds || []).length > 0) {
-                            this.workForm.domains[index].extraField4 = res.data.orderIds[0]
-                        }
+
                         this.workForm.domains[index].reportExtraField4List = res.data.orderIds || []
                         this.workForm.domains[index].reportExtraField5List = res.data.lines || []
                         this.$forceUpdate();
@@ -7082,9 +7080,9 @@
                     if (res.code == "ok") {
                         this.zhoBao.reportExtraField4List = res.data.orderIds || []
                         this.zhoBao.reportExtraField5List = res.data.lines || []
-                        if((res.data.orderIds || []).length > 0) {
-                            this.zhoBao.extraField4 = res.data.orderIds[0]
-                        }
+                        // if((res.data.orderIds || []).length > 0) {
+                        //     this.zhoBao.extraField4 = res.data.orderIds[0]
+                        // }
                         console.log(this.zhoBao, '<===== this.zhoBao')
                         this.$forceUpdate();
                     } 
@@ -7183,6 +7181,14 @@
                         });
                         return
                     }
+
+                    if(taskGroupRow.name.indexOf('出差工时') != '-1' && extraField4) {
+                        this.$message({
+                            message: `出差项目不能关联工单`,
+                            type: "error"
+                        });
+                        return
+                    }
                 }
                 
                 this.tianxieDialogVisible = false
@@ -9000,6 +9006,14 @@
                                     });
                                     return
                                 }
+
+                                if(taskGroupRow.name.indexOf('出差工时') != '-1' && extraField4) {
+                                    this.$message({
+                                        message: `出差项目不能关联工单`,
+                                        type: "error"
+                                    });
+                                    return
+                                }
                             }
                         }