工程是否已完成展示

web/client/src/sections/fillion/components/bridgeTable.js

@@ -1507,7 +1507,7 @@ const BrideTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button>
@@ -1691,7 +1691,7 @@ const BrideTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             yilanModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button><Popconfirm title='是否确认删除' onConfirm={() => { deldatas(record.id) }}>

web/client/src/sections/fillion/components/enforceTable.js

@@ -1508,7 +1508,7 @@ const openModal = (type, record) => {
                     return <div><Button type="link"
                     onClick={() => {
                         openModal('edit', record)
-                        setTypecard('111')
+                        setTypecard('compile')
                         
                     }}
                     >编辑</Button><Button type="link">删除</Button></div>

web/client/src/sections/fillion/components/highways/highwaysdata.js

@@ -47,7 +47,7 @@ const HightModal = (props) => {
                 }}
                 initialValues={recortd}
             >
-                {typecard == '111' ?
+                {typecard == 'compile' ?
                     <ProForm.Group
                     >
                         <ProFormText

web/client/src/sections/fillion/components/highwaysTable.js

@@ -75,7 +75,7 @@ const hightModal = (type, record) => {
                     return <div><Button type="link"
                     onClick={() => {
                         hightModal('edit', record)
-                        setTypecard('111')
+                        setTypecard('compile')
                         setRecortd(record)
                     }}
                     >编辑</Button></div>

web/client/src/sections/fillion/components/infor/details.js

@@ -152,12 +152,12 @@ const UserModal = (props) => {
                     if (Object.values(values).length > 0) {
                         if (rewkeys === 'transportation') {
 
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, level: whichofits, roadId: records?.[0]?.value || '' }
                                 dispatch(putRoadway(query)).then((res) => {
-                                return true
                                 })       
+                                return true   
                             } else {
                                 setDelet(values)
                                 const query = { ...values, level: whichofits }
@@ -169,7 +169,7 @@ const UserModal = (props) => {
                            
                         }
                         if (rewkeys === 'bridge') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, bridgeId: records?.[0]?.value || '' }
                                 dispatch(putBridge(query)).then((res) => {
@@ -186,7 +186,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'weihuo') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
 
                                 setDelet(values)
                                 const query = { ...values, vehicleId: records?.[0]?.value || '', type: '危货' }
@@ -205,7 +205,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'chuzu') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
 
                                 setDelet(values)
                                 const query = { ...values, vehicleId: records?.[0]?.value || '', type: '出租车' }
@@ -224,7 +224,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'yehu') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, businessId: records?.[0]?.value, type: values.type }
                                 dispatch(putHouseholds(query)).then((res) => {
@@ -240,7 +240,7 @@ const UserModal = (props) => {
                                 return true
                             }
                         } if (rewkeys === 'xianlu') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, lineId: records?.[0]?.value || '' }
                                 dispatch(putCircuit(query)).then((res) => {
@@ -257,7 +257,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'cheliang') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, carId: records?.[0]?.value || '' }
                                 dispatch(putVehicle(query)).then((res) => {
@@ -274,7 +274,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'zhichao') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, overspeedId: records?.[0]?.value || '' }
                                 dispatch(putPurchase(query)).then((res) => {
@@ -297,7 +297,7 @@ const UserModal = (props) => {
                 }}
                 initialValues={recortd}
             >
-                {typecard == '111' ?
+                {typecard == 'compile' ?
                     <ProForm.Group
                     >
                         <ProFormText

web/client/src/sections/fillion/components/inforTable.js

@@ -353,7 +353,7 @@ const InForTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button>

web/client/src/sections/fillion/components/operationalTable.js

@@ -110,7 +110,7 @@ const OperaTionalTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             hightModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button></div>
@@ -697,7 +697,7 @@ const OperaTionalTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button> <Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}>
@@ -1330,7 +1330,7 @@ const OperaTionalTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button> <Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}>
@@ -1800,7 +1800,7 @@ const OperaTionalTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button><Popconfirm title='是否确认删除' onConfirm={() => { deldatas(record.id) }}>

web/client/src/sections/fillion/components/project/project.js

@@ -79,16 +79,16 @@ const ProjectModal = (props) => {
                 onFinish={(values) => {
                     console.log(values)
                     if (rewkeys === 'road') {
-                        if (typecard == '111') {
+                        if (typecard == 'compile') {
                             setDelet(values)
-                            const query = { ...values, type:rewkeys,projectId:records?.[0]?.value || '' }
+                            const query = { ...values, type: rewkeys, projectId: records?.[0]?.value || '', done: values.done === 'true' ? true : false }
                             dispatch(putProject(query)).then((res) => {
 
                             })
                             return true
                         } else {
                             setDelet(values)
-                            const query = { ...values, type:rewkeys }
+                            const query = { ...values, type: rewkeys,done: values.done === 'true' ? true : false }
                             dispatch(putProject(query)).then((res) => {
 
                             })
@@ -96,16 +96,16 @@ const ProjectModal = (props) => {
                         }
                     }
                     if (rewkeys === 'bridge') {
-                        if (typecard == '111') {
+                        if (typecard == 'compile') {
                             setDelet(values)
-                            const query = { ...values, type:rewkeys,projectId:records?.[0]?.value || '' }
+                            const query = { ...values, type: rewkeys, projectId: records?.[0]?.value || '',done: values.done === 'true' ? true : false }
                             dispatch(putProject(query)).then((res) => {
 
                             })
                             return true
                         } else {
                             setDelet(values)
-                            const query = { ...values, type:rewkeys }
+                            const query = { ...values, type: rewkeys,done: values.done === 'true' ? true : false }
                             dispatch(putProject(query)).then((res) => {
 
                             })
@@ -113,9 +113,9 @@ const ProjectModal = (props) => {
                         }
                     }
                 }}
-                initialValues={recortd}
+                initialValues={{ ...recortd, done: recortd.done ? 'true' : 'false' }}
             >
-                {typecard == '111' ?
+                {typecard == 'compile' ?
                     <ProForm.Group
                     >
                         <ProFormText
@@ -176,7 +176,7 @@ const ProjectModal = (props) => {
                         // rules={[{ required: true, message: "必填" }]}
                         />
                         <ProFormSelect
-                           options={[
+                            request={async () => [
                                 {
                                     value: 'true',
                                     label: '是',
@@ -185,7 +185,7 @@ const ProjectModal = (props) => {
                                     label: '否',
                                 },
                             ]}
-                        width="xs"
+
                             name='done'
                             label='是否已完成'
                             rules={[{ required: true, message: "必填" }]}

web/client/src/sections/fillion/components/publicTable.js

@@ -408,7 +408,7 @@ const PublicTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button><Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}>
@@ -1103,7 +1103,7 @@ const PublicTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button><Popconfirm title='是否确认删除' onConfirm={() => { deldatas(record.id) }}>

web/client/src/sections/fillion/components/transportationTable.js

@@ -1178,7 +1178,7 @@ const TransporTationTable = (props) => {
                         onClick={() => {
                             setRecortd(record)
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                         }}
                     >编辑</Button>
                         <Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}><Button type="link"
@@ -2334,7 +2334,7 @@ const TransporTationTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
 
                         }}
@@ -3491,7 +3491,7 @@ const TransporTationTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
 
                         }}
@@ -3678,7 +3678,7 @@ const TransporTationTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             yilanModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button>
@@ -3832,7 +3832,6 @@ const TransporTationTable = (props) => {
                             setRowSelected([]);
                             const res = await dispatch(getProject(query));
                             setCounts(res.payload.data)
-                            console.log(res)
                             return {
                                 ...res,
                                 total: res.payload.data ? res.payload.data.count : 0