diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index af3d15f..e01b579 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -222,3 +222,10 @@ aside { font-size: 14px; color: $red; } + +.files-content { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; +} diff --git a/src/utils/request.js b/src/utils/request.js index 9168426..90d8994 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -9,9 +9,9 @@ import { saveAs } from 'file-saver' import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm' const systemConfig = JSON.parse(localStorage.getItem('systemConfig')) || { requestConfig: { - encryptRequest: false, - checkIntegrity: false, - encryptResponse: false, + encryptRequest: true, + checkIntegrity: true, + encryptResponse: true, }, } @@ -90,6 +90,7 @@ service.interceptors.request.use( if ( systemConfig.requestConfig.encryptRequest && encryptRequest + // true ) { console.log(data) console.log(hashWithSM3AndSalt(data)) diff --git a/src/views/basic-manage/team-manage/team-entry-and-exit/entry-and-exit-form.vue b/src/views/basic-manage/team-manage/team-entry-and-exit/entry-and-exit-form.vue index b6500a0..b53997c 100644 --- a/src/views/basic-manage/team-manage/team-entry-and-exit/entry-and-exit-form.vue +++ b/src/views/basic-manage/team-manage/team-entry-and-exit/entry-and-exit-form.vue @@ -446,11 +446,4 @@ export default { } - + diff --git a/src/views/construction-person/attendance-manage/card-replacement-apply/add-apply-form.vue b/src/views/construction-person/attendance-manage/card-replacement-apply/add-apply-form.vue index fc00637..5a0ebde 100644 --- a/src/views/construction-person/attendance-manage/card-replacement-apply/add-apply-form.vue +++ b/src/views/construction-person/attendance-manage/card-replacement-apply/add-apply-form.vue @@ -53,7 +53,7 @@ size="mini" type="text" style="color: #f56c6c" - @click="onHandleDelete($scope.index, scope)" + @click="onHandleDelete(scope.$index, scope)" > 删除 diff --git a/src/views/construction-person/attendance-manage/card-replacement-apply/select-person-and-date.vue b/src/views/construction-person/attendance-manage/card-replacement-apply/select-person-and-date.vue index f4fdf0a..7bcb49f 100644 --- a/src/views/construction-person/attendance-manage/card-replacement-apply/select-person-and-date.vue +++ b/src/views/construction-person/attendance-manage/card-replacement-apply/select-person-and-date.vue @@ -8,6 +8,7 @@ placeholder="请选择人员" @change="onChangePerson" v-model="queryPersonForm.selectPersonId" + :disabled="Object.keys(editRow).length > 0" > @@ -152,6 +154,28 @@ export default { cardReplacementDateList: [], // 修改时的补卡日期列表 editRepairDateList: [], + + pickerOptions: { + // 设置时间范围为上个月的1号到当前当天的日期,其他日期不可选 + disabledDate(time) { + // 获取当前日期 + const today = new Date() + // 设置时间为当天的23:59:59,避免当天时间未到导致不可选 + today.setHours(23, 59, 59, 999) + + // 计算上个月1号 + const lastMonthFirstDay = new Date() + lastMonthFirstDay.setMonth(lastMonthFirstDay.getMonth() - 1) // 切换到上个月 + lastMonthFirstDay.setDate(1) // 设置为1号 + lastMonthFirstDay.setHours(0, 0, 0, 0) // 设置时间为0点 + + // 禁用条件:小于上个月1号 或 大于今天 + return ( + time.getTime() < lastMonthFirstDay.getTime() || + time.getTime() > today.getTime() + ) + }, + }, } }, methods: { @@ -238,7 +262,9 @@ export default { } this.cardReplacementDateList = tempList.sort((a, b) => { - return a.date - b.date + if (a.currentDate < b.currentDate) return -1 + if (a.currentDate > b.currentDate) return 1 + return 0 }) this.$nextTick(() => { diff --git a/src/views/construction-person/attendance-manage/card-replacement-audit/audit-form.vue b/src/views/construction-person/attendance-manage/card-replacement-audit/audit-form.vue index 5c5859b..1e3d72e 100644 --- a/src/views/construction-person/attendance-manage/card-replacement-audit/audit-form.vue +++ b/src/views/construction-person/attendance-manage/card-replacement-audit/audit-form.vue @@ -73,6 +73,26 @@ 'docx', ]" /> --> + +
+ + {{ item.originFileName }} + + + + 下载 + +
@@ -112,6 +132,15 @@ export default { }) this.tableData = res.repairCardDetails this.detailsParams.repairRemark = res.repairRemark + + this.detailsParams.fileList = res.files + }, + + onHandlePreviewFile(item) { + window.open(item.lsUrl, '_blank') + }, + onHandleDownloadFile(item) { + window.open(item.lsUrl, '_blank') }, },