From 7f8becda2f1d3d85a35a380544ac1bd18d82ba93 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 28 Jun 2024 15:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=99=BB=E8=AE=B0=20?=
 =?UTF-8?q?=E9=A6=96=E5=A5=97=E6=B7=BB=E5=8A=A0=20=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/files/edit/BS057.js | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/files/edit/BS057.js b/src/files/edit/BS057.js
index b8231ae..5744364 100644
--- a/src/files/edit/BS057.js
+++ b/src/files/edit/BS057.js
@@ -443,7 +443,7 @@ export default {
 
   //新增记录
   btnAdd: ({ record, data, setState, close, loadData, getLoadParam, login, btn, dispatch }) => {
-    // btnAdd: (params) => {
+    // btnAdd: (params) => {  
     const data1 = {
       content: <FormPage formCode={btn.FORM_CODE} data={{
         id: (record ? record.ID : ''),
@@ -470,21 +470,33 @@ export default {
         homeReload: true,
         rules: [parentRecord],
         close: () => {
-          loadData();//onCancel 会被 重新赋值 在此做刷新
+          loadData();//wyw onCancel 会被 重新赋值 在此做刷新
         },
         onCancel: () => {
-          //此方法要有不能被删除  别处会重写
+          //wyw 此方法要有不能被删除  别处会重写
         },
         onSave: (data, clearData, setStateData) => {
-          //wyw 昌老师写的这个不能加，因为这样传参被修改了，限定逻辑不对了（onBeforeEdit 不执行，不知道拿什么去限制不然也是可以传入parentRecord）
-          // let tmpData = {
-          //   SAFE_CHECK_ID: data.SAFE_CHECK_ID,
-          //   ORG_ID: data.ORG_ID,
-          //   Nav_ListUserCheck: data.Nav_ListUserCheck
-          // }
-          // setStateData(tmpData);
-
+          //第二次页面打开时 使页面编辑为空 保留别的信息传入
+          let tmpData = {
+            ORG_ID: data.ORG_ID,
+            ROW_NO: data.ROW_NO + (data.Nav_ListCheckDetail == null || data.Nav_ListCheckDetail.length == 0 ? 0 : data.Nav_ListCheckDetail.length),
+            SAFE_CHECK_ID: data.SAFE_CHECK_ID,
+            AREA_IDS: data.AREA_IDS,
+            PROJECT_IDS: data.PROJECT_IDS,
+            CATEGORY_IDS: data.CATEGORY_IDS,
+            CHECK_TYPE_ID: data.CHECK_TYPE_ID,
+            CHECK_TYPE_LEVEL_ID: data.CHECK_TYPE_LEVEL_ID,
+            DEPARTMENT_ID: data.DEPARTMENT_ID,
+            CHECKOBJECT: data.CHECKOBJECT,
+            Nav_ListUserCheck: data.Nav_ListUserCheck,
+            Nav_ListCheckDetail: [],
+            CHECKCONTENT: '',
+            // Nav_CheckArea: [],
+            // RISK_AREA_ID: null 
+          }
+          setStateData(tmpData);
         }
+
       }} />,
     };
     return {