临时外出申请增加上下午
This commit is contained in:
parent
96a1a209c8
commit
03f7e8c43b
|
|
@ -69,10 +69,12 @@
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
form: {
|
form: {
|
||||||
phone: '15240004260',
|
// phone: '15240004260',
|
||||||
password: 'GZkq@123456!',
|
// password: 'GZkq@123456!',
|
||||||
|
phone: '',
|
||||||
|
password: '',
|
||||||
},
|
},
|
||||||
version: '1.0.6',
|
version: '1.0.7',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
phone: '',
|
phone: '',
|
||||||
avatar: '/static/defaultHead.png',
|
avatar: '/static/defaultHead.png',
|
||||||
},
|
},
|
||||||
version: '1.0.6',
|
version: '1.0.7',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@
|
||||||
<input type="text" placeholder="请输入所属部门" disabled />
|
<input type="text" placeholder="请输入所属部门" disabled />
|
||||||
</view> -->
|
</view> -->
|
||||||
|
|
||||||
<view class="form-item">
|
<!-- <view class="form-item">
|
||||||
<text class="label required">休假类型</text>
|
<text class="label required">休假类型</text>
|
||||||
<picker
|
<picker
|
||||||
@change="onLeaveTypeChange"
|
@change="onLeaveTypeChange"
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
</view>
|
</view>
|
||||||
</picker>
|
</picker>
|
||||||
<text v-if="errors.leaveType" class="error-message">{{ errors.leaveType }}</text>
|
<text v-if="errors.leaveType" class="error-message">{{ errors.leaveType }}</text>
|
||||||
</view>
|
</view>-->
|
||||||
|
|
||||||
<view class="form-item">
|
<view class="form-item">
|
||||||
<text class="label required">轮休开始时间</text>
|
<text class="label required">轮休开始时间</text>
|
||||||
|
|
@ -244,7 +244,6 @@
|
||||||
import {
|
import {
|
||||||
addHoliday,
|
addHoliday,
|
||||||
getDays,
|
getDays,
|
||||||
getHolidayType,
|
|
||||||
getPersonSelect,
|
getPersonSelect,
|
||||||
editHolidayApi,
|
editHolidayApi,
|
||||||
getLeaveReporting,
|
getLeaveReporting,
|
||||||
|
|
@ -263,7 +262,7 @@
|
||||||
activeTab: 'form',
|
activeTab: 'form',
|
||||||
formData: {
|
formData: {
|
||||||
userName: '',
|
userName: '',
|
||||||
leaveType: null,
|
leaveType: '轮休',
|
||||||
leaveStartDate: '',
|
leaveStartDate: '',
|
||||||
leaveEndDate: '',
|
leaveEndDate: '',
|
||||||
leaveDuration: '',
|
leaveDuration: '',
|
||||||
|
|
@ -304,7 +303,6 @@
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.gethostUserSelect()
|
this.gethostUserSelect()
|
||||||
this.getHolidayType()
|
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
displayedPersonOptionss() {
|
displayedPersonOptionss() {
|
||||||
|
|
@ -321,26 +319,6 @@
|
||||||
switchTab(tab) {
|
switchTab(tab) {
|
||||||
this.activeTab = 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) {
|
onLeaveTypeChange(e) {
|
||||||
const index = e.detail.value
|
const index = e.detail.value
|
||||||
this.leaveTypeIndex = index
|
this.leaveTypeIndex = index
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,11 @@
|
||||||
<input type="text" :value="formData.isAgree === '1' ? '是' : '否'" disabled />
|
<input type="text" :value="formData.isAgree === '1' ? '是' : '否'" disabled />
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<view class="form-item">
|
||||||
|
<text class="label required" style="width: 300px">是否培训</text>
|
||||||
|
<input type="text" :value="formData.isTrain === '1' ? '是' : '否'" disabled />
|
||||||
|
</view>
|
||||||
|
|
||||||
<view class="form-item">
|
<view class="form-item">
|
||||||
<text class="label required">代理主持工作人员</text>
|
<text class="label required">代理主持工作人员</text>
|
||||||
<input type="text" v-model="formData.hostUserName" disabled />
|
<input type="text" v-model="formData.hostUserName" disabled />
|
||||||
|
|
@ -84,6 +89,7 @@
|
||||||
leaveDuration: '',
|
leaveDuration: '',
|
||||||
location: '',
|
location: '',
|
||||||
isAgree: '1',
|
isAgree: '1',
|
||||||
|
isTrain: '1',
|
||||||
hostUserName: '',
|
hostUserName: '',
|
||||||
leaveReason: '',
|
leaveReason: '',
|
||||||
remark: '',
|
remark: '',
|
||||||
|
|
|
||||||
|
|
@ -39,22 +39,6 @@
|
||||||
<input type="text" placeholder="请输入所属部门" disabled />
|
<input type="text" placeholder="请输入所属部门" disabled />
|
||||||
</view> -->
|
</view> -->
|
||||||
|
|
||||||
<!-- <view class="form-item">
|
|
||||||
<text class="label required">休假类型</text>
|
|
||||||
<picker
|
|
||||||
@change="onLeaveTypeChange"
|
|
||||||
:disabled="isFormDisabled"
|
|
||||||
:value="leaveTypeIndex"
|
|
||||||
:range="leaveTypes"
|
|
||||||
range-key="label"
|
|
||||||
>
|
|
||||||
<view class="picker-value">
|
|
||||||
{{ formData.leaveType ? formData.leaveType : '请选择休假类型' }}
|
|
||||||
</view>
|
|
||||||
</picker>
|
|
||||||
<text v-if="errors.leaveType" class="error-message">{{ errors.leaveType }}</text>
|
|
||||||
</view> -->
|
|
||||||
|
|
||||||
<view class="form-item">
|
<view class="form-item">
|
||||||
<text class="label required">外出开始时间</text>
|
<text class="label required">外出开始时间</text>
|
||||||
<picker
|
<picker
|
||||||
|
|
@ -131,7 +115,7 @@
|
||||||
|
|
||||||
<view class="form-item">
|
<view class="form-item">
|
||||||
<text class="label required" style="width: 300px">是否请示领导同意</text>
|
<text class="label required" style="width: 300px">是否请示领导同意</text>
|
||||||
<radio-group @change="onApprovalChange">
|
<radio-group @change="onAgreerovalChange">
|
||||||
<label class="radio">
|
<label class="radio">
|
||||||
<radio
|
<radio
|
||||||
value="1"
|
value="1"
|
||||||
|
|
@ -152,6 +136,29 @@
|
||||||
</radio-group>
|
</radio-group>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<view class="form-item">
|
||||||
|
<text class="label required" style="width: 300px">是否培训</text>
|
||||||
|
<radio-group @change="onTrainChange">
|
||||||
|
<label class="radio">
|
||||||
|
<radio
|
||||||
|
value="1"
|
||||||
|
:disabled="isFormDisabled"
|
||||||
|
checked
|
||||||
|
:checked="formData.isTrain === '1'"
|
||||||
|
/>
|
||||||
|
是
|
||||||
|
</label>
|
||||||
|
<label class="radio">
|
||||||
|
<radio
|
||||||
|
value="0"
|
||||||
|
:disabled="isFormDisabled"
|
||||||
|
:checked="formData.isTrain === '0'"
|
||||||
|
/>
|
||||||
|
否
|
||||||
|
</label>
|
||||||
|
</radio-group>
|
||||||
|
</view>
|
||||||
|
|
||||||
<view class="form-item" style="margin-bottom: 20rpx">
|
<view class="form-item" style="margin-bottom: 20rpx">
|
||||||
<text
|
<text
|
||||||
class="label required"
|
class="label required"
|
||||||
|
|
@ -273,7 +280,6 @@
|
||||||
import {
|
import {
|
||||||
addHoliday,
|
addHoliday,
|
||||||
getDays,
|
getDays,
|
||||||
getHolidayType,
|
|
||||||
getPersonSelect,
|
getPersonSelect,
|
||||||
editHolidayApi,
|
editHolidayApi,
|
||||||
getLeaveReporting,
|
getLeaveReporting,
|
||||||
|
|
@ -292,7 +298,7 @@
|
||||||
activeTab: 'form',
|
activeTab: 'form',
|
||||||
formData: {
|
formData: {
|
||||||
userName: '',
|
userName: '',
|
||||||
leaveType: null,
|
leaveType: '临时外出',
|
||||||
leaveStartDate: '',
|
leaveStartDate: '',
|
||||||
leaveStartInterval:'',
|
leaveStartInterval:'',
|
||||||
leaveEndDate: '',
|
leaveEndDate: '',
|
||||||
|
|
@ -300,6 +306,7 @@
|
||||||
leaveDuration: '',
|
leaveDuration: '',
|
||||||
location: '',
|
location: '',
|
||||||
isAgree: '1',
|
isAgree: '1',
|
||||||
|
isTrain: '1',
|
||||||
representative: '',
|
representative: '',
|
||||||
hostUserId: '',
|
hostUserId: '',
|
||||||
hostUserName: '',
|
hostUserName: '',
|
||||||
|
|
@ -313,8 +320,6 @@
|
||||||
name: '',
|
name: '',
|
||||||
phone: '',
|
phone: '',
|
||||||
},
|
},
|
||||||
leaveTypes: [],
|
|
||||||
leaveTypeIndex: -1,
|
|
||||||
today: new Date().toISOString().substr(0, 10), // 格式化为YYYY-MM-DD
|
today: new Date().toISOString().substr(0, 10), // 格式化为YYYY-MM-DD
|
||||||
errors: {},
|
errors: {},
|
||||||
hostUserOptions: [], // 人员选项列表
|
hostUserOptions: [], // 人员选项列表
|
||||||
|
|
@ -336,7 +341,6 @@
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.gethostUserSelect()
|
this.gethostUserSelect()
|
||||||
this.getHolidayType()
|
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
displayedPersonOptionss() {
|
displayedPersonOptionss() {
|
||||||
|
|
@ -353,33 +357,6 @@
|
||||||
switchTab(tab) {
|
switchTab(tab) {
|
||||||
this.activeTab = 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
|
|
||||||
this.formData.leaveType = this.leaveTypes[index].label
|
|
||||||
console.log(this.formData.leaveType)
|
|
||||||
console.log('休假类型已更改为:', this.formData.leaveType)
|
|
||||||
},
|
|
||||||
onStartDateChange(e) {
|
onStartDateChange(e) {
|
||||||
const startDate = e.detail.value
|
const startDate = e.detail.value
|
||||||
this.formData.leaveStartDate = startDate
|
this.formData.leaveStartDate = startDate
|
||||||
|
|
@ -485,6 +462,12 @@
|
||||||
onApprovalChange(e) {
|
onApprovalChange(e) {
|
||||||
this.formData.isApproved = e.detail.value
|
this.formData.isApproved = e.detail.value
|
||||||
},
|
},
|
||||||
|
onAgreerovalChange(e){
|
||||||
|
this.formData.isAgree = e.detail.value
|
||||||
|
},
|
||||||
|
onTrainChange(e){
|
||||||
|
this.formData.isTrain = e.detail.value
|
||||||
|
},
|
||||||
onRepresentativeChange(e) {
|
onRepresentativeChange(e) {
|
||||||
this.formData.representative = e.detail.value
|
this.formData.representative = e.detail.value
|
||||||
},
|
},
|
||||||
|
|
@ -494,9 +477,6 @@
|
||||||
if (!this.formData.userName.trim()) {
|
if (!this.formData.userName.trim()) {
|
||||||
this.errors.userName = '请输入姓名'
|
this.errors.userName = '请输入姓名'
|
||||||
}
|
}
|
||||||
if (!this.formData.leaveType) {
|
|
||||||
this.errors.leaveType = '请选择休假类型'
|
|
||||||
}
|
|
||||||
if (!this.formData.leaveStartDate) {
|
if (!this.formData.leaveStartDate) {
|
||||||
this.errors.leaveStartDate = '请选择休假开始时间'
|
this.errors.leaveStartDate = '请选择休假开始时间'
|
||||||
}
|
}
|
||||||
|
|
@ -564,6 +544,7 @@
|
||||||
// 在这里可以添加一些视觉反馈,比如改变按钮文字
|
// 在这里可以添加一些视觉反馈,比如改变按钮文字
|
||||||
this.isDataUploaded = true
|
this.isDataUploaded = true
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
console.log('提交表单参数:', this.formData)
|
console.log('提交表单参数:', this.formData)
|
||||||
|
|
||||||
// 判断当前是新增还是修改
|
// 判断当前是新增还是修改
|
||||||
|
|
@ -623,6 +604,7 @@
|
||||||
hostUserId,
|
hostUserId,
|
||||||
hostUserName,
|
hostUserName,
|
||||||
isAgree,
|
isAgree,
|
||||||
|
isTrain,
|
||||||
leaveDuration,
|
leaveDuration,
|
||||||
leaveEndDate,
|
leaveEndDate,
|
||||||
leaveStartDate,
|
leaveStartDate,
|
||||||
|
|
@ -644,6 +626,7 @@
|
||||||
hostUserId,
|
hostUserId,
|
||||||
hostUserName,
|
hostUserName,
|
||||||
isAgree,
|
isAgree,
|
||||||
|
isTrain,
|
||||||
leaveDuration,
|
leaveDuration,
|
||||||
leaveEndDate,
|
leaveEndDate,
|
||||||
leaveStartDate,
|
leaveStartDate,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue