This commit is contained in:
Teo
2025-09-10 09:23:51 +08:00
parent b662da584a
commit 11a3db5b61
2 changed files with 9 additions and 43 deletions

View File

@ -148,8 +148,8 @@
<el-table-column label="薪水" align="center" min-width="180">
<template #default="scope">
<span class="flex justify-center">
{{ proxy.formatPrice(scope.row.salary ? scope.row.salary : scope.row.standardSalary) }}
(<dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit"></dict-tag>)
{{ scope.row.salary == '0' ? scope.row.original : scope.row.salary }}
<!-- (<dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit"></dict-tag>) -->
</span>
<div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">
{{ scope.row.salary != '0' ? '取消变更' : '变更' }}
@ -217,12 +217,12 @@
</div>
<div class="el-col el-col-12" v-if="!form.id">
<el-form-item label="身份证正面图片" prop="sfzFrontPic">
<image-upload v-model="form.sfzFrontPic" :limit="1" :is-show-tip="false" :idCardType="'front'" @success="handleUploadSuccess" />
<image-upload v-model="form.sfzFrontPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12" v-if="!form.id">
<el-form-item label="身份证背面图片" prop="sfzBackPic">
<image-upload v-model="form.sfzBackPic" :limit="1" :is-show-tip="false" :idCardType="'back'" @success="handleUploadSuccessBack" />
<image-upload v-model="form.sfzBackPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
@ -291,7 +291,7 @@
<div class="el-row">
<div class="el-col el-col-24" v-if="!form.id">
<el-form-item label="银行图片" prop="yhkPic">
<image-upload v-model="form.yhkPic" :limit="1" :is-show-tip="false" :idCardType="'bank'" @success="handleUploadSuccessBank" />
<image-upload v-model="form.yhkPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
@ -558,9 +558,9 @@ import { AttendanceMonthVO } from '@/api/project/attendance/types';
import { parseTime } from '@/utils/ruoyi';
const calendar = ref<CalendarInstance>();
const { proxy } = getCurrentInstance() as any;
const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type, user_post_type } = toRefs<any>(
proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type', 'user_post_type')
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type } = toRefs<any>(
proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type')
);
// 获取用户 store
const userStore = useUserStoreHook();
@ -738,41 +738,6 @@ const uploadPath = computed(() => {
console.log('🚀 ~ list:', list, fileList.value);
return list;
});
//身份证正面上传成功
const handleUploadSuccess = (data: any) => {
console.log('上传成功返回的数据:', data);
// 这里可以处理返回的数据
form.value.userName = data.name;
form.value.sex = data.gender == '男' ? 2 : 3;
form.value.nation = data.nation;
form.value.sfzNumber = data.citizenIdentification;
form.value.sfzSite = data.address;
form.value.sfzBirth = formatDate(data.birth);
};
//身份证反面面上传成功
const handleUploadSuccessBack = (data: any) => {
console.log('上传成功返回的数据:', data);
form.value.sfzStart = formatDate(data.issuingDate);
form.value.sfzEnd = formatDate(data.expiryDate);
};
//银行卡上传成功
const handleUploadSuccessBank = (data: any) => {
console.log('上传成功返回的数据:', data);
form.value.yhkNumber = data.bankCardNumber;
};
//格式化时间
const formatDate = (date: any) => {
const year = date.substring(0, 4);
const month = date.substring(4, 6);
const day = date.substring(6, 8);
return `${year}-${month}-${day}`;
};
// 获取项目列表
const getProjectList = async () => {
const res = await ProjectList({});
projectList.value = res.rows;
projectList.value.unshift({ id: '', projectName: '全部' });
};
/** 返回文件上传状态 */
const uploadStatusColor = computed(() => (str: string) => {

View File

@ -69,6 +69,7 @@ export default defineComponent({
};
const init = (obj) => {
let documentKey = obj.id.toString() + new Date().getTime();
window['$HOSTSRC'] = 'ws://xny.yj-3d.com:8899/ws';
let baseURL = window['$HOSTSRC'].replace('ws:', 'http:').replace('/ws', '');
let url = baseURL + obj.filenPathCoding.replaceAll('+', ' ');
let type = obj.suffix;