diff --git a/src/components/CustomPages/SK/SK002CheckListJT.js b/src/components/CustomPages/SK/SK002CheckListJT.js index 3835e01..42241bb 100644 --- a/src/components/CustomPages/SK/SK002CheckListJT.js +++ b/src/components/CustomPages/SK/SK002CheckListJT.js @@ -120,15 +120,15 @@ class SK002CheckListJT extends React.Component { loadData = () => { let json = initFilter("00300000-0000-0000-0000-000000000000"); json.Parameter22 = this.props.data.ORG_ID_HV; - extendInclude(json, 'Nav_Details'); - extendInclude(json, 'Nav_ProductionUnit'); - extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Contents'); - extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailHiddens.Nav_Question'); - extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailBasics.Nav_Law'); - extendInclude(json, 'Nav_Type'); - extendInclude(json, 'Nav_SCOREL'); - extendInclude(json, 'Nav_SCOREE'); - extendInclude(json, 'Nav_SCOREC'); + // extendInclude(json, 'Nav_Details'); + // extendInclude(json, 'Nav_ProductionUnit'); + // extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Contents'); + // extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailHiddens.Nav_Question'); + // extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailBasics.Nav_Law'); + // extendInclude(json, 'Nav_Type'); + // extendInclude(json, 'Nav_SCOREL'); + // extendInclude(json, 'Nav_SCOREE'); + // extendInclude(json, 'Nav_SCOREC'); extendIgnoreDataRule(json) this.props.dispatch({ type: 'app/getDataByPost', diff --git a/src/files/edit/SK002.js b/src/files/edit/SK002.js index 6e285ff..b815120 100644 --- a/src/files/edit/SK002.js +++ b/src/files/edit/SK002.js @@ -112,12 +112,23 @@ export default { } quess.push(ques) }) + let bass=[] + item.Nav_ContentsBasics && item.Nav_ContentsBasics.map(x=>{ + let ques={ + ID: guid(), + LAW_ID:x.LAW_ID, + Nav_Law:x.Nav_Law + } + bass.push(ques) + }) let tmpData = { ID: guid(), CHECK_CONTENTS_ID:item.ID, Nav_Contents:item, CHECK_CONTENT:item.CHECKCONTENT, Nav_DetailHiddens: quess, + Nav_DetailBasics: bass, + CHECK_STANDARD:item.CHECK_STANDARD, NUM :item.NUM } tmpDatas.push(tmpData); @@ -276,6 +287,7 @@ export default { if(login.tempAddData) { + stateData.ID = login.tempAddData.ID stateData.MineType = login.tempAddData.MineType stateData.PRODUCTION_UNIT_ID = login.tempAddData.PRODUCTION_UNIT_ID stateData.Nav_ProductionUnit = login.tempAddData.Nav_ProductionUnit @@ -292,72 +304,73 @@ export default { stateData.EVALUATE_SCORE = login.tempAddData.EVALUATE_SCORE stateData.EVALUATE_LEVEL = login.tempAddData.EVALUATE_LEVEL stateData.EMERGENCY = login.tempAddData.EMERGENCY - let departs=[] - if(login.tempAddData.EVALUATE_LEVEL) - { - if(login.tempAddData.EVALUATE_LEVEL ==10) - { - let temp3={ - ID: guid(), - DEPARTMENT_TYPE:5, - } - let temp={ - ID: guid(), - DEPARTMENT_TYPE:10, - } - let temp1={ - ID: guid(), - DEPARTMENT_TYPE:15, - } - let temp2={ - ID: guid(), - DEPARTMENT_TYPE:20, - } - departs.push(temp3); - departs.push(temp); - departs.push(temp1); - departs.push(temp2); - } - if(login.tempAddData.EVALUATE_LEVEL ==20) - { - let temp={ - ID: guid(), - DEPARTMENT_TYPE:10, - } - let temp1={ - ID: guid(), - DEPARTMENT_TYPE:15, - } - let temp2={ - ID: guid(), - DEPARTMENT_TYPE:20, - } - departs.push(temp); - departs.push(temp1); - departs.push(temp2); - } - if(login.tempAddData.EVALUATE_LEVEL ==30) - { - let temp1={ - ID: guid(), - DEPARTMENT_TYPE:15, - } - let temp2={ - ID: guid(), - DEPARTMENT_TYPE:20, - } - departs.push(temp1); - departs.push(temp2); - } - if(login.tempAddData.EVALUATE_LEVEL ==40) - { - let temp={ - ID: guid(), - DEPARTMENT_TYPE:20, - } - departs.push(temp); - } - } + stateData.DEPARTMENT_TYPE = login.tempAddData.DEPARTMENT_TYPE + // let departs=[] + // if(login.tempAddData.EVALUATE_LEVEL) + // { + // if(login.tempAddData.EVALUATE_LEVEL ==10) + // { + // let temp3={ + // ID: guid(), + // DEPARTMENT_TYPE:5, + // } + // let temp={ + // ID: guid(), + // DEPARTMENT_TYPE:10, + // } + // let temp1={ + // ID: guid(), + // DEPARTMENT_TYPE:15, + // } + // let temp2={ + // ID: guid(), + // DEPARTMENT_TYPE:20, + // } + // departs.push(temp3); + // departs.push(temp); + // departs.push(temp1); + // departs.push(temp2); + // } + // if(login.tempAddData.EVALUATE_LEVEL ==20) + // { + // let temp={ + // ID: guid(), + // DEPARTMENT_TYPE:10, + // } + // let temp1={ + // ID: guid(), + // DEPARTMENT_TYPE:15, + // } + // let temp2={ + // ID: guid(), + // DEPARTMENT_TYPE:20, + // } + // departs.push(temp); + // departs.push(temp1); + // departs.push(temp2); + // } + // if(login.tempAddData.EVALUATE_LEVEL ==30) + // { + // let temp1={ + // ID: guid(), + // DEPARTMENT_TYPE:15, + // } + // let temp2={ + // ID: guid(), + // DEPARTMENT_TYPE:20, + // } + // departs.push(temp1); + // departs.push(temp2); + // } + // if(login.tempAddData.EVALUATE_LEVEL ==40) + // { + // let temp={ + // ID: guid(), + // DEPARTMENT_TYPE:20, + // } + // departs.push(temp); + // } + // } // stateData.Nav_Departs = departs if(login.tempAddData.Nav_Details) { @@ -368,7 +381,7 @@ export default { let hiddens=[] x.Nav_DetailHiddens && x.Nav_DetailHiddens.sort((m, n) => (m.NUM > n.NUM ? 1 : -1)).map((y,i)=>{ let hidden={ - ID: guid(), + ID: y.ID, NUM:y.NUM, RECTIFICATION_MEASURES :y.RECTIFICATION_MEASURES, HIDDEN_LEVEL :y.HIDDEN_LEVEL, @@ -381,25 +394,25 @@ export default { let basics=[] x.Nav_DetailBasics && x.Nav_DetailBasics.map((y,i)=>{ let basic={ - ID: guid(), + ID: y.ID, LAW_ID:y.LAW_ID, Nav_Law:y.Nav_Law } basics.push(basic) }) let content={ - ID: guid(), + ID: x.ID, NUM:x.NUM, CHECK_STANDARD :x.CHECK_STANDARD, CHECK_CONTENTS_ID:x.CHECK_CONTENTS_ID, Nav_Contents:x.Nav_Contents, Nav_DetailHiddens:hiddens, - Nav_DetailBasics:basics + Nav_DetailBasics:basics, } contents.push(content) }) let detail={ - ID: guid(), + ID: item.ID, NUM:item.NUM, MEASURES_NAME:item.MEASURES_NAME, Nav_DetailContents:contents diff --git a/src/files/list/SK001.js b/src/files/list/SK001.js index 7d09d38..68139ea 100644 --- a/src/files/list/SK001.js +++ b/src/files/list/SK001.js @@ -26,5 +26,5 @@ export default { else{ message.error('请选择要导入的内容'); } - }, + } } diff --git a/src/files/list/SK001_JT.js b/src/files/list/SK001_JT.js new file mode 100644 index 0000000..b8525d4 --- /dev/null +++ b/src/files/list/SK001_JT.js @@ -0,0 +1,36 @@ +import { message } from "antd/lib/index"; +import FormPage from '../../components/FormPage' +import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common"; +import moment from 'moment'; +import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd'; +/** + * @return {string} + */ +// 编辑 +export default { + btnSaveNotice: ({ params, row, loadData, pageCode,close, record, dispatch, colInfo, login, stateData, getSelectedRowKeys, clearSelectedRowKeys, saveRowRecord, setFieldValueByBatch, getSelectedRecords }) => { + debugger + let selectedKeys = getSelectedRowKeys(); + if (!selectedKeys || selectedKeys.length == 0) { + message.error('请选择要导入的内容'); + } + let filter = initFilter(login.OrgId); + selectedKeys.forEach((item) => { + filter.Keyword = item+","+filter.Keyword + // extendGroupRule(filterGroup, "ID", 1, item); + }) + dispatch({ + type: 'app/getDataByPost', + url: 'SK/SKBasicLibrary/ImportFormJT', + payload: filter, + onlyData: false, + onComplete: (re) => { + if (re && re.IsSuccessful) { + message.success("执行成功"); + clearSelectedRowKeys(); + } + } + }); + }, +} + diff --git a/src/files/list/SK058.js b/src/files/list/SK058.js index fc4bf1f..f01038b 100644 --- a/src/files/list/SK058.js +++ b/src/files/list/SK058.js @@ -18,6 +18,7 @@ export default { }) filter.FilterGroup = filterGroup; extendInclude(filter, 'Nav_ListCheckQuestion'); + extendInclude(filter, 'Nav_ContentsBasics'); dispatch({ type: 'app/getDataByPost', url: 'SK/CheckContents/Entities', @@ -35,7 +36,9 @@ export default { ID: item.ID, NUM: index + 1, CHECKCONTENT: item.CHECKCONTENT, + CHECK_STANDARD:item.CHECK_STANDARD, Nav_ListCheckQuestion: item.Nav_ListCheckQuestion, + Nav_ContentsBasics: item.Nav_ContentsBasics, } temps.push(tmpData); });