禅道bug修复

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;
+}

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,
+        encryptRequest: true,
-        checkIntegrity: false,
+        checkIntegrity: true,
-        encryptResponse: false,
+        encryptResponse: true,
     },
 }
 
@@ -90,6 +90,7 @@ service.interceptors.request.use(
                 if (
                     systemConfig.requestConfig.encryptRequest &&
                     encryptRequest
+                    // true
                 ) {
                     console.log(data)
                     console.log(hashWithSM3AndSalt(data))

src/views/basic-manage/team-manage/team-entry-and-exit/entry-and-exit-form.vue

@@ -446,11 +446,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-.files-content {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-</style>

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)"
                     >
                         删除
                     </el-button>

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"
                 >
                     <el-option
                         :key="item.value"
@@ -26,6 +27,7 @@
                     value-format="yyyy-MM-dd"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    :picker-options="pickerOptions"
                     v-model="queryPersonForm.time"
                 />
             </el-form-item>
@@ -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(() => {

src/views/construction-person/attendance-manage/card-replacement-audit/audit-form.vue

@@ -73,6 +73,26 @@
                                 'docx',
                             ]"
                         /> -->
+
+                        <div
+                            :key="item.id"
+                            class="files-content"
+                            v-for="item in detailsParams.fileList"
+                        >
+                            <el-tag
+                                @click="onHandlePreviewFile(item)"
+                                style="cursor: pointer"
+                            >
+                                {{ item.originFileName }}
+                            </el-tag>
+
+                            <span
+                                class="cursor-blue"
+                                @click="onHandleDownloadFile(item)"
+                            >
+                                下载
+                            </span>
+                        </div>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -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')
         },
     },