26569 审核详情中信息显示重复了

one_stop_public/DetailForAudit/DetailSplit.js

@@ -39,6 +39,7 @@ import ChildTaskModel from './ChildTaskModel';
 import { checkNeedFormValidateFieldsAndScroll, must, submitValues, checkNeedWriteAuditInfo } from './splitDetailSplit';
 import { queryApiVersion, queryApiActionPath } from '@/webPublic/one_stop_public/utils/queryConfig';
 import { isJSON } from '@/webPublic/zyd_public/utils/utils';
+import HistoryFormList from '@/webPublic/one_stop_public/DetailForAudit/HistoryFormList';
 
 @Form.create()
 @connect()
@@ -399,39 +400,7 @@ export default class GetDetail extends Component {
   changePadding = value => {
     this.setState({ paddingBottom: value });
   };
-  /**
-   * @function 历史表单展示
-   * @description: 历史表单二次封装,独立form主要防止新表单进行输入时会同步刷新历史表单问题
-   * @param {string}  key 模板key值
-   * @param { any } postData 参数
-   * @param { any } obj 默认值
-   * @param { any } form form控件
-   * @param { any } routerState 路由参数
-   * @return: 渲染组件
-   */
 
-  OldFromZdy = Form.create()(function name({
-                                             key,
-                                             postData,
-                                             obj,
-                                             taskId,
-                                             form,
-                                             formKey,
-                                             routerState,
-                                           }) {
-    return (
-      <ZdyTable
-        key={key}
-        get='web'
-        postData={postData}
-        taskId={taskId}
-        obj={obj}
-        form={form}
-        formKey={formKey}
-        routerState={routerState}
-      />
-    );
-  });
 
   render() {
     const {
@@ -692,58 +661,19 @@ export default class GetDetail extends Component {
                   )}
                 </div>
               )}
-
               <div
+                className={styles.HistoryFormList}
                 id='card_table'
                 ref={el => (this.componentRef = el)}
                 style={{ padding: !isShowTitle ? '50px' : '' }}
               >
-                {hisTaskFormKeys.formKeys && hisTaskFormKeys.formKeys.length > 0
-                  ? hisTaskFormKeys.formKeys.map((item, index) => (
-                    <Fragment key={item.taskName}>
-                      {isShowTitle ? (
-                        <h3
-                          style={{
-                            display: 'flex',
-                            alignItems: 'center',
-                          }}
-                        >
-                          <SVG name='vertical' color='#999999' height='24' />
-                          {item?.taskName ?? '历史流程表单'}
-                        </h3>
-                      ) : (
-                        ''
-                      )}
-                      {!data ? (
-                        <div
-                          style={{
-                            width: '100%',
-                            height: 200,
-                            display: 'flex',
-                            justifyContent: 'center',
-                            alignItems: 'center',
-                          }}
-                        >
-                          <Spin size='large' spinning={true} />
-                        </div>
-                      ) : (
-                        /*  <div>
-                      123临时注释
-                    </div>*/
-                        <this.OldFromZdy
-                          key={item.formKey}
-                          get='web'
-                          taskId={data.taskId}
-                          postData={data}
-                          obj={data && data.isMultiple ? item.taskForm : hisTaskFormKeys.formData}
-                          formKey={item.formKey}
-                          routerState={routerState}
-                        />
-                      )}
-                    </Fragment>
-                  ))
-                  : ''}
-                {isHandle === true && !!data.taskFormKey ? (
+              <HistoryFormList data={data}
+                               formKeys={hisTaskFormKeys?.formKeys}
+                               isShowTitle={isShowTitle}
+                               routerState={routerState}
+                               formData={hisTaskFormKeys?.formData}
+              />
+                {isHandle === true && !!data.taskFormKey && (
                   <>
                     {isShowTitle ? (
                       <h3
@@ -772,8 +702,6 @@ export default class GetDetail extends Component {
                       ''
                     )}
                   </>
-                ) : (
-                  ''
                 )}
               </div>
             </Card>

one_stop_public/DetailForAudit/HistoryFormList.js

+/**
+ * 钟是志
+ * 拆分流程详情页面
+ * 解决禅道bug 26569 审核详情中信息显示重复了
+ * 2022年5月21日
+ * 配置方法 在模板挂载前运行公式中返回
+ *  window.zdyTableTemplateWillMountProps.detailCollapseProps = {
+      defaultActiveKey: ['24a3dfc0-1829-4b0c-a7cc-a74baf20c89e'],
+ * };
+ * */
+import React, { useRef, useState, useEffect, Fragment } from 'react';
+import SVG from '@/webPublic/one_stop_public/DetailForAudit/components/SVG';
+import { Form, Spin, Collapse, Icon } from 'antd';
+import styles from './styles.less';
+import ZdyTable from '@/webPublic/one_stop_public/Table';
+
+const { Panel } = Collapse;
+const customPanelStyle = {
+  background: '#fff',
+  borderRadius: 4,
+  marginBottom: 24,
+  border: 0,
+  overflow: 'hidden',
+};
+
+
+export default function HistoryFormList({
+                                          // isShowTitle = false,
+                                          formKeys = [],
+                                          data = {},
+                                          routerState = {},
+                                          formData,
+                                        }) {
+
+
+  if (!formKeys || !formKeys.length) {
+    return null;
+  }
+  const detailCollapseProps = window.zdyTableTemplateWillMountProps?.detailCollapseProps || {};
+
+  return (
+    <Collapse bordered={false}
+              defaultActiveKey={formKeys.map((g) => g.formKey)}
+              expandIcon={({ isActive }) => <Icon type='caret-right' rotate={isActive ? 90 : 0} />}
+              style={customPanelStyle}
+              {...detailCollapseProps}
+    >
+      {Array.isArray(formKeys) && formKeys.length > 0 &&
+      formKeys.map((item, index) => {
+        return (
+          <Panel header={<h3 className={styles.h3}
+
+          >
+            <SVG name='vertical' color='#999999' height='24' />
+            {item?.taskName ?? '历史流程表单'}
+          </h3>} key={item.formKey}>
+            {!data ? (
+              <div className={styles.div1}>
+                <Spin size='large' spinning={true} />
+              </div>
+            ) : (
+              <OldFromZdy
+                key={item.formKey}
+                get='web'
+                taskId={data.taskId}
+                postData={data}
+                // obj={data && data.isMultiple ? item.taskForm : hisTaskFormKeys.formData}
+                obj={data && data.isMultiple ? item.taskForm : formData}
+                formKey={item.formKey}
+                routerState={routerState}
+              />
+            )}
+          </Panel>
+        );
+      })
+      }
+    </Collapse>
+  );
+}
+
+
+/**
+ * @function 历史表单展示
+ * @description: 历史表单二次封装,独立form主要防止新表单进行输入时会同步刷新历史表单问题
+ * @param {string}  key 模板key值
+ * @param { any } postData 参数
+ * @param { any } obj 默认值
+ * @param { any } form form控件
+ * @param { any } routerState 路由参数
+ * @return: 渲染组件
+ */
+
+const OldFromZdy = Form.create()(function name({
+                                                 key,
+                                                 postData,
+                                                 obj,
+                                                 taskId,
+                                                 form,
+                                                 formKey,
+                                                 routerState,
+                                               }) {
+  return (
+    <ZdyTable
+      key={key}
+      get='web'
+      postData={postData}
+      taskId={taskId}
+      obj={obj}
+      form={form}
+      formKey={formKey}
+      routerState={routerState}
+    />
+  );
+});

one_stop_public/DetailForAudit/styles.less

@@ -190,3 +190,17 @@
   margin-bottom: 24px;
   min-height: 50px;
 }
+.HistoryFormList{
+  .h3{
+    display: flex;
+    align-items: center;
+    font-weight: bold;
+  }
+  .div1{
+    width: 100%;
+    height: 200px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}