开始修改

src/components/AutoTable/mtable.jsx

@@ -37,6 +37,7 @@ const Mtable = (props) => {
     pageSize, //修改默认pageSize
     pagination = true, //分页设置
     x, //横向滚动
+    y,
     activeTabKey, //激活的tabKey 拖拽表格唯一标识使用 其他情况用不到
     refreshDep, //依赖刷新 （已废弃）
     getDefaultSelected, //存在默认选中向上返回选中值
@@ -405,9 +406,10 @@ const Mtable = (props) => {
       rowKey={rowKey ?? 'id'} //表格每行数据的key
       dateFormatter="string"
       scroll={
-        x
+        x || y
           ? {
             x: x,
+            y: y
           }
           : {}
       }

src/pages/lease/contract/columns.js

@@ -118,7 +118,8 @@ function getcolumns(setdrawer, valtype, itemId) {
             hideInSearch: true,
             formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
             colProps: { span: 8 },
-            hideInTable: true
+            hideInTable: true,
+            precision: 0
         },
         {
             title: '预警设置（自然日）',
@@ -128,7 +129,8 @@ function getcolumns(setdrawer, valtype, itemId) {
             formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
             colProps: { span: 8 },
             valueType: 'digit',
-            hideInTable: true
+            hideInTable: true,
+            precision: 0
         },
         {
             title: '合同租期（月）',

src/pages/lease/contract/index.jsx

@@ -641,8 +641,9 @@ function Contract(props) {
           } else if (drawer?.val == 'edit') {
             await runAsync({ url: pathconfig?.edit, params: { ...newVals, id: drawer?.item?.id, amount } });
           } else if (drawer?.val == 'start') {
+            let equipmentIdList = newVals.intelligenceList?.map(it => it.equipmentId);
             delete newVals.intelligenceList;
-            await runAsync({ url: '/lease/umContract/start', params: { ...newVals, id: drawer?.item?.id } });
+            await runAsync({ url: '/lease/umContract/start', params: { ...newVals, id: drawer?.item?.id, equipmentIdList } });
           } else if (drawer?.val == 'out') {
             let contractEquipmentList = newVals.deviceList?.filter(it => {
               if (it.isFinish == 1) {