搜索: invoice status

src/components/SearchForm.jsx

@@ -137,40 +137,34 @@ function getFields(props) {
       99,
       <Form.Item name='referenceNo'>
         <Input placeholder={t('group:RefNo')} allowClear />
-      </Form.Item>,4
+      </Form.Item>,
+      fieldProps?.referenceNo?.col || 4
     ),
     item(
       'invoiceStatus',
       99,
-      <Form.Item name={`invoiceStatus`} initialValue={at(props, 'initialValue.invoiceStatus')[0] || (fieldProps?.invoiceStatus?.show_all ? { key: '-1', label: '所有' } : undefined)}>
-        <Select style={{ width: '100%' }} placeholder='所有状态' labelInValue>
-          {fieldProps?.invoiceStatus?.show_all && (
-            <Select.Option key='所有' value='-1'>
-              所有
-            </Select.Option>
-          )}
-          <Select.Option key='已成行' value='1'>
-            已成行
-          </Select.Option>
-          <Select.Option key='未成行' value='0'>
-            未成行
-          </Select.Option>
-        </Select>
+      <Form.Item name={`invoiceStatus`} initialValue={at(props, 'initialValue.invoiceStatus')[0] || { value: '0', label: 'Status' }}>
+        <Select
+          style={{ width: '100%' }}
+          labelInValue
+          options={[
+            { value: '0', label: 'Status' },
+            { value: '1', label: 'Not submitted' },
+            { value: '2', label: 'Submitted' },
+            { value: '3', label: 'Travel advisor approved' },
+            { value: '4', label: 'Finance Dept arrproved' },
+            { value: '5', label: 'Paid' },
+          ]}
+        />
       </Form.Item>,
-      3
+      fieldProps?.referenceNo?.col || 3
     ),
     item(
       'dates',
       99,
-      <Form.Item name={'dates'} {...fieldProps.dates} initialValue={at(props, 'initialValue.dates')[0]}>
+      <Form.Item name={'dates'} label={t('group:ArrivalDate')} {...fieldProps.dates} initialValue={at(props, 'initialValue.dates')[0]}>
         {/* <DatePickerCharts isform={true} {...fieldProps.dates} form={form} /> */}
-        <RangePicker
-          allowClear={true}
-          inputReadOnly={true}
-          presets={presets}
-          placeholder={['From', 'Thru']}
-          {...fieldComProps.dates}
-        />
+        <RangePicker allowClear={true} inputReadOnly={true} presets={presets} placeholder={['From', 'Thru']} {...fieldComProps.dates} />
       </Form.Item>,
       fieldProps?.dates?.col || midCol
     ),