Merge branch 'master' of http://182.92.169.222:3000/zhc077/zmd_kejiju
commit
638495607d
24 changed files with 1058 additions and 56 deletions
@ -0,0 +1,207 @@ |
||||
<!--部门选择组件--> |
||||
<template> |
||||
<div class="JSelectDept"> |
||||
<JSelectBiz @change="handleSelectChange" @handleOpen="handleOpen" :loading="loadingEcho" v-bind="attrs"/> |
||||
<!-- update-begin--author:liaozhiyang---date:20240515---for:【QQYUN-9260】必填模式下会影响到弹窗内antd组件的样式 --> |
||||
<a-form-item> |
||||
<DeptSelectModal4FaRen @register="regModal" @getSelectResult="setValue" v-bind="getBindValue" :multiple="multiple" @close="handleClose"/> |
||||
</a-form-item> |
||||
<!-- update-end--author:liaozhiyang---date:20240515---for:【QQYUN-9260】必填模式下会影响到弹窗内antd组件的样式 --> |
||||
</div> |
||||
</template> |
||||
<script lang="ts"> |
||||
import DeptSelectModal4FaRen from './modal/DeptSelectModal4FaRen.vue'; |
||||
import JSelectBiz from './base/JSelectBiz.vue'; |
||||
import { defineComponent, ref, reactive, watchEffect, watch, provide, unref, toRaw } from 'vue'; |
||||
import { useModal } from '/@/components/Modal'; |
||||
import { propTypes } from '/@/utils/propTypes'; |
||||
import { useRuleFormItem } from '/@/hooks/component/useFormItem'; |
||||
import { useAttrs } from '/@/hooks/core/useAttrs'; |
||||
import { SelectValue } from 'ant-design-vue/es/select'; |
||||
import { cloneDeep } from 'lodash-es'; |
||||
|
||||
export default defineComponent({ |
||||
name: 'JSelectDept4FaRen', |
||||
components: { |
||||
DeptSelectModal4FaRen, |
||||
JSelectBiz, |
||||
}, |
||||
inheritAttrs: false, |
||||
props: { |
||||
value: propTypes.oneOfType([propTypes.string, propTypes.array]), |
||||
// 是否允许多选,默认 true |
||||
multiple: propTypes.bool.def(true), |
||||
}, |
||||
emits: ['options-change', 'change', 'select', 'update:value'], |
||||
setup(props, { emit, refs }) { |
||||
const emitData = ref<any[]>(); |
||||
//注册model |
||||
const [regModal, { openModal }] = useModal(); |
||||
//表单值 |
||||
// const [state] = useRuleFormItem(props, 'value', 'change', emitData); |
||||
//下拉框选项值 |
||||
const selectOptions = ref<SelectValue>([]); |
||||
//下拉框选中值 |
||||
let selectValues = reactive<Recordable>({ |
||||
value: [], |
||||
}); |
||||
let tempSave: any = []; |
||||
|
||||
// 是否正在加载回显数据 |
||||
const loadingEcho = ref<boolean>(false); |
||||
//下发 selectOptions,xxxBiz组件接收 |
||||
provide('selectOptions', selectOptions); |
||||
//下发 selectValues,xxxBiz组件接收 |
||||
provide('selectValues', selectValues); |
||||
//下发 loadingEcho,xxxBiz组件接收 |
||||
provide('loadingEcho', loadingEcho); |
||||
|
||||
const tag = ref(false); |
||||
const attrs = useAttrs(); |
||||
|
||||
/** |
||||
* 监听组件值 |
||||
*/ |
||||
watchEffect(() => { |
||||
// update-begin--author:liaozhiyang---date:20240611---for:【TV360X-576】已选中了数据,再次选择打开弹窗点击取消,数据清空了(同步JSelectDept改法) |
||||
//update-begin-author:liusq---date:2024-06-03--for: [TV360X-840]用户授权,没有选择,点取消,也会回显一个选过的用户 |
||||
tempSave = []; |
||||
//update-end-author:liusq---date:2024-06-03--for:[TV360X-840]用户授权,没有选择,点取消,也会回显一个选过的用户 |
||||
// update-end--author:liaozhiyang---date:20240611---for:【TV360X-576】已选中了数据,再次选择打开弹窗点击取消,数据清空了(同步JSelectDept改法) |
||||
props.value && initValue(); |
||||
}); |
||||
|
||||
//update-begin-author:liusq---date:20220609--for: 为了解决弹窗form初始化赋值问题 --- |
||||
watch( |
||||
() => props.value, |
||||
() => { |
||||
initValue(); |
||||
} |
||||
); |
||||
//update-end-author:liusq---date:20220609--for: 为了解决弹窗form初始化赋值问题 --- |
||||
/** |
||||
* 监听selectValues变化 |
||||
*/ |
||||
// update-begin--author:liaozhiyang---date:20240527---for:【TV360X-414】部门设置了默认值,查询重置变成空了(同步JSelectUser组件改法) |
||||
// watch(selectValues, () => { |
||||
// if (selectValues) { |
||||
// state.value = selectValues.value; |
||||
// } |
||||
// }); |
||||
// update-end--author:liaozhiyang---date:20240527---for:【TV360X-414】部门设置了默认值,查询重置变成空了(同步JSelectUser组件改法) |
||||
/** |
||||
* 监听selectOptions变化 |
||||
*/ |
||||
watch(selectOptions, () => { |
||||
if (selectOptions) { |
||||
emit('select', toRaw(unref(selectOptions)), toRaw(unref(selectValues))); |
||||
} |
||||
}); |
||||
|
||||
/** |
||||
* 打卡弹出框 |
||||
*/ |
||||
function handleOpen() { |
||||
tag.value = true; |
||||
openModal(true, { |
||||
isUpdate: false, |
||||
}); |
||||
} |
||||
|
||||
/** |
||||
* 将字符串值转化为数组 |
||||
*/ |
||||
function initValue() { |
||||
let value = props.value ? props.value : []; |
||||
if (value && typeof value === 'string') { |
||||
// state.value = value.split(','); |
||||
selectValues.value = value.split(','); |
||||
tempSave = value.split(','); |
||||
} else { |
||||
// 【VUEN-857】兼容数组(行编辑的用法问题) |
||||
selectValues.value = value; |
||||
tempSave = cloneDeep(value); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* 设置下拉框的值 |
||||
*/ |
||||
function setValue(options, values) { |
||||
selectOptions.value = options; |
||||
//emitData.value = values.join(","); |
||||
// state.value = values; |
||||
selectValues.value = values; |
||||
send(values); |
||||
} |
||||
const getBindValue = Object.assign({}, unref(props), unref(attrs)); |
||||
|
||||
// update-begin--author:liaozhiyang---date:20240527---for:【TV360X-414】部门设置了默认值,查询重置变成空了(同步JSelectUser组件改法) |
||||
const handleClose = () => { |
||||
if (tempSave.length) { |
||||
selectValues.value = cloneDeep(tempSave); |
||||
} else { |
||||
send(tempSave); |
||||
} |
||||
}; |
||||
const handleSelectChange = (values) => { |
||||
tempSave = cloneDeep(values); |
||||
send(tempSave); |
||||
}; |
||||
const send = (values) => { |
||||
let result = typeof props.value == 'string' ? values.join(',') : values; |
||||
emit('update:value', result); |
||||
emit('change', result); |
||||
// update-begin--author:liaozhiyang---date:20240627---for:【TV360X-1648】用户编辑界面“所属部门”与“负责部门”联动出错(同步之前丢的代码) |
||||
if (!values || values.length == 0) { |
||||
emit('select', null, null); |
||||
} |
||||
// update-end--author:liaozhiyang---date:20240627---for:【TV360X-1648】用户编辑界面“所属部门”与“负责部门”联动出错(同步之前丢的代码) |
||||
}; |
||||
// update-end--author:liaozhiyang---date:20240527---for:【TV360X-414】部门设置了默认值,查询重置变成空了(同步JSelectUser组件改法) |
||||
|
||||
return { |
||||
// state, |
||||
attrs, |
||||
selectOptions, |
||||
selectValues, |
||||
loadingEcho, |
||||
getBindValue, |
||||
tag, |
||||
regModal, |
||||
setValue, |
||||
handleOpen, |
||||
handleClose, |
||||
handleSelectChange, |
||||
}; |
||||
}, |
||||
}); |
||||
</script> |
||||
<style lang="less" scoped> |
||||
// update-begin--author:liaozhiyang---date:20240515---for:【QQYUN-9260】必填模式下会影响到弹窗内antd组件的样式 |
||||
.JSelectDept { |
||||
> .ant-form-item { |
||||
display: none; |
||||
} |
||||
} |
||||
// update-end--author:liaozhiyang---date:20240515---for:【QQYUN-9260】必填模式下会影响到弹窗内antd组件的样式 |
||||
.j-select-row { |
||||
@width: 82px; |
||||
|
||||
.left { |
||||
width: calc(100% - @width - 8px); |
||||
} |
||||
|
||||
.right { |
||||
width: @width; |
||||
} |
||||
|
||||
.full { |
||||
width: 100%; |
||||
} |
||||
|
||||
:deep(.ant-select-search__field) { |
||||
display: none !important; |
||||
} |
||||
} |
||||
</style> |
@ -0,0 +1,131 @@ |
||||
<!--部门选择框--> |
||||
<template> |
||||
<div> |
||||
<BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="500px" :maxHeight="maxHeight" @ok="handleOk" destroyOnClose @visible-change="visibleChange"> |
||||
<BasicTree |
||||
ref="treeRef" |
||||
:treeData="treeData" |
||||
:load-data="sync == false ? null : onLoadData" |
||||
v-bind="getBindValue" |
||||
@select="onSelect" |
||||
@check="onCheck" |
||||
:fieldNames="fieldNames" |
||||
:checkedKeys="checkedKeys" |
||||
:multiple="multiple" |
||||
:checkStrictly="getCheckStrictly" |
||||
/> |
||||
<!--树操作部分--> |
||||
<!-- <template #insertFooter> |
||||
<a-dropdown placement="top"> |
||||
<template #overlay> |
||||
<a-menu> |
||||
<a-menu-item v-if="multiple" key="1" @click="checkALL(true)">全部勾选</a-menu-item> |
||||
<a-menu-item v-if="multiple" key="2" @click="checkALL(false)">取消全选</a-menu-item> |
||||
<a-menu-item key="3" @click="expandAll(true)">展开全部</a-menu-item> |
||||
<a-menu-item key="4" @click="expandAll(false)">折叠全部</a-menu-item> |
||||
</a-menu> |
||||
</template> |
||||
<a-button style="float: left"> 树操作 <Icon icon="ant-design:up-outlined" /> </a-button> |
||||
</a-dropdown> |
||||
</template>--> |
||||
</BasicModal> |
||||
</div> |
||||
</template> |
||||
<script lang="ts"> |
||||
import { defineComponent, ref, unref } from 'vue'; |
||||
import { BasicModal, useModalInner } from '/@/components/Modal'; |
||||
import { queryDepartTreeSync4FaRen, queryTreeList } from '/@/api/common/api'; |
||||
import { useAttrs } from '/@/hooks/core/useAttrs'; |
||||
import { treeProps } from '/@/components/Form/src/jeecg/props/props'; |
||||
import { BasicTree, TreeActionType } from '/@/components/Tree'; |
||||
import { useTreeBiz } from '/@/components/Form/src/jeecg/hooks/useTreeBiz'; |
||||
import {propTypes} from "/@/utils/propTypes"; |
||||
import { omit } from 'lodash-es'; |
||||
|
||||
export default defineComponent({ |
||||
name: 'DeptSelectModal4FaRen', |
||||
components: { |
||||
BasicModal, |
||||
BasicTree, |
||||
}, |
||||
props: { |
||||
...treeProps, |
||||
//选择框标题 |
||||
modalTitle: { |
||||
type: String, |
||||
default: '单位选择', |
||||
}, |
||||
// update-begin--author:liaozhiyang---date:20231220---for:【QQYUN-7678】部门组件内容过多没有滚动条(给一个默认最大高) |
||||
maxHeight: { |
||||
type: Number, |
||||
default: 500, |
||||
}, |
||||
// update-end--author:liaozhiyang---date:20231220---for:【QQYUN-7678】部门组件内容过多没有滚动条(给一个默认最大高) |
||||
value: propTypes.oneOfType([propTypes.string, propTypes.array]) |
||||
}, |
||||
emits: ['register', 'getSelectResult', 'close'], |
||||
setup(props, { emit, refs }) { |
||||
//注册弹框 |
||||
const [register, { closeModal }] = useModalInner(); |
||||
const attrs = useAttrs(); |
||||
const treeRef = ref<Nullable<TreeActionType>>(null); |
||||
|
||||
//update-begin-author:taoyan date:2022-10-28 for: 部门选择警告类型不匹配 |
||||
let propValue = props.value === ''?[]:props.value; |
||||
//update-begin-author:liusq date:2023-05-26 for: [issues/538]JSelectDept组件受 dynamicDisabled 影响 |
||||
let temp = Object.assign({}, unref(props), unref(attrs), {value: propValue},{disabled: false}); |
||||
const getBindValue = omit(temp, 'multiple'); |
||||
//update-end-author:liusq date:2023-05-26 for: [issues/538]JSelectDept组件受 dynamicDisabled 影响 |
||||
//update-end-author:taoyan date:2022-10-28 for: 部门选择警告类型不匹配 |
||||
|
||||
const queryUrl = getQueryUrl(); |
||||
const [{ visibleChange, checkedKeys, getCheckStrictly, getSelectTreeData, onCheck, onLoadData, treeData, checkALL, expandAll, onSelect }] = |
||||
useTreeBiz(treeRef, queryUrl, getBindValue, props, emit); |
||||
const searchInfo = ref(props.params); |
||||
const tree = ref([]); |
||||
//替换treeNode中key字段为treeData中对应的字段 |
||||
const fieldNames = { |
||||
key: props.rowKey, |
||||
}; |
||||
// {children:'children', title:'title', key:'key' } |
||||
/** |
||||
* 确定选择 |
||||
*/ |
||||
function handleOk() { |
||||
getSelectTreeData((options, values) => { |
||||
//回传选项和已选择的值 |
||||
emit('getSelectResult', options, values); |
||||
//关闭弹窗 |
||||
closeModal(); |
||||
}); |
||||
} |
||||
|
||||
/** 获取查询数据方法 */ |
||||
function getQueryUrl() { |
||||
let queryFn = props.sync ? queryDepartTreeSync4FaRen : queryTreeList; |
||||
//update-begin-author:taoyan date:2022-7-4 for: issues/I5F3P4 online配置部门选择后编辑,查看数据应该显示部门名称,不是部门代码 |
||||
return (params) => queryFn(Object.assign({}, params, { primaryKey: props.rowKey })); |
||||
//update-end-author:taoyan date:2022-7-4 for: issues/I5F3P4 online配置部门选择后编辑,查看数据应该显示部门名称,不是部门代码 |
||||
} |
||||
|
||||
return { |
||||
tree, |
||||
handleOk, |
||||
searchInfo, |
||||
treeRef, |
||||
treeData, |
||||
onCheck, |
||||
onSelect, |
||||
checkALL, |
||||
expandAll, |
||||
fieldNames, |
||||
checkedKeys, |
||||
register, |
||||
getBindValue, |
||||
getCheckStrictly, |
||||
visibleChange, |
||||
onLoadData, |
||||
}; |
||||
}, |
||||
}); |
||||
</script> |
@ -0,0 +1,188 @@ |
||||
<template> |
||||
<a-spin :spinning="confirmLoading"> |
||||
<JFormContainer :disabled="disabled"> |
||||
<template #detail> |
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ExpertForm"> |
||||
<a-row> |
||||
|
||||
|
||||
<a-col :span="24"> |
||||
<a-form-item label="驳回原因" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo"> |
||||
<a-input v-model:value="formData.backinfo" placeholder="请输入驳回原因" allow-clear ></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
|
||||
|
||||
</a-row> |
||||
</a-form> |
||||
</template> |
||||
</JFormContainer> |
||||
</a-spin> |
||||
</template> |
||||
|
||||
<script lang="ts" setup> |
||||
import { usePermission } from '/@/hooks/web/usePermission'; |
||||
const { hasPermission } = usePermission(); |
||||
import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue'; |
||||
import JSelectDept from '/src/components/Form/src/jeecg/components/JSelectDept.vue'; |
||||
import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload.vue'; |
||||
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue'; |
||||
import { defHttp } from '/src/utils/http/axios'; |
||||
import { useMessage } from '/src/hooks/web/useMessage'; |
||||
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue'; |
||||
import { getValueType } from '/src/utils'; |
||||
import { saveOrUpdateadminbh } from '../Expert.api'; |
||||
import { Form } from 'ant-design-vue'; |
||||
import JFormContainer from '/src/components/Form/src/container/JFormContainer.vue'; |
||||
const props = defineProps({ |
||||
formDisabled: { type: Boolean, default: false }, |
||||
formData: { type: Object, default: () => ({})}, |
||||
formBpm: { type: Boolean, default: true } |
||||
}); |
||||
const formRef = ref(); |
||||
const useForm = Form.useForm; |
||||
const emit = defineEmits(['register', 'ok']); |
||||
const formData = reactive<Record<string, any>>({ |
||||
id: '', |
||||
seusername: '', |
||||
psd: '', |
||||
sepsd: '', |
||||
realname: '', |
||||
workon: '', |
||||
sex: '', |
||||
ssdep: '', |
||||
topPic: '', |
||||
phone: '', |
||||
emails: '', |
||||
colleges: '', |
||||
major: '', |
||||
directioncal: '', |
||||
research: '', |
||||
educationcal: '', |
||||
expinfo: '', |
||||
compopen: '', |
||||
adminopen: '', |
||||
backinfo: '', |
||||
zc: '', |
||||
expsture: '', |
||||
errinfo: '', |
||||
}); |
||||
const { createMessage } = useMessage(); |
||||
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } }); |
||||
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } }); |
||||
const confirmLoading = ref<boolean>(false); |
||||
//表单验证 |
||||
const validatorRules = reactive({ |
||||
psd: [{ required: true, message: '请输入密码!'},], |
||||
sepsd: [{ required: true, message: '请输入确认密码!'},], |
||||
workon: [{ required: true, message: '请输入工号!'},], |
||||
ssdep: [{ required: true, message: '请输入部门!'},], |
||||
emails: [{ required: true, message: '请输入邮箱!'},], |
||||
phone: [{ required: true, message: '请输入电话!'},], |
||||
seusername: [{ required: true, message: '请输入用户名!'},], |
||||
}); |
||||
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); |
||||
|
||||
// 表单禁用 |
||||
const disabled = computed(()=>{ |
||||
if(props.formBpm === true){ |
||||
if(props.formData.disabled === false){ |
||||
return false; |
||||
}else{ |
||||
return true; |
||||
} |
||||
} |
||||
return props.formDisabled; |
||||
}); |
||||
|
||||
|
||||
/** |
||||
* 新增 |
||||
*/ |
||||
const isEit = ref(false) |
||||
function add() { |
||||
isEit.value = true |
||||
console.log(11111) |
||||
// edit({}); |
||||
} |
||||
|
||||
/** |
||||
* 编辑 |
||||
*/ |
||||
function edit(record) { |
||||
isEit.value = false |
||||
console.log(22222) |
||||
nextTick(() => { |
||||
resetFields(); |
||||
const tmpData = {}; |
||||
Object.keys(formData).forEach((key) => { |
||||
if(record.hasOwnProperty(key)){ |
||||
tmpData[key] = record[key] |
||||
} |
||||
}) |
||||
//赋值 |
||||
Object.assign(formData, tmpData); |
||||
}); |
||||
} |
||||
|
||||
/** |
||||
* 提交数据 |
||||
*/ |
||||
async function submitForm() { |
||||
try { |
||||
// 触发表单验证 |
||||
await validate(); |
||||
} catch ({ errorFields }) { |
||||
if (errorFields) { |
||||
const firstField = errorFields[0]; |
||||
if (firstField) { |
||||
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' }); |
||||
} |
||||
} |
||||
return Promise.reject(errorFields); |
||||
} |
||||
confirmLoading.value = true; |
||||
const isUpdate = ref<boolean>(false); |
||||
//时间格式化 |
||||
let model = formData; |
||||
if (model.id) { |
||||
isUpdate.value = true; |
||||
} |
||||
//循环数据 |
||||
for (let data in model) { |
||||
//如果该数据是数组并且是字符串类型 |
||||
if (model[data] instanceof Array) { |
||||
let valueType = getValueType(formRef.value.getProps, data); |
||||
//如果是字符串类型的需要变成以逗号分割的字符串 |
||||
if (valueType === 'string') { |
||||
model[data] = model[data].join(','); |
||||
} |
||||
} |
||||
} |
||||
await saveOrUpdateadminbh(model, isUpdate.value) |
||||
.then((res) => { |
||||
if (res.success) { |
||||
createMessage.success(res.message); |
||||
emit('ok'); |
||||
} else { |
||||
createMessage.warning(res.message); |
||||
} |
||||
}) |
||||
.finally(() => { |
||||
confirmLoading.value = false; |
||||
}); |
||||
} |
||||
|
||||
|
||||
defineExpose({ |
||||
add, |
||||
edit, |
||||
submitForm, |
||||
}); |
||||
</script> |
||||
|
||||
<style lang="less" scoped> |
||||
.antd-modal-form { |
||||
padding: 14px; |
||||
} |
||||
</style> |
@ -0,0 +1,78 @@ |
||||
<template> |
||||
<j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> |
||||
<ExpertForm1 ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ExpertForm1> |
||||
</j-modal> |
||||
</template> |
||||
|
||||
<script lang="ts" setup> |
||||
import { ref, nextTick, defineExpose } from 'vue'; |
||||
import ExpertForm1 from './ExpertForm1.vue' |
||||
import JModal from '/src/components/Modal/src/JModal/JModal.vue'; |
||||
|
||||
const title = ref<string>(''); |
||||
const width = ref<number>(800); |
||||
const visible = ref<boolean>(false); |
||||
const disableSubmit = ref<boolean>(false); |
||||
const registerForm = ref(); |
||||
const emit = defineEmits(['register', 'success']); |
||||
|
||||
/** |
||||
* 新增 |
||||
*/ |
||||
function add() { |
||||
title.value = '新增'; |
||||
visible.value = true; |
||||
nextTick(() => { |
||||
registerForm.value.add(); |
||||
}); |
||||
} |
||||
|
||||
/** |
||||
* 编辑 |
||||
* @param record |
||||
*/ |
||||
function edit(record) { |
||||
console.log(record,'record') |
||||
title.value = disableSubmit.value ? '详情' : '编辑'; |
||||
visible.value = true; |
||||
nextTick(() => { |
||||
registerForm.value.edit(record); |
||||
}); |
||||
} |
||||
|
||||
/** |
||||
* 确定按钮点击事件 |
||||
*/ |
||||
function handleOk() { |
||||
registerForm.value.submitForm(); |
||||
} |
||||
|
||||
/** |
||||
* form保存回调事件 |
||||
*/ |
||||
function submitCallback() { |
||||
handleCancel(); |
||||
emit('success'); |
||||
} |
||||
|
||||
/** |
||||
* 取消按钮回调事件 |
||||
*/ |
||||
function handleCancel() { |
||||
visible.value = false; |
||||
} |
||||
|
||||
defineExpose({ |
||||
add, |
||||
edit, |
||||
disableSubmit, |
||||
}); |
||||
</script> |
||||
|
||||
<style lang="less"> |
||||
/**隐藏样式-modal确定按钮 */ |
||||
.jee-hidden { |
||||
display: none !important; |
||||
} |
||||
</style> |
||||
<style lang="less" scoped></style> |
@ -0,0 +1,182 @@ |
||||
<template> |
||||
<a-spin :spinning="confirmLoading"> |
||||
<JFormContainer :disabled="disabled"> |
||||
<template #detail> |
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ExpertForm"> |
||||
<a-row> |
||||
|
||||
<a-col :span="24"> |
||||
<a-form-item label="驳回原因" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo"> |
||||
<a-input v-model:value="formData.backinfo" placeholder="请输入驳回原因" allow-clear ></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
|
||||
</a-row> |
||||
</a-form> |
||||
</template> |
||||
</JFormContainer> |
||||
</a-spin> |
||||
</template> |
||||
|
||||
<script lang="ts" setup> |
||||
import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue'; |
||||
import JSelectDept from '/src/components/Form/src/jeecg/components/JSelectDept.vue'; |
||||
import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload.vue'; |
||||
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue'; |
||||
import { defHttp } from '/src/utils/http/axios'; |
||||
import { useMessage } from '/src/hooks/web/useMessage'; |
||||
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue'; |
||||
import { getValueType } from '/src/utils'; |
||||
import { saveOrUpdateadminbh } from '../Expert.api'; |
||||
import { Form } from 'ant-design-vue'; |
||||
import JFormContainer from '/src/components/Form/src/container/JFormContainer.vue'; |
||||
const props = defineProps({ |
||||
formDisabled: { type: Boolean, default: false }, |
||||
formData: { type: Object, default: () => ({})}, |
||||
formBpm: { type: Boolean, default: true } |
||||
}); |
||||
const formRef = ref(); |
||||
const useForm = Form.useForm; |
||||
const emit = defineEmits(['register', 'ok']); |
||||
const formData = reactive<Record<string, any>>({ |
||||
id: '', |
||||
seusername: '', |
||||
psd: '', |
||||
sepsd: '', |
||||
realname: '', |
||||
workon: '', |
||||
sex: '', |
||||
ssdep: '', |
||||
topPic: '', |
||||
phone: '', |
||||
emails: '', |
||||
colleges: '', |
||||
major: '', |
||||
directioncal: '', |
||||
research: '', |
||||
educationcal: '', |
||||
expinfo: '', |
||||
compopen: '', |
||||
adminopen: '', |
||||
errinfo: '', |
||||
expsture: '', |
||||
backinfo: '', |
||||
zc: '', |
||||
}); |
||||
const { createMessage } = useMessage(); |
||||
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } }); |
||||
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } }); |
||||
const confirmLoading = ref<boolean>(false); |
||||
//表单验证 |
||||
const validatorRules = reactive({ |
||||
psd: [{ required: true, message: '请输入密码!'},], |
||||
sepsd: [{ required: true, message: '请输入确认密码!'},], |
||||
workon: [{ required: true, message: '请输入工号!'},], |
||||
ssdep: [{ required: true, message: '请输入部门!'},], |
||||
emails: [{ required: true, message: '请输入邮箱!'},], |
||||
phone: [{ required: true, message: '请输入电话!'},], |
||||
seusername: [{ required: true, message: '请输入用户名!'},], |
||||
}); |
||||
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); |
||||
|
||||
// 表单禁用 |
||||
const disabled = computed(()=>{ |
||||
if(props.formBpm === true){ |
||||
if(props.formData.disabled === false){ |
||||
return false; |
||||
}else{ |
||||
return true; |
||||
} |
||||
} |
||||
return props.formDisabled; |
||||
}); |
||||
|
||||
|
||||
/** |
||||
* 新增 |
||||
*/ |
||||
const isEit = ref(false) |
||||
function add() { |
||||
isEit.value = true |
||||
// edit({}); |
||||
} |
||||
|
||||
/** |
||||
* 编辑 |
||||
*/ |
||||
function edit(record) { |
||||
isEit.value = false |
||||
nextTick(() => { |
||||
resetFields(); |
||||
const tmpData = {}; |
||||
Object.keys(formData).forEach((key) => { |
||||
if(record.hasOwnProperty(key)){ |
||||
tmpData[key] = record[key] |
||||
} |
||||
}) |
||||
//赋值 |
||||
Object.assign(formData, tmpData); |
||||
}); |
||||
} |
||||
|
||||
/** |
||||
* 提交数据 |
||||
*/ |
||||
async function submitForm() { |
||||
try { |
||||
// 触发表单验证 |
||||
await validate(); |
||||
} catch ({ errorFields }) { |
||||
if (errorFields) { |
||||
const firstField = errorFields[0]; |
||||
if (firstField) { |
||||
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' }); |
||||
} |
||||
} |
||||
return Promise.reject(errorFields); |
||||
} |
||||
confirmLoading.value = true; |
||||
const isUpdate = ref<boolean>(false); |
||||
//时间格式化 |
||||
let model = formData; |
||||
if (model.id) { |
||||
isUpdate.value = true; |
||||
} |
||||
//循环数据 |
||||
for (let data in model) { |
||||
//如果该数据是数组并且是字符串类型 |
||||
if (model[data] instanceof Array) { |
||||
let valueType = getValueType(formRef.value.getProps, data); |
||||
//如果是字符串类型的需要变成以逗号分割的字符串 |
||||
if (valueType === 'string') { |
||||
model[data] = model[data].join(','); |
||||
} |
||||
} |
||||
} |
||||
await saveOrUpdateadminbh(model, isUpdate.value) |
||||
.then((res) => { |
||||
if (res.success) { |
||||
createMessage.success(res.message); |
||||
emit('ok'); |
||||
} else { |
||||
createMessage.warning(res.message); |
||||
} |
||||
}) |
||||
.finally(() => { |
||||
confirmLoading.value = false; |
||||
}); |
||||
} |
||||
|
||||
|
||||
defineExpose({ |
||||
add, |
||||
edit, |
||||
submitForm, |
||||
}); |
||||
</script> |
||||
|
||||
<style lang="less" scoped> |
||||
.antd-modal-form { |
||||
padding: 14px; |
||||
} |
||||
</style> |
@ -0,0 +1,77 @@ |
||||
<template> |
||||
<j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> |
||||
<ExpertForm1 ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ExpertForm1> |
||||
</j-modal> |
||||
</template> |
||||
|
||||
<script lang="ts" setup> |
||||
import { ref, nextTick, defineExpose } from 'vue'; |
||||
import ExpertForm1 from './ExpertForm1.vue' |
||||
import JModal from '/src/components/Modal/src/JModal/JModal.vue'; |
||||
|
||||
const title = ref<string>(''); |
||||
const width = ref<number>(800); |
||||
const visible = ref<boolean>(false); |
||||
const disableSubmit = ref<boolean>(false); |
||||
const registerForm = ref(); |
||||
const emit = defineEmits(['register', 'success']); |
||||
|
||||
/** |
||||
* 新增 |
||||
*/ |
||||
function add() { |
||||
title.value = '新增'; |
||||
visible.value = true; |
||||
nextTick(() => { |
||||
registerForm.value.add(); |
||||
}); |
||||
} |
||||
|
||||
/** |
||||
* 编辑 |
||||
* @param record |
||||
*/ |
||||
function edit(record) { |
||||
title.value = disableSubmit.value ? '详情' : '编辑'; |
||||
visible.value = true; |
||||
nextTick(() => { |
||||
registerForm.value.edit(record); |
||||
}); |
||||
} |
||||
|
||||
/** |
||||
* 确定按钮点击事件 |
||||
*/ |
||||
function handleOk() { |
||||
registerForm.value.submitForm(); |
||||
} |
||||
|
||||
/** |
||||
* form保存回调事件 |
||||
*/ |
||||
function submitCallback() { |
||||
handleCancel(); |
||||
emit('success'); |
||||
} |
||||
|
||||
/** |
||||
* 取消按钮回调事件 |
||||
*/ |
||||
function handleCancel() { |
||||
visible.value = false; |
||||
} |
||||
|
||||
defineExpose({ |
||||
add, |
||||
edit, |
||||
disableSubmit, |
||||
}); |
||||
</script> |
||||
|
||||
<style lang="less"> |
||||
/**隐藏样式-modal确定按钮 */ |
||||
.jee-hidden { |
||||
display: none !important; |
||||
} |
||||
</style> |
||||
<style lang="less" scoped></style> |
Loading…
Reference in new issue