Commit d9cb097a authored by 皮倩雯's avatar 皮倩雯

流程受理权限界面交互修改

parent 798c46fb
Pipeline #41227 skipped with stages
......@@ -262,7 +262,7 @@ const AddFlowsModal = props => {
duration: 3,
description: '编辑失败',
});
setLoading(false);
// setLoading(false);
});
}
};
......@@ -304,11 +304,11 @@ const AddFlowsModal = props => {
}
}
});
if (a.length > 0) {
pp.外部字段 = a;
console.log(pp);
arr.push('外部字段');
}
// if (a.length > 0) {
// pp.外部字段 = a;
// console.log(pp);
// arr.push('外部字段');
// }
console.log(a);
console.log(pp);
setFiled1(pp);
......@@ -319,41 +319,49 @@ const AddFlowsModal = props => {
setVisible1(true);
};
const onOKk = prop => {
let { title } = prop;
let selectData = prop.stt;
let ff = prop.filed22;
let aa = [];
let bb = 0;
title.map((item, index) => {
console.log(ff[item]);
aa = [];
selectData.map((item1, index1) => {
console.log(item1);
if (ff[item].indexOf(item1) != -1) {
aa.push(item1);
}
});
console.log(aa);
if (aa.length == 0) {
bb = 1;
}
});
console.log(aa);
if (bb == 1) {
notification.error({
message: '提示',
description: '权限角色部门必须都选至少一项',
});
} else {
setVisible1(false);
let inputText = { ...inputValue };
inputText[prop.pickItem] = prop.str;
console.log(prop.str);
console.log(inputText);
setStrr(prop.str);
setCheckedList1(prop.checkedList);
setInputValue(inputText);
}
// let { title } = prop;
// let selectData = prop.stt;
// let ff = prop.filed22;
// let aa = [];
// let bb = 0;
// title.map((item, index) => {
// console.log(ff[item]);
// aa = [];
// selectData.map((item1, index1) => {
// console.log(item1);
// if (ff[item].indexOf(item1) != -1) {
// aa.push(item1);
// }
// });
// console.log(aa);
// if (aa.length == 0) {
// bb = 1;
// }
// });
// console.log(aa);
// if (bb == 1) {
// notification.error({
// message: '提示',
// description: '权限角色部门必须都选至少一项',
// });
// } else {
// setVisible1(false);
// let inputText = { ...inputValue };
// inputText[prop.pickItem] = prop.str;
// console.log(prop.str);
// console.log(inputText);
// setStrr(prop.str);
// setCheckedList1(prop.checkedList);
// setInputValue(inputText);
// }
setVisible1(false);
let inputText = { ...inputValue };
inputText[prop.pickItem] = prop.str;
console.log(prop.str);
console.log(inputText);
setStrr(prop.str);
setCheckedList1(prop.stt);
setInputValue(inputText);
};
return (
<Drawer
......@@ -433,7 +441,7 @@ const AddFlowsModal = props => {
onCancel={() => setVisible1(false)}
callBackSubmit={onOKk}
newCheckedList={checkedList1}
filed1={filed1}
filed11={filed1}
pickItem={pickItem}
characterValue={characterValue}
formObj={formObj}
......
......@@ -107,7 +107,6 @@ const ChangeAdd = props => {
setIsCheck(0);
setIsCheck1(0);
setIsCheck2(0);
// setList([]);
setKeyValue('0');
setSearchWord('');
};
......@@ -116,7 +115,6 @@ const ChangeAdd = props => {
setKeepOption1(filed11['部门']);
setKeepOption2(filed11['站点']);
getRoles('角色', '', pageSize, 1);
console.log(filed1);
setRoleValue(filed1);
setFlagg(1);
let arr = Object.keys(filed1);
......@@ -295,7 +293,6 @@ const ChangeAdd = props => {
arr.forEach(item => {
if (item == '角色') {
checkArr[0] = [];
console.log(filed1);
checkDataRole.map(checkItem => {
if (filed1['角色'].includes(checkItem)) {
checkArr[0].push(checkItem);
......@@ -394,7 +391,6 @@ const ChangeAdd = props => {
setIsCheck(1);
let data = checkDataRole;
let DataValue = [];
console.log(roleValue);
checkDataRole.forEach(item => {
if (roleValue['角色'].indexOf(item) != -1) {
DataValue.push(item);
......@@ -428,7 +424,6 @@ const ChangeAdd = props => {
setIsCheck1(1);
let data = checkDataPm;
let DataValue = [];
console.log(roleValue);
checkDataPm.forEach(item => {
if (roleValue['部门'].indexOf(item) != -1) {
DataValue.push(item);
......@@ -462,7 +457,6 @@ const ChangeAdd = props => {
setIsCheck(1);
let data = checkDataSite;
let DataValue = [];
console.log(roleValue);
checkDataSite.forEach(item => {
if (roleValue['站点'].indexOf(item) != -1) {
DataValue.push(item);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment