相关方需求变更

src/pages/Container/BranchCompany/EvaluationManage/CompositeManage/HiddenList/index.js

@@ -1,7 +1,7 @@
 import ListPage from "~/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList";
 
 function HiddenList(props) {
-  return <ListPage {...props}  />;
+  return <ListPage {...props} type="corp" />;
 }
 
 export default HiddenList;

src/pages/Container/BranchCompany/EvaluationManage/EvaluationManage/HiddenList/index.js

@@ -1,7 +1,7 @@
 import ListPage from "~/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList";
 
 function HiddenList(props) {
-  return <ListPage {...props}  />;
+  return <ListPage {...props} type="corp"  />;
 }
 
 export default HiddenList;

src/pages/Container/BranchCompany/Qualification/Apply/View/index.js

@@ -70,6 +70,9 @@ function View(props) {
                   ]
                 : []),
               { label: "资质名称", children: info.qualificationsName },
+              { label: "维修、保养", children: info.maintainName },
+              { label: "检测", children: info.detectionName },
+              { label: "其它高风险业务", children: info.otherHighRiskName },
               { label: "备注", children: info.remarks },
             ]}
           />

src/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList/index.js

@@ -38,15 +38,11 @@ function List(props) {
     <Page headerTitle="隐患列表">
       <Search
         options={[
-          { name: "source", label: "隐患来源", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_SOURCE_ENUM },
+          // { name: "source", label: "隐患来源", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_SOURCE_ENUM },
-          { name: "hiddenDesc", label: "隐患描述" },
+          // { name: "hiddenDesc", label: "隐患描述" },
           { name: "hiddenFindTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
-          { name: "hiddenFindDept", label: "隐患发现部门", render: <DepartmentSelectTree /> },
+          { name: "hiddenFindDept", label: "隐患发现部门", render: <DepartmentSelectTree searchType={props.type === "corp" ? "current" : "inType"}  params={{inType:[0,1,2]}} /> },
-          {
+
-            name: "hiddenType",
-            label: "隐患类型",
-            render: <DictionarySelectTree dictValue="hiddenType" onlyLastLevel />,
-          },
           {
             name: "hiddenLevel",
             label: "隐患级别",
@@ -65,17 +61,17 @@ function List(props) {
           { name: "rectificationUserName", label: "整改人" },
           { name: "rectificationDeptId", label: "整改部门", render: <DepartmentSelectTree /> },
           { name: "checkUserName", label: "验收人" },
+          // {
+          //   name: "isRelated",
+          //   label: "是否相关方",
+          //   render: FORM_ITEM_RENDER_ENUM.SELECT,
+          //   items: IS_RELATED_ENUM,
+          // },
+
           {
-            name: "isRelated",
+            name: "hiddenType",
-            label: "是否相关方",
+            label: "隐患类型",
-            render: FORM_ITEM_RENDER_ENUM.SELECT,
+            render: <DictionarySelectTree dictValue="hiddenType" onlyLastLevel />,
-            items: IS_RELATED_ENUM,
-          },
-          {
-            name: "isAi",
-            label: "是否使用AI",
-            render: FORM_ITEM_RENDER_ENUM.SELECT,
-            items: [{ bianma: "1", name: "是" }, { bianma: "0", name: "否" }],
           },
         ]}
         form={form}
@@ -117,15 +113,15 @@ function List(props) {
             render: (_, record) => record.rectificationTime ? dayjs(record.rectificationTime).format("YYYY-MM-DD HH:mm:ss") : "",
           },
           { title: "验收人", dataIndex: "hiddenYUserName", width: 100 },
-          {
+          // {
-            title: "是否相关方",
+          //   title: "是否相关方",
-            dataIndex: "isRelated",
+          //   dataIndex: "isRelated",
-            width: 150,
+          //   width: 150,
-            render: (_, record) => getLabelName({
+          //   render: (_, record) => getLabelName({
-              list: IS_RELATED_ENUM,
+          //     list: IS_RELATED_ENUM,
-              status: record.isRelated,
+          //     status: record.isRelated,
-            }),
+          //   }),
-          },
+          // },
           {
             title: "隐患状态",
             dataIndex: "state",

src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js

@@ -172,7 +172,55 @@ function Add(props) {
               />
             ),
           },
+
           { name: "managerUserName", label: "审核人名称", onlyForLabel: true },
+          {
+            name: "maintain",
+            label: "维修、保养",
+            render: (
+              <DictionarySelect
+                dictValue="maintain"
+                disabled={query.id}
+                mode="multiple"
+                onGetLabel={(label) => {
+                  form.setFieldValue("maintainName", label);
+                }}
+              />
+            ),
+
+          },
+          { name: "maintainName", label: "维修、保养名称", onlyForLabel: true, componentProps: { disabled: query.id } },
+          {
+            name: "detection",
+            label: "检测",
+            render: (
+              <DictionarySelect
+                dictValue="detection"
+                disabled={query.id}
+                mode="multiple"
+                onGetLabel={(label) => {
+                  form.setFieldValue("detectionName", label);
+                }}
+              />
+            ),
+          },
+          { name: "detectionName", label: "检测名称", onlyForLabel: true, componentProps: { disabled: query.id } },
+          {
+            name: "otherHighRisk",
+            label: "其它高风险业务",
+            render: (
+              <DictionarySelect
+                dictValue="otherHighRisk"
+                disabled={query.id}
+                mode="multiple"
+                onGetLabel={(label) => {
+                  form.setFieldValue("otherHighRiskName", label);
+                }}
+              />
+            ),
+          },
+          { name: "otherHighRiskName", label: "其它高风险业务名称", onlyForLabel: true, componentProps: { disabled: query.id } },
+
           {
             name: "shareDeptId",
             label: "股份主管部门",

src/pages/Container/Supervision/Qualification/ViewInfo/index.js

@@ -92,7 +92,10 @@ function ViewInfo(props) {
                 { label: "资质类别", children: info.qualificationsTypeName },
                 { label: "资质等级", children: info.stakeholderLevelName },
                 { label: "材料数", children: info.materialNum },
-                { label: "备注", children: info.remarks },
+                { label: "维修、保养", children: info.maintainName },
+                { label: "检测", children: info.detectionName },
+                { label: "其它高风险业务", children: info.otherHighRiskName,span:2 },
+                { label: "备注", children: info.remarks ,span:2 },
               ]}
             />