Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

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

@@ -426,7 +426,7 @@ export default class ZdyTable extends Component {
                                                     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:{},
+                                                        ...isBorder?(cell.content.comName=="InputHidden"?{}:borderStyle):{},
 
                                                         ...styles
                                                     }} >