zy-react-library 1.0.118 → 1.0.119
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -79,7 +79,7 @@ function HiddenInfo(props) {
|
|
|
79
79
|
if (info.hiddenInspecCO && Object.keys(info.hiddenInspecCO).length > 0) {
|
|
80
80
|
const inspectionAcceptImageFiles = await getFile({
|
|
81
81
|
eqType: UPLOAD_FILE_TYPE_ENUM["146"],
|
|
82
|
-
eqForeignKey:
|
|
82
|
+
eqForeignKey: hiddenId || query[hiddenIdKey],
|
|
83
83
|
});
|
|
84
84
|
setInspectionAcceptImageFiles(inspectionAcceptImageFiles);
|
|
85
85
|
}
|
|
@@ -12,7 +12,7 @@ const Search = (props) => {
|
|
|
12
12
|
const {
|
|
13
13
|
labelCol = { span: 6 },
|
|
14
14
|
options = [],
|
|
15
|
-
values,
|
|
15
|
+
values = {},
|
|
16
16
|
onFinish,
|
|
17
17
|
onSubmit,
|
|
18
18
|
onReset,
|
|
@@ -61,8 +61,18 @@ const Search = (props) => {
|
|
|
61
61
|
|
|
62
62
|
// 处理重置
|
|
63
63
|
const handleReset = () => {
|
|
64
|
-
form.resetFields();
|
|
65
|
-
const values = form.getFieldsValue();
|
|
64
|
+
// form.resetFields();
|
|
65
|
+
// const values = form.getFieldsValue();
|
|
66
|
+
// onFinish?.(values, "reset");
|
|
67
|
+
// onReset?.(values);
|
|
68
|
+
|
|
69
|
+
const currentValues = form.getFieldsValue();
|
|
70
|
+
const resetValues = {};
|
|
71
|
+
Object.keys(currentValues).forEach((key) => {
|
|
72
|
+
resetValues[key] = values.hasOwnProperty(key) ? values[key] : undefined;
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
form.setFieldsValue(resetValues);
|
|
66
76
|
onFinish?.(values, "reset");
|
|
67
77
|
onReset?.(values);
|
|
68
78
|
};
|
|
@@ -55,10 +55,10 @@ export const UPLOAD_FILE_TYPE_ENUM = {
|
|
|
55
55
|
123: 123, // on_site_responsible_person_confirmation_signature - 现场负责人确实签字
|
|
56
56
|
124: 124, // post_hot_work_site_jurisdiction_unit_confirmation - 动火后现场管辖单位确认
|
|
57
57
|
125: 125, // delayed_fire_monitoring_pictures - 延迟监火图片
|
|
58
|
-
126: 126, // safety_and_environmental_inspection_initiation_signature -
|
|
59
|
-
127: 127, // inspector_confirmation_signature -
|
|
60
|
-
128: 128, // inspected_person_confirmation_signature -
|
|
61
|
-
129: 129, // safety_and_environmental_inspection_appeal_signature -
|
|
58
|
+
126: 126, // safety_and_environmental_inspection_initiation_signature - 安全环保检查发起签字（弃用）
|
|
59
|
+
127: 127, // inspector_confirmation_signature - 检查人确认签字（弃用）
|
|
60
|
+
128: 128, // inspected_person_confirmation_signature - 被检查人确认签字（弃用）
|
|
61
|
+
129: 129, // safety_and_environmental_inspection_appeal_signature - 安全环保检查申辩签字（弃用）
|
|
62
62
|
130: 130, // hk_safety_committee_office_director_safety_director_issuance - （港股安委办主任）安全总监签发
|
|
63
63
|
131: 131, // hot_work_contracting_unit_signature - 动火发包单位签字
|
|
64
64
|
132: 132, // safety_director_approval - 安全总监审批
|