From 62c0885f2777abb700b66bb26ed9f66786c79f7b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 01 八月 2024 18:57:53 +0800
Subject: [PATCH] 修改工时管理
---
src/components/view/b3-work-time-management.vue | 43 ++++++++++++++++++++++++++++++++++++++-----
src/components/view/b1-report-preparation.vue | 1 +
src/components/do/b1-inspect-order-plan/Inspection.vue | 6 ++++++
src/components/view/b1-inspection-order.vue | 2 +-
4 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 284db80..67022a4 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1933,6 +1933,12 @@
this.getTableLists();
this.currentKey = row.index
this.currentTab = null;
+ this.worker.postMessage(JSON.stringify({
+ type: 'saveData',
+ tableList:this.tableList,
+ param:this.param,
+ currentTable:this.currentTable
+ }));
},
getReportModel(id){
if(this.PROJECT!='妫�娴嬩腑蹇�'){
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 3860336..51a1186 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -763,7 +763,7 @@
}`,
onPrintDialogClose: this.erexcel=false,
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
- font_size: '',
+ font_size: '0.21cm',
});
},
print(){
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 64633d0..8230629 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -406,6 +406,7 @@
this.inLoading = false;
if (response.code == 200) {
this.$message.success('瀵煎叆鎴愬姛')
+ this.refreshTable()
}else{
this.$message.error(response.message)
}
diff --git a/src/components/view/b3-work-time-management.vue b/src/components/view/b3-work-time-management.vue
index 3238471..0174ff6 100644
--- a/src/components/view/b3-work-time-management.vue
+++ b/src/components/view/b3-work-time-management.vue
@@ -2,13 +2,13 @@
<div class="work-time-management">
<div style="text-align: left">
<el-radio-group v-model="currentComponent" size="small" style="margin-top: 16px;margin-bottom: 16px;">
- <el-radio-button label="workTimeStatistics">
+ <el-radio-button label="workTimeStatistics" v-if="selectAuxiliaryOriginalHours">
宸ユ椂缁熻
</el-radio-button>
- <el-radio-button label="workTimeManagement">
+ <el-radio-button label="workTimeManagement" v-if="selectAuxiliaryOutputWorkingHours">
鏃ュ伐鏃剁鐞�
</el-radio-button>
- <el-radio-button label="workTimeConfig">
+ <el-radio-button label="workTimeConfig" v-if="selectAuxiliaryWorkingHours">
杈呭姪宸ユ椂閰嶇疆
</el-radio-button>
</el-radio-group>
@@ -27,11 +27,44 @@
workTimeManagement,
workTimeConfig
},
- mounted() {
+ created() {
+ this.getPower()
},
data() {
return{
- currentComponent:'workTimeStatistics'
+ currentComponent:'workTimeStatistics',
+ selectAuxiliaryOriginalHours:false,
+ selectAuxiliaryOutputWorkingHours:false,
+ selectAuxiliaryWorkingHours:false
+ }
+ },
+ methods: {
+ getPower(){
+ let power = JSON.parse(sessionStorage.getItem('power'))
+ let selectAuxiliaryOriginalHours = false
+ let selectAuxiliaryOutputWorkingHours = false
+ let selectAuxiliaryWorkingHours = false
+ for (var i = 0; i < power.length; i++) {
+ if (power[i].menuMethod == 'selectAuxiliaryOriginalHours') {
+ selectAuxiliaryOriginalHours = true
+ }
+ if (power[i].menuMethod == 'selectAuxiliaryOutputWorkingHours') {
+ selectAuxiliaryOutputWorkingHours = true
+ }
+ if (power[i].menuMethod == 'selectAuxiliaryWorkingHours') {
+ selectAuxiliaryWorkingHours = true
+ }
+ }
+ this.selectAuxiliaryOriginalHours = selectAuxiliaryOriginalHours
+ this.selectAuxiliaryOutputWorkingHours = selectAuxiliaryOutputWorkingHours
+ this.selectAuxiliaryWorkingHours = selectAuxiliaryWorkingHours
+ if(this.selectAuxiliaryOriginalHours){
+ this.currentComponent = 'workTimeStatistics'
+ }else if(this.selectAuxiliaryOutputWorkingHours){
+ this.currentComponent = 'workTimeManagement'
+ }else if(this.selectAuxiliaryWorkingHours){
+ this.currentComponent = 'workTimeConfig'
+ }
}
}
}
--
Gitblit v1.9.3