Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web
This commit is contained in:
wyw
commit
885a5a8d25
@ -60,21 +60,21 @@ class SK018ShowPrint extends React.Component {
|
||||
json.Parameter22 = this.props.data.ORG_ID_HV;
|
||||
extendRule(json, 'ID', 1, dataId);
|
||||
// extendRule(json, 'TASK_ID', 1, taskID);
|
||||
extendInclude(json, 'Nav_Report');
|
||||
extendInclude(json, 'Nav_ApplyUser');
|
||||
extendInclude(json, 'Nav_ApplyDepartment');
|
||||
extendInclude(json, 'Nav_ProductionUnit');
|
||||
extendInclude(json, 'Nav_RiskArea');
|
||||
extendInclude(json, 'Nav_Photos');
|
||||
extendInclude(json, 'Nav_Photos.Nav_ImgFile');
|
||||
extendInclude(json, 'Nav_Contents');
|
||||
extendInclude(json, 'Nav_CheckType');
|
||||
extendInclude(json, 'Nav_RecitifyUser');
|
||||
extendInclude(json, 'Nav_Files');
|
||||
extendInclude(json, 'Nav_Files.Nav_ImgFile');
|
||||
extendInclude(json, 'Nav_Basics.Nav_Law');
|
||||
extendInclude(json, 'Nav_Reasons.Nav_Reason');
|
||||
extendInclude(json, 'Nav_Question');
|
||||
// extendInclude(json, 'Nav_Report');
|
||||
// extendInclude(json, 'Nav_ApplyUser');
|
||||
// extendInclude(json, 'Nav_ApplyDepartment');
|
||||
// extendInclude(json, 'Nav_ProductionUnit');
|
||||
// extendInclude(json, 'Nav_RiskArea');
|
||||
// extendInclude(json, 'Nav_Photos');
|
||||
// extendInclude(json, 'Nav_Photos.Nav_ImgFile');
|
||||
// extendInclude(json, 'Nav_Contents');
|
||||
// extendInclude(json, 'Nav_CheckType');
|
||||
// extendInclude(json, 'Nav_RecitifyUser');
|
||||
// extendInclude(json, 'Nav_Files');
|
||||
// extendInclude(json, 'Nav_Files.Nav_ImgFile');
|
||||
// extendInclude(json, 'Nav_Basics.Nav_Law');
|
||||
// extendInclude(json, 'Nav_Reasons.Nav_Reason');
|
||||
// extendInclude(json, 'Nav_Question');
|
||||
extendIgnoreDataRule(json)
|
||||
// extendRule(json, 'ID', 1, dataId);
|
||||
// extendInclude(json, 'Nav_JobName');
|
||||
|
||||
@ -13,7 +13,24 @@ import { T } from "antd/lib/upload/utils";
|
||||
|
||||
export default {
|
||||
onBeforeEdit(params) {
|
||||
const { isNew, dispatch, login, setFieldValueByBatch, setFieldEditable, setFieldVisible,stateData } = params ? params : {};
|
||||
const { isNew, dispatch, login, setFieldValue, setFieldEditable, setFieldVisible,stateData } = params ? params : {};
|
||||
if(isNew)
|
||||
{
|
||||
if (stateData.PARENT_ID) {
|
||||
let filter = initFilter(login.OrgId, '', '', 0);
|
||||
extendRule(filter, "ID", 1, stateData.PARENT_ID);
|
||||
dispatch({
|
||||
type: 'app/getDataByPost',
|
||||
payload: filter,
|
||||
url: 'FM/Department/Get',
|
||||
onComplete: (ret) => {
|
||||
if (ret) {
|
||||
setFieldValue('Nav_Parent.NAME', ret.NAME);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
handleRenderHeadControl(params) {
|
||||
if (params.colConfig.field === 'Nav_DepartmentUser') {
|
||||
|
||||
@ -121,6 +121,134 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
updateCheckUser: ({ row, pageCode, record, colInfo, resetFields, stateData, saveHeadRecord, saveRowRecord, getSelectedRecords, setState, emptyEditSelectedKeys }) => {
|
||||
//,state const temps = state['editTableSelectedKeysT_BS_SAFE_CHECK_DETAIL'];// + editCode + (parentId ? parentId : '')
|
||||
|
||||
let DetailCheck = getSelectedRecords();
|
||||
if (DetailCheck && DetailCheck.length > 1) {
|
||||
let ListCheckUserFirst = DetailCheck[0].Nav_CheckRecordDetailUsers;
|
||||
if (ListCheckUserFirst == null || ListCheckUserFirst.length < 1) {
|
||||
message.error("请选择需要同步的检查人员!")
|
||||
return
|
||||
}
|
||||
var isNeedEmpty = false;
|
||||
//更新行数据
|
||||
for (let i = 1; i < DetailCheck.length; i++) {
|
||||
//组装数据
|
||||
let updateList = [];
|
||||
if (ListCheckUserFirst != undefined && ListCheckUserFirst.length > 0) {
|
||||
for (let j = 0; j < ListCheckUserFirst.length; j++) {
|
||||
if (!ListCheckUserFirst[j].IS_DELETED) {
|
||||
let updateObj = { ...ListCheckUserFirst[j] };
|
||||
updateObj["ID"] = guid()
|
||||
updateList.push(updateObj);
|
||||
}
|
||||
}
|
||||
let iRow = { ...DetailCheck[i] };
|
||||
iRow.Nav_CheckRecordDetailUsers = updateList;
|
||||
saveRowRecord({ record: iRow, editCode: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL" })
|
||||
|
||||
for (var x = 0; x < stateData.Nav_CheckRecordDetails.length; x++) {
|
||||
if (iRow.ID == stateData.Nav_CheckRecordDetails[x].ID) {
|
||||
stateData.Nav_CheckRecordDetails[x].Nav_CheckRecordDetailUsers = updateList;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
//人员删除
|
||||
let iRow = { ...DetailCheck[i] };
|
||||
// iRow.Nav_ListCheckDetailUser = updateList;
|
||||
for (let j = 0; j < iRow.Nav_CheckRecordDetailUsers.length; j++) {
|
||||
iRow.Nav_CheckRecordDetailUsers[j].IS_DELETED = true
|
||||
}
|
||||
saveRowRecord({ record: iRow, editCode: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL" })
|
||||
}
|
||||
isNeedEmpty = true
|
||||
//更新选中人员
|
||||
let tmp = "";
|
||||
for (var x = 0; x < stateData.Nav_CheckRecordDetails.length; x++) {
|
||||
let users = stateData.Nav_CheckRecordDetails[x].Nav_CheckRecordDetailUsers
|
||||
if (users) {
|
||||
for (let i = 0; i < users.length; i++) {
|
||||
if (!users[i].IS_DELETED) {
|
||||
if (tmp.indexOf(users[i].Nav_User.NAME) == -1) {
|
||||
tmp += (tmp.length > 0 ? "," : "") + users[i].Nav_User.NAME
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stateData.CheckUsers = tmp
|
||||
setState({ data: stateData });
|
||||
}
|
||||
if (isNeedEmpty) {
|
||||
emptyEditSelectedKeys()
|
||||
}
|
||||
}
|
||||
},
|
||||
updateCheckUserSum: ({ row, pageCode, record, colInfo, resetFields, stateData, saveHeadRecord, saveRowRecord, getSelectedRecords, setState, emptyEditSelectedKeys }) => {
|
||||
//,state const temps = state['editTableSelectedKeysT_BS_SAFE_CHECK_DETAIL'];// + editCode + (parentId ? parentId : '')
|
||||
|
||||
let DetailCheck = getSelectedRecords();
|
||||
if (DetailCheck && DetailCheck.length > 1) {
|
||||
let ListCheckUserFirst = DetailCheck[0].Nav_CheckRecordDetailUsers;
|
||||
if (ListCheckUserFirst == null || ListCheckUserFirst.length < 1) {
|
||||
message.error("请选择需要同步的检查人员!")
|
||||
return
|
||||
}
|
||||
var isNeedEmpty = false;
|
||||
//更新行数据
|
||||
for (let i = 1; i < DetailCheck.length; i++) {
|
||||
//组装数据
|
||||
let updateList = [];
|
||||
if (ListCheckUserFirst != undefined && ListCheckUserFirst.length > 0) {
|
||||
for (let j = 0; j < ListCheckUserFirst.length; j++) {
|
||||
if (!ListCheckUserFirst[j].IS_DELETED) {
|
||||
let updateObj = { ...ListCheckUserFirst[j] };
|
||||
updateObj["ID"] = guid()
|
||||
updateList.push(updateObj);
|
||||
}
|
||||
}
|
||||
let iRow = { ...DetailCheck[i] };
|
||||
iRow.Nav_CheckRecordDetailUsers = updateList;
|
||||
saveRowRecord({ record: iRow, editCode: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL" })
|
||||
|
||||
for (var x = 0; x < stateData.Nav_CheckRecordDetails.length; x++) {
|
||||
if (iRow.ID == stateData.Nav_CheckRecordDetails[x].ID) {
|
||||
stateData.Nav_CheckRecordDetails[x].Nav_CheckRecordDetailUsers = updateList;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
//人员删除
|
||||
let iRow = { ...DetailCheck[i] };
|
||||
// iRow.Nav_ListCheckDetailUser = updateList;
|
||||
for (let j = 0; j < iRow.Nav_CheckRecordDetailUsers.length; j++) {
|
||||
iRow.Nav_CheckRecordDetailUsers[j].IS_DELETED = true
|
||||
}
|
||||
saveRowRecord({ record: iRow, editCode: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL" })
|
||||
}
|
||||
isNeedEmpty = true
|
||||
//更新选中人员
|
||||
let tmp = "";
|
||||
for (var x = 0; x < stateData.Nav_CheckRecordDetails.length; x++) {
|
||||
let users = stateData.Nav_CheckRecordDetails[x].Nav_CheckRecordDetailUsers
|
||||
if (users) {
|
||||
for (let i = 0; i < users.length; i++) {
|
||||
if (!users[i].IS_DELETED) {
|
||||
if (tmp.indexOf(users[i].Nav_User.NAME) == -1) {
|
||||
tmp += (tmp.length > 0 ? "," : "") + users[i].Nav_User.NAME
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stateData.CheckUsers = tmp
|
||||
setState({ data: stateData });
|
||||
}
|
||||
if (isNeedEmpty) {
|
||||
emptyEditSelectedKeys()
|
||||
}
|
||||
}
|
||||
},
|
||||
btnSubAdd: ({ record,data, parentRecord, stateData,setState, close, loadData, login, btn, dispatch }) => {
|
||||
|
||||
let temps=[];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user