Merge remote-tracking branch 'origin/master'

FormInsertDiy/HistoryForm/index.js

@@ -13,6 +13,7 @@ import styles from './index.less';
 
 export default function HistoryForm(props) {
   const { data, isNewForm } = props;
+  console.log(data,isNewForm)
   return (
     <div>
       {data.hisTaskForm.formKeys && data.hisTaskForm.formKeys.length > 0

FormInsertDiy/MyApplyList/DetailPage.js

 import React, { useState, useEffect } from 'react';
 import { Form, Spin } from 'antd';
+import { router } from 'umi';
 import Shell from '@/baseComponent/Shell';
 import HistoryForm from '@/webPublic/FormInsertDiy/HistoryForm';
 import { getHistoryFormDetail } from '../../Services';
 import withGoBack from '@/highOrderComponent/withGoBack';
-import SubmitButton from '@/webPublic/one_stop_public/AffairButton/SumbitButton';
 import { ModalInfo } from '@/baseComponent/Modal';
-import { router } from 'umi';
+import AuditButton from '../AuditButton';
 
 // 查看详情， 传申报数据的code
-let DetailPage = ({ form, code, appId }) => {
+let DetailPage = ({ form, code }) => {
   const [data, setData] = useState(null);
   const [loading, setLoading] = useState(false);
 
@@ -39,9 +39,11 @@ let DetailPage = ({ form, code, appId }) => {
               isNewForm={data.isSecond ?? false} // 是否渲染需要当前用户填写的审核表单 为false只会渲染历史回显表单
             />
             {data.isSecond && (
-              <div style={{ padding: 16, textAlign: 'center' }}>
-                <SubmitButton form={form} appId={appId} text="提交" callback={submitCb} />
-              </div>
+              <AuditButton
+                data={data} // 为 'affair/getIdFormDetail' 接口请求到的数据
+                callback={submitCb} // 提交完成后回调函数
+                form={form} // form表单控件
+              />
             )}
           </>
         )}

one_stop_public/libs/formList/index.js

@@ -883,16 +883,14 @@ class FormList extends React.Component {
       showMobileDiv,
       isView
     } = this.state
-
+    
 
     let scrollWidth  = document.documentElement.clientWidth || document.body.clientWidth;  //可使宽度
     let isMobile = scrollWidth < 1200
     if(document.querySelector('#previewDiv')){
       isMobile = true
     }
-    let showDiv = document.querySelector('#mobelDiv')?
-    document.querySelector('#mobelDiv')?.parentNode.clientWidth
-    :1100
+    let showDiv = document.querySelector('#mobelDiv')&&document.querySelector('#mobelDiv')?.parentNode.clientWidth
     const parentMethods = {
       handleAdd: this.handleAdd,
       handleModalVisible: this.handleModalVisible,
@@ -968,6 +966,9 @@ class FormList extends React.Component {
               if(isEmpty(item)){
                 return item
               }
+              if(index === this.columns.length-1){
+                return item
+              }
               let width = item.width?item.width:150
               if(!item.width){
                 item.width = 150
@@ -980,7 +981,6 @@ class FormList extends React.Component {
           ){
             this.columns[this.columns.length-2].width = ''
             AllWidth+=100
-            // this.columns.push({})
           }
     }
     const xxxx = <><Card bordered={false} bodyStyle={{padding:0}}>
@@ -1036,7 +1036,7 @@ class FormList extends React.Component {
             <div
               id='mobelDiv'
               style={{
-                overflow:'auto',
+                overflow:'hidden',
                 width: isMobile?showMobileDiv:showDiv,
                 height: '100%'
               }}
@@ -1044,9 +1044,10 @@ class FormList extends React.Component {
               <div
                 >
 
-                  <StandardTable
-                  showHeader={this.props.showHeader!=null?this.props.showHeader:true}
-                      noSelectRow={rights==null|| !rights.includes('delete') }
+                  {
+                    showDiv&&<StandardTable
+                    showHeader={this.props.showHeader!=null?this.props.showHeader:true}
+                    noSelectRow={rights==null|| !rights.includes('delete') }
                     rowKey="id"
                     data={data}
                     columns={this.columns}
@@ -1057,6 +1058,7 @@ class FormList extends React.Component {
                     onChange={this.handleStandardTableChange}
                     loading={this.props.loading}
                   />
+                  }
 
               </div>
             </div>