Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue
This commit is contained in:
commit
adb5adf201
|
|
@ -2,7 +2,7 @@
|
|||
VITE_USE_MOCK = false
|
||||
|
||||
# 发布路径
|
||||
VITE_PUBLIC_PATH = /biz103
|
||||
VITE_PUBLIC_PATH = /biz104
|
||||
|
||||
# 是否启用gzip或brotli压缩
|
||||
# 选项值: gzip | brotli | none
|
||||
|
|
@ -13,11 +13,11 @@ VITE_BUILD_COMPRESS = 'gzip'
|
|||
VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
|
||||
|
||||
#后台接口父地址(必填)
|
||||
VITE_GLOB_API_URL=/nursingunit103
|
||||
VITE_GLOB_API_URL=/nursingunit104
|
||||
|
||||
#后台接口全路径地址(必填)
|
||||
VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit103
|
||||
# VITE_GLOB_DOMAIN_URL=http://115.175.20.152/nursingunit104
|
||||
# VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101
|
||||
VITE_GLOB_DOMAIN_URL=http://115.175.20.152/nursingunit104
|
||||
|
||||
# 接口父路径前缀
|
||||
VITE_GLOB_API_URL_PREFIX=
|
||||
|
|
|
|||
|
|
@ -1,39 +1,39 @@
|
|||
import {BasicColumn} from '/@/components/Table';
|
||||
import {FormSchema} from '/@/components/Table';
|
||||
import { rules} from '/@/utils/helper/validator';
|
||||
import { BasicColumn } from '/@/components/Table';
|
||||
import { FormSchema } from '/@/components/Table';
|
||||
import { rules } from '/@/utils/helper/validator';
|
||||
import { render } from '/@/utils/common/renderUtils';
|
||||
import { getWeekMonthQuarterYear } from '/@/utils';
|
||||
//列表数据
|
||||
export const columns: BasicColumn[] = [
|
||||
{
|
||||
title: '姓名',
|
||||
align: "center",
|
||||
dataIndex: 'name'
|
||||
align: 'center',
|
||||
dataIndex: 'name',
|
||||
},
|
||||
{
|
||||
title: '性别',
|
||||
align: "center",
|
||||
dataIndex: 'sex'
|
||||
align: 'center',
|
||||
dataIndex: 'sex',
|
||||
},
|
||||
{
|
||||
title: '年龄',
|
||||
align: "center",
|
||||
dataIndex: 'dateOfBirth'
|
||||
align: 'center',
|
||||
dataIndex: 'dateOfBirth',
|
||||
},
|
||||
{
|
||||
title: '联系电话',
|
||||
align: "center",
|
||||
dataIndex: 'tel'
|
||||
align: 'center',
|
||||
dataIndex: 'tel',
|
||||
},
|
||||
{
|
||||
title: '申请日期',
|
||||
align: "center",
|
||||
dataIndex: 'createTime'
|
||||
align: 'center',
|
||||
dataIndex: 'createTime',
|
||||
},
|
||||
{
|
||||
title: '审核状态',
|
||||
align: "center",
|
||||
dataIndex: 'status'
|
||||
align: 'center',
|
||||
dataIndex: 'status',
|
||||
},
|
||||
// {
|
||||
// title: '审核备注',
|
||||
|
|
@ -46,33 +46,33 @@ export const columns: BasicColumn[] = [
|
|||
export const columns1: BasicColumn[] = [
|
||||
{
|
||||
title: '姓名',
|
||||
align: "center",
|
||||
dataIndex: 'name'
|
||||
align: 'center',
|
||||
dataIndex: 'name',
|
||||
},
|
||||
{
|
||||
title: '性别',
|
||||
align: "center",
|
||||
dataIndex: 'sex'
|
||||
align: 'center',
|
||||
dataIndex: 'sex',
|
||||
},
|
||||
{
|
||||
title: '年龄',
|
||||
align: "center",
|
||||
dataIndex: 'dateOfBirth'
|
||||
align: 'center',
|
||||
dataIndex: 'dateOfBirth',
|
||||
},
|
||||
{
|
||||
title: '联系电话',
|
||||
align: "center",
|
||||
dataIndex: 'tel'
|
||||
align: 'center',
|
||||
dataIndex: 'tel',
|
||||
},
|
||||
{
|
||||
title: '申请日期',
|
||||
align: "center",
|
||||
dataIndex: 'createTime'
|
||||
align: 'center',
|
||||
dataIndex: 'createTime',
|
||||
},
|
||||
{
|
||||
title: '邀请状态',
|
||||
align: "center",
|
||||
dataIndex: 'status'
|
||||
align: 'center',
|
||||
dataIndex: 'status',
|
||||
},
|
||||
// {
|
||||
// title: '审核备注',
|
||||
|
|
@ -83,12 +83,12 @@ export const columns1: BasicColumn[] = [
|
|||
|
||||
// 高级查询数据
|
||||
export const superQuerySchema = {
|
||||
name: {title: '姓名',order: 0,view: 'text', type: 'string',},
|
||||
sex: {title: '性别',order: 1,view: 'radio', type: 'string',dictCode: '',},
|
||||
tel: {title: '联系电话',order: 4,view: 'text', type: 'string',},
|
||||
createTime: {title: '申请日期',order: 27,view: 'datetime', type: 'string',},
|
||||
status: {title: '申请状态 0历史 1申请中 2通过 3驳回',order: 28,view: 'text', type: 'string',},
|
||||
auditContent: {title: '审核备注',order: 29,view: 'text', type: 'string',},
|
||||
name: { title: '姓名', order: 0, view: 'text', type: 'string' },
|
||||
sex: { title: '性别', order: 1, view: 'radio', type: 'string', dictCode: '' },
|
||||
tel: { title: '联系电话', order: 4, view: 'text', type: 'string' },
|
||||
createTime: { title: '申请日期', order: 27, view: 'datetime', type: 'string' },
|
||||
status: { title: '申请状态 0历史 1申请中 2通过 3驳回', order: 28, view: 'text', type: 'string' },
|
||||
auditContent: { title: '审核备注', order: 29, view: 'text', type: 'string' },
|
||||
};
|
||||
|
||||
export const applyObj = {
|
||||
|
|
@ -131,5 +131,7 @@ export const applyObj = {
|
|||
status: '申请状态 1申请中 2通过 3驳回',
|
||||
auditContent: '审核备注',
|
||||
izHistory: '是否历史数据',
|
||||
applyType: '申请类型 0被邀请 1主动申请 2信息变更'
|
||||
applyType: '申请类型 0被邀请 1主动申请 2信息变更',
|
||||
startTime: '有效开始日期',
|
||||
endTime: '有效结束日期',
|
||||
};
|
||||
|
|
|
|||
|
|
@ -348,6 +348,8 @@ const formData = reactive<Record<string, any>>({
|
|||
status: '',
|
||||
auditContent: '',
|
||||
applyType: '',
|
||||
startTime:'',
|
||||
endTime:'',
|
||||
});
|
||||
const statusVal = ref('')
|
||||
const { createMessage } = useMessage();
|
||||
|
|
|
|||
|
|
@ -121,6 +121,10 @@ const filteredTableData = computed(() => {
|
|||
&& item.d1 !== 'updateBy'
|
||||
&& item.d1 !== 'updateTime'
|
||||
&& item.d1 !== 'modifyStatus'
|
||||
&& item.d1 !== 'openingBank'
|
||||
&& item.d1 !== 'bankCard'
|
||||
&& item.d1 !== 'startTime'
|
||||
&& item.d1 !== 'endTime'
|
||||
|
||||
);
|
||||
});
|
||||
|
|
@ -182,6 +186,8 @@ const fieldMap = {
|
|||
qualification: 'qualification',
|
||||
noCrimeCertificate: 'noCrimeCertificate',
|
||||
regional: 'regional',
|
||||
startTime: 'startTime',
|
||||
endTime: 'endTime',
|
||||
};
|
||||
|
||||
async function show(record) {
|
||||
|
|
@ -219,6 +225,14 @@ async function submitForm() {
|
|||
}
|
||||
return Promise.reject(errorFields);
|
||||
}
|
||||
|
||||
console.log("🌊 ~ submitForm ~ formData:", formData)
|
||||
if (formData.startTime) {
|
||||
formData.startTime = formData.startTime.replace(/-/g, '.');
|
||||
}
|
||||
if (formData.endTime) {
|
||||
formData.endTime = formData.endTime.replace(/-/g, '.');
|
||||
}
|
||||
auditSubmit(formData)
|
||||
.then((res) => {
|
||||
emit('ok');
|
||||
|
|
|
|||
Loading…
Reference in New Issue