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

FormInsertDiy/AffairPage/ApplyPage/JustApply.js

@@ -32,24 +32,6 @@ export default class AffairPage extends React.Component {
 			message.error('您的数据未同步,请联系管理员!');
 			return false;
 		}
-		// window.addEventListener(
-		// 	'message',
-		// 	(event) => {
-		// 		// 和Iframe页进行通迅
-		// 		if (event.data === 'returnList') {
-		// 			this.returnList(true);
-		// 		}
-		// 		if (event && event.data && event.data.indexOf && event.data.indexOf('iframeHeight') > -1) {
-		// 			let height = Number(event.data.split('-')[1]);
-		// 			const iframe = document.getElementById('applyIframeId');
-		// 			if (iframe) {
-		// 				iframe.height = height;
-		// 			}
-		// 		}
-		// 	},
-		// 	false,
-		// );
-
 		return true;
 	}
 
@@ -89,26 +71,8 @@ export default class AffairPage extends React.Component {
            {...this.props}
            id={workId}
            returnList={this.returnList}
-           init={encodeURIComponent(JSON.stringify(init))}
+           init={init}
          />
-				{/*	<iframe
-						src={iframeUrl}
-						frameBorder={0}
-						id="applyIframeId"
-						name="applyIframe"
-						marginWidth="0"
-						marginHeight="0"
-						allowtransparency="yes"
-						seamless
-						scrolling={'auto'}
-						style={{
-							width: '100%',
-							minHeight: '800px',
-							overflowY: 'hidden',
-							backgroundColor: '#fff',
-						}}
-					/>*/}
-					: null
 				</div>
 			</PageHeaderWrapper>
 		);

one_stop_public/App/ImportUtil.js

