diff --git a/ruoyi-ui/src/views/pay/dayWorkHours/index.vue b/ruoyi-ui/src/views/pay/dayWorkHours/index.vue
index 3d4ed92..62fda6f 100644
--- a/ruoyi-ui/src/views/pay/dayWorkHours/index.vue
+++ b/ruoyi-ui/src/views/pay/dayWorkHours/index.vue
@@ -129,6 +129,13 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['pay:dayWorkHours:edit']"
>修改
+ 详情
-
+ :rules="{required: true, message: '员工姓名不能为空', trigger: ['blur', 'change']}">
+
@@ -180,7 +187,7 @@
+ :rules="{required: true, message: '员工姓名不能为空', trigger: ['blur', 'change']}">
@@ -218,7 +225,94 @@
-
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+ 新增时间段
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -237,7 +331,7 @@
-
+
@@ -254,8 +348,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+
+
+
+
@@ -353,6 +520,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ opena: false,
// 查询参数
queryParams: {
pageNum: 1,
@@ -527,24 +695,19 @@ export default {
const id = row.id || this.ids
getDayWorkHours(id).then(response => {
this.form = response.data;
- /*getEmpNameList().then(response => {
- this.$set(this.form,'employeeList',response.data)
- })*/
- /*treeselect().then(response => {
- this.form.dwHoursContrasts.forEach(item => {
- this.$set(item,'departOptions',response.data)
- var sth = new Date(item.startTime).getHours();
- sth = sth < 10 ? sth : sth;
- var stm = new Date(item.startTime).getMinutes();
- stm = stm < 10 ? '0' + stm : stm;
- var eth = new Date(item.endTime).getHours();
- eth = eth < 10 ? eth : eth;
- var etm = new Date(item.endTime).getMinutes();
- etm = etm < 10 ? '0' + etm : etm;
- this.$set(item,"beginTime",sth+":"+stm);
- this.$set(item,"fnishTime",eth+":"+etm);
- })
- })*/
+ this.form.dwHoursContrasts.forEach(item => {
+ // this.$set(item,'departOptions',response.data)
+ var sth = new Date(item.startTime).getHours();
+ sth = sth < 10 ? sth : sth;
+ var stm = new Date(item.startTime).getMinutes();
+ stm = stm < 10 ? '0' + stm : stm;
+ var eth = new Date(item.endTime).getHours();
+ eth = eth < 10 ? eth : eth;
+ var etm = new Date(item.endTime).getMinutes();
+ etm = etm < 10 ? '0' + etm : etm;
+ this.$set(item,"beginTime",sth+":"+stm);
+ this.$set(item,"fnishTime",eth+":"+etm);
+ })
this.opena = true;
this.title = "修改日工工时";
});
@@ -553,29 +716,9 @@ export default {
changeDept(dept) {
this.form.deptName = dept.label
},
- getSummaries(param) {
- const { columns, data } = param;
- const sums = [];
- var sum = 0
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '总小时数';
- return;
- }
- if (column.property == 'hours') {
- data.forEach(item => {
- item.dwHoursContrasts.forEach(hour => {
- if(hour.hours != null){
- sum += Number(hour.hours);
- sums[index] = parseFloat(sum).toFixed(2);
- }
- })
- })
- } else {
- sums[index] = '';
- }
- });
- return sums;
+ /** 查询时选择部门 */
+ changeDept1(dept,item) {
+ item.deptName = dept.label
},
/** 查询时选择员工 */
getEmploy(val) {
@@ -586,52 +729,11 @@ export default {
}
})
},
- /** 新增或修改时选择员工 */
- getEmployee(val, index) {
- this.form.employeeList.forEach(employee => {
- if (employee.id == val) {
- this.form.employeeId = employee.id;
- this.form.empName = employee.name;
- this.form.deptName = employee.deptName;
- this.form.deptId = employee.deptId;
- this.form.empInfos[index].employeeId = employee.id;
- this.form.empInfos[index].empName = employee.name;
- this.form.empInfos[index].deptName = employee.deptName;
- this.form.empInfos[index].deptId = employee.deptId;
- }
- })
- },
- /** 查询时选择部门 */
- currDeptChange(dept) {
- this.form.deptName = dept.label
- },
getHelpers() {
- treeselect().then(response => {
- this.form.dwHoursContrasts.forEach(item => {
- if(0 == item.isHelper){
- item.departOptions = []
- item.deptId = null
- item.deptName = null
- } else {
- // item.departOptions = response.data[0].children;
- item.departOptions = response.data;
- }
- })
- })
- },
- currDepartChange(val, i) {
- this.form.dwHoursContrasts[i].deptName = val.label
- },
- //查询业务员
- handleSalelist() {
- getSalelist().then(response => {
- this.saleList = response
- })
- },
- getSalemanList(val) {
- this.saleList.forEach(sal => {
- if(sal.id == val){
- this.queryParams.salesman = sal.name
+ this.form.dwHoursContrasts.forEach(item => {
+ if(0 == item.isHelper){
+ item.deptId = null
+ item.deptName = null
}
})
},
@@ -712,29 +814,23 @@ export default {
handleDetails(row) {
this.reset();
const id = row.id || this.ids
- /*getDwhours(id).then(response => {
+ getDayWorkHours(id).then(response => {
this.form = response.data;
- getEmpNameList().then(response => {
- this.$set(this.form,'employeeList',response.data)
- })
- treeselect().then(response => {
- this.form.dwHoursContrasts.forEach(item => {
- this.$set(item,'departOptions',response.data)
- var sth = new Date(item.startTime).getHours();
- sth = sth < 10 ? sth : sth;
- var stm = new Date(item.startTime).getMinutes();
- stm = stm < 10 ? '0' + stm : stm;
- var eth = new Date(item.endTime).getHours();
- eth = eth < 10 ? eth : eth;
- var etm = new Date(item.endTime).getMinutes();
- etm = etm < 10 ? '0' + etm : etm;
- this.$set(item,"beginTime",sth+":"+stm);
- this.$set(item,"fnishTime",eth+":"+etm);
- })
+ this.form.dwHoursContrasts.forEach(item => {
+ var sth = new Date(item.startTime).getHours();
+ sth = sth < 10 ? sth : sth;
+ var stm = new Date(item.startTime).getMinutes();
+ stm = stm < 10 ? '0' + stm : stm;
+ var eth = new Date(item.endTime).getHours();
+ eth = eth < 10 ? eth : eth;
+ var etm = new Date(item.endTime).getMinutes();
+ etm = etm < 10 ? '0' + etm : etm;
+ this.$set(item,"beginTime",sth+":"+stm);
+ this.$set(item,"fnishTime",eth+":"+etm);
})
this.opena = true;
this.title = "日工工时详情";
- });*/
+ });
},
/** 提交按钮 */
submitForm() {
@@ -779,7 +875,7 @@ export default {
});
},
// 添加包活派工单 选择员工
- changeEmp(val,index,type){
+ changeEmp(index,type){
this.emp.open = true;
this.emp.index = index;
this.emp.type = type;
@@ -811,8 +907,6 @@ export default {
}
if( this.emp.type===2 ){
this.form.dwHoursContrasts[this.emp.index].salesman = val.name;
- this.form.dwHoursContrasts[this.emp.index].deptId = val.deptId;
- this.form.dwHoursContrasts[this.emp.index].deptName = val.deptName
}
this.emp.open = false;
},