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

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

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