Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/pc-admin into dev1.0

src/components/Page/index.jsx

@@ -34,7 +34,7 @@ const Title = (props) => {
 
   return (
     <div style={titleStyle}>
-      <Typography.Title level={3} style={{fontWeight: 400, flex: 'none'}}>
+      <Typography.Title level={3} style={{ fontWeight: 400, flex: 'none' }}>
         {
           back && (
             <span onClick={goBack}><ArrowLeftOutlined style={backStyle} /></span>
@@ -42,7 +42,7 @@ const Title = (props) => {
         }
         {props.children}
       </Typography.Title>
-      <div style={{flex: 'none'}}>{extra}</div>
+      <div style={{ flex: 'none' }}>{extra}</div>
     </div>
   )
 }
@@ -54,9 +54,11 @@ export default (props) => {
   const style = meta.noLayout ? { height: '100%' } : pageStyle;
   const title = props.title || meta.title;
 
+  console.log('back', back);
+
   return (
     <div style={style}>
-      { title && !meta.noLayout && <Title extra={extra} back={back}>{ title }</Title> }
+      {title && !meta.noLayout && <Title extra={extra} back={back}>{title}</Title>}
       {props.children}
     </div>
   )

src/pages/checkAnswer/survey/detail.jsx

@@ -79,7 +79,7 @@ export default (props) => {
     //   hideInSearch: true,
     // }
   ]
-  
+
   const beforeSearchSubmit = (params) => {
     paramsRef.current = params;
     return params;
@@ -98,7 +98,7 @@ export default (props) => {
   }
 
   return (
-    <Page>
+    <Page back>
       {contextHolder}
       <ProTable
         rowKey="answerItemId"

src/pages/issue/detail/components/ApplyInfo.jsx

@@ -7,12 +7,12 @@ import { queryTable, queryDict } from '@/utils/request';
 import useBool from '@/utils/hooks/useBool';
 import { processEnum } from '@/utils/biz';
 
-const fetchOrg = queryDict(getSysOrg, { labelKey: 'orgId', valueKey: 'name' });
+const fetchOrg = queryDict(getSysOrg, { labelKey: 'name', valueKey: 'orgId' });
 const fetchData = queryTable(getTaIssueApply);
 
 export default (props) => {
   const { issueId } = props;
-  
+
   const columns = [
     {
       title: "申请日期",
@@ -61,6 +61,7 @@ export default (props) => {
     },
     {
       title: "申请单位",
+      valueType: 'select',
       dataIndex: "orgId",
       request: fetchOrg
     }
@@ -71,7 +72,7 @@ export default (props) => {
       <ProTable
         rowKey="verifyId"
         search={false}
-        params={{issueId, isAll: true}}
+        params={{ issueId, isAll: true }}
         columns={columns}
         request={fetchData}
         toolBarRender={false}

src/pages/issue/detail/components/BasicProfile.jsx

@@ -73,8 +73,10 @@ export default (props) => {
         </Descriptions.Item>
         <Descriptions.Item label="截止日期">{fmDate(detail?.expireDate)}</Descriptions.Item>
         <Descriptions.Item label="责任单位" span={2}>{detail?.orgName}</Descriptions.Item>
+        <Descriptions.Item label="办结时间">{fmDate(detail?.endDate)}</Descriptions.Item>
+        <Descriptions.Item label="交办次数" span={2}>{detail?.processNum}</Descriptions.Item>
         <Descriptions.Item label="问题描述" span={3}>
-          <div dangerouslySetInnerHTML={{__html: detail?.content}}></div>  
+          <div dangerouslySetInnerHTML={{ __html: detail?.content }}></div>
         </Descriptions.Item>
         <Descriptions.Item label="图片列表" span={3}>
           <AttachList attachList={detail?.attachList} />

src/pages/issue/detail/index.jsx

@@ -13,8 +13,8 @@ export default (props) => {
   const id = params.get("id");
 
   return (
-    <Page>
-      <Space direction="vertical"  size="middle" style={{ width: '100%' }}>
+    <Page back>
+      <Space direction="vertical" size="middle" style={{ width: '100%' }}>
         <Process issueId={id} />
         <BasicProfile issueId={id} />
         <ApplyInfo issueId={id} />