.

src/pages/certificateIssuance/index.jsx

@@ -16,8 +16,6 @@ export default (props) => {
   const actionRef = useRef();
   const [applyStart, setStart] = useState()
   const [applyEnd, setEnd] = useState()
-  const [makeStart, setMakeStart] = useState()
-  const [makeEnd, setMakeEnd] = useState()
   const goDetail = (id) => {
     history.push(`certificateIssuance/issuance.jsx?id=${id}`);
   }
@@ -25,15 +23,9 @@ export default (props) => {
     setStart(dateStrings[0])
     setEnd(dateStrings[1])
   }
-  const handelMakeDateChange = (date, dateStrings) => {
-    setMakeStart(dateStrings[0])
-    setMakeEnd(dateStrings[1])
-  }
   const handleReset = () => {
     setStart()
     setEnd()
-    setMakeStart()
-    setMakeEnd()
   }
   const columns = [
     {
@@ -119,6 +111,23 @@ export default (props) => {
             ? '已发放' : ''
       },
     },
+    {
+      title: '制证状态',
+      dataIndex: 'status',
+      key: 'status',
+      hideInTable:true,
+      render: (_, record) => {
+        return record.status === 2
+          ? '待发放'
+          : record.status === 3
+            ? '已发放' : ''
+      },
+      valueType: 'select',
+      valueEnum: {
+        2: { text: '待发放' },
+        3: { text: '已发放' },
+      },
+    },
     {
       title: '发放人',
       dataIndex: 'makeUserName',
@@ -131,7 +140,7 @@ export default (props) => {
       width:160,
       key: 'makeDate',
       render: (t) => t != '-' ? formatterTime(t) : '-',
-      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD'onChange={handelMakeDateChange} />
+      search:false
     },
     {
       title: '操作',
@@ -154,7 +163,7 @@ export default (props) => {
         actionRef={actionRef}
         columns={columns}
         request={getMakeList}
-        params={{ applyStart, applyEnd, makeStart, makeEnd }}
+        params={{ applyStart, applyEnd }}
         options={false}
         onReset={handleReset}
         rowKey="applyId"