diff --git a/jjb.config.js b/jjb.config.js index c302c18..855bdb1 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -9,8 +9,8 @@ module.exports = { // 应用后端分支名称,部署上线需要 javaGitBranch: "", // 接口服务地址 - API_HOST: "http://192.168.20.100:30140", - // API_HOST: "https://gbs-gateway.qhdsafety.com", + // API_HOST: "http://192.168.20.100:30140", + API_HOST: "https://gbs-gateway.qhdsafety.com", }, production: { // 应用后端分支名称,部署上线需要 diff --git a/src/pages/Container/Supervision/EvaluationTeamConfig/List/index.js b/src/pages/Container/Supervision/EvaluationTeamConfig/List/index.js index 7d5e4c0..2c6a15c 100644 --- a/src/pages/Container/Supervision/EvaluationTeamConfig/List/index.js +++ b/src/pages/Container/Supervision/EvaluationTeamConfig/List/index.js @@ -182,11 +182,11 @@ const ConfigModalComponent = (props) => { } else { form.setFieldValue("updateCmdList", [ - { corpinfoId: "", departmentId: "", evaluationType, userId: "" }, - { corpinfoId: "", departmentId: "", evaluationType, userId: "" }, - { corpinfoId: "", departmentId: "", evaluationType, userId: "" }, - { corpinfoId: "", departmentId: "", evaluationType, userId: "" }, - { corpinfoId: "", departmentId: "", evaluationType, userId: "" }, + { corpinfoId: undefined, departmentId: undefined, evaluationType, userId: undefined }, + { corpinfoId: undefined, departmentId: undefined, evaluationType, userId: undefined }, + { corpinfoId: undefined, departmentId: undefined, evaluationType, userId: undefined }, + { corpinfoId: undefined, departmentId: undefined, evaluationType, userId: undefined }, + { corpinfoId: undefined, departmentId: undefined, evaluationType, userId: undefined }, ]); } }; @@ -239,8 +239,8 @@ const ConfigModalComponent = (props) => { label: "考评部门", render: ( { form.setFieldValue(["updateCmdList", field.name, "userId"], ""); }} @@ -440,7 +440,7 @@ const ChangeLogModalComponent = (props) => { styles={{ label: { width: 100 }, content: { width: 100 } }} items={[ ...list.flatMap(item => ([ - { label: "隐患考评组类型", children: getLabelName({ list: EVALUATION_TYPE_ENUM, status: item.evaluateType }) }, + { label: "隐患考评组类型", children: getLabelName({ list: EVALUATION_TYPE_ENUM, status: item.evaluationType }) }, { label: "变更前", children: `${item.oldDepartmentName || ""}-${item.oldUserName || ""}` }, { label: "变更后", children: `${item.newDepartmentName || ""}-${item.newUserName || ""}` }, ])), diff --git a/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js b/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js index 5731883..3d92f7f 100644 --- a/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js +++ b/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js @@ -245,7 +245,7 @@ const EvaluationModalComponent = (props) => { items: EVALUATION_IS_COMPLIANT_ENUM, }, { - name: "resultCase", + name: "nonCompliantReason", label: "不符合原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, dependencies: ["isCompliant"],