From a51a11c663772c171a7af6a726d14bab5a3a7f01 Mon Sep 17 00:00:00 2001
From: xingyongchun <xing.yongchun@free-sun.com.cn>
Date: Sat, 30 Jul 2022 14:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A8=E5=A4=B4=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fillion/components/bridgeTable.js         |  8 +++---
 .../fillion/components/highwaysTable.js       |  4 +++
 .../sections/fillion/components/inforTable.js |  4 +--
 .../fillion/components/operationalTable.js    | 25 +++++++++++--------
 .../fillion/components/publicTable.js         |  8 +++---
 .../fillion/components/transportationTable.js | 16 ++++++------
 6 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js
index 770a0e84..1e22bc37 100644
--- a/web/client/src/sections/fillion/components/bridgeTable.js
+++ b/web/client/src/sections/fillion/components/bridgeTable.js
@@ -1534,13 +1534,13 @@ const BrideTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
 
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1717,13 +1717,13 @@ const BrideTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
 
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
diff --git a/web/client/src/sections/fillion/components/highwaysTable.js b/web/client/src/sections/fillion/components/highwaysTable.js
index ccb7dd53..cc47a244 100644
--- a/web/client/src/sections/fillion/components/highwaysTable.js
+++ b/web/client/src/sections/fillion/components/highwaysTable.js
@@ -37,6 +37,7 @@ const hightModal = (type, record) => {
                 dataIndex: 'placeName',
                 fixed: 'left',
                 width: 120,
+                search: false,
                 options: 1,
                 backgroundColor: "#ffffff",
                 fieldProps: {
@@ -91,6 +92,9 @@ const hightModal = (type, record) => {
                     actionRef={ref}
                     scroll={{ x: 800 }}
                     options={false}
+                    form={{
+                        submitter:false 
+                    }}
                     // ref={c => { finishedProductTable = c; }}
                     style={{ width: "100% ", overflow: "auto", height: '760px' }}
                     rowKey='id'
diff --git a/web/client/src/sections/fillion/components/inforTable.js b/web/client/src/sections/fillion/components/inforTable.js
index fd616f41..88738971 100644
--- a/web/client/src/sections/fillion/components/inforTable.js
+++ b/web/client/src/sections/fillion/components/inforTable.js
@@ -381,13 +381,13 @@ const InForTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
 
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js
index d61da928..79d5fff3 100644
--- a/web/client/src/sections/fillion/components/operationalTable.js
+++ b/web/client/src/sections/fillion/components/operationalTable.js
@@ -723,7 +723,7 @@ const OperaTionalTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -731,7 +731,7 @@ const OperaTionalTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1356,7 +1356,7 @@ const OperaTionalTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -1364,7 +1364,7 @@ const OperaTionalTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1826,7 +1826,7 @@ const OperaTionalTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -1834,7 +1834,7 @@ const OperaTionalTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1848,6 +1848,9 @@ const OperaTionalTable = (props) => {
             <div className='protable-transpor'>
                 <ProTable
                     actionRef={ref}
+                    form={{
+                        submitter: rewkeys === 'keyun' ? false : true,
+                    }}
                     toolbar={{
                         multipleLine: true,
 
@@ -1887,8 +1890,8 @@ const OperaTionalTable = (props) => {
                                 }, {
                                     key: 'tab4',
                                     label: <span onClick={() => {
-                                            setDifferentiate('business')
-                                            setRewkeys('yehu')
+                                        setDifferentiate('business')
+                                        setRewkeys('yehu')
                                     }}>业户{activeKey === 'tab4'}</span>,
 
                                 },
@@ -1900,7 +1903,9 @@ const OperaTionalTable = (props) => {
                     ref={c => { finishedProductTable = c; }}
                     style={{ width: "100% ", overflow: "auto", height: '760px' }}
                     rowKey='id'
-                    rowSelection={{
+                    // alwaysShowAlert 
+                    // tableAlertRender={true}
+                    rowSelection={ rewkeys=='keyun'?false:{  
                         selectedRowKeys: rowSelected,
                         onChange: (selectedRowKeys) => {
                             setRowSelected(selectedRowKeys);
@@ -1966,7 +1971,7 @@ const OperaTionalTable = (props) => {
                         defaultCollapsed: false,
                         optionRender: (searchConfig, formProps, dom) => [
                             ...dom.reverse(),
-                            ['tab2', 'tab3', 'tab4'].includes(activeKey) ? <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected,differentiate,genre) }}>
+                            ['tab2', 'tab3', 'tab4'].includes(activeKey) ? <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, differentiate, genre) }}>
                                 <Button
                                 >
                                     导出
diff --git a/web/client/src/sections/fillion/components/publicTable.js b/web/client/src/sections/fillion/components/publicTable.js
index d8035979..666e8164 100644
--- a/web/client/src/sections/fillion/components/publicTable.js
+++ b/web/client/src/sections/fillion/components/publicTable.js
@@ -434,7 +434,7 @@ const PublicTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -442,7 +442,7 @@ const PublicTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1129,7 +1129,7 @@ const PublicTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -1137,7 +1137,7 @@ const PublicTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js
index c6dafcdd..3b7a7c8f 100644
--- a/web/client/src/sections/fillion/components/transportationTable.js
+++ b/web/client/src/sections/fillion/components/transportationTable.js
@@ -1208,7 +1208,7 @@ const TransporTationTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -1216,7 +1216,7 @@ const TransporTationTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
                     );
                 },
@@ -2363,7 +2363,7 @@ const TransporTationTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -2371,7 +2371,7 @@ const TransporTationTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -3519,7 +3519,7 @@ const TransporTationTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -3527,7 +3527,7 @@ const TransporTationTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -3706,13 +3706,13 @@ const TransporTationTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
 
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>