fix
parent
616be6c8d8
commit
149bdcd512
|
|
@ -12,9 +12,9 @@ module.exports = {
|
||||||
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
|
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
|
||||||
//API_HOST: "http://localhost:80",
|
//API_HOST: "http://localhost:80",
|
||||||
|
|
||||||
// API_HOST: "http://192.168.0.134",
|
API_HOST: "http://192.168.0.134",
|
||||||
// API_HOST: "http://192.168.0.150", //太浅
|
// API_HOST: "http://192.168.0.150", //太浅
|
||||||
API_HOST: "https://gbs-gateway.qhdsafety.com",
|
// API_HOST: "https://gbs-gateway.qhdsafety.com",
|
||||||
//API_HOST: "http://192.168.0.103", //huwei
|
//API_HOST: "http://192.168.0.103", //huwei
|
||||||
},
|
},
|
||||||
production: {
|
production: {
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ export default function StaffViewModal({
|
||||||
? info.titleCodeArr.map((item) => ({
|
? info.titleCodeArr.map((item) => ({
|
||||||
titleName: TITLE_LEVEL_MAP[item.titleCode] || item.titleCode || "-",
|
titleName: TITLE_LEVEL_MAP[item.titleCode] || item.titleCode || "-",
|
||||||
industryName:
|
industryName:
|
||||||
PROFESSIONAL_MAJOR_MAP[item.industryCode] || item.industryCode || "-",
|
item.industryName,
|
||||||
proveUrlList: parseFileList(item.proveUrl),
|
proveUrlList: parseFileList(item.proveUrl),
|
||||||
}))
|
}))
|
||||||
: [];
|
: [];
|
||||||
|
|
@ -286,7 +286,7 @@ export default function StaffViewModal({
|
||||||
dataSource={titleInfo}
|
dataSource={titleInfo}
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "职称", dataIndex: "titleName", width: 120 },
|
{ title: "职称", dataIndex: "titleName", width: 120 },
|
||||||
{ title: "专业", dataIndex: "industryName", width: 150 },
|
{ title: "系列/专业", dataIndex: "industryName", width: 150 },
|
||||||
{
|
{
|
||||||
title: "证明材料",
|
title: "证明材料",
|
||||||
dataIndex: "proveUrlList",
|
dataIndex: "proveUrlList",
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,6 @@ import {
|
||||||
import {
|
import {
|
||||||
CERT_LEVEL_OPTIONS_BY_TYPE,
|
CERT_LEVEL_OPTIONS_BY_TYPE,
|
||||||
CAPABILITY_OPTIONS,
|
CAPABILITY_OPTIONS,
|
||||||
PROFESSIONAL_MAJOR_OPTIONS,
|
|
||||||
CERT_LEVEL_LABEL_BY_TYPE
|
CERT_LEVEL_LABEL_BY_TYPE
|
||||||
} from "~/enumerate/constant";
|
} from "~/enumerate/constant";
|
||||||
import { renderCapabilityList } from "~/utils";
|
import { renderCapabilityList } from "~/utils";
|
||||||
|
|
@ -706,6 +705,7 @@ function StaffFormModal({
|
||||||
titleCodeArr: [
|
titleCodeArr: [
|
||||||
{
|
{
|
||||||
industryCode: values.industryCode,
|
industryCode: values.industryCode,
|
||||||
|
industryName: values.industryName,
|
||||||
titleCode: values.titleCode,
|
titleCode: values.titleCode,
|
||||||
proveUrl: Array.isArray(values.proveUrl)
|
proveUrl: Array.isArray(values.proveUrl)
|
||||||
? JSON.stringify(values.proveUrl)
|
? JSON.stringify(values.proveUrl)
|
||||||
|
|
@ -1373,15 +1373,28 @@ function StaffFormModal({
|
||||||
<Col span={12}>
|
<Col span={12}>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="industryCode"
|
name="industryCode"
|
||||||
label="专业"
|
label="系列/专业"
|
||||||
rules={[{ required: true, message: "请选择专业" }]}
|
rules={[{ required: true, message: "请选择系列/专业" }]}
|
||||||
>
|
>
|
||||||
<Select
|
<Select
|
||||||
placeholder="请选择专业"
|
placeholder="请选择系列/专业"
|
||||||
allowClear
|
allowClear
|
||||||
options={PROFESSIONAL_MAJOR_OPTIONS}
|
showSearch
|
||||||
|
onChange={(val, option) => {
|
||||||
|
form.setFieldValue('industryName', option?.label);
|
||||||
|
}}
|
||||||
|
optionFilterProp="label"
|
||||||
|
options={(staffInfo?.basicDisciplineMajorList || []).map(
|
||||||
|
(item) => ({
|
||||||
|
label: `${item.professionalName}`,
|
||||||
|
value: item.id,
|
||||||
|
}),
|
||||||
|
)}
|
||||||
|
loading={staffInfo?.staffInfoLoading}
|
||||||
|
disabled={!staffInfo?.basicDisciplineMajorList?.length}
|
||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
<Form.Item name="industryName" noStyle />
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={12}>
|
<Col span={12}>
|
||||||
<AttachmentUpload
|
<AttachmentUpload
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue