From 0d33bdd92be0147365a47314dc5fd2f3c0ad8775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
<10755671+mei-rong-he@user.noreply.gitee.com>
Date: Wed, 14 Aug 2024 16:57:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CustomPages/BI/BI007FormRunAnalysisNew.js | 103 +++++++++---------
1 file changed, 52 insertions(+), 51 deletions(-)
diff --git a/src/components/CustomPages/BI/BI007FormRunAnalysisNew.js b/src/components/CustomPages/BI/BI007FormRunAnalysisNew.js
index ea67874..539098b 100644
--- a/src/components/CustomPages/BI/BI007FormRunAnalysisNew.js
+++ b/src/components/CustomPages/BI/BI007FormRunAnalysisNew.js
@@ -159,6 +159,13 @@ class BI007FormRunAnalysisNew extends React.Component {
title: "未完成",
dataIndex: "UNFINISH_QTY",
key: "UNFINISH_QTY",
+ render: (text, record) => (
+
+ this.showUnfinishModal(record)}>
+ {record.UNFINISH_QTY}
+
+
+ ),
},
{
width: "100px",
@@ -258,7 +265,7 @@ class BI007FormRunAnalysisNew extends React.Component {
extendRule(json, "CREATE_DATE", 6, startTime);
extendRule(json, "CREATE_DATE", 4, endTime);
extendRule(json, "NOTICE_STATUS", 1, 0);
- extendRule(json, "SHOP_DEPARTMENT_ID", 1, record.DEPARTMENT_ID);
+ extendRule(json, "CLASS_DEPARTMENT_ID", 1, record.DEPARTMENT_ID);
this.props.dispatch({
type: "app/getDataByPost",
payload: json,
@@ -294,7 +301,7 @@ class BI007FormRunAnalysisNew extends React.Component {
{
id: departmentId,
name: departmentName,
- noticeTitle: departmentName + "安全生产标准化运行情况",
+ noticeTitle: "安全生产标准化运行情况",
tmpData: newtmpData,
currActivatedMenu: "",
},
@@ -441,33 +448,31 @@ class BI007FormRunAnalysisNew extends React.Component {
getDepartId = () => {};
//加载数据赋值
loadData = () => {
- // this.ksRun();
- // this.xkRun();
- var orgId = this.props.login ? this.props.login.OrgId : "";
- const jsonTemp = initFilter(orgId);
- extendRule(
- jsonTemp,
- "NAME",
- 1,
- this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS
- );
- this.props.dispatch({
- type: "app/getDataByPost",
- payload: jsonTemp,
- url: "FM/Department/OrderEntities",
- onComplete: (retDepart) => {
- if (retDepart) {
- // this.getClassDepartment(retDepart[0].ID);
- this.getShopDepartment(retDepart[0].ID);
- } else {
- message.error(
- "未找到部门" +
- this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS +
- "，请先维护"
- );
- }
- },
- });
+ this.getShopDepartment();
+ // var orgId = this.props.login ? this.props.login.OrgId : "";
+ // const jsonTemp = initFilter(orgId);
+ // extendRule(
+ // jsonTemp,
+ // "NAME",
+ // 1,
+ // this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS
+ // );
+ // this.props.dispatch({
+ // type: "app/getDataByPost",
+ // payload: jsonTemp,
+ // url: "FM/Department/OrderEntities",
+ // onComplete: (retDepart) => {
+ // if (retDepart) {
+ // this.getShopDepartment(retDepart[0].ID);
+ // } else {
+ // message.error(
+ // "未找到部门" +
+ // this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS +
+ // "，请先维护"
+ // );
+ // }
+ // },
+ // });
};
//
workTicket = () => {
@@ -863,13 +868,14 @@ class BI007FormRunAnalysisNew extends React.Component {
var orgId = this.props.login ? this.props.login.OrgId : "";
const jsonTemp = initFilter(orgId);
extendRule(jsonTemp, "DEPARTMENT_TYPE", 1, 2);
+ extendRule(jsonTemp, "ENABLE_STATUS", 1, 0);
// extendRule(jsonTemp, 'Nav_Parent.PARENT_ID', 1, this.props.data.id);
- extendRule(
- jsonTemp,
- "Nav_Parent.Nav_Parent.NAME",
- 1,
- this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS
- );
+ // extendRule(
+ // jsonTemp,
+ // "Nav_Parent.Nav_Parent.NAME",
+ // 1,
+ // this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS
+ // );
extendOrder(jsonTemp, "PARENT_ID", 0);
extendOrder(jsonTemp, "NAME", 0);
this.props.dispatch({
@@ -942,17 +948,18 @@ class BI007FormRunAnalysisNew extends React.Component {
});
};
- getShopDepartment = (departId) => {
+ getShopDepartment = () => {
var orgId = this.props.login ? this.props.login.OrgId : "";
const jsonTemp = initFilter(orgId);
extendRule(jsonTemp, "DEPARTMENT_TYPE", 1, 1);
+ extendRule(jsonTemp, "ENABLE_STATUS", 1, 0);
// extendRule(jsonTemp, 'PARENT_ID', 1, this.props.data.id);
- extendRule(
- jsonTemp,
- "Nav_Parent.NAME",
- 1,
- this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS
- );
+ // extendRule(
+ // jsonTemp,
+ // "Nav_Parent.NAME",
+ // 1,
+ // this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS
+ // );
this.props.dispatch({
type: "app/getDataByPost",
payload: jsonTemp,
@@ -977,7 +984,7 @@ class BI007FormRunAnalysisNew extends React.Component {
"YYYY-MM-DD 00:00:00"
);
let endTime = this.state.selectEndTime.format("YYYY-MM-DD 23:59:59");
- let json = initFilter(orgId, departId, "", 1, "", startTime, endTime);
+ let json = initFilter(orgId, null, "", 1, "", startTime, endTime);
// extendRule(json, 'TYPE', 1, this.state.timeType);
// extendRule(json, 'DEPARTMENT_TYPE', 1, 1);
// extendRule(json, 'PARENT_DEPARTMENT_ID', 1, this.props.data.id);
@@ -1160,7 +1167,6 @@ class BI007FormRunAnalysisNew extends React.Component {
fontWeight: "bold",
}}
>
- {this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS}{" "}
安全生产标准化运行情况
@@ -1330,7 +1336,7 @@ class BI007FormRunAnalysisNew extends React.Component {
- |
-
- {/*
- {this.props.data.name}安全任务完成情况
-
- */}
+ > */}