1607

src/components/InitForm/FormItems.jsx

@@ -1468,7 +1468,44 @@ function FormList(props) {
     <Col {...col}>
       <div className="formlist">
         {
-          !isEmpty ?
+          item?.creatorButtonProps === false ?
+            !isEmpty ?
+              <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>
+                <div>{item.title}</div>
+                <Empty
+                  image={"./empty.svg"}
+                  imageStyle={{
+                    height: 60,
+                  }}
+                />
+              </div>
+            :
             <ProFormList
               name={item.key ?? item.dataIndex}
               label={item.title}
@@ -1494,16 +1531,6 @@ function FormList(props) {
                 );
               }}
             </ProFormList>
-            :
-            <div>
-              <div>{item.title}</div>
-              <Empty
-                image={"./empty.svg"}
-                imageStyle={{
-                  height: 60,
-                }}
-              />
-            </div>
         }
 
       </div>

src/components/TreeRender/index.jsx

@@ -448,28 +448,30 @@ function TreeRender({
         onChange={onChange}
       />
 
-      <Tree
-        onSelect={(selectedKeys, e) => {
-          cselectedKeys(selectedKeys);
-          onselected?.(selectedKeys, e, alldata);
-        }}
-        autoExpandParent={autoExpandParent}
-        defaultExpandAll={true}
-        expandedKeys={expandedKeys}
-        selectedKeys={selectedKeys}
-        onExpand={(expandedKeys, { expanded: bool, node }) => {
-          onExpand(expandedKeys);
-          setAutoExpandParent(false);
-          if (!bool && node.key == '00000000') {
-            setexpandall(false);
-          } else {
-            setexpandall(true);
-          }
-        }}
-        treeData={loop(treeData ?? [])}
-      >
-        {/* {loop(treeData ? treeData : [])} */}
-      </Tree>
+      <div style={{ overflow: 'auto' }}>
+        <Tree
+          onSelect={(selectedKeys, e) => {
+            cselectedKeys(selectedKeys);
+            onselected?.(selectedKeys, e, alldata);
+          }}
+          autoExpandParent={autoExpandParent}
+          defaultExpandAll={true}
+          expandedKeys={expandedKeys}
+          selectedKeys={selectedKeys}
+          onExpand={(expandedKeys, { expanded: bool, node }) => {
+            onExpand(expandedKeys);
+            setAutoExpandParent(false);
+            if (!bool && node.key == '00000000') {
+              setexpandall(false);
+            } else {
+              setexpandall(true);
+            }
+          }}
+          treeData={loop(treeData ?? [])}
+        >
+          {/* {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',