1725

src/components/AutoTable/index.jsx

@@ -118,7 +118,7 @@ export default (props) => {
             items={items}
             onChange={props.onTabChange}
             destroyInactiveTabPane
-            activeTabKey={props.activeTabKey}
+            activeKey={props.activeTabKey}
           />
         </div>
       )}

src/pages/lease/contract/columns.js

@@ -143,7 +143,8 @@ function getcolumns(setdrawer, valtype, itemId) {
             hideInSearch: true,
             valueType: 'digit',
             hideInTable: true,
-            precision: 0
+            precision: 0,
+            min: 1
         },
         {
             title: '租赁设备',

src/pages/lease/costanalysis/index.jsx

@@ -16,7 +16,7 @@ const Costanalysis = () => {
         open: false,
     }),
         [extraparams, setextraparams] = useState({}),
-        [activeKey, catk] = useState('item-1'),
+        [activeKey, catk] = useState(''),
         [searchParams, csearch] = useState({});
     const { run, loading, runAsync } = useRequest(doFetch, {
         manual: true,
@@ -42,7 +42,7 @@ const Costanalysis = () => {
     }, [activeKey]);
     const tabList = useMemo(() => {
         return getcolumns();
-    }, [activeKey, extraparams]);
+    }, [activeKey]);
     const rightExtra = (text, row, _, action) => {
         return [
             activeKey == 'item-1' && <PremButton
@@ -193,12 +193,15 @@ const Costanalysis = () => {
         if (state) {
             catk(state.pageStatus == 1 ? 'item-1' : 'item-2');
             setextraparams(state.extraparams);
+        } else {
+            catk('item-1');
         }
     }, [state]);
     return <div ref={boxRef}>
         <AutoTable
             pagetitle={<h3 className="page-title">费用分析</h3>}
             columns={columns}
+            extraparams={extraparams}
             path={activeKey == 'item-1' ? '/lease/umContractEquipment/queryNoAnalysis' : '/lease/umContractEquipment/queryYesAnalysis'}
             actionRef={actionRef}
             resizeable={false}
@@ -224,7 +227,6 @@ const Costanalysis = () => {
                     }
                 }
             }}
-            extraparams={extraparams}
         />