From 4e44261ac4f6dcac2f15b3d30636d4b4823f6918 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 27 五月 2026 13:24:38 +0800
Subject: [PATCH] 君哥 1.恢复之前工艺路线模块，删除字段计件/计时字段，工资定额修改成计划工时，新增计划执行人员。工艺绑定，工艺路线恢复。仅需删除bom。 2.对于新增订单需流转协同办公进行审批，审批完成流转生产管控-生产订单 3.新增审批管理，规范管理所有节点审批人。 4.修改菜单栏样式bug
---
src/components/Crontab/year.vue | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/components/Crontab/year.vue b/src/components/Crontab/year.vue
index c2bf2f0..01b58f3 100644
--- a/src/components/Crontab/year.vue
+++ b/src/components/Crontab/year.vue
@@ -61,22 +61,24 @@
}
}
})
-const fullYear = ref(0)
-const maxFullYear = ref(0)
+
+const fullYear = Number(new Date().getFullYear())
+const maxFullYear = fullYear + 10
const radioValue = ref(1)
-const cycle01 = ref(0)
-const cycle02 = ref(0)
-const average01 = ref(0)
+const cycle01 = ref(fullYear)
+const cycle02 = ref(fullYear + 1)
+const average01 = ref(fullYear)
const average02 = ref(1)
const checkboxList = ref([])
-const checkCopy = ref([])
+const checkCopy = ref([fullYear])
+
const cycleTotal = computed(() => {
- cycle01.value = props.check(cycle01.value, fullYear.value, maxFullYear.value - 1)
- cycle02.value = props.check(cycle02.value, cycle01.value + 1, maxFullYear.value)
+ cycle01.value = props.check(cycle01.value, fullYear, maxFullYear - 1)
+ cycle02.value = props.check(cycle02.value, cycle01.value + 1, maxFullYear)
return cycle01.value + '-' + cycle02.value
})
const averageTotal = computed(() => {
- average01.value = props.check(average01.value, fullYear.value, maxFullYear.value - 1)
+ average01.value = props.check(average01.value, fullYear, maxFullYear - 1)
average02.value = props.check(average02.value, 1, 10)
return average01.value + '/' + average02.value
})
@@ -97,8 +99,8 @@
radioValue.value = 3
} else if (value.indexOf("/") > -1) {
const indexArr = value.split('/')
- average01.value = Number(indexArr[1])
- average02.value = Number(indexArr[0])
+ average01.value = Number(indexArr[0])
+ average02.value = Number(indexArr[1])
radioValue.value = 4
} else {
checkboxList.value = [...new Set(value.split(',').map(item => Number(item)))]
@@ -129,14 +131,6 @@
break
}
}
-onMounted(() => {
- fullYear.value = Number(new Date().getFullYear())
- maxFullYear.value = fullYear.value + 10
- cycle01.value = fullYear.value
- cycle02.value = cycle01.value + 1
- average01.value = fullYear.value
- checkCopy.value = [fullYear.value]
-})
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3