|
@@ -754,14 +754,14 @@ $(document).ready(function () {
|
|
|
ledgerSpreadObj.setFontColor(info.row);
|
|
ledgerSpreadObj.setFontColor(info.row);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- const num = _.filter(ledger_cooperation_list, { pwd: validText, status: 1, user_id });
|
|
|
|
|
- console.log(num, ledger_cooperation_list);
|
|
|
|
|
- if(num.length > 0) {
|
|
|
|
|
- toastr.error('同一个审批人密码不能相同');
|
|
|
|
|
- SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
|
|
- ledgerSpreadObj.setFontColor(info.row);
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // const num = _.filter(ledger_cooperation_list, { pwd: validText, status: 1, user_id });
|
|
|
|
|
+ // console.log(num, ledger_cooperation_list);
|
|
|
|
|
+ // if(num.length > 0) {
|
|
|
|
|
+ // toastr.error('同一个审批人密码不能相同');
|
|
|
|
|
+ // SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
|
|
+ // ledgerSpreadObj.setFontColor(info.row);
|
|
|
|
|
+ // return;
|
|
|
|
|
+ // }
|
|
|
select.pwd = validText;
|
|
select.pwd = validText;
|
|
|
const data = {
|
|
const data = {
|
|
|
type: 'pwd',
|
|
type: 'pwd',
|
|
@@ -931,11 +931,11 @@ $(document).ready(function () {
|
|
|
$(this).parents('td').html(html);
|
|
$(this).parents('td').html(html);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- const num = _.filter(ledger_cooperation_list, { pwd: validText, status: 1, user_id });
|
|
|
|
|
- if(num.length > 0) {
|
|
|
|
|
- toastr.error('同一个审批人密码不能相同');
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // const num = _.filter(ledger_cooperation_list, { pwd: validText, status: 1, user_id });
|
|
|
|
|
+ // if(num.length > 0) {
|
|
|
|
|
+ // toastr.error('同一个审批人密码不能相同');
|
|
|
|
|
+ // return;
|
|
|
|
|
+ // }
|
|
|
const data = {
|
|
const data = {
|
|
|
type: 'pwd',
|
|
type: 'pwd',
|
|
|
ledger_id,
|
|
ledger_id,
|
|
@@ -1007,10 +1007,11 @@ function setRightData(datas, coolist) {
|
|
|
const newdatas = [];
|
|
const newdatas = [];
|
|
|
const reg = /(^GD([0-9\-]+))|(^([0-9\-]+)$)/;
|
|
const reg = /(^GD([0-9\-]+))|(^([0-9\-]+)$)/;
|
|
|
for (const l of datas) {
|
|
for (const l of datas) {
|
|
|
- if (reg.test(l.code) && l.level <= 4) {
|
|
|
|
|
- if(l.level === 4 && l.is_leaf === false) {
|
|
|
|
|
- l.is_leaf = true;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // if (reg.test(l.code) && l.level <= 4) {
|
|
|
|
|
+ if (reg.test(l.code)) {
|
|
|
|
|
+ // if(l.level === 4 && l.is_leaf === false) {
|
|
|
|
|
+ // l.is_leaf = true;
|
|
|
|
|
+ // }
|
|
|
const coo = _.find(coolist, { 'ledger_id': l.ledger_id, 'user_id': cur_uid });
|
|
const coo = _.find(coolist, { 'ledger_id': l.ledger_id, 'user_id': cur_uid });
|
|
|
if(coo) {
|
|
if(coo) {
|
|
|
l.pwd = coo.pwd;
|
|
l.pwd = coo.pwd;
|
|
@@ -1019,12 +1020,12 @@ function setRightData(datas, coolist) {
|
|
|
newdatas.push(l);
|
|
newdatas.push(l);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- for (const nd of newdatas) {
|
|
|
|
|
- const child = _.find(newdatas, { 'ledger_pid': nd.ledger_id });
|
|
|
|
|
- if (!child && !nd.is_leaf) {
|
|
|
|
|
- nd.is_leaf = true;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // for (const nd of newdatas) {
|
|
|
|
|
+ // const child = _.find(newdatas, { 'ledger_pid': nd.ledger_id });
|
|
|
|
|
+ // if (!child && !nd.is_leaf) {
|
|
|
|
|
+ // nd.is_leaf = true;
|
|
|
|
|
+ // }
|
|
|
|
|
+ // }
|
|
|
return newdatas;
|
|
return newdatas;
|
|
|
}
|
|
}
|
|
|
function updateByCanEdit(datas, coolist, flag) {
|
|
function updateByCanEdit(datas, coolist, flag) {
|
