合并

FormInsertDiy/AuditPage/index.js

@@ -19,6 +19,7 @@ export default function AuditPage({ appId, tab1 = {}, tab2 = {} }) {
   const pageSearch = {
     tab1: {
       search: {
+        searchType: 'cascadeSearchNew',
         getInfo: getInfoGenerator(tab1.condition),
         url: '/common/assigneeTasks',
         field: {
@@ -36,6 +37,7 @@ export default function AuditPage({ appId, tab1 = {}, tab2 = {} }) {
     },
     tab2: {
       search: {
+        searchType: 'cascadeSearchNew',
         getInfo: getInfoGenerator(tab2.condition),
         url: '/common/assigneeDTasks',
         field: {

one_stop_public/Table/index.jsx

@@ -448,66 +448,41 @@ export default class ZdyTable extends Component {
                                                     />
                                             </div>
                                             :<table style={{ overflow: "auto",  margin: max * width > 550 ? "auto" : '',...style }}  border={border} cellSpacing="0" cellPadding="0" >
-                                                <tbody>
-                                                    {items.map((row, i) => {
-                                                        const allhidden = this.checkAllHidden(row)
-                                                        return <tr key={i}>
-        
-                                                            {row.map((cell, j) => {
-                                                            let styles={}
-                                                            if(cell.content&&cell.content.styles){
-                                                                try{
-                                                                styles= JSON.parse(cell.content.styles)
-                                                                }catch (e) {
-                                                                console.log(`第${i}行第${j}列样式配置有误,${e}`)
-                                                                }
+                                            <tbody>
+                                                {items.map((row, i) => {
+                                                    const allhidden = this.checkAllHidden(row)
+                                                    return <tr key={i}>
+    
+                                                        {row.map((cell, j) => {
+                                                        let styles={}
+                                                        if(cell.content&&cell.content.styles){
+                                                            try{
+                                                            styles= JSON.parse(cell.content.styles)
+                                                            }catch (e) {
+                                                            console.log(`第${i}行第${j}列样式配置有误,${e}`)
                                                             }
-        
-        
-                                                            return !allhidden && cell.hidden ? 
-                                                                    "" 
-                                                                    : <td  
-                                                                            width={
-                                                                                i==0?
-                                                                                    ((cell.content!=null&&cell.content.cwidth!=null?cell.content.cwidth:width) * (cell.col ? cell.col : 1))      
-                                                                                    :width * (cell.col ? cell.col : 1)} 
-                                                                            rowSpan={cell.row} 
-                                                                            colSpan={cell.col} 
-                                                                            key={j} 
-                                                                            style={{
-                                                                            overflow: "auto",
-                                                                            textAlign: cell.content&&cell.content.calign?cell.content.calign:"left",
-                                                                            ...isBorder?borderStyle:{},
-                                                                            ...styles
-                                                                            }} >
-                                                                <TableCom 
-                                                                        i={i}  
-                                                                        j={j} 
-                                                                        fatherCode={fatherCode} 
-                                                                        index={index} 
-                                                                        datas={datas} 
-                                                                        uuid={cell.uuid} 
-                                                                        isEdit={isEdit} 
-                                                                        formKey={currentFormKey} 
-                                                                        init={init} 
-                                                                        get={get} 
-                                                                        json={cell.content} 
-                                                                        obj={ obj||{}}
-                                                                        mapData={mapData} 
-                                                                        form={this.props.form} 
-                                                                        sqlData={sqlData} 
-                                                                        defaultValues={defaultValues || {}} />
-                                                            </td>}
-                                                            )
-        
-        
                                                         }
-        
-                                                        </tr>
-        
-                                                    })}
-                                                </tbody>
-                                            </table>
+    
+                                                        return !allhidden && cell.hidden ? "" : <td  width={i==0?((cell.content!=null&&cell.content.cwidth!=null?cell.content.cwidth:width) * (cell.col ? cell.col : 1))      :width * (cell.col ? cell.col : 1)} rowSpan={cell.row} colSpan={cell.col} key={j} style={{
+                                                            overflow: "auto",
+                                                            textAlign: cell.content&&cell.content.calign?cell.content.calign:"left",
+                                                            ...isBorder?(cell.content.comName=="InputHidden"?{}:borderStyle):{},
+    
+                                                            ...styles
+                                                        }} >
+    
+                                                            <TableCom i={i}  j={j} fatherCode={fatherCode} index={index} datas={datas} uuid={cell.uuid} isEdit={isEdit} formKey={currentFormKey} init={init} get={get} json={cell.content} obj={ obj||{}} mapData={mapData} form={this.props.form} sqlData={sqlData} defaultValues={defaultValues || {}} />
+                                                        </td>}
+                                                        )
+    
+    
+                                                    }
+    
+                                                    </tr>
+    
+                                                })}
+                                            </tbody>
+                                        </table>
                                     }