diff --git a/src/components/CustomPages/SE/SE007ShowPrint.js b/src/components/CustomPages/SE/SE007ShowPrint.js
index ea7db89..fa49497 100644
--- a/src/components/CustomPages/SE/SE007ShowPrint.js
+++ b/src/components/CustomPages/SE/SE007ShowPrint.js
@@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button, Popconfirm, Row, Col, Checkbox, Radio, Form, Input, Select, Table, Upload, Icon, PageHeader, Modal } from 'antd';
import React from 'react';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendSelectField, setDataFieldValue, guid, initQueryFilter } from "../../../utils/common";
import ReactToPrint from "react-to-print";
import styles from '../../CustomPages/HI/StepForm.css';
import SEstyles from './SE.css';
@@ -54,13 +54,19 @@ class SE007ShowPrint extends React.Component {
return;
let json = initFilter(this.props.login.OrgId);
extendRule(json, 'ID', 1, this.props.data.id);
- extendInclude(json, 'Nav_LaunchDepartment');
- extendInclude(json, 'Nav_LaunchUser');
- extendInclude(json, 'Nav_Points.Nav_Point');
- extendInclude(json, 'Nav_JoinDepartment.Nav_Department');
- extendInclude(json, 'Nav_Demands.Nav_User.Nav_Department');
- extendInclude(json, 'Nav_Demands.Nav_Department');
- extendInclude(json, 'Nav_Demands.Nav_Items.Nav_DEMAND');
+ extendSelectField(json, 'NAME');
+ extendSelectField(json, 'LAUNCH_TIME');
+ extendSelectField(json, 'END_TIME');
+ extendSelectField(json, 'Nav_LaunchDepartment.NAME');
+ extendSelectField(json, 'Nav_LaunchUser.NAME');
+ extendSelectField(json, 'Nav_Points.Nav_Point.NAME');
+ extendSelectField(json, 'Nav_Demands.Nav_User.Nav_Department.NAME');
+ extendSelectField(json, 'Nav_Demands.Nav_Department.NAME');
+ extendSelectField(json, 'Nav_Demands.Nav_Items.Nav_DEMAND.NAME');
+ extendSelectField(json, 'Nav_Demands.OK');
+ extendSelectField(json, 'Nav_Demands.OTHER');
+ extendSelectField(json, 'Nav_Demands.Nav_User.NAME');
+
this.props.dispatch({
type: 'app/getDataByPost',
payload: json,
@@ -85,14 +91,14 @@ class SE007ShowPrint extends React.Component {
r[d.DEMAND_ID] = idx;
ROWS.push({
ID: d.DEMAND_ID,
- NAME: d.Nav_DEMAND.NAME,
+ NAME: d.Nav_DEMAND?.NAME,
department: [],
total: 0,
report: 0,
})
}
- let name = it.Nav_User.Nav_Department.NAME;
+ let name = it.Nav_User?.Nav_Department.NAME;
if (name == '宁化行洛坑钨矿有限公司') {
name = '公司领导';
}
@@ -109,7 +115,7 @@ class SE007ShowPrint extends React.Component {
if (it.OTHER != undefined && it.OTHER != "") {
ROWS1.push({
NAME: it.OTHER,
- department: [it.Nav_User.NAME],
+ department: [it.Nav_User?.NAME],
total: 1,
report: 1,
})
@@ -204,9 +210,9 @@ class SE007ShowPrint extends React.Component {
{
data?.Nav_Points && data?.Nav_Points.map((item, i) => {
if (i == (data?.Nav_Points.length - 1)) {
- return item.Nav_Point.NAME
+ return item.Nav_Point?.NAME
} else {
- return item.Nav_Point.NAME + ' '
+ return item.Nav_Point?.NAME + ' '
}
})
} |
diff --git a/src/utils/common.js b/src/utils/common.js
index cae311f..c0fc4c2 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -232,6 +232,13 @@ export function extendInclude(obj, clude) {
}
obj.Include.push(clude);
}
+export function extendSelectField(obj, clude) {
+
+ if (!obj.SelectField) {
+ obj.SelectField = [];
+ }
+ obj.SelectField.push(clude);
+}
export function extendOrder(obj, filed, order) {
var data = {};
@@ -740,14 +747,14 @@ export function getParseValueByDate(date) {
n1 > 0
? moment().add(n1, bts[0])
: n1 < 0
- ? moment().subtract(Math.abs(n1), bts[0])
- : moment();
+ ? moment().subtract(Math.abs(n1), bts[0])
+ : moment();
const e =
n2 > 0
? moment().add(n2, ets[0])
: n2 < 0
- ? moment().subtract(Math.abs(n2), ets[0])
- : moment();
+ ? moment().subtract(Math.abs(n2), ets[0])
+ : moment();
if (b.isBefore(e)) {
r = [b, e];
}
@@ -773,14 +780,14 @@ export function getParseValueByDate(date) {
n1 > 0
? moment().add(n1, ts[0])
: n1 < 0
- ? moment().subtract(Math.abs(n1), ts[0])
- : moment();
+ ? moment().subtract(Math.abs(n1), ts[0])
+ : moment();
const e =
n2 > 0
? moment().add(n2, ts[0])
: n2 < 0
- ? moment().subtract(Math.abs(n2), ts[0])
- : moment();
+ ? moment().subtract(Math.abs(n2), ts[0])
+ : moment();
if (b.isBefore(e)) {
r = [b, e];
}
@@ -867,9 +874,9 @@ export function getRulesByQueryFields(queryFields, groupList) {
return timeIndex === 0
? moment(time).format("YYYY-MM-DD")
: moment(moment(time).format("YYYY-MM-DD"))
- .add(1, "d")
- .subtract(1, "s")
- .format("YYYY-MM-DD HH:mm:ss");
+ .add(1, "d")
+ .subtract(1, "s")
+ .format("YYYY-MM-DD HH:mm:ss");
});
// 将 2020-07-18 格式化成 2020-07-01 月份开始的时间
const monthFormat = moment(moment(vas[0]).format("YYYY-MM")).format(
@@ -942,9 +949,9 @@ export function getRulesByQueryFields(queryFields, groupList) {
k === 0
? moment(j).format("YYYY-MM-DD")
: moment(moment(j).format("YYYY-MM-DD"))
- .add(1, "d")
- .subtract(1, "s")
- .format("YYYY-MM-DD HH:mm:ss");
+ .add(1, "d")
+ .subtract(1, "s")
+ .format("YYYY-MM-DD HH:mm:ss");
const monthVal = moment(moment(j).format("YYYY-MM")).format(
"YYYY-MM-DD"
);
@@ -961,11 +968,11 @@ export function getRulesByQueryFields(queryFields, groupList) {
? t.DATA_TYPE === 16
? dateHM
: t.DATA_TYPE === 15
- ? dateHMS
- : tmpVal
+ ? dateHMS
+ : tmpVal
: t.DATA_TYPE === 9 || t.DATA_TYPE === 10
- ? monthVal
- : yearVal,
+ ? monthVal
+ : yearVal,
isCustom: t.IS_CUSTOM,
isSysParam: t.IS_SYS_PARAM,
});
@@ -1066,9 +1073,9 @@ export function getRuleAndGroupByParseValue({
k === 0
? moment(j).format("YYYY-MM-DD")
: moment(moment(j).format("YYYY-MM-DD"))
- .add(1, "d")
- .subtract(1, "s")
- .format("YYYY-MM-DD HH:mm:ss");
+ .add(1, "d")
+ .subtract(1, "s")
+ .format("YYYY-MM-DD HH:mm:ss");
vas += v + ",";
});
if (ruleJson && ruleJson.rules) {
@@ -1113,9 +1120,9 @@ export function getRuleAndGroupByParseValue({
k === 0
? moment(j).format("YYYY-MM-DD")
: moment(moment(j).format("YYYY-MM-DD"))
- .add(1, "d")
- .subtract(1, "s")
- .format("YYYY-MM-DD HH:mm:ss"),
+ .add(1, "d")
+ .subtract(1, "s")
+ .format("YYYY-MM-DD HH:mm:ss"),
isCustom: isCustom,
});
});
@@ -1481,9 +1488,9 @@ export function showApprove(listApproveDetail, enums, imgHost, width, height) {
title={
item.Nav_ApproveUser != null ? item.Nav_ApproveUser.NAME : ""
}
- // onError={(e) => {
- // e.target.src = require('../assets/home/backlog.png');
- // }}
+ // onError={(e) => {
+ // e.target.src = require('../assets/home/backlog.png');
+ // }}
/>