diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js index 08e83263..2adb437b 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js @@ -91,6 +91,7 @@ export const conditions = [ isQuickSearch: false, label: "类型", labelcol: 6, + valueList:[], options: [ { key: "NUMBER", @@ -110,7 +111,6 @@ export const conditions = [ conditionType: "SWITCH", domkey: ["enableStatus"], fieldcol: 14, - isQuickSearch: false, label: "是否启用", labelcol: 6, viewAttr: 3, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js index 0e6d7ab3..0bbc46f0 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js @@ -22,7 +22,7 @@ class AttendanceCustomFieldsModal extends Component { } componentWillReceiveProps(nextProps, nextContext) { - if (nextProps.visible !== this.props.visible) this.handleResetForm(); + if (nextProps.visible !== this.props.visible && nextProps.visible) this.handleResetForm(); } @@ -53,7 +53,7 @@ class AttendanceCustomFieldsModal extends Component { }; handleResetForm = () => { const { attendanceStore: { form } } = this.props; - form.resetForm(); + form.updateFields({ fieldName: "", fieldType: "NUMBER", enableStatus: "0", description: "" }); }; render() {