diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 8c24d8a..783a36c 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -69,10 +69,12 @@
data() {
return {
form: {
- phone: '15240004260',
- password: 'GZkq@123456!',
+ // phone: '15240004260',
+ // password: 'GZkq@123456!',
+ phone: '',
+ password: '',
},
- version: '1.0.6',
+ version: '1.0.7',
}
},
onLoad() {
diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue
index ae26160..0f17b63 100644
--- a/src/pages/my/index.vue
+++ b/src/pages/my/index.vue
@@ -53,7 +53,7 @@
phone: '',
avatar: '/static/defaultHead.png',
},
- version: '1.0.6',
+ version: '1.0.7',
}
},
onLoad() {
diff --git a/src/pages/stagger-holidays/index.vue b/src/pages/stagger-holidays/index.vue
index 236095a..e9d1c5e 100644
--- a/src/pages/stagger-holidays/index.vue
+++ b/src/pages/stagger-holidays/index.vue
@@ -39,7 +39,7 @@
-->
-
+
轮休开始时间
@@ -244,7 +244,6 @@
import {
addHoliday,
getDays,
- getHolidayType,
getPersonSelect,
editHolidayApi,
getLeaveReporting,
@@ -263,7 +262,7 @@
activeTab: 'form',
formData: {
userName: '',
- leaveType: null,
+ leaveType: '轮休',
leaveStartDate: '',
leaveEndDate: '',
leaveDuration: '',
@@ -304,7 +303,6 @@
},
created() {
this.gethostUserSelect()
- this.getHolidayType()
},
computed: {
displayedPersonOptionss() {
@@ -321,26 +319,6 @@
switchTab(tab) {
this.activeTab = tab
},
- getHolidayType() {
- getHolidayType({ dictType: 'att_status' })
- .then((response) => {
- this.leaveTypes = response.data.map((type) => ({
- value: type.value,
- label: type.label || type.type, // 使用label如果存在,否则使用type
- }))
- if (this.leaveTypes.length > 0) {
- this.formData.leaveType = this.leaveTypes[0].label
- this.leaveTypeIndex = 0
- }
- })
- .catch((error) => {
- console.error('获取休假类型失败:', error)
- // 可以在这里添加错误提示
- })
- .finally(() => {
- this.isLoading = false
- })
- },
onLeaveTypeChange(e) {
const index = e.detail.value
this.leaveTypeIndex = index
diff --git a/src/pages/temporary-outing/details.vue b/src/pages/temporary-outing/details.vue
index 388ddb1..8e00af2 100644
--- a/src/pages/temporary-outing/details.vue
+++ b/src/pages/temporary-outing/details.vue
@@ -46,6 +46,11 @@
+
+ 是否培训
+
+
+
代理主持工作人员
@@ -84,6 +89,7 @@
leaveDuration: '',
location: '',
isAgree: '1',
+ isTrain: '1',
hostUserName: '',
leaveReason: '',
remark: '',
diff --git a/src/pages/temporary-outing/index.vue b/src/pages/temporary-outing/index.vue
index af81ba1..ff428c2 100644
--- a/src/pages/temporary-outing/index.vue
+++ b/src/pages/temporary-outing/index.vue
@@ -39,22 +39,6 @@
-->
-
-
外出开始时间
是否请示领导同意
-
+
+
+ 是否培训
+
+
+
+
+
+
{
- this.leaveTypes = response.data.map((type) => ({
- value: type.value,
- label: type.label || type.type, // 使用label如果存在,否则使用type
- }))
- if (this.leaveTypes.length > 0) {
- this.formData.leaveType = this.leaveTypes[0].label
- this.leaveTypeIndex = 0
- }
- })
- .catch((error) => {
- console.error('获取休假类型失败:', error)
- // 可以在这里添加错误提示
- })
- .finally(() => {
- this.isLoading = false
- })
- },
- onLeaveTypeChange(e) {
- const index = e.detail.value
- this.leaveTypeIndex = index
- this.formData.leaveType = this.leaveTypes[index].label
- console.log(this.formData.leaveType)
- console.log('休假类型已更改为:', this.formData.leaveType)
- },
onStartDateChange(e) {
const startDate = e.detail.value
this.formData.leaveStartDate = startDate
@@ -485,6 +462,12 @@
onApprovalChange(e) {
this.formData.isApproved = e.detail.value
},
+ onAgreerovalChange(e){
+ this.formData.isAgree = e.detail.value
+ },
+ onTrainChange(e){
+ this.formData.isTrain = e.detail.value
+ },
onRepresentativeChange(e) {
this.formData.representative = e.detail.value
},
@@ -494,9 +477,6 @@
if (!this.formData.userName.trim()) {
this.errors.userName = '请输入姓名'
}
- if (!this.formData.leaveType) {
- this.errors.leaveType = '请选择休假类型'
- }
if (!this.formData.leaveStartDate) {
this.errors.leaveStartDate = '请选择休假开始时间'
}
@@ -564,6 +544,7 @@
// 在这里可以添加一些视觉反馈,比如改变按钮文字
this.isDataUploaded = true
} else {
+
console.log('提交表单参数:', this.formData)
// 判断当前是新增还是修改
@@ -623,6 +604,7 @@
hostUserId,
hostUserName,
isAgree,
+ isTrain,
leaveDuration,
leaveEndDate,
leaveStartDate,
@@ -644,6 +626,7 @@
hostUserId,
hostUserName,
isAgree,
+ isTrain,
leaveDuration,
leaveEndDate,
leaveStartDate,