free-sun
/
Highways4Good
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

工程是否已完成展示

release_0.0.4^2
xingyongchun 2 years ago
parent
535e7daa93
commit
e621405382
10 changed files with 72 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      web/client/src/sections/fillion/components/bridgeTable.js
  2. 2
      web/client/src/sections/fillion/components/enforceTable.js
  3. 2
      web/client/src/sections/fillion/components/highways/highwaysdata.js
  4. 2
      web/client/src/sections/fillion/components/highwaysTable.js
  5. 22
      web/client/src/sections/fillion/components/infor/details.js
  6. 2
      web/client/src/sections/fillion/components/inforTable.js
  7. 8
      web/client/src/sections/fillion/components/operationalTable.js
  8. 90
      web/client/src/sections/fillion/components/project/project.js
  9. 4
      web/client/src/sections/fillion/components/publicTable.js
  10. 9
      web/client/src/sections/fillion/components/transportationTable.js

4
web/client/src/sections/fillion/components/bridgeTable.js
View File

@ -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) }}>

2
web/client/src/sections/fillion/components/enforceTable.js
View File

@ -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>

2
web/client/src/sections/fillion/components/highways/highwaysdata.js
View File

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

2
web/client/src/sections/fillion/components/highwaysTable.js
View File

@ -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>

22
web/client/src/sections/fillion/components/infor/details.js
View File

@ -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

2
web/client/src/sections/fillion/components/inforTable.js
View File

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

8
web/client/src/sections/fillion/components/operationalTable.js
View File

@ -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) }}>

90
web/client/src/sections/fillion/components/project/project.js
View File

@ -1,9 +1,9 @@
import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
import { Form, Spin, Table } from 'antd';
import { DrawerForm, ProForm, ProFormText,ProFormSelect } from '@ant-design/pro-form';
import { DrawerForm, ProForm, ProFormText, ProFormSelect } from '@ant-design/pro-form';
import { putProject } from "../../actions/infor"
import _ from 'lodash'
import _ from 'lodash'
const data = {
"entryName": "项目名称",
@ -32,7 +32,7 @@ const ProjectModal = (props) => {
setNewlys(array?.splice(0, 2))
setNewlysay(array)
// console.log()
}
if (rewkeys === 'bridge') {
_.forIn(data, function (value, key) {
@ -41,7 +41,7 @@ const ProjectModal = (props) => {
setNewlys(array?.splice(0, 2))
setNewlysay(array)
// console.log()
}
}, [])
useEffect(() => {
@ -51,7 +51,7 @@ const ProjectModal = (props) => {
arr.push({ value: value, type: key })
});
setRecordsay(arr.splice(1, 2))
setRecords(arr)
}
if (rewkeys === 'bridge') {
@ -79,68 +79,68 @@ 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) => {
})
return true
}
}
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) => {
})
return true
}
}
}}
initialValues={recortd}
initialValues={{ ...recortd, done: recortd.done ? 'true' : 'false' }}
>
{typecard == '111' ?
{typecard == 'compile' ?
<ProForm.Group
>
<ProFormText
name={newlys?.[0]?.type}
width="md"
label={newlys?.[0]?.name}
placeholder="请输入名称"
// value={recordsay?.[0]?.value}
// rules={[{ required: true, message: "必填" }]}
// value={recordsay?.[0]?.value}
// rules={[{ required: true, message: "必填" }]}
/><ProFormText
name={newlys?.[1]?.type}
width="md"
label={newlys?.[1]?.name}
placeholder="请输入名称"
// value={recordsay?.[1]?.value}
// rules={[{ required: true, message: "必填" }]}
// value={recordsay?.[1]?.value}
// rules={[{ required: true, message: "必填" }]}
/>
<ProFormSelect
options={[
{
value: 'true',
label: '是',
},{
}, {
value: 'false',
label: '否',
},
@ -162,38 +162,38 @@ const ProjectModal = (props) => {
name={newlys?.[0]?.type}
width="md"
label={newlys?.[0]?.name}
placeholder="请输入名称"
// value={recordssy?.[0]?.value}
// rules={[{ required: true, message: "必填" }]}
// value={recordssy?.[0]?.value}
// rules={[{ required: true, message: "必填" }]}
/><ProFormText
name={newlys?.[1]?.type}
width="md"
label={newlys?.[1]?.name}
placeholder="请输入名称"
// value={recordssy?.[1]?.value}
// rules={[{ required: true, message: "必填" }]}
// value={recordssy?.[1]?.value}
// rules={[{ required: true, message: "必填" }]}
/>
<ProFormSelect
options={[
{
value: 'true',
label: '是',
},{
value: 'false',
label: '否',
},
]}
width="xs"
name='done'
label='是否已完成'
rules={[{ required: true, message: "必填" }]}
<ProFormSelect
request={async () => [
{
value: 'true',
label: '是',
}, {
value: 'false',
label: '否',
},
]}
name='done'
label='是否已完成'
rules={[{ required: true, message: "必填" }]}
/>
{newlysay?.map((item, index) => {
return <ProFormText width="md"
name={item?.type} label={newlysay[index]?.name} placeholder="请输入名称" key={index}
/>
})}

4
web/client/src/sections/fillion/components/publicTable.js
View File

@ -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) }}>

9
web/client/src/sections/fillion/components/transportationTable.js
View File

@ -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

Write Preview
Loading…
Cancel
Save