@@ -241,9 +241,9 @@ export default class ImportUtil extends React.PureComponent {
 		fetch(transformApi, {
 			method: 'POST',
 			body: FormdataWrapper(newParams.datas),
-			headers: {
-				apis: headersApi,
-			},
+			// headers: {
+			// 	apis: headersApi,
+			// },
 		})
 			.then((res) => {
 			  console.log(res.status);

one_stop_public/Base16/SplitBase16Index.js

@@ -35,10 +35,11 @@ function giveKey(key, datas) {
 }
 
 export async function countAllValues(datas, item) {
+  // console.log(datas);
   if (item.setNull) {
     datas.allValues = JSON.stringify({});
   } else {
-    if (item.query) {
+    if (item.query && !datas.isMeta) {
       if (datas?.sqlKey.length < 13) {
         const response = await apiRequest('/SqlManageEntityApi/findParamsKey', {
           sqlKey: datas.sqlKey,

one_stop_public/Base16/binaryEncode.js

@@ -8,7 +8,8 @@ import { countAllValues } from '@/webPublic/one_stop_public/Base16/SplitBase16In
 import { getUrlInfo } from '@/webPublic/one_stop_public/DetailForAudit/utils';
 import { getTransformApi } from '@/webPublic/one_stop_public/2022beidianke/localstorageTransform';
 import { strToBinary } from './strToBinary'; // 字符串转二进制 混淆代码
-import { binaryToStr } from './binaryToStr'; // 二进制字符串转JSON字符串 混淆代码
+import { binaryToStr } from './binaryToStr';
+import { getVisitorToken } from '@/webPublic/zyd_public/utils/getHeaders'; // 二进制字符串转JSON字符串 混淆代码
 
 const test = !!(getUrlInfo().test);
 
@@ -93,8 +94,8 @@ export async function requestFileInfo(url, datas) {
   //   datas = await testPromise(datas);
   // }
   const formData = new FormData();
-  if (getToken()) {
-    datas.token = getToken();
+  if (getVisitorToken()) {
+    datas.token = getVisitorToken();
   }
   for (let key in datas) {
     formData.append(key, datas[key]);
@@ -115,7 +116,7 @@ export async function requestFileInfo(url, datas) {
     headers: {
       Accept: 'application/json',
       ...getHeaders(transformApi).headers,
-      apis: headersApi,
+      // apis: headersApi,
       // axxx: `select * from user123 where id = 1`,
     },
     method: 'POST',

one_stop_public/DetailForAudit/DetailSplit.js

@@ -3,21 +3,21 @@
  * 2019年9月19日
  * 查看详情页面
  */
-import React, { Component, Fragment } from 'react';
+import React, { Component, Fragment, useEffect, useState } from 'react';
 import {
-  Row,
-  Col,
-  Timeline,
-  Icon,
-  Form,
-  Button,
-  Spin,
-  Radio,
-  Popconfirm,
-  Checkbox,
-  Switch,
-  InputNumber,
-  message,
+	Row,
+	Col,
+	Timeline,
+	Icon,
+	Form,
+	Button,
+	Spin,
+	Radio,
+	Popconfirm,
+	Checkbox,
+	Switch,
+	InputNumber,
+	message,
 } from 'antd';
 import Card from './components/Card';
 import { getToken } from '@/webPublic/one_stop_public/utils/token';
@@ -36,952 +36,983 @@ import styles from './styles.less';
 import TrunToDetail from './trunToDetail';
 import Countersign from './components/Countersign';
 import ChildTaskModel from './ChildTaskModel';
-import { checkNeedFormValidateFieldsAndScroll, must, submitValues, checkNeedWriteAuditInfo } from './splitDetailSplit';
+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';
 
 @connect()
 class DetailSplit extends Component {
-  constructor() {
-    super();
-    this.state = {
-      isTakeFlow: false,
-      data: {}, // 详情数据
-      stepFlow: [],
-      items: [],
-      obj: {},
-      isSecond: false, // 如果为true,表示重新发起
-      selects: new Map(),
-      left: 0,
-      top: 0,
-      max: 4,
-      width: 100,
-      taskId: '', // 模型id
-      appId: '', // 事务id
-      code: '', // 事务code 当前表单唯一值
-      isHandle: false, // 判断用户是否有权限
-      id: '', // 表单id
-      btns: [], // 自定义按钮
-      taskFormKey: '', // 多表单显示的key
-      itemsOK: [], // 多表单显示的表单
-      hisTaskFormKeys: {}, // 历史任务相关
-      isLoading: false, // 请求状态
-      formColor: '', // 流程紧急度颜色
-      formLevel: '', // 流程文本
-      btnList: [], // 紧急度按钮返回数据
-      radiovalue: '', // 单选id
-      isEnd: false, // 是否结束
-      isShowTitle: true, // 是否展示流程步骤几个字
-      isSumbitLoading: false, // 发起时触发
-      isOpenTrunToModel: false, // 用户转办,回收弹框控制变量
-      trunToStatus: '转办', // 当前节点存在状态
-      trunData: '', // 转办当前选中数据
-      isCloseUserDetail: false, // 是否展示用户基础详细信息
-      checkedConfimList: [], // 用户选择打印元素
-      checkListOptions: [], // 历史表单复选框存放值
-      isShowTitleTwo: true, // 历史表单展示状态
-      paddingBottom: 0,
-      isSign: false, // 是否使用签名
-      userInfo: '', // 得到用户数据
-      setData: '', // 配置的数据
-      countersignModal: '', // 开启加签弹框函数
-      isAllPrint: false,
-      closeAutoSign: false, // 28521 退役大学生评优管理/在校退役大学生评优审核，去掉审核签名
-    };
-    window.callbackSubmitInfoZhiYong = undefined;
-  }
-
-  /**
-   * @function 同步加签函数
-   * @param { function } func 打开加签弹框函数
-   */
-  updateCountersignModal = func => {
-    this.setState({
-      countersignModal: func,
-    });
-  };
-  /**
-   * 关闭转办,回收弹框
-   */
-  handleTrunToModel = () => {
-    this.setState({
-      isOpenTrunToModel: false,
-      trunData: '',
-      trunToStatus: '',
-    });
-  };
-
-  /**
-   * 打开转办,回收弹框
-   * @param { string } text 当前按钮状态
-   */
-  showTrunToModel = (text, record) => {
-    this.setState({
-      isOpenTrunToModel: true,
-      trunToStatus: text,
-      trunData: record,
-    });
-  };
-
-  examineFlow = (...ags) => {
-    this.flowExamineModal.showModal(...ags);
-  };
-
-  componentDidMount() {
-    this.getInit();
-
-    if (this.props.onRef) {
-      this.props.onRef(this);
-    }
-  }
-
-  /**
-   * @function 默认请求
-   */
-  getInit = handleUser => {
-    const { dispatch } = this.props;
-    const id = this.props.history.location.state && this.props.history.location.state.id;
-    const code = this.props.history.location.state && this.props.history.location.state.code;
-    const queryId = this.props.history.location.query && this.props.history.location.query.id;
-    const taskId = this.props.history.location.state && this.props.history.location.state.taskId;
-    if (!id && !code) {
-      if (queryId) {
-      } else {
-        openToast('error', '数据已过期', '当前页面数据已过期,请重新进入');
-        router.push('/portal/home');
-        return;
-      }
-    }
-
-    dispatch({
-      type: 'affair/getIdFormDetail',
-      payload: {
-        id: queryId ? queryId : id, // 审批表Id
-        code: code || null, // 表单值
-        handleUser: handleUser || null, // 处理人
-        taskId, // 多任务流程会使用到,后续改为必须传入
-        lite: true,
-      },
-      callback: val => {
-        if (this.props.changeData) {
-          this.props.changeData(val);
-        }
-        const checkListOptions = [];
-        const checkedConfimList = [];
-        if (val.hisTaskForm.formKeys) {
-          val.hisTaskForm.formKeys.map(item => {
-            checkListOptions.push({
-              label: item.taskName,
-              value: item.formKey,
-            });
-          });
-        }
-        if (val && !val.taskInfo) {
-          permRequest('/UnifiedAppFormApi/getTaskInfos', { // 获取每一步的审核人.
-            id: queryId ? queryId : id, // 审批表Id
-            code: code || null, // 表单值
-          })
-            .then(res => {
-              val.taskInfo = res.taskInfo;
-              this.setState(
-                {
-                  data: val,
-                  stepFlow: val.taskInfo,
-                  obj: JSON.parse(val.content),
-                  code: val.code,
-                  taskId: val.taskId,
-                  isSecond: val.isSecond ? val.isSecond : false,
-                  appId: val.appId,
-                  code: val.code,
-                  isHandle: val.isHandle,
-                  id,
-                  btns: val.btns,
-                  taskFormKey: val.taskFormKey,
-                  hisTaskFormKeys: val.hisTaskForm,
-                  isLoading: true,
-                  formColor: val.formColor,
-                  formLevel: val.formLevel,
-                  isEnd: val.isEnd,
-                  checkListOptions,
-                  checkedConfimList,
-                },
-                () => {
-                  if (val.isSecond) {
-                    this.props.dispatch({
-                      type: 'urge/GetMyBtn',
-                      payload: {},
-                      callback: arr => {
-                        this.setState({
-                          btnList: arr,
-                          radiovalue: val.formLevelId ? val.formLevelId : arr[arr.length - 1].id,
-                        }, () => {
-                          // this.giveMessageTop();
-                        });
-                      },
-                    });
-                  } else {
-                    // this.giveMessageTop();
-                  }
-                },
-              );
-
-            });
-        }
-
-
-      },
-    });
-
-    dispatch({
-      type: 'emailorphone/GetLogo',
-      payload: {
-        configKeys: ['isCloseUserDetail', 'isCloseFlowPath', 'isAllPrint', 'closeAutoSign'],
-      },
-      callback: val => {
-        const closeAutoSign = !!(val[3] && val[3].configValue === 'true');
-        this.setState({
-          isCloseUserDetail: !!(val[0] && val[0].configValue === 'true'),
-          isAllPrint: !!(val[2] && val[2].configValue === 'true'),
-          closeAutoSign,
-        });
-
-        if(!closeAutoSign){
-          /**
-           * 获取设置的数据
-           */
-          this.props.dispatch({
-            type: 'UserSetCenterApi/queryUserSet',
-            payload: {},
-            callback: val => {
-              this.setState({
-                setData: val,
-              });
-            },
-          });
-        }
-
-        if (val[1]?.configValue) {
-          sessionStorage.setItem(
-            'isCloseFlowPath',
-            val[1]?.configValue === 'true' ? JSON.stringify(true) : JSON.stringify(false),
-          );
-        }
-      },
-    });
-    if (getToken()) {
-      const user = localStorage.getItem('user');
-      if (user && isJSON(user)) {
-        this.setState({
-          userInfo: JSON.parse(user),
-        });
-      }
-    }
-
-  };
-
-
-  /**
-   * @function 用户点击确认执行相应操作
-   * @description: 注意 用户点击状态时在点击动态配置按钮时进行了保存,并在该函数中最终提交给后端
-   * @param { string } oldkey 按钮状态
-   * @param { string } btnValue 按钮选中状态
-   * @param { string } value 审批理由
-   * @param { boolean } checked 加签状态
-   * @param { function } callback 回调函数
-   */
-  affairOk = (oldkey, btnValue, value, checked, callback) => {
-    const { dispatch } = this.props;
-    const {
-      radiovalue,
-      isSecond,
-      userInfo,
-      setData,
-      data,
-      btns,
-      taskId,
-      code,
-    } = this.state;
-    const { handleUser } = this.props.history.location.state;
-    const isCloseFlowPath = sessionStorage.getItem('isCloseFlowPath')
-      ? JSON.parse(sessionStorage.getItem('isCloseFlowPath'))
-      : false;
-    if (callback) {
-      callback();
-    }
-
-    let checkSumbitInfo = checkNeedFormValidateFieldsAndScroll({ // 检查是否必填表单值
-      btns,
-      btnValue,
-    });
-
-    let needWriteAuditInfo = checkNeedWriteAuditInfo({ // 检查是否必填审批理由
-      btns,
-      btnValue,
-    });
-    if (needWriteAuditInfo && !value) {
-      let d = document.getElementById('textarea_shen_pi_li_you');
-      if (d) {
-        message.warning('请输入审批理由');
-        return false;
-      }
-    }
-    const argumentsSubmitValue = {
-      isCloseFlowPath,
-      radiovalue,
-      isSecond,
-      taskId,
-      code,
-      btnValue,
-      oldkey,
-      value,
-      checked,
-      setData,
-      data,
-      userInfo,
-      btns,
-      dispatch,
-      that: this,
-      handleUser,
-    };
-
-    if (!checkSumbitInfo) { // 如果不需要校验 直接提交数据
-      const values = this.props.form.getFieldsValue();
-      argumentsSubmitValue.values = values;
-      submitValues(argumentsSubmitValue);
-    } else {
-      this.props.form.validateFieldsAndScroll((err, values) => { // 校验是否填了必填字段
-        if (!err) {
-          argumentsSubmitValue.values = values;
-          submitValues(argumentsSubmitValue);
-        }
-      });
-    }
-
-
-  };
-
-  onChange = e => {
-    this.setState({
-      radiovalue: e.target.value,
-    });
-  };
-
-  /**
-   * @function 复选框状态函数
-   * @event change
-   */
-  onCheckChange = checkedValues => {
-    this.setState({
-      checkedConfimList: checkedValues,
-    });
-  };
-  /**
-   * @function 加签点击函数
-   * @event click
-   */
-  onClickCountersign = () => {
-    const { countersignModal } = this.state;
-    countersignModal();
-  };
-  /**
-   * @function 通过用户复选框选择拼装为对应打印页面
-   */
-
-  changeTake = checked => {
-    this.setState({ isTakeFlow: checked });
-  };
-
-  changePadding = value => {
-    this.setState({ paddingBottom: value });
-  };
-
-
-  render() {
-    const {
-      stepFlow,
-      isHandle,
-      hisTaskFormKeys,
-      id,
-      appId,
-      code,
-      steps,
-      data,
-      btns,
-      isSecond,
-      isLoading,
-      formColor,
-      formLevel,
-      btnList,
-      radiovalue,
-      isEnd,
-      isShowTitle,
-      isSumbitLoading,
-      isOpenTrunToModel,
-      trunToStatus,
-      trunData,
-      isCloseUserDetail,
-      checkListOptions,
-      checkedConfimList,
-      isTakeFlow,
-      paddingBottom,
-      setData,
-      isSign,
-      isAllPrint,
-      closeAutoSign, // 28521 退役大学生评优管理/在校退役大学生评优审核，去掉审核签名
-    } = this.state;
-    const { showPrint } = this.props;
-    const isCloseFlowPath = sessionStorage.getItem('isCloseFlowPath')
-      ? JSON.parse(sessionStorage.getItem('isCloseFlowPath'))
-      : false;
-    const isTrunTo = sessionStorage.getItem('isTrunTo')
-      ? JSON.parse(sessionStorage.getItem('isTrunTo'))
-      : false;
-    const domainName = sessionStorage.getItem('domainName')
-      ? sessionStorage.getItem('domainName')
-      : '';
-    const routerState = {
-      history: this.props?.history,
-      location: this.props?.location,
-      match: this.props?.match,
-      computedMatch: this.props?.computedMatch,
-      route: this.props?.route,
-    };
-
-    // console.log(data, isAllPrint);
-    return (
-      <Fragment>
-        <div
-          style={{
-            width: '100%',
-            display: 'flex',
-            justifyContent: 'center',
-          }}
-        >
-          <div style={{ width: '100%' }}>
-            <div
-              className={styles.header}
-              style={{
-                position: 'relative',
-              }}
-            >
-              {isCloseFlowPath ? null : ( // 关闭流程紧急度显示
-                <span
-                  style={{
-                    position: 'absolute',
-                    left: 0,
-                    top: '30%',
-                  }}
-                >
-                  {isSecond ? (
-                    <>
-                      <span style={{ marginRight: 12 }}>{must}流程紧急度</span>
-                      <Radio.Group onChange={this.onChange} value={radiovalue}>
-                        {btnList.length > 0
-                          ? btnList.map(item => (
-                            <Radio key={item.id + Math.random()} value={item.id}>
-                              <span style={{ color: item.color }}>{item.name}</span>
-                            </Radio>
-                          ))
-                          : ''}
-                      </Radio.Group>
-                    </>
-                  ) : (
-                    <>
-                      紧急程度:
-                      <span
-                        style={{
-                          color: formColor || '',
-                          marginLeft: 21,
-                        }}
-                      >
-                        {formLevel || '暂无'}
-                      </span>
-                    </>
-                  )}
-                </span>
-              )}
-
-              {data.appName ? data.appName : '当前表单'}
-              {(isEnd || isAllPrint) && showPrint !== false ? (
-                <>
-                  <Popconfirm
-                    onConfirm={() => {
-                      if (!checkedConfimList || !checkedConfimList.length) {
-                        message.warning('请选择需要打印的表单');
-                        return false;
-                      }
-                      if (domainName) {
-                        window.open(
-                          `${domainName}/protal/printRouter?id=${data.id}&list=${JSON.stringify(
-                            checkedConfimList,
-                          )}&padding=${paddingBottom}&isTakeFlow=${isTakeFlow}&token=${getToken()}`,
-                        );
-                      } else {
-                        openToast('warning', '未配置域名地址,请联系管理员');
-                      }
-                    }}
-                    title={
-                      <div>
-                        <div>
-                          是否带流程:
-                          <Switch checked={isTakeFlow} onChange={this.changeTake} />
-                        </div>
-                        <div>
-                          表单间距:
-                          <InputNumber
-                            min={0}
-                            size='small'
-                            value={paddingBottom}
-                            onChange={this.changePadding}
-                          />
-                        </div>
-                        <div className={styles.history_form_title}>请选择需要打印的表单</div>
-                        <div className={styles.history_form_body_div}>
-                          <Checkbox.Group
-                            options={checkListOptions}
-                            onChange={this.onCheckChange}
-                            defaultValue={checkedConfimList}
-                          />
-                        </div>
-                      </div>
-                    }
-                    okText='确定'
-                    cancelText='取消'
-                  >
-                    {(data.isPrint == null || data.isPrint || isAllPrint) && showPrint !== false ? (
-                      <Button
-                        style={{
-                          position: 'absolute',
-                          right: 200,
-                          top: '30%',
-                        }}
-                        type='primary'
-                      >
-                        打印预览
-                      </Button>
-                    ) : (
-                      ''
-                    )}
-                  </Popconfirm>
-                </>
-              ) : (
-                ''
-              )}
-            </div>
-          </div>
-        </div>
-        {isLoading ?
-          (
-          <>
-            <Card style={{ width: '100%' }}>
-              {!isCloseUserDetail && (
-                <div className={styles.body_hea}>
-                  <h3>发起人信息</h3>
-                  {data &&
-                  (data.createTime ||
-                    data.code ||
-                    data.userName ||
-                    data.userPosition ||
-                    data.userPhone ||
-                    data.userSchool) && (
-                    <Row className={styles.row}>
-                      {data && data.code && (
-                        <Col
-                          style={{
-                            marginBottom: 12,
-                          }}
-                          span={8}
-                        >
-                          <span className={styles.hea_title}>单号</span>
-                          <span className={styles.hew_content}>{data.code}</span>
-                        </Col>
-                      )}
-                      {data && data.userName && (
-                        <Col
-                          style={{
-                            marginBottom: 12,
-                          }}
-                          span={8}
-                        >
-                          <span className={styles.hea_title}>用户姓名</span>
-                          <span className={styles.hew_content}>{data.userName}</span>
-                        </Col>
-                      )}
-                      {data && data.userPosition && (
-                        <Col
-                          style={{
-                            marginBottom: 12,
-                          }}
-                          span={8}
-                        >
-                          <span className={styles.hea_title}>职位</span>
-                          <span className={styles.hew_content}>{data.userPosition}</span>
-                        </Col>
-                      )}
-                      {data && data.userSchool && (
-                        <Col
-                          span={8}
-                          style={{
-                            marginBottom: 12,
-                          }}
-                        >
-                          <span className={styles.hea_title}>学院/单位</span>
-                          <span className={styles.hew_content}>{data.userSchool}</span>
-                        </Col>
-                      )}
-                      {data && data.userPhone && (
-                        <Col
-                          span={8}
-                          style={{
-                            marginBottom: 12,
-                          }}
-                        >
-                          <span className={styles.hea_title}>联系电话</span>
-                          <span className={styles.hew_content}>{data.userPhone}</span>
-                        </Col>
-                      )}
-                      {data && data.createTime && (
-                        <Col
-                          style={{
-                            marginBottom: 12,
-                          }}
-                          span={8}
-                        >
-                          <span className={styles.hea_title}>申请时间</span>
-                          <span className={styles.hew_content}>
-                              {moment(data.createTime)
-                                .format('YYYY-MM-DD HH:mm')}
-                            </span>
-                        </Col>
-                      )}
-                    </Row>
-                  )}
-                </div>
-              )}
-              <div
-                className={styles.HistoryFormList}
-                id='card_table'
-                ref={el => (this.componentRef = el)}
-                style={{ padding: !isShowTitle ? '50px' : '' }}
-              >
-              <HistoryFormList data={data}
-                               formKeys={hisTaskFormKeys?.formKeys}
-                               isShowTitle={isShowTitle}
-                               routerState={routerState}
-                               formData={hisTaskFormKeys?.formData}
-              />
-                {isHandle === true && !!data.taskFormKey && (
-                  <>
-                    {isShowTitle ? (
-                      <h3
-                        style={{
-                          display: 'flex',
-                          alignItems: 'center',
-                        }}
-                      >
-                        <SVG name='vertical' color='#999999' height='24' />
-                        当前流程
-                      </h3>
-                    ) : (
-                      ''
-                    )}
-                    {isEmpty(data) === false ? (
-                      <ZdyTable
-                        key={data.taskFormKey}
-                        postData={data}
-                        get='web'
-                        obj={hisTaskFormKeys.formData}
-                        table='new'
-                        form={this.props.form}
-                        routerState={routerState}
-                      />
-                    ) : (
-                      ''
-                    )}
-                  </>
-                )}
-              </div>
-            </Card>
-            <Card style={{ width: '100%' }}>
-              <div className={styles.body_content} style={{ minHeight: '300px' }}>
-                <div id={'btnsModalMountDiv'}></div>
-                <h3>
-                  审批状态 <span onClick={this.examineFlow}>查看流程图</span>
-                </h3>
-                <div
-                  ref={el => (this.componentTwoRef = el)}
-                  style={{
-                    padding: !isShowTitle ? '0 50px 50px 50px' : '',
-                  }}
-                >
-                  <Timeline>
-                    {stepFlow !== '' && steps !== ''
-                      ? stepFlow.map((item, index) => {
-                        if (index === stepFlow.length - 1) {
-                          // 最后一步流程
-                          return (
-                            <Timeline.Item
-                              color={['处理中', '待处理'].includes(item.status) ? 'red' : '#ccc'}
-                              dot={
-                                <Icon
-                                  type={
-                                    ['处理中', '待处理'].includes(item.status) ? 'clock-circle-o' : 'check-circle'
-                                  }
-                                  style={{ fontSize: '16px' }}
-                                />
-                              }
-                              className={styles.steps_step}
-                              key={item.id}
-                            >
-                              <p className={styles.steps_title}>
-                                {item.assignee}
-                                <span>
-                                    {item.endTime
-                                      ? moment(item.endTime)
-                                        .format('YYYY-MM-DD HH:mm')
-                                      : '处理中'}
-                                  </span>
-                              </p>
-                              {
-                                queryApiVersion() === '2.0' && ['处理中', '待处理'].includes(item.status) && !!data.nextUsers && (
-                                  <p>审批人员: {data.nextUsers}</p>
-                                )
-                              }
-                              {queryApiVersion() !== '2.0' && ['处理中', '待处理'].includes(item.status) && !!item.nextUsers && (
-                                <p>审批人员: {item.nextUsers}</p>
-                              )}
-                              <p>审批流程：{item.name}</p>
-                              <p className={styles.steps_body}>审批状态：{item.status}</p>
-                              {item.taskVariable?.reason ? (
-                                <p>审批原因：{item.taskVariable?.reason}</p>
-                              ) : (
-                                ''
-                              )}
-                              {item.childTaskModel && item.childTaskModel.length > 0 && (
-                                <ChildTaskModel data={item.childTaskModel} />
-                              )}
-
-                              {(isSign || item.taskVariable?.sign) && !closeAutoSign ? (
-                                <img
-                                  style={{
-                                    position: 'absolute',
-                                    top: '50%',
-                                    left: 200,
-                                    height: 50,
-                                    marginTop: -25,
-                                    border: item.taskVariable?.sign ? '1px solid #ccc' : '',
-                                  }}
-                                  src={
-                                    item.taskVariable?.sign
-                                      ? queryApiActionPath() + item.taskVariable?.sign
-                                      : ''
-                                  }
-                                  alt=''
-                                />
-                              ) : (
-                                ''
-                              )}
-                              {isTrunTo && +item.commentCount > 0 ? (
-                                <TrunToDetail data={data} item={item} />
-                              ) : null}
-                            </Timeline.Item>
-                          );
-                        }
-                        return (
-                          <Timeline.Item
-                            color={item.status === 0 ? 'gray' : 'green'}
-                            dot={
-                              item.status === 0 ? (
-                                ''
-                              ) : (
-                                <Icon
-                                  type='check-circle'
-                                  theme='twoTone'
-                                  twoToneColor='#52c41a'
-                                />
-                              )
-                            }
-                            className={styles.steps_step}
-                            key={item.id}
-                          >
-                            <p className={styles.steps_title}>
-                              {item.assignee}
-                              <span>
-                                  {item.endTime
-                                    ? moment(item.endTime)
-                                      .format('YYYY-MM-DD HH:mm')
-                                    : null}
-                                </span>
-                            </p>
-                            <p>审批流程：{item.name}</p>
-                            <p className={styles.steps_body}>审批状态：{item.status}</p>
-                            {item.taskVariable?.reason ? (
-                              <p>审批原因：{item.taskVariable.reason}</p>
-                            ) : (
-                              ''
-                            )}
-                            {item.childTaskModel && item.childTaskModel.length > 0 && (
-                              <ChildTaskModel data={item.childTaskModel} />
-                            )}
-                            {item.taskVariable?.sign ? (
-                              <img
-                                style={{
-                                  position: 'absolute',
-                                  top: '50%',
-                                  left: 200,
-                                  height: 50,
-                                  marginTop: -25,
-                                  border: item.taskVariable?.sign ? '1px solid #ccc' : '',
-                                }}
-                                src={
-                                  item.taskVariable?.sign
-                                    ? queryApiActionPath() + item.taskVariable?.sign
-                                    : ''
-                                }
-                                alt=''
-                              />
-                            ) : (
-                              ''
-                            )}
-                            {isTrunTo && +item.commentCount > 0 ? (
-                              <TrunToDetail data={data} item={item} />
-                            ) : null}
-                          </Timeline.Item>
-                        );
-                      })
-                      : ''}
-                  </Timeline>
-                </div>
-              </div>
-            </Card>
-            <div className={styles.buttonList}>
-              {isHandle === true ? (
-                <>
-                  <BtnOk // 审批按钮和弹窗
-                    Sign={!!setData?.userSign}
-                    isSumbitLoading={isSumbitLoading}
-                    isSecond={isSecond}
-                    affairOk={this.affairOk}
-                    form={this.props.form}
-                    btns={btns}
-                    addition={
-                      <>
-                        {isTrunTo && data.isSecond !== true && isHandle ? (
-                          <Button
-                            style={{
-                              marginLeft: 16,
-                              minHeight: 32,
-                              minWidth: 90,
-                            }}
-                            onClick={() => {
-                              this.showTrunToModel(
-                                data.isHandle && data.isOwner
-                                  ? '转办'
-                                  : !data.isHandle && data.isOwner
-                                    ? '撤回'
-                                    : '回退',
-                                data,
-                              );
-                            }}
-                            type='primary'
-                          >
-                            {data.isHandle && data.isOwner
-                              ? '转办'
-                              : !data.isHandle && data.isOwner
-                                ? '撤回'
-                                : data.isHandle && !data.isOwner
-                                  ? '回退'
-                                  : null}
-                          </Button>
-                        ) : null}
-                        {data.isCanSign && (
-                          <Button
-                            style={{
-                              marginLeft: 16,
-                              minHeight: 32,
-                              minWidth: 90,
-                            }}
-                            onClick={this.onClickCountersign}
-                            type='primary'
-                          >
-                            加签
-                          </Button>
-                        )}
-                      </>
-                    }
-                  />
-                </>
-              ) : (
-                ''
-              )}
-              {isTrunTo && data.isSecond !== true && !data.isHandle && data.isOwner && (
-                <div
-                  style={{
-                    width: '100%',
-                    textAlign: 'center',
-                  }}
-                >
-                  <Button
-                    style={{
-                      minHeight: 32,
-                      minWidth: 90,
-                      margin: '0 auto',
-                    }}
-                    onClick={() => {
-                      this.showTrunToModel('撤回', data);
-                    }}
-                    type='primary'
-                  >
-                    撤回
-                  </Button>
-                </div>
-              )}
-            </div>
-          </>
-        ) : (
-          <div
-            style={{
-              width: '100%',
-              height: 200,
-              display: 'flex',
-              justifyContent: 'center',
-              alignItems: 'center',
-            }}
-          >
-            <Spin size='large' spinning={true} />
-          </div>
-        )}
-        <PortalFlowExamineModal // 流程图
-          ref={node => (this.flowExamineModal = node)}
-          affairId={id}
-          id={appId}
-          code={code}
-        />
-        <TrunToModel //
-          visible={isOpenTrunToModel}
-          handleCancel={this.handleTrunToModel}
-          status={trunToStatus}
-          value={trunData}
-          init={this.getInit}
-        />
-        {data?.appName && ( // 加签
-          <Countersign
-            taskId={data.taskId}
-            data={data}
-            getInit={this.getInit}
-            updateCountersignModal={this.updateCountersignModal}
-          />
-        )}
-      </Fragment>
-    );
-  }
+	constructor() {
+		super();
+		this.state = {
+			isTakeFlow: false,
+			data: {}, // 详情数据
+			stepFlow: [],
+			items: [],
+			obj: {},
+			isSecond: false, // 如果为true,表示重新发起
+			selects: new Map(),
+			left: 0,
+			top: 0,
+			max: 4,
+			width: 100,
+			taskId: '', // 模型id
+			appId: '', // 事务id
+			code: '', // 事务code 当前表单唯一值
+			isHandle: false, // 判断用户是否有权限
+			id: '', // 表单id
+			btns: [], // 自定义按钮
+			taskFormKey: '', // 多表单显示的key
+			itemsOK: [], // 多表单显示的表单
+			hisTaskFormKeys: {}, // 历史任务相关
+			isLoading: false, // 请求状态
+			formColor: '', // 流程紧急度颜色
+			formLevel: '', // 流程文本
+			btnList: [], // 紧急度按钮返回数据
+			radiovalue: '', // 单选id
+			isEnd: false, // 是否结束
+			isShowTitle: true, // 是否展示流程步骤几个字
+			isSumbitLoading: false, // 发起时触发
+			isOpenTrunToModel: false, // 用户转办,回收弹框控制变量
+			trunToStatus: '转办', // 当前节点存在状态
+			trunData: '', // 转办当前选中数据
+			isCloseUserDetail: false, // 是否展示用户基础详细信息
+			checkedConfimList: [], // 用户选择打印元素
+			checkListOptions: [], // 历史表单复选框存放值
+			isShowTitleTwo: true, // 历史表单展示状态
+			paddingBottom: 0,
+			isSign: false, // 是否使用签名
+			userInfo: '', // 得到用户数据
+			setData: '', // 配置的数据
+			countersignModal: '', // 开启加签弹框函数
+			isAllPrint: false,
+			closeAutoSign: false, // 28521 退役大学生评优管理/在校退役大学生评优审核，去掉审核签名
+		};
+		window.callbackSubmitInfoZhiYong = undefined;
+	}
+
+	/**
+	 * @function 同步加签函数
+	 * @param { function } func 打开加签弹框函数
+	 */
+	updateCountersignModal = (func) => {
+		this.setState({
+			countersignModal: func,
+		});
+	};
+	/**
+	 * 关闭转办,回收弹框
+	 */
+	handleTrunToModel = () => {
+		this.setState({
+			isOpenTrunToModel: false,
+			trunData: '',
+			trunToStatus: '',
+		});
+	};
+
+	/**
+	 * 打开转办,回收弹框
+	 * @param { string } text 当前按钮状态
+	 */
+	showTrunToModel = (text, record) => {
+		this.setState({
+			isOpenTrunToModel: true,
+			trunToStatus: text,
+			trunData: record,
+		});
+	};
+
+	examineFlow = (...ags) => {
+		this.flowExamineModal.showModal(...ags);
+	};
+
+	componentDidMount() {
+		this.getInit();
+
+		if (this.props.onRef) {
+			this.props.onRef(this);
+		}
+	}
+
+	/**
+	 * @function 默认请求
+	 */
+	getInit = (handleUser) => {
+		const { dispatch, formPrepareData } = this.props;
+		const id = this.props.history.location.state && this.props.history.location.state.id;
+		const code = this.props.history.location.state && this.props.history.location.state.code;
+		const queryId = this.props.history.location.query && this.props.history.location.query.id;
+		const taskId = this.props.history.location.state && this.props.history.location.state.taskId;
+		if (!id && !code) {
+			if (queryId) {
+			} else {
+				openToast('error', '数据已过期', '当前页面数据已过期,请重新进入');
+				router.push('/portal/home');
+				return;
+			}
+		}
+		const val = formPrepareData;
+		if (val) {
+			if (this.props.changeData) {
+				this.props.changeData(val);
+			}
+			const checkListOptions = [];
+			const checkedConfimList = [];
+			if (val.hisTaskForm.formKeys) {
+				val.hisTaskForm.formKeys.map((item) => {
+					checkListOptions.push({
+						label: item.taskName,
+						value: item.formKey,
+					});
+				});
+			}
+			if (val && !val.taskInfo) {
+				permRequest('/UnifiedAppFormApi/getTaskInfos', {
+					// 获取每一步的审核人.
+					id: queryId ? queryId : id, // 审批表Id
+					code: code || null, // 表单值
+				}).then((res) => {
+					val.taskInfo = res.taskInfo;
+					this.setState(
+						{
+							data: val,
+							stepFlow: val.taskInfo,
+							obj: JSON.parse(val.content),
+							code: val.code,
+							taskId: val.taskId,
+							isSecond: val.isSecond ? val.isSecond : false,
+							appId: val.appId,
+							code: val.code,
+							isHandle: val.isHandle,
+							id,
+							btns: val.btns,
+							taskFormKey: val.taskFormKey,
+							hisTaskFormKeys: val.hisTaskForm,
+							isLoading: true,
+							formColor: val.formColor,
+							formLevel: val.formLevel,
+							isEnd: val.isEnd,
+							checkListOptions,
+							checkedConfimList,
+						},
+						() => {
+							if (val.isSecond) {
+								this.props.dispatch({
+									type: 'urge/GetMyBtn',
+									payload: {},
+									callback: (arr) => {
+										this.setState(
+											{
+												btnList: arr,
+												radiovalue: val.formLevelId ? val.formLevelId : arr[arr.length - 1].id,
+											},
+											() => {
+												// this.giveMessageTop();
+											},
+										);
+									},
+								});
+							} else {
+								// this.giveMessageTop();
+							}
+						},
+					);
+				});
+			}
+		}
+		dispatch({
+			type: 'emailorphone/GetLogo',
+			payload: {
+				configKeys: ['isCloseUserDetail', 'isCloseFlowPath', 'isAllPrint', 'closeAutoSign'],
+			},
+			callback: (val) => {
+				const closeAutoSign = !!(val[3] && val[3].configValue === 'true');
+				this.setState({
+					isCloseUserDetail: !!(val[0] && val[0].configValue === 'true'),
+					isAllPrint: !!(val[2] && val[2].configValue === 'true'),
+					closeAutoSign,
+				});
+
+				if (!closeAutoSign) {
+					/**
+					 * 获取设置的数据
+					 */
+					this.props.dispatch({
+						type: 'UserSetCenterApi/queryUserSet',
+						payload: {},
+						callback: (val) => {
+							this.setState({
+								setData: val,
+							});
+						},
+					});
+				}
+
+				if (val[1]?.configValue) {
+					sessionStorage.setItem(
+						'isCloseFlowPath',
+						val[1]?.configValue === 'true' ? JSON.stringify(true) : JSON.stringify(false),
+					);
+				}
+			},
+		});
+		if (getToken()) {
+			const user = localStorage.getItem('user');
+			if (user && isJSON(user)) {
+				this.setState({
+					userInfo: JSON.parse(user),
+				});
+			}
+		}
+	};
+
+	/**
+	 * @function 用户点击确认执行相应操作
+	 * @description: 注意 用户点击状态时在点击动态配置按钮时进行了保存,并在该函数中最终提交给后端
+	 * @param { string } oldkey 按钮状态
+	 * @param { string } btnValue 按钮选中状态
+	 * @param { string } value 审批理由
+	 * @param { boolean } checked 加签状态
+	 * @param { function } callback 回调函数
+	 */
+	affairOk = (oldkey, btnValue, value, checked, callback) => {
+		const { dispatch } = this.props;
+		const { radiovalue, isSecond, userInfo, setData, data, btns, taskId, code } = this.state;
+		const { handleUser } = this.props.history.location.state;
+		const isCloseFlowPath = sessionStorage.getItem('isCloseFlowPath')
+			? JSON.parse(sessionStorage.getItem('isCloseFlowPath'))
+			: false;
+		if (callback) {
+			callback();
+		}
+
+		let checkSumbitInfo = checkNeedFormValidateFieldsAndScroll({
+			// 检查是否必填表单值
+			btns,
+			btnValue,
+		});
+
+		let needWriteAuditInfo = checkNeedWriteAuditInfo({
+			// 检查是否必填审批理由
+			btns,
+			btnValue,
+		});
+		if (needWriteAuditInfo && !value) {
+			let d = document.getElementById('textarea_shen_pi_li_you');
+			if (d) {
+				message.warning('请输入审批理由');
+				return false;
+			}
+		}
+		const argumentsSubmitValue = {
+			isCloseFlowPath,
+			radiovalue,
+			isSecond,
+			taskId,
+			code,
+			btnValue,
+			oldkey,
+			value,
+			checked,
+			setData,
+			data,
+			userInfo,
+			btns,
+			dispatch,
+			that: this,
+			handleUser,
+		};
+
+		if (!checkSumbitInfo) {
+			// 如果不需要校验 直接提交数据
+			const values = this.props.form.getFieldsValue();
+			argumentsSubmitValue.values = values;
+			submitValues(argumentsSubmitValue);
+		} else {
+			this.props.form.validateFieldsAndScroll((err, values) => {
+				// 校验是否填了必填字段
+				if (!err) {
+					argumentsSubmitValue.values = values;
+					submitValues(argumentsSubmitValue);
+				}
+			});
+		}
+	};
+
+	onChange = (e) => {
+		this.setState({
+			radiovalue: e.target.value,
+		});
+	};
+
+	/**
+	 * @function 复选框状态函数
+	 * @event change
+	 */
+	onCheckChange = (checkedValues) => {
+		this.setState({
+			checkedConfimList: checkedValues,
+		});
+	};
+	/**
+	 * @function 加签点击函数
+	 * @event click
+	 */
+	onClickCountersign = () => {
+		const { countersignModal } = this.state;
+		countersignModal();
+	};
+	/**
+	 * @function 通过用户复选框选择拼装为对应打印页面
+	 */
+
+	changeTake = (checked) => {
+		this.setState({ isTakeFlow: checked });
+	};
+
+	changePadding = (value) => {
+		this.setState({ paddingBottom: value });
+	};
+
+	render() {
+		const {
+			stepFlow,
+			isHandle,
+			hisTaskFormKeys,
+			id,
+			appId,
+			code,
+			steps,
+			data,
+			btns,
+			isSecond,
+			isLoading,
+			formColor,
+			formLevel,
+			btnList,
+			radiovalue,
+			isEnd,
+			isShowTitle,
+			isSumbitLoading,
+			isOpenTrunToModel,
+			trunToStatus,
+			trunData,
+			isCloseUserDetail,
+			checkListOptions,
+			checkedConfimList,
+			isTakeFlow,
+			paddingBottom,
+			setData,
+			isSign,
+			isAllPrint,
+			closeAutoSign, // 28521 退役大学生评优管理/在校退役大学生评优审核，去掉审核签名
+		} = this.state;
+		const { showPrint } = this.props;
+		const isCloseFlowPath = sessionStorage.getItem('isCloseFlowPath')
+			? JSON.parse(sessionStorage.getItem('isCloseFlowPath'))
+			: false;
+		const isTrunTo = sessionStorage.getItem('isTrunTo')
+			? JSON.parse(sessionStorage.getItem('isTrunTo'))
+			: false;
+		const domainName = sessionStorage.getItem('domainName')
+			? sessionStorage.getItem('domainName')
+			: '';
+		const routerState = {
+			history: this.props?.history,
+			location: this.props?.location,
+			match: this.props?.match,
+			computedMatch: this.props?.computedMatch,
+			route: this.props?.route,
+		};
+
+		// console.log(data, isAllPrint);
+		return (
+			<Fragment>
+				<div
+					style={{
+						width: '100%',
+						display: 'flex',
+						justifyContent: 'center',
+					}}>
+					<div style={{ width: '100%' }}>
+						<div
+							className={styles.header}
+							style={{
+								position: 'relative',
+							}}>
+							{isCloseFlowPath ? null : ( // 关闭流程紧急度显示
+								<span
+									style={{
+										position: 'absolute',
+										left: 0,
+										top: '30%',
+									}}>
+									{isSecond ? (
+										<>
+											<span style={{ marginRight: 12 }}>
+												{must}
+												流程紧急度
+											</span>
+											<Radio.Group onChange={this.onChange} value={radiovalue}>
+												{btnList.length > 0
+													? btnList.map((item) => (
+															<Radio key={item.id + Math.random()} value={item.id}>
+																<span style={{ color: item.color }}>{item.name}</span>
+															</Radio>
+													  ))
+													: ''}
+											</Radio.Group>
+										</>
+									) : (
+										<>
+											紧急程度:
+											<span
+												style={{
+													color: formColor || '',
+													marginLeft: 21,
+												}}>
+												{formLevel || '暂无'}
+											</span>
+										</>
+									)}
+								</span>
+							)}
+
+							{data.appName ? data.appName : '当前表单'}
+							{(isEnd || isAllPrint) && showPrint !== false ? (
+								<>
+									<Popconfirm
+										onConfirm={() => {
+											if (!checkedConfimList || !checkedConfimList.length) {
+												message.warning('请选择需要打印的表单');
+												return false;
+											}
+											if (domainName) {
+												window.open(
+													`${domainName}/protal/printRouter?id=${data.id}&list=${JSON.stringify(
+														checkedConfimList,
+													)}&padding=${paddingBottom}&isTakeFlow=${isTakeFlow}&token=${getToken()}`,
+												);
+											} else {
+												openToast('warning', '未配置域名地址,请联系管理员');
+											}
+										}}
+										title={
+											<div>
+												<div>
+													是否带流程:
+													<Switch checked={isTakeFlow} onChange={this.changeTake} />
+												</div>
+												<div>
+													表单间距:
+													<InputNumber
+														min={0}
+														size="small"
+														value={paddingBottom}
+														onChange={this.changePadding}
+													/>
+												</div>
+												<div className={styles.history_form_title}>请选择需要打印的表单</div>
+												<div className={styles.history_form_body_div}>
+													<Checkbox.Group
+														options={checkListOptions}
+														onChange={this.onCheckChange}
+														defaultValue={checkedConfimList}
+													/>
+												</div>
+											</div>
+										}
+										okText="确定"
+										cancelText="取消">
+										{(data.isPrint == null || data.isPrint || isAllPrint) && showPrint !== false ? (
+											<Button
+												style={{
+													position: 'absolute',
+													right: 200,
+													top: '30%',
+												}}
+												type="primary">
+												打印预览
+											</Button>
+										) : (
+											''
+										)}
+									</Popconfirm>
+								</>
+							) : (
+								''
+							)}
+						</div>
+					</div>
+				</div>
+				{isLoading ? (
+					<>
+						<Card style={{ width: '100%' }}>
+							{!isCloseUserDetail && (
+								<div className={styles.body_hea}>
+									<h3>发起人信息</h3>
+									{data &&
+										(data.createTime ||
+											data.code ||
+											data.userName ||
+											data.userPosition ||
+											data.userPhone ||
+											data.userSchool) && (
+											<Row className={styles.row}>
+												{data &&
+													data.code && (
+														<Col
+															style={{
+																marginBottom: 12,
+															}}
+															span={8}>
+															<span className={styles.hea_title}>单号</span>
+															<span className={styles.hew_content}>{data.code}</span>
+														</Col>
+													)}
+												{data &&
+													data.userName && (
+														<Col
+															style={{
+																marginBottom: 12,
+															}}
+															span={8}>
+															<span className={styles.hea_title}>用户姓名</span>
+															<span className={styles.hew_content}>{data.userName}</span>
+														</Col>
+													)}
+												{data &&
+													data.userPosition && (
+														<Col
+															style={{
+																marginBottom: 12,
+															}}
+															span={8}>
+															<span className={styles.hea_title}>职位</span>
+															<span className={styles.hew_content}>{data.userPosition}</span>
+														</Col>
+													)}
+												{data &&
+													data.userSchool && (
+														<Col
+															span={8}
+															style={{
+																marginBottom: 12,
+															}}>
+															<span className={styles.hea_title}>学院/单位</span>
+															<span className={styles.hew_content}>{data.userSchool}</span>
+														</Col>
+													)}
+												{data &&
+													data.userPhone && (
+														<Col
+															span={8}
+															style={{
+																marginBottom: 12,
+															}}>
+															<span className={styles.hea_title}>联系电话</span>
+															<span className={styles.hew_content}>{data.userPhone}</span>
+														</Col>
+													)}
+												{data &&
+													data.createTime && (
+														<Col
+															style={{
+																marginBottom: 12,
+															}}
+															span={8}>
+															<span className={styles.hea_title}>申请时间</span>
+															<span className={styles.hew_content}>
+																{moment(data.createTime).format('YYYY-MM-DD HH:mm')}
+															</span>
+														</Col>
+													)}
+											</Row>
+										)}
+								</div>
+							)}
+							<div
+								className={styles.HistoryFormList}
+								id="card_table"
+								ref={(el) => (this.componentRef = el)}
+								style={{ padding: !isShowTitle ? '50px' : '' }}>
+								<HistoryFormList
+									data={data}
+									formKeys={hisTaskFormKeys?.formKeys}
+									isShowTitle={isShowTitle}
+									routerState={routerState}
+									formData={hisTaskFormKeys?.formData}
+								/>
+								{isHandle === true &&
+									!!data.taskFormKey && (
+										<>
+											{isShowTitle ? (
+												<h3
+													style={{
+														display: 'flex',
+														alignItems: 'center',
+													}}>
+													<SVG name="vertical" color="#999999" height="24" />
+													当前流程
+												</h3>
+											) : (
+												''
+											)}
+											{isEmpty(data) === false ? (
+												<ZdyTable
+													key={data.taskFormKey}
+													postData={data}
+													get="web"
+													obj={hisTaskFormKeys.formData}
+													table="new"
+													form={this.props.form}
+													routerState={routerState}
+												/>
+											) : (
+												''
+											)}
+										</>
+									)}
+							</div>
+						</Card>
+						<Card style={{ width: '100%' }}>
+							<div className={styles.body_content} style={{ minHeight: '300px' }}>
+								<div id={'btnsModalMountDiv'} />
+								<h3>
+									审批状态 <span onClick={this.examineFlow}>查看流程图</span>
+								</h3>
+								<div
+									ref={(el) => (this.componentTwoRef = el)}
+									style={{
+										padding: !isShowTitle ? '0 50px 50px 50px' : '',
+									}}>
+									<Timeline>
+										{stepFlow !== '' && steps !== ''
+											? stepFlow.map((item, index) => {
+													if (index === stepFlow.length - 1) {
+														// 最后一步流程
+														return (
+															<Timeline.Item
+																color={['处理中', '待处理'].includes(item.status) ? 'red' : '#ccc'}
+																dot={
+																	<Icon
+																		type={
+																			['处理中', '待处理'].includes(item.status)
+																				? 'clock-circle-o'
+																				: 'check-circle'
+																		}
+																		style={{ fontSize: '16px' }}
+																	/>
+																}
+																className={styles.steps_step}
+																key={item.id}>
+																<p className={styles.steps_title}>
+																	{item.assignee}
+																	<span>
+																		{item.endTime
+																			? moment(item.endTime).format('YYYY-MM-DD HH:mm')
+																			: '处理中'}
+																	</span>
+																</p>
+																{queryApiVersion() === '2.0' &&
+																	['处理中', '待处理'].includes(item.status) &&
+																	!!data.nextUsers && <p>审批人员: {data.nextUsers}</p>}
+																{queryApiVersion() !== '2.0' &&
+																	['处理中', '待处理'].includes(item.status) &&
+																	!!item.nextUsers && <p>审批人员: {item.nextUsers}</p>}
+																<p>
+																	审批流程：
+																	{item.name}
+																</p>
+																<p className={styles.steps_body}>
+																	审批状态：
+																	{item.status}
+																</p>
+																{item.taskVariable?.reason ? (
+																	<p>
+																		审批原因：
+																		{item.taskVariable?.reason}
+																	</p>
+																) : (
+																	''
+																)}
+																{item.childTaskModel &&
+																	item.childTaskModel.length > 0 && (
+																		<ChildTaskModel data={item.childTaskModel} />
+																	)}
+
+																{(isSign || item.taskVariable?.sign) && !closeAutoSign ? (
+																	<img
+																		style={{
+																			position: 'absolute',
+																			top: '50%',
+																			left: 200,
+																			height: 50,
+																			marginTop: -25,
+																			border: item.taskVariable?.sign ? '1px solid #ccc' : '',
+																		}}
+																		src={
+																			item.taskVariable?.sign
+																				? queryApiActionPath() + item.taskVariable?.sign
+																				: ''
+																		}
+																		alt=""
+																	/>
+																) : (
+																	''
+																)}
+																{isTrunTo && +item.commentCount > 0 ? (
+																	<TrunToDetail data={data} item={item} />
+																) : null}
+															</Timeline.Item>
+														);
+													}
+													return (
+														<Timeline.Item
+															color={item.status === 0 ? 'gray' : 'green'}
+															dot={
+																item.status === 0 ? (
+																	''
+																) : (
+																	<Icon
+																		type="check-circle"
+																		theme="twoTone"
+																		twoToneColor="#52c41a"
+																	/>
+																)
+															}
+															className={styles.steps_step}
+															key={item.id}>
+															<p className={styles.steps_title}>
+																{item.assignee}
+																<span>
+																	{item.endTime
+																		? moment(item.endTime).format('YYYY-MM-DD HH:mm')
+																		: null}
+																</span>
+															</p>
+															<p>
+																审批流程：
+																{item.name}
+															</p>
+															<p className={styles.steps_body}>
+																审批状态：
+																{item.status}
+															</p>
+															{item.taskVariable?.reason ? (
+																<p>
+																	审批原因：
+																	{item.taskVariable.reason}
+																</p>
+															) : (
+																''
+															)}
+															{item.childTaskModel &&
+																item.childTaskModel.length > 0 && (
+																	<ChildTaskModel data={item.childTaskModel} />
+																)}
+															{item.taskVariable?.sign ? (
+																<img
+																	style={{
+																		position: 'absolute',
+																		top: '50%',
+																		left: 200,
+																		height: 50,
+																		marginTop: -25,
+																		border: item.taskVariable?.sign ? '1px solid #ccc' : '',
+																	}}
+																	src={
+																		item.taskVariable?.sign
+																			? queryApiActionPath() + item.taskVariable?.sign
+																			: ''
+																	}
+																	alt=""
+																/>
+															) : (
+																''
+															)}
+															{isTrunTo && +item.commentCount > 0 ? (
+																<TrunToDetail data={data} item={item} />
+															) : null}
+														</Timeline.Item>
+													);
+											  })
+											: ''}
+									</Timeline>
+								</div>
+							</div>
+						</Card>
+						<div className={styles.buttonList}>
+							{isHandle === true ? (
+								<>
+									<BtnOk // 审批按钮和弹窗
+										Sign={!!setData?.userSign}
+										isSumbitLoading={isSumbitLoading}
+										isSecond={isSecond}
+										affairOk={this.affairOk}
+										form={this.props.form}
+										btns={btns}
+										addition={
+											<>
+												{isTrunTo && data.isSecond !== true && isHandle ? (
+													<Button
+														style={{
+															marginLeft: 16,
+															minHeight: 32,
+															minWidth: 90,
+														}}
+														onClick={() => {
+															this.showTrunToModel(
+																data.isHandle && data.isOwner
+																	? '转办'
+																	: !data.isHandle && data.isOwner
+																		? '撤回'
+																		: '回退',
+																data,
+															);
+														}}
+														type="primary">
+														{data.isHandle && data.isOwner
+															? '转办'
+															: !data.isHandle && data.isOwner
+																? '撤回'
+																: data.isHandle && !data.isOwner
+																	? '回退'
+																	: null}
+													</Button>
+												) : null}
+												{data.isCanSign && (
+													<Button
+														style={{
+															marginLeft: 16,
+															minHeight: 32,
+															minWidth: 90,
+														}}
+														onClick={this.onClickCountersign}
+														type="primary">
+														加签
+													</Button>
+												)}
+											</>
+										}
+									/>
+								</>
+							) : (
+								''
+							)}
+							{isTrunTo &&
+								data.isSecond !== true &&
+								!data.isHandle &&
+								data.isOwner && (
+									<div
+										style={{
+											width: '100%',
+											textAlign: 'center',
+										}}>
+										<Button
+											style={{
+												minHeight: 32,
+												minWidth: 90,
+												margin: '0 auto',
+											}}
+											onClick={() => {
+												this.showTrunToModel('撤回', data);
+											}}
+											type="primary">
+											撤回
+										</Button>
+									</div>
+								)}
+						</div>
+					</>
+				) : (
+					<div
+						style={{
+							width: '100%',
+							height: 200,
+							display: 'flex',
+							justifyContent: 'center',
+							alignItems: 'center',
+						}}>
+						<Spin size="large" spinning={true} />
+					</div>
+				)}
+				<PortalFlowExamineModal // 流程图
+					ref={(node) => (this.flowExamineModal = node)}
+					affairId={id}
+					id={appId}
+					code={code}
+				/>
+				<TrunToModel //
+					visible={isOpenTrunToModel}
+					handleCancel={this.handleTrunToModel}
+					status={trunToStatus}
+					value={trunData}
+					init={this.getInit}
+				/>
+				{data?.appName && ( // 加签
+					<Countersign
+						taskId={data.taskId}
+						data={data}
+						getInit={this.getInit}
+						updateCountersignModal={this.updateCountersignModal}
+					/>
+				)}
+			</Fragment>
+		);
+	}
 }
 
-export default function Index(props){
-  console.log(window.zdyTableTemplateWillMountProps?.formCreateOptions);
-  const DetailSplitFormNew = Form.create(
-    window.zdyTableTemplateWillMountProps?.formCreateOptions || undefined,
-  )(DetailSplit);
-  return <DetailSplitFormNew {...props}/>;
+function Index(props) {
+	const { dispatch, history } = props;
+	const [prepare, setPrepare] = useState(false);
+	useEffect(() => {
+		const id = history.location.state && history.location.state.id;
+		const code = history.location.state && history.location.state.code;
+		const queryId = history.location.query && history.location.query.id;
+		const taskId = history.location.state && history.location.state.taskId;
+		if (!id && !code) {
+			if (queryId) {
+			} else {
+				openToast('error', '数据已过期', '当前页面数据已过期,请重新进入');
+				return;
+			}
+		}
+		message.info('正在加载数据，请等待。');
+		dispatch({
+			type: 'affair/getIdFormDetail',
+			payload: {
+				id: queryId ? queryId : id, // 审批表Id
+				code: code || null, // 表单值
+				handleUser: null, // 处理人
+				taskId, // 多任务流程会使用到,后续改为必须传入
+				lite: true,
+			},
+			callback: (val) => {
+				if (val) {
+					setPrepare(val);
+				}
+			},
+		});
+	}, []);
+
+	if (!prepare) {
+		return <Spin size="large" spinning={true} />;
+	}
+
+	const DetailSplitFormNew = Form.create(
+		window.zdyTableTemplateWillMountProps?.formCreateOptions || undefined,
+	)(DetailSplit);
+	return <DetailSplitFormNew {...props} formPrepareData={prepare} />;
 }
+
+export default connect(() => {
+	return {};
+})(Index);

one_stop_public/ForZydApply/index.js

@@ -49,7 +49,8 @@ export default class IframeForApply extends React.Component {
     } = props;
     this.state = {
       id, // 传入id
-      init: init && isJSON(init) ? JSON.parse(decodeURIComponent(init)) : undefined,
+      init: init || undefined,
+      // 2022年8月9日 发起页面的默认值可以通过这个init 传进来
       value: '', // 紧急度选择
       btnList: [], // 紧急度按钮返回数据
       noNeedApply,

one_stop_public/Table/ZdyTable.jsx

@@ -19,6 +19,7 @@ import getActiveJson from '@/webPublic/one_stop_public/Table/getActiveJson';
 export default class ZdyTable extends Component {
   constructor(props) {
     super(props);
+    console.log(props);
     this.state = {
       objRealTime: {},
       isChange: false,

one_stop_public/Table/globalFunction.js

@@ -796,9 +796,9 @@ export async function downloadFile(url, params, fileName = '导出文件', ext =
   let headers = {
     Authorization: `bearer ${localStorage.getItem('antd-pro-token-onestop')}`,
   };
-  if(headersApi){
-    headers.apis = headersApi;
-  }
+  // if(headersApi){
+  //   headers.apis = headersApi;
+  // }
   fetch(transformApi, {
     method: 'POST',
     body: FormdataWrapper(params),
@@ -840,9 +840,9 @@ export async function downloadFileAndShowModal(url, params, fileName = '导出
   let headers = {
     Authorization: `bearer ${localStorage.getItem('antd-pro-token-onestop')}`,
   };
-  if(headersApi){
-    headers.apis = headersApi;
-  }
+  // if(headersApi){
+  //   headers.apis = headersApi;
+  // }
   fetch(transformApi, {
     method: 'POST',
     body: FormdataWrapper(params),

one_stop_public/libs/TableSelect.js

-import React from "react";
-import { Button, message, Table, Tag } from "antd";
-import FormList from "./formList/index";
-import { connect } from "dva";
+import React from 'react';
+import { Button, message, Table, Tag } from 'antd';
+import FormList from './formList/index';
+import { connect } from 'dva';
 import { getModal } from '@/webPublic/one_stop_public/utils/utils';
 import TableSelectNormal from '@/webPublic/one_stop_public/libs/Split/TableSelectNormal';
 import styles from './Split/styles.less';
+
 const Modal = getModal();
 
 
-@connect(({ DataColumn, SqlManageEntity, loading }) => ({
-	DataColumn,
-	SqlManageEntity,
-	loading: loading.models.DataColumn || loading.models.SqlManageEntity,
+@connect(({
+            DataColumn,
+            SqlManageEntity,
+            loading
+          }) => ({
+  DataColumn,
+  SqlManageEntity,
+  loading: loading.models.DataColumn || loading.models.SqlManageEntity,
 }))
 export default class TableSelect extends React.Component {
-	constructor(props) {
-		super(props);
-		const value = props.value || {};
-		this.otherProps = {};
+  constructor(props) {
+    super(props);
+    const value = props.value || {};
+    this.otherProps = {};
     if (props.json.otherProps && props.json.otherProps.length) {
       try {
         this.otherProps = new Function(props.json.otherProps)();
       } catch (e) {
-        console.log('TableSelect组件 otherProps 获取失败')
+        console.log('TableSelect组件 otherProps 获取失败');
       }
     }
-		this.state = {
-			selects: value.selects || {},
-			visiable: value.visiable,
-			isAll: value.isAll != null ? value.isAll : false,
-			querys: value.querys || [],
-			sql: value.sql,
-		};
-	}
+    this.state = {
+      selects: value.selects || {},
+      visiable: value.visiable,
+      isAll: value.isAll != null ? value.isAll : false,
+      querys: value.querys || [],
+      sql: value.sql,
+    };
+  }
+
+  triggerChange = (changedValue) => {
+    // Should provide an event to pass value to Form.
+    const onChange = this.props.onChange;
+    if (onChange) {
+      // console.log('changedValue', changedValue);
+      onChange(Object.assign({}, this.state, changedValue));
+    }
+  };
 
-	triggerChange = (changedValue) => {
-		// Should provide an event to pass value to Form.
-		const onChange = this.props.onChange;
-		if (onChange) {
-			// console.log('changedValue', changedValue);
-			onChange(Object.assign({}, this.state, changedValue));
-		}
-	};
+  componentWillReceiveProps(nextProps) {
+    // Should be a controlled component.
+    if ('value' in nextProps) {
+      const value = nextProps.value;
 
-	componentWillReceiveProps(nextProps) {
-		// Should be a controlled component.
-		if ('value' in nextProps) {
-			const value = nextProps.value;
+      if (value != null && value instanceof Object) {
+        this.setState(value);
+      }
+      //
+    }
+  }
 
-			if (value != null && value instanceof Object) {
-				this.setState(value);
-			}
-			//
-		}
-	}
+  remove = (rowKey) => {
+    const { selects } = this.state;
+    delete selects[rowKey];
+    if (!('value' in this.props)) {
+      this.setState({ selects });
+    }
+    this.triggerChange({ selects });
+  };
 
-	remove = (rowKey) => {
-		const { selects } = this.state;
-		delete selects[rowKey];
-		if (!('value' in this.props)) {
-			this.setState({ selects });
-		}
-		this.triggerChange({ selects });
-	};
+  select = (obj) => {
+    var { selects } = this.state;
+    const {
+      json: {
+        isMultiple,
+        optionType
+      },
+    } = this.props;
+    let valueName = this.props.json.valueName;
 
-	select = (obj) => {
-		var { selects } = this.state;
-		const {
-			json: { isMultiple, optionType },
-		} = this.props;
-		let valueName = this.props.json.valueName;
+    if (optionType == 'reference' && this.props.dataColumn.referenceObjId) {
+      valueName = this.props.dataColumn.referenceCodeName;
+    }
 
-		if (optionType == 'reference' && this.props.dataColumn.referenceObjId) {
-			valueName = this.props.dataColumn.referenceCodeName;
-		}
+    const kk = obj[valueName];
+    if (kk == null) {
+      message.error('指定的取值字段不存在或者值为空');
+      return;
+    }
+    if (!isMultiple) {
+      selects = {
+        [kk]: {
+          ...obj,
+          selectKey: kk
+        }
+      };
+    } else {
+      selects[kk] = obj;
+      selects[kk].selectKey = kk;
+    }
+    if (!('value' in this.props)) {
+      this.setState({ selects });
+    }
+    this.triggerChange({ selects });
+  };
+
+  selectAll = () => {
+    let { selects } = this.state;
+    const {
+      dataSource,
+      json
+    } = this.props;
+    let {
+      valueName,
+      optionType
+    } = json;
+    const { list } = dataSource;
+    if (optionType == 'reference' && this.props.dataColumn.referenceObjId) {
+      valueName = this.props.dataColumn.referenceCodeName;
+    }
+    if (list && Array.isArray(list)) {
+      for (let item of list) {
+        let kk = item[valueName];
+        selects[kk] = item;
+        selects[kk].selectKey = kk;
+      }
+    }
+    if (!('value' in this.props)) {
+      this.setState({ selects });
+    }
+    this.triggerChange({ selects });
+  };
 
-		const kk = obj[valueName];
-		if (kk == null) {
-			message.error('指定的取值字段不存在或者值为空');
-			return;
-		}
-		if (!isMultiple) {
-			selects = { [kk]: { ...obj, selectKey: kk } };
-		} else {
-			selects[kk] = obj;
-			selects[kk].selectKey = kk;
-		}
-		if (!('value' in this.props)) {
-			this.setState({ selects });
-		}
-		this.triggerChange({ selects });
-	};
+  cancelAll = () => {
+    let selects = {};
+    if (!('value' in this.props)) {
+      this.setState({ selects });
+    }
+    this.triggerChange({ selects });
+  };
 
-	selectAll = () => {
-		let { selects } = this.state;
-		const { dataSource, json } = this.props;
-		let { valueName, optionType } = json;
-		const { list } = dataSource;
-		if (optionType == 'reference' && this.props.dataColumn.referenceObjId) {
-			valueName = this.props.dataColumn.referenceCodeName;
-		}
-		if (list && Array.isArray(list)) {
-			for (let item of list) {
-				let kk = item[valueName];
-				selects[kk] = item;
-				selects[kk].selectKey = kk;
-			}
-		}
-		if (!('value' in this.props)) {
-			this.setState({ selects });
-		}
-		this.triggerChange({ selects });
-	};
+  close = (i) => {
+    var {
+      values,
+      labels
+    } = this.state;
+    values.splice(i, 1);
+    labels.splice(i, 1);
+    if (!('value' in this.props)) {
+      this.setState({
+        values,
+        labels
+      });
+    }
+    this.triggerChange({
+      values,
+      labels
+    });
+  };
 
-	cancelAll = () => {
-		let selects = {};
-		if (!('value' in this.props)) {
-			this.setState({ selects });
-		}
-		this.triggerChange({ selects });
-	};
+  open = () => {
+    if (!('value' in this.props)) {
+      this.setState({ visiable: true });
+    }
+    this.triggerChange({ visiable: true });
+  };
 
-	close = (i) => {
-		var { values, labels } = this.state;
-		values.splice(i, 1);
-		labels.splice(i, 1);
-		if (!('value' in this.props)) {
-			this.setState({ values, labels });
-		}
-		this.triggerChange({ values, labels });
-	};
+  closeModal = () => {
+    if (!('value' in this.props)) {
+      this.setState({ visiable: false });
+    }
+    const { resetSearchText } = this.props;
+    resetSearchText && resetSearchText();
+    this.triggerChange({ visiable: false });
+  };
 
-	open = () => {
-		if (!('value' in this.props)) {
-			this.setState({ visiable: true });
-		}
-		this.triggerChange({ visiable: true });
-	};
+  cancelOne = (record) => {
+    var { selects } = this.state;
+    const {
+      json: {
+        isMultiple,
+        optionType
+      },
+    } = this.props;
+    let valueName = this.props.json.valueName;
 
-	closeModal = () => {
-		if (!('value' in this.props)) {
-			this.setState({ visiable: false });
-		}
-		const { resetSearchText } = this.props;
-		resetSearchText && resetSearchText();
-		this.triggerChange({ visiable: false });
-	};
+    if (optionType == 'reference' && this.props.dataColumn.referenceObjId) {
+      valueName = this.props.dataColumn.referenceCodeName;
+    }
 
-	cancelOne = (record) => {
-		var { selects } = this.state;
-		const {
-			json: { isMultiple, optionType },
-		} = this.props;
-		let valueName = this.props.json.valueName;
+    const kk = record[valueName];
+    if (kk == null) {
+      message.error('指定的取值字段不存在或者值为空');
+      return;
+    }
+    if (selects[kk]) {
+      delete selects[kk];
+    }
+    if (!('value' in this.props)) {
+      this.setState({ selects });
+    }
+    this.triggerChange({ selects });
+  };
 
-		if (optionType == 'reference' && this.props.dataColumn.referenceObjId) {
-			valueName = this.props.dataColumn.referenceCodeName;
-		}
+  render() {
+    const {
+      json: {
+        isMultiple,
+        sql,
+        optionType,
+        showTable,
+        isShowQuanXuan
+      },
+      dataColumn: { referenceObjId },
+      sqlModel,
+      columns,
+      dataSource,
+    } = this.props;
+    let disabled = this.props.disabled || this.props.json.disabled; // 禅道 28713
+    const { cardSelectModalProps = {} } = this.otherProps;
 
-		const kk = record[valueName];
-		if (kk == null) {
-			message.error('指定的取值字段不存在或者值为空');
-			return;
-		}
-		if (selects[kk]) {
-			delete selects[kk];
-		}
-		if (!('value' in this.props)) {
-			this.setState({ selects });
-		}
-		this.triggerChange({ selects });
-	};
+    let {
+      valueName,
+      labelName
+    } = this.props.json;
+    if (optionType == 'reference' && referenceObjId) {
+      valueName = this.props.dataColumn.referenceCodeName;
+      labelName = this.props.dataColumn.referenceNameName;
+    }
+    if (valueName == null || valueName == '') {
+      return <>请指定取值的列名</>;
+    }
+    const {
+      selects,
+      visiable,
+      labels
+    } = this.state;
+    const keys = [];
+    for (let i in selects) {
+      keys.push(selects[i][valueName]);
+    }
+    const columns2 = [
+      ...columns,
+    ];
+    if (!disabled) {
+      columns2.push({
+        title: '操作',
+        render: (val, record) => <a onClick={this.remove.bind(this, record.selectKey)}>移除</a>,
+      },);
+    }
+    const columns3 = [
+      ...columns,
+    ];
+    if (!disabled) {
+      columns3.push( {
+        title: '操作',
+        render: (val, record) =>
+          keys.includes(record[valueName]) ? (
+            <a
+              onClick={() => {
+                this.cancelOne(record);
+              }}>
+              已选择
+            </a>
+          ) : (
+            <a onClick={this.select.bind(this, record)}>选择</a>
+          ),
+      },);
+    }
 
-	render() {
-		const {
-			json: { isMultiple, sql, optionType, showTable, isShowQuanXuan },
-			dataColumn: { referenceObjId },
-			sqlModel,
-			columns,
-			dataSource,
-			disabled,
-		} = this.props;
-		const { cardSelectModalProps = {} } = this.otherProps;
 
-    let { valueName, labelName } = this.props.json;
-		if (optionType == 'reference' && referenceObjId) {
-			valueName = this.props.dataColumn.referenceCodeName;
-			labelName = this.props.dataColumn.referenceNameName;
-		}
-		if (valueName == null || valueName == '') {
-			return <>请指定取值的列名</>;
-		}
-		const { selects, visiable, labels } = this.state;
-		const keys = [];
-		for (let i in selects) {
-			keys.push(selects[i][valueName]);
-		}
-		const columns2 = [
-			...columns,
-			{
-				title: '操作',
-				render: (val, record) => <a onClick={this.remove.bind(this, record.selectKey)}>移除</a>,
-			},
-		];
-		const columns3 = [
-			...columns,
-			{
-				title: '操作',
-				render: (val, record) =>
-					keys.includes(record[valueName]) ? (
-						<a
-							onClick={() => {
-								this.cancelOne(record);
-							}}>
-							已选择
-						</a>
-					) : (
-						<a onClick={this.select.bind(this, record)}>选择</a>
-					),
-			},
-		];
-		const custom = {
-			isAll: this.state.isAll,
-			querys: this.state.querys,
-			sql: this.state.sql,
-		};
-		let allWidth = 0;
-		if (columns3) {
-			columns3.map((item, index) => {
-				if (index === columns3.length - 1) {
-					item.fixed = 'right';
-					item.width = 90;
-					allWidth += 90;
-					return item;
-				}
-				if (index === columns3.length - 2) {
-					allWidth += 150;
-				} else {
-					if (item.width) {
-						allWidth += item.width;
-					} else {
-						item.width = 180;
-						allWidth += 180;
-					}
-				}
-				return item;
-			});
-		}
+    const custom = {
+      isAll: this.state.isAll,
+      querys: this.state.querys,
+      sql: this.state.sql,
+    };
+    let allWidth = 0;
+    if (columns3) {
+      columns3.map((item, index) => {
+        if (index === columns3.length - 1) {
+          item.fixed = 'right';
+          item.width = 90;
+          allWidth += 90;
+          return item;
+        }
+        if (index === columns3.length - 2) {
+          allWidth += 150;
+        } else {
+          if (item.width) {
+            allWidth += item.width;
+          } else {
+            item.width = 180;
+            allWidth += 180;
+          }
+        }
+        return item;
+      });
+    }
 
-		return (
-			<div>
-				{Object.keys(selects).length > 0 ? ( // 是否显示表格
-					showTable ? (
-						<Table
-							rowKey={valueName}
-							size="small"
-							dataSource={Object.values(selects)}
-							columns={columns2}
-							pagination={false}
-						/>
-					) : (
-						Object.keys(selects).map((k) => (
-							<Tag key={k} closable={!disabled} onClose={this.remove.bind(this, k)}>
-								{selects[k][labelName]}
-							</Tag>
-						))
-					)
-				) : (
-					''
-				)}
-				{!disabled && (
-					<Button type="primary" onClick={this.open}>
-						选择
-					</Button>
-				)}
+    return (
+      <div>
+        {Object.keys(selects).length > 0 ? ( // 是否显示表格
+          showTable ? (
+            <Table
+              rowKey={valueName}
+              size="small"
+              dataSource={Object.values(selects)}
+              columns={columns2}
+              pagination={false}
+            />
+          ) : (
+            Object.keys(selects)
+              .map((k) => (
+                <Tag key={k} closable={!disabled} onClose={this.remove.bind(this, k)}>
+                  {selects[k][labelName]}
+                </Tag>
+              ))
+          )
+        ) : (
+          ''
+        )}
+        {!disabled && (
+          <Button type="primary" onClick={this.open}>
+            选择
+          </Button>
+        )}
 
-				{visiable && (
-					<Modal
+        {visiable && (
+          <Modal
             className={styles.ModalDiy}
-						width={this.props.get === 'mobile' ? '100%' : '60%'}
-						maskClosable={false}
-						title={`请选择`}
-						visible={visiable}
+            width={this.props.get === 'mobile' ? '100%' : '60%'}
+            maskClosable={false}
+            title={`请选择`}
+            visible={visiable}
             // footer={[
             //   <Button key="back"
             //           onClick={this.closeModal}
@@ -290,42 +341,42 @@ export default class TableSelect extends React.Component {
             //     确定
             //   </Button>,
             // ]}
-						onOk={this.closeModal}
-						onCancel={this.closeModal}
+            onOk={this.closeModal}
+            onCancel={this.closeModal}
             {...cardSelectModalProps}
           >
-						{optionType === 'reference' ? (
-							referenceObjId ? (
-								<FormList
-									rights={this.props.rights || []}
-									notShowBack={true}
-									value={custom}
-									objId={referenceObjId}
-									isFormCom={true}
-									isSelect={true}
-									selects={keys}
-									valueName={valueName}
-									callback={this.select}
-									sql={sql}
-								/>
-							) : (
-								'未关联数据对象'
-							)
-						) : sqlModel.dataObjId ? (
-							<FormList
-								rights={this.props.rights || []}
-								notShowBack={true}
-								value={custom}
-								objId={sqlModel.dataObjId}
-								isFormCom={true}
-								isSelect={true}
-								selects={keys}
-								valueName={valueName}
-								callback={this.select}
-								sql={sql}
-							/>
-						) : (
-						  <TableSelectNormal isMultiple={isMultiple}
+            {optionType === 'reference' ? (
+              referenceObjId ? (
+                <FormList
+                  rights={this.props.rights || []}
+                  notShowBack={true}
+                  value={custom}
+                  objId={referenceObjId}
+                  isFormCom={true}
+                  isSelect={true}
+                  selects={keys}
+                  valueName={valueName}
+                  callback={this.select}
+                  sql={sql}
+                />
+              ) : (
+                '未关联数据对象'
+              )
+            ) : sqlModel.dataObjId ? (
+              <FormList
+                rights={this.props.rights || []}
+                notShowBack={true}
+                value={custom}
+                objId={sqlModel.dataObjId}
+                isFormCom={true}
+                isSelect={true}
+                selects={keys}
+                valueName={valueName}
+                callback={this.select}
+                sql={sql}
+              />
+            ) : (
+              <TableSelectNormal isMultiple={isMultiple}
                                  allWidth={allWidth}
                                  cancelAll={this.cancelAll}
                                  selectAll={this.selectAll}
@@ -339,10 +390,10 @@ export default class TableSelect extends React.Component {
                                  callback={this.select}
 
               />
-						)}
-					</Modal>
-				)}
-			</div>
-		);
-	}
+            )}
+          </Modal>
+        )}
+      </div>
+    );
+  }
 }

one_stop_public/libs/formList/TreeList.js

@@ -248,18 +248,7 @@ class TreeList extends React.Component {
 				});
 			},
 		});
-		// } else {
-		//   router.push({
-		//     pathname: '/admin/ddl/dataObj/formEdit',
-		//     state: {
-		//       id: this.state.objId,
-		//       recordId: record[this.state.primaryKey],
-		//       recordKey: this.state.primaryKey,
-		//       isAdd: false,
-		//       isView:false
-		//     },
-		//   });
-		// }
+
 	};
 
 	view = (record) => {
@@ -271,18 +260,7 @@ class TreeList extends React.Component {
 			isAdd: false,
 			isView: true,
 		});
-		// } else {
-		//   router.push({
-		//     pathname: '/admin/ddl/dataObj/formEdit',
-		//     state: {
-		//       id: this.state.objId,
-		//       recordId: record[this.state.primaryKey],
-		//       recordKey: this.state.primaryKey,
-		//       isAdd: false,
-		//       isView:true
-		//     },
-		//   });
-		// }
+
 	};
 
 	isJSON = (str) => {

one_stop_public/tableCompon/Split_Index/giveVarcharLength.js

@@ -18,6 +18,9 @@ export default function giveVarcharRules({
     res.push({
       max: dataColumn.length,
       message: `不能超过${dataColumn.length}个字符`,
+      transform: function(value){
+        return value + '';
+      },
     });
   }
   return res;

one_stop_public/utils/request.js

@@ -20,6 +20,7 @@ import { getUrlInfo } from '@/webPublic/one_stop_public/DetailForAudit/utils';
 import { getHeaders, getIsBei_Dian } from '@/webPublic/zyd_public/utils/utils';
 import { proxyChangeUrl } from '@/webPublic/zyd_public/request/proxyChangeUrl';
 import { getTransformApi } from '@/webPublic/one_stop_public/2022beidianke/localstorageTransform';
+import { getVisitorToken } from '@/webPublic/zyd_public/utils/getHeaders';
 
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
@@ -245,7 +246,7 @@ export async function requestOrigin(url, data, options = {}){
       });
   } else {
     const pp = {
-      token: getToken(), // 部分接口 只需要传入假token 所以这里优先级是 data中的token > getToken;
+      token: getVisitorToken(), // 部分接口 只需要传入假token 所以这里优先级是 data中的token > getToken;
       ...data,
       version_: version,
     };
@@ -260,10 +261,7 @@ export async function requestOrigin(url, data, options = {}){
 
     // 由于自动添加前缀 这里暂时修改getUrl(url)
     let fetchRequest = url.indexOf('UserApi/login') > -1 ? loginUmiRequest : umiRequest;
-    if (process.env.NODE_ENV !== 'production' && url.indexOf('UserApi/login') > -1) {
-      url = '/UserApi/login'; // 通过 proxy代理 解决登录接口本地跨域问题
-      options.prefix = '';
-    }
+
     if (getToken()) {
       options.headers = getHeaders(url).headers;
     }
@@ -273,11 +271,11 @@ export async function requestOrigin(url, data, options = {}){
       if(options.headers){
         options.headers = {
           ...options.headers,
-          apis: headersApi,
+          // apis: headersApi,
         };
       }else{
         options.headers = {
-          apis: headersApi,
+          // apis: headersApi,
         };
       }
     }

zyd_public/utils/getHeaders.js

@@ -5,8 +5,18 @@ import { getUrlInfo } from '@/webPublic/one_stop_public/DetailForAudit/utils';
 
 const isTest = getUrlInfo().test;
 
+export function getVisitorToken(){
+  let token = getToken();
+  const visitor_client = sessionStorage.getItem('visitor_client') === 'true' || !!getUrlInfo().visitor;
+  if(visitor_client && (token === 'null' || !token)){ // 访客token 欢哥喊加的
+    token = '704d693b-cc68-49a7-8888-4acc73b5ca73';
+  }
+  return token;
+}
+
+
 export function getHeaders(url = '', headersApi = undefined) {
-  const token = getToken();
+  let token = getVisitorToken();
   const currentInfo = getCurrentUser() || {};
   const user = getUserInfo() || {};
   const userId = user.id || currentInfo.xgUserId;
@@ -16,6 +26,9 @@ export function getHeaders(url = '', headersApi = undefined) {
     headers: {},
   };
 
+  if(url && typeof url === 'string' && url.indexOf('oauthPub=true') > -1){ // 公共接口不需要token
+    return res;
+  }
   if (!token || token === 'null') {
     return res;
   } else {
@@ -26,9 +39,9 @@ export function getHeaders(url = '', headersApi = undefined) {
     res.headers.Authorization = `bearer ${token}`;
     res.headers.auth = gg5xxxxx(secretString);
     res.headers.timestamp = timestamp;
-    if (headersApi) {
-      res.headers.apis = headersApi;
-    }
+    // if (headersApi) {
+    //   res.headers.apis = headersApi;
+    // }
   }
   return res;
 }