src/views/sq/qfg/zcdjxx.js

@@ -4,7 +4,7 @@ import zd from '../../../assets/img/wait.png'
 const Page = () => {
     return (
         <div style={{display:'flex',justifyContent:'center',alignItems:'center',backgroundColor:'#fff',height:'100%',padding:'20px'}}>
-            <Image src={zd} style={{margin:'auto',margin:'20px',height:'130px'}} preview={false}/>
+            <Image src={zd} style={{margin:'auto',margin:'20px',height:'530px'}} preview={false}/>
         </div>
     )
 }

src/views/sz/flfg/toolbar.js

@@ -96,9 +96,9 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
             <Form.Item label="施行日期" name="implementationDate">
               <RangePicker allowClear />
             </Form.Item>
-            {/* <Form.Item label="上传时间" name="uploadTime">
+            <Form.Item label="上传时间" name="uploadTime">
               <RangePicker allowClear />
-            </Form.Item> */}
+            </Form.Item>
           </div>}
         </Form>
       </div>

src/views/sz/szzf/ajdj/editTabs.js

@@ -68,7 +68,7 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => {
         if (mode == 'save') {
             addBasic(params)
         } else if (mode == 'edit') {
-            editBasic({...params,caseDate:record.caseDate ? dayjs(record.caseDate).format('YYYY-MM-DD HH:mm:ss'):''})
+            editBasic({...params})
         }
     }
     const addBasic = (params) => {

src/views/sz/szzf/form/index.js

@@ -13,7 +13,7 @@ const { RangePicker } = DatePicker;
 const { TextArea } = Input;
 
 const baseUrl = "http://223.75.53.141:9100/gs-tsg"
-let dataList = [];
+
 const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, formJsonData, typeUpload = 'dispatch', isModalOpen, fileType, footer = true, uploadUrl,TableZdyProps,downloadUrl,
     onSave }) => {
     const [fileList, setFileList] = useState([])
@@ -23,7 +23,6 @@ const FormZdy = ({ fileKey, typeName = "ddForm", formJson, getFormInfo, type, fo
     const [loading, setLoading] = useState(false)
     const [searchValue, setSearchValue] = useState('');    
 
-		const treeRef = useRef();
 
     // 
     const [form] = Form.useForm();
@@ -163,48 +162,27 @@ const FormZdy = ({ fileKey, typeName = "ddForm", formJson, getFormInfo, type, fo
     }, [type, formJsonData, isModalOpen])
 
    const handleTreeData = (treeData, searchValue = '') => {
-		const loop = (treeData) =>
+        const loop = (data) => {
-			treeData.map((item) => {
+          return data.map((item) => {
-				const strTitle = item.legalName;
+            const strTitle = item.title?.toString() || '';
-				const index = strTitle?.indexOf(searchValue);
+            const matchValue = strTitle.toLowerCase().indexOf(searchValue.toLowerCase()) > -1;
-				const beforeStr = strTitle.substring(0, index);
-				const afterStr = strTitle.slice(index + searchValue?.length);
-				const title =
-					index > -1 ? (
-						<span key={item.id}>
-							{beforeStr}
-							<span className="site-tree-search-value" style={{ color: 'red' }}>{searchValue}</span>
-							{afterStr}
-						</span>
-					) : (
-						<span key={item.id}>{strTitle}</span>
-					);
-				if (item.children) {
-					return { title: title, key: item.id, children: loop(item.children), name: strTitle };
-				}
-				if (index > -1) {
             
-					console.log(index, strTitle, searchValue);
+            const children = item.children ? loop(item.children) : [];
+            const hasChildren = children && children.length > 0;
             
-					dataList.push(item.id)
-					// setExpandedKeys(dataList);
-					if (dataList.length < 2) {
-						treeRef.current.scrollTo({ key: dataList[0].id });
-					}
-
-				}
             return {
-					title: title,
+              ...item,
-					key: item.id,
+              disabled: hasChildren, // 有子节点的设为禁用
-					name: strTitle
+              children: hasChildren ? children : undefined
             };
           });
+        };
         
         return loop(treeData);
       };
 
     const disableParentNodes = (treeData) => {
-
+        debugger
         return treeData.map(node => {
             const newNode = { ...node };
             if (node.children && node.children.length > 0) {
@@ -307,16 +285,14 @@ const FormZdy = ({ fileKey, typeName = "ddForm", formJson, getFormInfo, type, fo
                                 >
                                     <TreeSelect
                                         showSearch
-										ref={treeRef}
                                         style={{ width: '100%' }}
                                         dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
                                         allowClear
                                         onSearch={setSearchValue}
                                         fieldNames={item.fieldNames}
-										treeData={disableParentNodes(item.treeData)}
+                                        treeData={handleTreeData(item.treeData,searchValue)}
                                         treeCheckable={item.multiple}
                                         disabled={type == 'view'}
-										// treeNodeFilterProp='legalName'
                                         filterTreeNode={(inputValue, treeNode) => {
                                             return treeNode.legalName.toLowerCase().includes(inputValue.toLowerCase());
                                           }}