wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

Browse Source
This commit is contained in:
何美荣 2025-10-26 01:32:30 +08:00
commit dd4fb6de39
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/CustomPages/PF/PFCommonApprove.js
View File

@ -123,6 +123,9 @@ class PFCommonApprove extends React.Component {
if (this.state.data.CALLBACK_INTERFACE && this.state.data.CALLBACK_INTERFACE.indexOf("New") > -1) { if (this.state.data.CALLBACK_INTERFACE && this.state.data.CALLBACK_INTERFACE.indexOf("New") > -1) {
newUrl = this.state.data.CALLBACK_INTERFACE newUrl = this.state.data.CALLBACK_INTERFACE
} }
if (this.props.data && this.props.data.TASK_ORGID && this.props.data.TASK_ORGID.length > 0 && this.props.data.TASK_ORGID !== this.props.login.OrgId) {
this.state.data.Parameter22 = this.props.data.TASK_ORGID
}
if (newUrl.length > 0) { if (newUrl.length > 0) {
this.props.dispatch({ this.props.dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',

1
src/components/CustomPages/PF/PFCommonApproveView.js
View File

@ -238,6 +238,7 @@ class PFCommonApproveView extends React.Component {
appVisible:appVisibleTemp, appVisible:appVisibleTemp,
BtnAgreeDisplay:this.props.data.BtnAgreeDisplay?this.props.data.BtnAgreeDisplay:'inline' BtnAgreeDisplay:this.props.data.BtnAgreeDisplay?this.props.data.BtnAgreeDisplay:'inline'
}); });
json.Parameter22=this.props.data?.TASK_ORGID
this.props.dispatch({ this.props.dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',
payload: json, payload: json,

23
src/components/CustomPages/SK/SK033ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index"; import { message } from "antd/lib/index";
import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd'; import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
import React from 'react'; import React from 'react';
import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid,showUserSign, showFiles, GetFileModel } from "../../../utils/common"; import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showUserSign, showFiles, GetFileModel } from "../../../utils/common";
import ReactToPrint from "react-to-print"; import ReactToPrint from "react-to-print";
import config from "../../../config"; import config from "../../../config";
import XLSX from 'xlsx'; import XLSX from 'xlsx';
@ -12,7 +12,6 @@ import moment from 'moment';
import Item from "antd/lib/list/Item"; import Item from "antd/lib/list/Item";
class SK033ShowPrint extends React.Component { class SK033ShowPrint extends React.Component {
constructor(props) { constructor(props) {
debugger
super(props); super(props);
this.state = { this.state = {
data: null, data: null,
@ -86,7 +85,7 @@ class SK033ShowPrint extends React.Component {
} }
onClickApprove = (appVisible) => { onClickApprove = (appVisible) => {
const newtmpData = { const newtmpData = {
data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' }, data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline', TASK_ORGID: this.props.data?.TASK_ORGID },
formCode: "PF123", formCode: "PF123",
} }
this.setState({ this.setState({
@ -137,7 +136,7 @@ class SK033ShowPrint extends React.Component {
<td style={{ width: "80px" }} className={stylesStep.fontBold}>风险类别</td> <td style={{ width: "80px" }} className={stylesStep.fontBold}>风险类别</td>
<td className={stylesStep.fontBold}>管控措施</td> <td className={stylesStep.fontBold}>管控措施</td>
<td className={stylesStep.fontBold}>应急处置</td> <td className={stylesStep.fontBold}>应急处置</td>
<td style={{ width: "50px" }} className={stylesStep.fontBold}>状态</td> <td style={{ width: "50px" }} className={stylesStep.fontBold}>状态</td>
</tr> </tr>
{ {
data?.Nav_Details && data.Nav_Details?.map((item, i) => { data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@ -183,14 +182,14 @@ class SK033ShowPrint extends React.Component {
} }
</table> </table>
{ {
data ? data ?
<div> <div>
<Descriptions size="middle" bordered> <Descriptions size="middle" bordered>
<Descriptions.Item label="辨识人签名">{ <Descriptions.Item label="辨识人签名">{
data.STATUS !== 0 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null data.STATUS !== 0 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null
}</Descriptions.Item> }</Descriptions.Item>
</Descriptions> </Descriptions>
</div>:null </div> : null
} }
<FormPage {...this.state.tmpData} /> <FormPage {...this.state.tmpData} />
</div> </div>

5
src/utils/common.js
View File

@ -182,6 +182,7 @@ export function initQueryFilter(OrgId, PageIndex, Limit, Sort, Order) {
IncludeCount: 0, IncludeCount: 0,
OrderCount: 0, OrderCount: 0,
FilterGroupCount: 0, FilterGroupCount: 0,
IgnoreOrgRule: true,
Include: [], Include: [],
Orders: [], Orders: [],
FilterGroup: { Rules: [], Groups: [] } FilterGroup: { Rules: [], Groups: [] }
@ -200,6 +201,7 @@ export function initFilter(OrgId, Keyword = "", Sort, Order, PageIndex = 1, Para
OrgId, OrgId,
PageIndex, PageIndex,
Limit: 10, Limit: 10,
IgnoreOrgRule: true,
Start: (PageIndex - 1) * 10, Start: (PageIndex - 1) * 10,
Sort, Sort,
Order: (Order === '' ? 0 : Order), Order: (Order === '' ? 0 : Order),
@ -212,7 +214,8 @@ export function initFilter(OrgId, Keyword = "", Sort, Order, PageIndex = 1, Para
FilterGroup: { Rules: [], Groups: [] }, FilterGroup: { Rules: [], Groups: [] },
SelectField: [], SelectField: [],
DataRule: [], DataRule: [],
IgnoreDataRule: false IgnoreDataRule: false,
IgnoreOrgRule: true
}; };
// let params = $("#search-form").elFilterParam(); // let params = $("#search-form").elFilterParam();
// extend(json, params); // extend(json, params);