Browse Source

[fix]

修复客户资料添加报404问题
修改客户报价的前端列表页面,修改操作栏按钮调整为统一样式
修改物料的审核,解决管理员不能添加的问题
dev
liuxiaoxu 3 months ago
parent
commit
f6e864cf7c
  1. 5
      ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java
  2. 2
      ruoyi-admin/src/main/resources/templates/system/customer/add.html
  3. 4
      ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html

5
ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java

@ -973,7 +973,8 @@ private ISysAttachService attachService;
// }else if(roleKeys.contains("gcjlRole")){ // }else if(roleKeys.contains("gcjlRole")){
// variables.put("authority",2); // variables.put("authority",2);
// } // }
// if(roleKeys.contains("yfzjRole") || roleKeys.contains("admin")){ if(roleKeys.contains("admin")) {
// variables.put("authority",4); variables.put("authority", 4);
}
} }
} }

2
ruoyi-admin/src/main/resources/templates/system/customer/add.html

@ -365,7 +365,7 @@
return; return;
} }
console.log( $('#form-customer-add').serialize()); console.log( $('#form-customer-add').serialize());
$.operate.save(prefix + "/ad", $('#form-customer-add').serialize()); $.operate.save(prefix + "/add", $('#form-customer-add').serialize());
} }
} }

4
ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html

@ -299,7 +299,7 @@
// 已作废 // 已作废
if(row.useStatus=="2" && !row.restoreInstanceId){ if(row.useStatus=="2" && !row.restoreInstanceId){
// 恢复 // 恢复
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> '); actions.push('<a href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
} }
// 有流程实例id // 有流程实例id
if (row.instanceId) { if (row.instanceId) {
@ -308,7 +308,7 @@
var todoUserIdList = row.todoUserId.split(","); var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName)){ if(todoUserIdList.includes(loginName)){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> '); actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
} }
} }
// 审批历史 // 审批历史

Loading…
Cancel
Save