wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

Browse Source
This commit is contained in:
ccy 2025-11-30 10:45:04 +08:00
commit e85988ffb7
3 changed files with 198 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/CustomPages/SE/SE061PaperPage.js
View File

@ -54,10 +54,12 @@ class SE061PaperPage extends React.Component {
if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
this.props.data.onCancel();
}
getUsers = () => {
getUsers = (dataid) => {
debugger
let json = initFilter(this.props.login.OrgId);
json.OrgType = 2;
extendRule(json, 'RECORD_ID', 1, this.props.data.id);
// extendRule(json, 'RECORD_ID', 1, this.props.data.id);
extendRule(json, 'RECORD_ID', 1, dataid);
extendInclude(json, 'Nav_User');
this.state.loading = true;
this.props.dispatch({
@ -88,6 +90,12 @@ class SE061PaperPage extends React.Component {
message.warn("当前用户没有问卷");
}
}
} else {
this.setState({
SelUsrID: '',
papers: []
})
}
}
});
@ -142,10 +150,10 @@ class SE061PaperPage extends React.Component {
}
});
}
loadData = () => {
loadData = (dataid) => {
if (this.props.data.id == "")
return;
this.getUsers();
this.getUsers(dataid);
}
onSave = () => {
if (this.state.readonly) {

59
src/files/edit/HM041.js Normal file
View File

@ -0,0 +1,59 @@
import { message } from "antd/lib/index";
import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, empty,extendOrder, guid } from "../../utils/common";
import { connect } from 'dva';
/**
* @return {string}
*/
// 编辑
export default {
onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => {
if (!(colInfo.FIELD_NAME == 'Nav_OperationStep.NAME'))
return;
let code = getFieldValue('OPERATION_STEP_ID')
if(code && code!==null && code!==undefined)
{
let json = initFilter(login.OrgId);
extendRule(json, 'ID', 1, code);
extendInclude(json, 'Nav_SafeConfirms');
extendInclude(json, 'Nav_SafeMeasures');
extendInclude(json, 'Nav_DealMeasures');
dispatch({
type: 'app/getDataByPost',
url: 'HM/OperationStep/Get',
payload: json,
onlyData: false,
onComplete: (re) => {
if (re && re.IsSuccessful && re.Data) {
let temps = [];
let detailConfirms=re.Data.Nav_SafeConfirms?.map((item,i)=>{
item['ROW_NO'] = item.NUM;
item['NUM'] = item.NUM;
item['NAME']=item.NAME;
return item;
});
let detailMeasures=re.Data.Nav_SafeMeasures?.map((item,i)=>{
item['ROW_NO'] = item.NUM;
item['NUM'] = item.NUM;
item['NAME']=item.NAME;
return item;
});
let detailDeal=re.Data.Nav_DealMeasures?.map((item,i)=>{
item['ROW_NO'] = item.NUM;
item['NUM'] = item.NUM;
item['NAME']=item.NAME;
return item;
});
temps.push({ field: 'Nav_SafeConfirms', value: detailConfirms.sort((x, y) => (parseInt(x.NUM) > parseInt(y.NUM)) ? 1 : -1) })
temps.push({ field: 'Nav_SafeMeasures', value: detailMeasures.sort((x, y) => (parseInt(x.NUM) > parseInt(y.NUM)) ? 1 : -1) })
temps.push({ field: 'Nav_DealMeasures', value: detailDeal.sort((x, y) => (parseInt(x.NUM) > parseInt(y.NUM)) ? 1 : -1) })
// temps.push({ field: 'SafeMeasuresStr', value: re.Data.SafeMeasuresStr})
setFieldValueByBatch(temps);
//updateSubTableData(params.pageCode,detail,true)
}
}
})
}
},
}

55
src/files/edit/SK014.js
View File

@ -30,54 +30,29 @@ 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_RecitifyUser;
if (ListCheckUserFirst == null || ListCheckUserFirst.length < 1) {
message.error("请选择需要同步的检查人员!")
//向下同步培训组织 单选
updateCheckUser: ({ stateData, saveRowRecord }) => {
var totalCount = stateData.Nav_ReportDetails.length
if (totalCount < 2) {
return
}
var isNeedEmpty = false;
//更新行数据
for (let i = 1; i < DetailCheck.length; i++) {
//组装数据
if (ListCheckUserFirst != undefined && ListCheckUserFirst) {
let iRow = { ...DetailCheck[i] };
iRow.Nav_RecitifyUser = ListCheckUserFirst;
saveRowRecord({ record: iRow, editCode: "T_SK_HIDDEN_DANGER_REPORT_DETAIL" })
for (var x = 0; x < stateData.Nav_ReportDetails.length; x++) {
if (iRow.ID == stateData.Nav_ReportDetails[x].ID) {
stateData.Nav_ReportDetails[x].Nav_RecitifyUser = ListCheckUserFirst;
var user = {}
for (var i = 1; i < totalCount; i++) {
//本行数据 如果为空 取上一行的 RECITIFY_USER_ID Nav_RecitifyUser
if ((stateData.Nav_ReportDetails[i].RECITIFY_USER_ID == null || stateData.Nav_ReportDetails[i].RECITIFY_USER_ID == undefined) && stateData.Nav_ReportDetails[i - 1].RECITIFY_USER_ID) {
user = {
ID: stateData.Nav_ReportDetails[i - 1].RECITIFY_USER_ID,
NAME: stateData.Nav_ReportDetails[i - 1].Nav_RecitifyUser.NAME
}
}
} else {
//人员删除
let iRow = { ...DetailCheck[i] };
iRow.Nav_RecitifyUser.IS_DELETED = true
if (user.ID != null && user.ID != undefined) {
let iRow = { ...stateData.Nav_ReportDetails[i] };
iRow.RECITIFY_USER_ID = user.ID
iRow.Nav_RecitifyUser = user
saveRowRecord({ record: iRow, editCode: "T_SK_HIDDEN_DANGER_REPORT_DETAIL" })
}
isNeedEmpty = true
//更新选中人员
for (var x = 0; x < stateData.Nav_ReportDetails.length; x++) {
let users = stateData.Nav_ReportDetails[x].Nav_RecitifyUser
if (users && !users.IS_DELETED) {
stateData.CheckUsers = users
}
}
setState({ data: stateData });
}
if (isNeedEmpty) {
emptyEditSelectedKeys()
}
}else
{
message.error("请选择需要同步的整改责任人!")
return
}
},
btnSubAdd: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => {
let DetailCheck = getSelectedRecords();