From d3d19bafbe9609a3835fc1ad279b55f99b190260 Mon Sep 17 00:00:00 2001
From: xingyongchun <xing.yongchun@free-sun.com.cn>
Date: Fri, 12 Aug 2022 15:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fillion/components/infor/details.js       | 48 ++++++++++++++-----
 .../fillion/components/operationalTable.js    | 16 ++++---
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/web/client/src/sections/fillion/components/infor/details.js b/web/client/src/sections/fillion/components/infor/details.js
index 1cc3e87c..096d0b60 100644
--- a/web/client/src/sections/fillion/components/infor/details.js
+++ b/web/client/src/sections/fillion/components/infor/details.js
@@ -2,11 +2,11 @@ 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 { putRoadway, putSpecificVehicle, putHouseholds,putCircuit,putVehicle } from "../../actions/infor"
+import { putRoadway, putSpecificVehicle, putHouseholds,putCircuit,putVehicle,putPurchase } from "../../actions/infor"
 import { putBridge } from "../../actions/infor"
 import  _  from 'lodash'
 const UserModal = (props) => {
-    const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, setRecortd, engineering } = props
+    const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename,setDelet, dispatch, setRecortd, engineering,whichofits } = props
     const [newlys, setNewlys] = useState() //必填数据
     const [newlysay, setNewlysay] = useState() //处理hou
     const [records, setRecords] = useState()//处理
@@ -64,6 +64,12 @@ const UserModal = (props) => {
             });
             setNewlys(array?.splice(0, 2))
             setNewlysay(array)
+        }if (rewkeys === 'zhichao') {
+            _.forIn(data, function (value, key) {
+                array.push({ name: value, type: key })
+            });
+            setNewlys(array?.splice(0, 2))
+            setNewlysay(array)
         }
     }, [])
     useEffect(() => {
@@ -136,8 +142,7 @@ const UserModal = (props) => {
                 onFinish={(values) => {
                     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) => {
@@ -154,8 +159,8 @@ const UserModal = (props) => {
                                 return true
                             }
                         }
-                        if (rewkeys === 'bridge') {
-                            if (typecard == '111') {
+                        if (rewkeys === 'bridge') {  
+                            if (typecard == 'compile') {
                             setDelet(values)
                                 const query = { ...values, roadId: records?.[0]?.value || '' }
                                 dispatch(putBridge(query)).then((res) => {
@@ -172,7 +177,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'weihuo' || rewkeys === 'chuzu') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, vehicleId: records?.[0]?.value || '', type: rewkeys == 'chuzu' ? '出租车' : '危货' }
                                 dispatch(putSpecificVehicle(query)).then((res) => {
@@ -189,7 +194,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'yehu') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, businessId: records?.[0]?.value, type: rewkeys == 'chuzu' ? '出租车' : '危货' }
                                 dispatch(putHouseholds(query)).then((res) => {
@@ -205,7 +210,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) => {
@@ -222,7 +227,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) => {
@@ -234,6 +239,27 @@ const UserModal = (props) => {
                                 const query = { ...values }
                                 dispatch(putVehicle(query)).then((res) => {
                                     
+                                })
+                                return true
+                            }
+                        }
+                        if (rewkeys == 'zhichao') {
+
+                            if (typecard == 'compile') {
+                                console.log(typecard)
+
+                                setDelet(values)
+                                const query = { ...values, overspeedId: records?.[0]?.value || '' }
+                                dispatch(putPurchase(query)).then((res) => {
+                                    console.log(res)
+                                })
+                                return true
+                            } else {
+                            setDelet(values)
+                                const query = { ...values }
+                                dispatch(putPurchase(query)).then((res) => {
+                                    console.log(res)
+                                    
                                 })
                                 return true
                             }
@@ -243,7 +269,7 @@ const UserModal = (props) => {
                 }}
                 initialValues={recortd}
             >
-                {typecard == '111' ?
+                {typecard == 'compile' ?
                     <ProForm.Group
                     >
                         <ProFormText
diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js
index a26fccf1..c00e6788 100644
--- a/web/client/src/sections/fillion/components/operationalTable.js
+++ b/web/client/src/sections/fillion/components/operationalTable.js
@@ -108,7 +108,7 @@ const [genre,setGenre]=useState()
                     return <div><Button type="link"
                         onClick={() => {
                             hightModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button></div>
@@ -161,7 +161,7 @@ const [genre,setGenre]=useState()
                     return <div><Button type="link"
                         onClick={() => {
                             hightModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button></div>
@@ -749,7 +749,7 @@ const [genre,setGenre]=useState()
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button> <Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}>
@@ -1382,7 +1382,7 @@ const [genre,setGenre]=useState()
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button> <Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}>
@@ -1850,9 +1850,11 @@ const [genre,setGenre]=useState()
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
-                        onClick={() => {
-                            // dispatch(push(`article/update/post`));
-                        }}
+                    onClick={() => {
+                        openModal('edit', record)
+                        setTypecard('compile')
+                        setRecortd(record)
+                    }}
                     >编辑</Button><Popconfirm title='是否确认删除' onConfirm={() => { deldatas(record.id) }}>
                             <Button type="link">删除</Button>
                         </Popconfirm></div>