1607

src/components/InitForm/FormItems.jsx

@@ -1468,6 +1468,7 @@ function FormList(props) {
     <Col {...col}>
       <div className="formlist">
         {
+          item?.creatorButtonProps === false ?
             !isEmpty ?
               <ProFormList
                 name={item.key ?? item.dataIndex}
@@ -1504,6 +1505,32 @@ function FormList(props) {
                   }}
                 />
               </div>
+            :
+            <ProFormList
+              name={item.key ?? item.dataIndex}
+              label={item.title}
+              min={item.min ?? 0}
+              max={item.max ?? 100}
+              itemContainerRender={(doms) => {
+                return <ProForm.Group>{doms}</ProForm.Group>;
+              }}
+              alwaysShowItemLabel={false}
+              copyIconProps={item?.copyIconProps ?? false}
+              deleteIconProps={item?.deleteIconProps ?? true}
+              creatorButtonProps={item?.creatorButtonProps ?? true}
+            >
+              {(f, index, action) => {
+                return (
+                  <FormRender
+                    fields={fields}
+                    action={action}
+                    curindex={index}
+                    formRef={formRef}
+                    name={item.key ?? item.dataIndex}
+                  />
+                );
+              }}
+            </ProFormList>
         }
 
       </div>

src/components/TreeRender/index.jsx

@@ -448,6 +448,7 @@ function TreeRender({
         onChange={onChange}
       />
 
+      <div style={{ overflow: 'auto' }}>
         <Tree
           onSelect={(selectedKeys, e) => {
             cselectedKeys(selectedKeys);
@@ -471,6 +472,7 @@ function TreeRender({
           {/* {loop(treeData ? treeData : [])} */}
         </Tree>
       </div>
+    </div>
   );
 }
 

src/pages/lease/devicedata/index.jsx

@@ -95,7 +95,11 @@ const Devicedata = () => {
                     extraparams={extraparams}
                     pagination={false}
                     toolBarRender={true}
-                    options={false}
+                    options={{
+                        reload: () => {
+                            tableData.run()
+                        }
+                    }}
                 />
             },
             {

src/pages/lease/ledger/Devicestatus.jsx

@@ -276,8 +276,8 @@ const Devicestatus = ({ drawer }) => {
                             },
                             {
                                 title: '采集状态',
-                                dataIndex: 'status',
-                                key: 'status',
+                                dataIndex: 'name',
+                                key: 'name',
                                 search: false
                             },
                         ]}

src/pages/lease/supplier/index.jsx

@@ -109,7 +109,7 @@ const Details = ({ drawer }) => {
     let res = await doFetch({
       url: '/base/paFormField/queryList',
       params: {
-        formId: '3',
+        formId: '5',
       },
     });
     if (res?.data?.dataList) {
@@ -302,7 +302,7 @@ function Supplier(props) {
             drawer={drawer}
             actionRef={actionRef}
             columns={columns}
-            formId={'3'}
+            formId={'5'}
             // urlParams={urlParams}
             onFinish={async (vals) => {
               let equipmentSupplierCharReqList = [];
@@ -342,7 +342,7 @@ function Supplier(props) {
             drawer={drawer}
             actionRef={actionRef}
             columns={drawer?.item?.statusChangeable == 1 ? getcolumns(false) : getcolumns(true)}
-            formId={'3'}
+            formId={'5'}
             urlParams={urlParams}
             onFinish={async (vals) => {
               let equipmentSupplierCharReqList = [];

src/pages/setting/users/columns.js

@@ -80,6 +80,18 @@ function getcolumns(setDrawer, ifs, formRef, isLease) {
                     dataIndex: 'departmentName',
                     key: 'departmentId',
                   },
+                  {
+                    title: '用户类型',
+                    dataIndex: 'customerTypeName',
+                    key: 'customerType',
+                    hideInDescriptions: isLease == 1 ? false : true
+                  },
+                  {
+                    title: '所属客户',
+                    dataIndex: 'customerName',
+                    key: 'customerId',
+                    hideInDescriptions: isLease == 1 ? false : true
+                  },
                   {
                     title: '负责工厂',
                     dataIndex: 'factoryNames',