diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue index 64e5640..2da80e6 100644 --- a/src/views/attendance/editRemarks.vue +++ b/src/views/attendance/editRemarks.vue @@ -267,6 +267,7 @@ add() { this.resetForm() this.addShow = true + // 选择一个初始值 if(this.remarksTypeList.length === 1){ this.remarksForm.remarksType = this.remarksTypeList[0].id } else { @@ -277,6 +278,16 @@ } } } + // 根据remarksType的值，自动选择breastfeedType + if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') { + this.remarksForm.breastfeedType = '1' + this.breastfeedTypeDisabled = true + } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') { + this.remarksForm.breastfeedType = '2' + this.breastfeedTypeDisabled = true + } else { + this.breastfeedTypeDisabled = false + } }, // 保存数据 saveData: function() { @@ -293,6 +304,7 @@ var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]) if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) { this.$message.error('哺乳假时间太长，请选择合理的起止日期') + this.saveBtnDisabeld = false return }// 把相差的毫秒数 this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType @@ -312,11 +324,13 @@ this.addShow = false this.$message.success('添加成功！') this.edited = true + if(this.remarksForm.remarks.indexOf('哺乳假')>-1) this.remarksForm.remarks = '请假-哺乳假' } this.saveBtnDisabeld = false }).catch(err => { console.log(err) this.saveBtnDisabeld = false + if(this.remarksForm.remarks.indexOf('哺乳假')>-1) this.remarksForm.remarks = '请假-哺乳假' }) } }) diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue index 64e5640..2da80e6 100644 --- a/src/views/attendance/editRemarks.vue +++ b/src/views/attendance/editRemarks.vue @@ -267,6 +267,7 @@ add() { this.resetForm() this.addShow = true + // 选择一个初始值 if(this.remarksTypeList.length === 1){ this.remarksForm.remarksType = this.remarksTypeList[0].id } else { @@ -277,6 +278,16 @@ } } } + // 根据remarksType的值，自动选择breastfeedType + if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') { + this.remarksForm.breastfeedType = '1' + this.breastfeedTypeDisabled = true + } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') { + this.remarksForm.breastfeedType = '2' + this.breastfeedTypeDisabled = true + } else { + this.breastfeedTypeDisabled = false + } }, // 保存数据 saveData: function() { @@ -293,6 +304,7 @@ var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]) if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) { this.$message.error('哺乳假时间太长，请选择合理的起止日期') + this.saveBtnDisabeld = false return }// 把相差的毫秒数 this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType @@ -312,11 +324,13 @@ this.addShow = false this.$message.success('添加成功！') this.edited = true + if(this.remarksForm.remarks.indexOf('哺乳假')>-1) this.remarksForm.remarks = '请假-哺乳假' } this.saveBtnDisabeld = false }).catch(err => { console.log(err) this.saveBtnDisabeld = false + if(this.remarksForm.remarks.indexOf('哺乳假')>-1) this.remarksForm.remarks = '请假-哺乳假' }) } }) diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue index 9c4b9d3..640b85f 100644 --- a/src/views/attendance/makeReport.vue +++ b/src/views/attendance/makeReport.vue @@ -17,9 +17,9 @@ - + - + { - if (this.form.beginDate === '' && this.form.endDate == '' && value === '') { + if (this.form.beginDateS === '' && this.form.endDateS === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -65,7 +65,7 @@ } } const validateBeginDate = (rule, value, callback) => { - if (this.form.month === '' && this.form.endDate == '' && value === '') { + if (this.form.month === '' && this.form.endDateS === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -75,7 +75,7 @@ } } const validateEndDate = (rule, value, callback) => { - if (this.form.beginDate === '' && this.form.month == '' && value === '') { + if (this.form.beginDateS === '' && this.form.month === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -87,25 +87,25 @@ return { beginDateOptions: { disabledDate: (time) => { - if( this.form.endDate !== '' ) return time.getTime() > this.form.endDate + if( this.form.endDateS !== '' ) return time.getTime() > new Date(this.form.endDateS) else return false } }, endDateOptions: { disabledDate: (time) => { - if( this.form.beginDate !== '' ) return (time.getTime() < this.form.beginDate || time.getTime() > Date.now()) + if( this.form.beginDateS !== '' ) return (time.getTime() < new Date(this.form.beginDateS) || time.getTime() > Date.now()) else return time.getTime() > Date.now() } }, form: { month: '', - beginDate: '', - endDate: '' + beginDateS: '', + endDateS: '' }, rules: { month: [{ validator: validateMonth, trigger: ['blur', 'change'] }], - beginDate: [{ validator: validateBeginDate, trigger: ['blur', 'change'] }], - endDate: [{ validator: validateEndDate, trigger: ['blur', 'change'] }] + beginDateS: [{ validator: validateBeginDate, trigger: ['blur', 'change'] }], + endDateS: [{ validator: validateEndDate, trigger: ['blur', 'change'] }] }, pickerOptions: { disabledDate: (time) => { diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue index 64e5640..2da80e6 100644 --- a/src/views/attendance/editRemarks.vue +++ b/src/views/attendance/editRemarks.vue @@ -267,6 +267,7 @@ add() { this.resetForm() this.addShow = true + // 选择一个初始值 if(this.remarksTypeList.length === 1){ this.remarksForm.remarksType = this.remarksTypeList[0].id } else { @@ -277,6 +278,16 @@ } } } + // 根据remarksType的值，自动选择breastfeedType + if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') { + this.remarksForm.breastfeedType = '1' + this.breastfeedTypeDisabled = true + } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') { + this.remarksForm.breastfeedType = '2' + this.breastfeedTypeDisabled = true + } else { + this.breastfeedTypeDisabled = false + } }, // 保存数据 saveData: function() { @@ -293,6 +304,7 @@ var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]) if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) { this.$message.error('哺乳假时间太长，请选择合理的起止日期') + this.saveBtnDisabeld = false return }// 把相差的毫秒数 this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType @@ -312,11 +324,13 @@ this.addShow = false this.$message.success('添加成功！') this.edited = true + if(this.remarksForm.remarks.indexOf('哺乳假')>-1) this.remarksForm.remarks = '请假-哺乳假' } this.saveBtnDisabeld = false }).catch(err => { console.log(err) this.saveBtnDisabeld = false + if(this.remarksForm.remarks.indexOf('哺乳假')>-1) this.remarksForm.remarks = '请假-哺乳假' }) } }) diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue index 9c4b9d3..640b85f 100644 --- a/src/views/attendance/makeReport.vue +++ b/src/views/attendance/makeReport.vue @@ -17,9 +17,9 @@ - + - + { - if (this.form.beginDate === '' && this.form.endDate == '' && value === '') { + if (this.form.beginDateS === '' && this.form.endDateS === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -65,7 +65,7 @@ } } const validateBeginDate = (rule, value, callback) => { - if (this.form.month === '' && this.form.endDate == '' && value === '') { + if (this.form.month === '' && this.form.endDateS === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -75,7 +75,7 @@ } } const validateEndDate = (rule, value, callback) => { - if (this.form.beginDate === '' && this.form.month == '' && value === '') { + if (this.form.beginDateS === '' && this.form.month === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -87,25 +87,25 @@ return { beginDateOptions: { disabledDate: (time) => { - if( this.form.endDate !== '' ) return time.getTime() > this.form.endDate + if( this.form.endDateS !== '' ) return time.getTime() > new Date(this.form.endDateS) else return false } }, endDateOptions: { disabledDate: (time) => { - if( this.form.beginDate !== '' ) return (time.getTime() < this.form.beginDate || time.getTime() > Date.now()) + if( this.form.beginDateS !== '' ) return (time.getTime() < new Date(this.form.beginDateS) || time.getTime() > Date.now()) else return time.getTime() > Date.now() } }, form: { month: '', - beginDate: '', - endDate: '' + beginDateS: '', + endDateS: '' }, rules: { month: [{ validator: validateMonth, trigger: ['blur', 'change'] }], - beginDate: [{ validator: validateBeginDate, trigger: ['blur', 'change'] }], - endDate: [{ validator: validateEndDate, trigger: ['blur', 'change'] }] + beginDateS: [{ validator: validateBeginDate, trigger: ['blur', 'change'] }], + endDateS: [{ validator: validateEndDate, trigger: ['blur', 'change'] }] }, pickerOptions: { disabledDate: (time) => { diff --git a/src/views/attendance/remarksLimit.vue b/src/views/attendance/remarksLimit.vue index ab210ff..a79ccbc 100644 --- a/src/views/attendance/remarksLimit.vue +++ b/src/views/attendance/remarksLimit.vue @@ -31,7 +31,7 @@ - + - + - + - + diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue index 64e5640..2da80e6 100644 --- a/src/views/attendance/editRemarks.vue +++ b/src/views/attendance/editRemarks.vue @@ -267,6 +267,7 @@ add() { this.resetForm() this.addShow = true + // 选择一个初始值 if(this.remarksTypeList.length === 1){ this.remarksForm.remarksType = this.remarksTypeList[0].id } else { @@ -277,6 +278,16 @@ } } } + // 根据remarksType的值，自动选择breastfeedType + if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') { + this.remarksForm.breastfeedType = '1' + this.breastfeedTypeDisabled = true + } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') { + this.remarksForm.breastfeedType = '2' + this.breastfeedTypeDisabled = true + } else { + this.breastfeedTypeDisabled = false + } }, // 保存数据 saveData: function() { @@ -293,6 +304,7 @@ var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]) if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) { this.$message.error('哺乳假时间太长，请选择合理的起止日期') + this.saveBtnDisabeld = false return }// 把相差的毫秒数 this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType @@ -312,11 +324,13 @@ this.addShow = false this.$message.success('添加成功！') this.edited = true + if(this.remarksForm.remarks.indexOf('哺乳假')>-1) this.remarksForm.remarks = '请假-哺乳假' } this.saveBtnDisabeld = false }).catch(err => { console.log(err) this.saveBtnDisabeld = false + if(this.remarksForm.remarks.indexOf('哺乳假')>-1) this.remarksForm.remarks = '请假-哺乳假' }) } }) diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue index 9c4b9d3..640b85f 100644 --- a/src/views/attendance/makeReport.vue +++ b/src/views/attendance/makeReport.vue @@ -17,9 +17,9 @@ - + - + { - if (this.form.beginDate === '' && this.form.endDate == '' && value === '') { + if (this.form.beginDateS === '' && this.form.endDateS === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -65,7 +65,7 @@ } } const validateBeginDate = (rule, value, callback) => { - if (this.form.month === '' && this.form.endDate == '' && value === '') { + if (this.form.month === '' && this.form.endDateS === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -75,7 +75,7 @@ } } const validateEndDate = (rule, value, callback) => { - if (this.form.beginDate === '' && this.form.month == '' && value === '') { + if (this.form.beginDateS === '' && this.form.month === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -87,25 +87,25 @@ return { beginDateOptions: { disabledDate: (time) => { - if( this.form.endDate !== '' ) return time.getTime() > this.form.endDate + if( this.form.endDateS !== '' ) return time.getTime() > new Date(this.form.endDateS) else return false } }, endDateOptions: { disabledDate: (time) => { - if( this.form.beginDate !== '' ) return (time.getTime() < this.form.beginDate || time.getTime() > Date.now()) + if( this.form.beginDateS !== '' ) return (time.getTime() < new Date(this.form.beginDateS) || time.getTime() > Date.now()) else return time.getTime() > Date.now() } }, form: { month: '', - beginDate: '', - endDate: '' + beginDateS: '', + endDateS: '' }, rules: { month: [{ validator: validateMonth, trigger: ['blur', 'change'] }], - beginDate: [{ validator: validateBeginDate, trigger: ['blur', 'change'] }], - endDate: [{ validator: validateEndDate, trigger: ['blur', 'change'] }] + beginDateS: [{ validator: validateBeginDate, trigger: ['blur', 'change'] }], + endDateS: [{ validator: validateEndDate, trigger: ['blur', 'change'] }] }, pickerOptions: { disabledDate: (time) => { diff --git a/src/views/attendance/remarksLimit.vue b/src/views/attendance/remarksLimit.vue index ab210ff..a79ccbc 100644 --- a/src/views/attendance/remarksLimit.vue +++ b/src/views/attendance/remarksLimit.vue @@ -31,7 +31,7 @@ - + diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue index e869530..044f011 100644 --- a/src/views/memberManage/listVisitor.vue +++ b/src/views/memberManage/listVisitor.vue @@ -70,6 +70,7 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> + @@ -82,10 +83,11 @@ // import { isIE } from '@/utils/browser' import { downloadFile } from '@/utils/downloadUtils' import UpdateData from './updateData' +import CaptureIris from './captureIris' export default { name: 'ListVisitor', - components: { DeptSelect, UpdateData }, + components: { DeptSelect, UpdateData, CaptureIris }, data() { return { listQuery: { @@ -237,6 +239,8 @@ }) }, registerIris(row) { + this.dialogFormVisible = true + this.$refs.captureIris.initDialog(this.dialogFormVisible, row, '0') // const token = getToken() // const id = row.id // const idCardNo = row.idCardNo @@ -248,14 +252,14 @@ // const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo // window.location.href = url // } - this.$router.push({ - path: '/addIris', - query: { - personId: row.id, - idCardNo: row.idCardNo, - type: 'visitor' - } - }) + // this.$router.push({ + // path: '/addIris', + // query: { + // personId: row.id, + // idCardNo: row.idCardNo, + // type: 'visitor' + // } + // }) }, // 查询数据 search() { diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue index 64e5640..2da80e6 100644 --- a/src/views/attendance/editRemarks.vue +++ b/src/views/attendance/editRemarks.vue @@ -267,6 +267,7 @@ add() { this.resetForm() this.addShow = true + // 选择一个初始值 if(this.remarksTypeList.length === 1){ this.remarksForm.remarksType = this.remarksTypeList[0].id } else { @@ -277,6 +278,16 @@ } } } + // 根据remarksType的值，自动选择breastfeedType + if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') { + this.remarksForm.breastfeedType = '1' + this.breastfeedTypeDisabled = true + } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') { + this.remarksForm.breastfeedType = '2' + this.breastfeedTypeDisabled = true + } else { + this.breastfeedTypeDisabled = false + } }, // 保存数据 saveData: function() { @@ -293,6 +304,7 @@ var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]) if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) { this.$message.error('哺乳假时间太长，请选择合理的起止日期') + this.saveBtnDisabeld = false return }// 把相差的毫秒数 this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType @@ -312,11 +324,13 @@ this.addShow = false this.$message.success('添加成功！') this.edited = true + if(this.remarksForm.remarks.indexOf('哺乳假')>-1) this.remarksForm.remarks = '请假-哺乳假' } this.saveBtnDisabeld = false }).catch(err => { console.log(err) this.saveBtnDisabeld = false + if(this.remarksForm.remarks.indexOf('哺乳假')>-1) this.remarksForm.remarks = '请假-哺乳假' }) } }) diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue index 9c4b9d3..640b85f 100644 --- a/src/views/attendance/makeReport.vue +++ b/src/views/attendance/makeReport.vue @@ -17,9 +17,9 @@ - + - + { - if (this.form.beginDate === '' && this.form.endDate == '' && value === '') { + if (this.form.beginDateS === '' && this.form.endDateS === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -65,7 +65,7 @@ } } const validateBeginDate = (rule, value, callback) => { - if (this.form.month === '' && this.form.endDate == '' && value === '') { + if (this.form.month === '' && this.form.endDateS === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -75,7 +75,7 @@ } } const validateEndDate = (rule, value, callback) => { - if (this.form.beginDate === '' && this.form.month == '' && value === '') { + if (this.form.beginDateS === '' && this.form.month === '' && value === '') { callback(new Error('请选择考勤月或起止日期')) } else { this.$nextTick(() => { @@ -87,25 +87,25 @@ return { beginDateOptions: { disabledDate: (time) => { - if( this.form.endDate !== '' ) return time.getTime() > this.form.endDate + if( this.form.endDateS !== '' ) return time.getTime() > new Date(this.form.endDateS) else return false } }, endDateOptions: { disabledDate: (time) => { - if( this.form.beginDate !== '' ) return (time.getTime() < this.form.beginDate || time.getTime() > Date.now()) + if( this.form.beginDateS !== '' ) return (time.getTime() < new Date(this.form.beginDateS) || time.getTime() > Date.now()) else return time.getTime() > Date.now() } }, form: { month: '', - beginDate: '', - endDate: '' + beginDateS: '', + endDateS: '' }, rules: { month: [{ validator: validateMonth, trigger: ['blur', 'change'] }], - beginDate: [{ validator: validateBeginDate, trigger: ['blur', 'change'] }], - endDate: [{ validator: validateEndDate, trigger: ['blur', 'change'] }] + beginDateS: [{ validator: validateBeginDate, trigger: ['blur', 'change'] }], + endDateS: [{ validator: validateEndDate, trigger: ['blur', 'change'] }] }, pickerOptions: { disabledDate: (time) => { diff --git a/src/views/attendance/remarksLimit.vue b/src/views/attendance/remarksLimit.vue index ab210ff..a79ccbc 100644 --- a/src/views/attendance/remarksLimit.vue +++ b/src/views/attendance/remarksLimit.vue @@ -31,7 +31,7 @@ - + diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue index e869530..044f011 100644 --- a/src/views/memberManage/listVisitor.vue +++ b/src/views/memberManage/listVisitor.vue @@ -70,6 +70,7 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> + @@ -82,10 +83,11 @@ // import { isIE } from '@/utils/browser' import { downloadFile } from '@/utils/downloadUtils' import UpdateData from './updateData' +import CaptureIris from './captureIris' export default { name: 'ListVisitor', - components: { DeptSelect, UpdateData }, + components: { DeptSelect, UpdateData, CaptureIris }, data() { return { listQuery: { @@ -237,6 +239,8 @@ }) }, registerIris(row) { + this.dialogFormVisible = true + this.$refs.captureIris.initDialog(this.dialogFormVisible, row, '0') // const token = getToken() // const id = row.id // const idCardNo = row.idCardNo @@ -248,14 +252,14 @@ // const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo // window.location.href = url // } - this.$router.push({ - path: '/addIris', - query: { - personId: row.id, - idCardNo: row.idCardNo, - type: 'visitor' - } - }) + // this.$router.push({ + // path: '/addIris', + // query: { + // personId: row.id, + // idCardNo: row.idCardNo, + // type: 'visitor' + // } + // }) }, // 查询数据 search() { diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue index e168b83..af628a5 100644 --- a/src/views/query/listRecord.vue +++ b/src/views/query/listRecord.vue @@ -177,11 +177,11 @@ value: 'devCode', align: 'center' }, - // { - // text: '标签', - // value: 'inoutTypeName', - // align: 'center' - // }, + { + text: '标签', + value: 'inoutTypeName', + align: 'center' + }, { text: '时间', value: 'dateTime',