优化

src/files/edit/SK002.js

@@ -91,13 +91,28 @@ export default {
     }
    }
   },
-  btnSubAdd: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => {
+  btnSubAdd: (params) => {
+    const { row, srcRecord,getSelectedRecords,  clearSelectedRowKeys,saveRowRecord,close, loadData, login, btn, dispatch,props } = params ? params : {};
     let DetailCheck = getSelectedRecords();
+    // if (!DetailCheck || DetailCheck.length == 0) {
+    //   message.error("请先勾选管控措施！");
+    //   return;
+    // }
+  
       if(login.tempContents && login.tempContents.length>0)
       {
         if(DetailCheck && DetailCheck.length > 0)
         {
-          let tmpDatas=[]
+          if (DetailCheck.length !== 1) {
+            DetailCheck = [];
+            login.tempContents =[];
+            close();
+            message.error("每次只能勾选一条管控措施！");
+            return;
+          }
+          else
+          {
+            let tmpDatas=[]
         login.tempContents.map(item=>{
           let quess=[]
           item.Nav_ListCheckQuestion && item.Nav_ListCheckQuestion.map(x=>{
@@ -150,17 +165,20 @@ export default {
           }
           saveRowRecord({ record: iRow, editCode: "T_SK_BASIC_LIBRARY_DETAIL" })
           }
+          DetailCheck = [];
+          login.tempContents =[];
+          message.success("执行成功");
+          close();
+          }
           }
         }
         else
         {
           login.tempContents =[];
           message.error("请先勾选管控措施！");
+          close();
           return;
         }
-        
-       login.tempContents =[];
-       close();
       }
     
   },

src/files/edit/SK004.js

@@ -224,70 +224,82 @@ export default {
       {
         if(DetailCheck && DetailCheck.length > 0)
         {
-          let tmpDatas=[]
+          if (DetailCheck.length !== 1) {
-        login.tempContents.sort((a,b)=>{a.NUM>b.NUM?1:-1}).map(item=>{
+            DetailCheck = [];
-          let quess=[]
+            login.tempContents =[];
-          item.Nav_ListCheckQuestion && item.Nav_ListCheckQuestion.sort((a,b)=>{a.NUM>b.NUM?1:-1}).map(x=>{
+            close();
-            let ques={
+            message.error("每次只能勾选一条管控措施！");
-              ID: guid(),
+            return;
-              HIDDEN_DESCRIPTION:x.DESCREPTION,
-              RECTIFICATION_MEASURES:x.DEMAND,
-              HIDDEN_LEVEL :x.QUESTION_LEVEL,
-              CHECK_QUESTION_ID:x.ID,
-              Nav_Question:x,
-              NUM :x.NUM
-            }
-            quess.push(ques)
-          })
-          let basics=[]
-          item.Nav_ContentsBasics && item.Nav_ContentsBasics.map((y,i)=>{
-            let basic={
-              ID: guid(),
-              LAW_ID:y.LAW_ID,
-              Nav_Law:y.Nav_Law
-            }
-            basics.push(basic)
-          })
-          let tmpData = {
-            ID: guid(),
-            CHECK_CONTENTS_ID:item.ID,
-            Nav_Contents:item,
-            CHECK_CONTENT:item.CHECKCONTENT,
-            CHECK_STANDARD :item.CHECK_STANDARD,
-            Nav_DetailHiddens: quess,
-            Nav_DetailBasics:basics,
-            NUM :item.NUM
-          }
-          tmpDatas.push(tmpData);
-        });
-        if (tmpDatas && tmpDatas.length > 0) {
-         //更新行数据
-        for (let i = 0; i < DetailCheck.length; i++) {
-          let iRow = { ...DetailCheck[i] };
-          if(iRow.Nav_DetailContents && iRow.Nav_DetailContents.length>0)
-          {
-            for (let j = 0; j < tmpDatas.length; j++)
-            {
-              iRow.Nav_DetailContents.push(tmpDatas[j])
-            }
           }
           else
           {
-            iRow.Nav_DetailContents = tmpDatas;
+            let tmpDatas=[]
-          }
+            login.tempContents.sort((a,b)=>{a.NUM>b.NUM?1:-1}).map(item=>{
-          saveRowRecord({ record: iRow, editCode: "T_SK_ENTERPRISE_LIBRARY_DETAIL" })
+              let quess=[]
-          }
+              item.Nav_ListCheckQuestion && item.Nav_ListCheckQuestion.sort((a,b)=>{a.NUM>b.NUM?1:-1}).map(x=>{
+                let ques={
+                  ID: guid(),
+                  HIDDEN_DESCRIPTION:x.DESCREPTION,
+                  RECTIFICATION_MEASURES:x.DEMAND,
+                  HIDDEN_LEVEL :x.QUESTION_LEVEL,
+                  CHECK_QUESTION_ID:x.ID,
+                  Nav_Question:x,
+                  NUM :x.NUM
+                }
+                quess.push(ques)
+              })
+              let basics=[]
+              item.Nav_ContentsBasics && item.Nav_ContentsBasics.map((y,i)=>{
+                let basic={
+                  ID: guid(),
+                  LAW_ID:y.LAW_ID,
+                  Nav_Law:y.Nav_Law
+                }
+                basics.push(basic)
+              })
+              let tmpData = {
+                ID: guid(),
+                CHECK_CONTENTS_ID:item.ID,
+                Nav_Contents:item,
+                CHECK_CONTENT:item.CHECKCONTENT,
+                CHECK_STANDARD :item.CHECK_STANDARD,
+                Nav_DetailHiddens: quess,
+                Nav_DetailBasics:basics,
+                NUM :item.NUM
+              }
+              tmpDatas.push(tmpData);
+            });
+            if (tmpDatas && tmpDatas.length > 0) {
+             //更新行数据
+            for (let i = 0; i < DetailCheck.length; i++) {
+              let iRow = { ...DetailCheck[i] };
+              if(iRow.Nav_DetailContents && iRow.Nav_DetailContents.length>0)
+              {
+                for (let j = 0; j < tmpDatas.length; j++)
+                {
+                  iRow.Nav_DetailContents.push(tmpDatas[j])
+                }
+              }
+              else
+              {
+                iRow.Nav_DetailContents = tmpDatas;
+              }
+              saveRowRecord({ record: iRow, editCode: "T_SK_ENTERPRISE_LIBRARY_DETAIL" })
+              }
+              DetailCheck = [];
+          login.tempContents =[];
+          message.success("执行成功");
+          close();
+              }
           }
         }
         else
         {
           login.tempContents =[];
           message.error("请先勾选管控措施！");
+          close();
           return;
         }
-        
-       login.tempContents =[];
-       close();
       }
     
   },

src/files/edit/SK006.js

@@ -155,11 +155,22 @@ export default {
     {
         let tmpDatas=[]
       login.tempContents.map((item,i)=>{
+        let basics=[]
+        item.Nav_ContentsBasics && item.Nav_ContentsBasics.map((y,i)=>{
+          let basic={
+            ID: guid(),
+            LAW_ID:y.LAW_ID,
+            Nav_Law:y.Nav_Law
+          }
+          basics.push(basic)
+        })
         let tmpData = {
           ID: guid(),
           CHECK_CONTENTS_ID:item.ID,
           Nav_Contents:item,
+          Nav_CheckNoticeDetailBasics:basics,
           CHECKCONTENT:item.CHECKCONTENT,
+          CHECKSTANDARD:item.CHECK_STANDARD,
           // NUM:i+1
         }
         tmpDatas.push(tmpData);

src/files/list/SK058.js

@@ -9,8 +9,15 @@ import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin, Table
  */
 // 编辑
 export default {
-  btnSaveNotice: ({ params, row, loadData, pageCode, close, record, dispatch, colInfo, login, stateData, getSelectedRowKeys, clearSelectedRowKeys, saveRowRecord, setFieldValueByBatch, getSelectedRecords }) => {
+  btnSaveNotice: (params) => {
+    const { row, loadData, pageCode, close, record, dispatch, colInfo, login, stateData, getSelectedRowKeys, clearSelectedRowKeys, saveRowRecord, setFieldValueByBatch, getSelectedRecords  } = params ? params : {};
     let selectedKeys = getSelectedRowKeys();
+    if (!selectedKeys || selectedKeys.length == 0) {
+      message.error('请选择要导入的内容');
+      return;
+  }
+  else
+  {
     let filter = initFilter();
     let filterGroup = initFilterGroup(false);
     selectedKeys.forEach((item) => {
@@ -26,7 +33,6 @@ export default {
       onlyData: false,
       onComplete: (re) => {
         if (re && re.IsSuccessful) {
-          message.success("执行成功");
           clearSelectedRowKeys();
           let DetailCheck=re.Data;
           if (DetailCheck && DetailCheck.length > 0) {
@@ -56,6 +62,8 @@ export default {
         }
       }
     });
+  }
+    
 
   },
 }