Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
9829f24d0a
|
|
@ -4,44 +4,22 @@
|
|||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
|
||||
name="NuIssueInfoForm">
|
||||
<a-row style="padding:14px;" class="card-class">
|
||||
<!-- <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
|
||||
<a-row style="padding:14px;">
|
||||
<a-col :span="24" style="text-align: center;">
|
||||
<p>
|
||||
<span>机构名称:</span>
|
||||
<span>{{ formData.orgName_dictText }}</span>
|
||||
</p>
|
||||
<p>
|
||||
<span>发版类型:</span>
|
||||
<span>{{ formData.issueType_dictText }}</span>
|
||||
</p>
|
||||
<p>
|
||||
<span>发版日期:</span>
|
||||
<span style="margin-left: 40px;">发版日期:</span>
|
||||
<span>{{ formData.createTime }}</span>
|
||||
</p>
|
||||
</a-col>
|
||||
<a-col :span="24" style="margin-top: 20px;">
|
||||
<!-- <p>发版内容:</p> -->
|
||||
<div v-html="formData.content"></div>
|
||||
</a-col> -->
|
||||
|
||||
<a-col :span="24">
|
||||
<a-form-item label="机构名称" v-bind="validateInfos.orgName" id="NuIssueInfoForm-orgName"
|
||||
name="orgName">
|
||||
<a-input v-model:value="formData.orgName" placeholder="请输入机构名称" disabled></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="发版类型" v-bind="validateInfos.issueType_dictText"
|
||||
id="NuEmployeesAdvisoryInfoForm-issueType_dictText" name="issueType_dictText">
|
||||
<a-input v-model:value="formData.issueType_dictText" placeholder="请输入发版类型" disabled></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="发版日期" v-bind="validateInfos.createTime" id="NuEmployeesAdvisoryInfoForm-createTime"
|
||||
name="createTime">
|
||||
<a-input v-model:value="formData.createTime" placeholder="请输入发版日期" disabled></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="发版内容:" v-bind="validateInfos.content" id="NuEmployeesAdvisoryInfoForm-content"
|
||||
name="content">
|
||||
<div v-html="formData.content" style="background:#f9f9fa;padding:8px;"></div>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
|
|
@ -73,6 +51,7 @@ const formData = reactive<Record<string, any>>({
|
|||
createTime: '',
|
||||
issueType: '',
|
||||
issueType_dictText: '',
|
||||
orgName_dictText:'',
|
||||
content: '',
|
||||
orgName:'',
|
||||
});
|
||||
|
|
|
|||
|
|
@ -15,8 +15,11 @@
|
|||
<a-col :span="24">
|
||||
<a-form-item label="机构名称" v-bind="validateInfos.orgName" id="NuIssueInfoForm-orgName"
|
||||
name="orgName">
|
||||
<j-dict-select-tag type='list' v-model:value="formData.orgName" dictCode="sys_depart,depart_name,id"
|
||||
placeholder="请选择机构名称" allow-clear />
|
||||
<!-- <j-dict-select-tag type='list' v-model:value="formData.orgName" dictCode="sys_depart,depart_name,id"
|
||||
placeholder="请选择机构名称" allow-clear /> -->
|
||||
|
||||
<JSelectMultiple v-model:value="formData.orgName" placeholder="请选择机构名称" dictCode="sys_depart,depart_name,id"></JSelectMultiple>
|
||||
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
|
|
@ -48,6 +51,8 @@ import { getValueType } from '/@/utils';
|
|||
import { saveOrUpdate } from '../IssueInfo.api';
|
||||
import { Form } from 'ant-design-vue';
|
||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
||||
|
||||
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
|
||||
const props = defineProps({
|
||||
formDisabled: { type: Boolean, default: false },
|
||||
formData: { type: Object, default: () => ({}) },
|
||||
|
|
|
|||
Loading…
Reference in New Issue