1537

src/pages/lease/contract/index.jsx

@@ -756,6 +756,7 @@ function Contract(props) {
                 title: '新增',
                 val: 'add'
               }));
+              camount(0);
             },
           },
         }}

src/pages/lease/devicedata/index.jsx

@@ -54,9 +54,9 @@ const Devicedata = () => {
                     resizeable={false}
                     bordered={false}
                     x={1500}
-                    y={`calc(100vh - 410px)`}
+                    y={`calc(100vh - 430px)`}
                     formRef={formRef}
-                    extraparams={extraparams}
+                    extraparams={{ ...extraparams, equipmentType: 1 }}
                 />
             },
             {

src/pages/lease/ledger/columns.js

@@ -166,6 +166,7 @@ function getcolumns(setdrawer) {
                 key: 'shopId',
                 hideInSearch: true,
                 hideInTable: true,
+                hideInDescriptions:true,
                 valueType: 'select',
                 options: { path: '/auth/sysShop/getShopSelectBox', linkParams: { factoryId: '' } },
                 colProps: { span: 8 },
@@ -174,6 +175,19 @@ function getcolumns(setdrawer) {
                     showSearch: true,
                 },
             },
+            {
+                title: '车间名称',
+                dataIndex: 'shopName',
+                key: 'shopId',
+                hideInForm: true,
+                valueType: 'select',
+                options: { path: '/auth/sysShop/getShopSelectBox',params:{} },
+                colProps: { span: 8 },
+                fieldProps: {
+                    placeholder: '请选择',
+                    showSearch: true,
+                },
+            },
             {
                 title: '工段名称',
                 dataIndex: 'sectionName',