fix(sip): 修复订单编辑页面关闭按钮显示逻辑

- 在订单编辑页面中,当关闭 iframe 时,重新显示保存和保存草稿按钮
- 更新订单编辑页面的权限控制逻辑,允许商务人员更新附件
- 修复订单创建时合作伙伴用户 ID 的获取逻辑,使用正确的系统用户 ID
dev_1.0.0
chenhao 2025-08-19 15:44:39 +08:00
parent d9065d33d2
commit 5bf1250714
3 changed files with 6 additions and 2 deletions

View File

@ -731,6 +731,10 @@
parent.parent.$('.layui-layer-btn').show()
parent.parent.$('.saveDraft').show()
},
cancel: function (index) {
parent.parent.$('.layui-layer-btn').show()
parent.parent.$('.saveDraft').show()
},
end: function (index) {
// parent.parent.$('.layui-layer-btn').show()
// parent.parent.$('.saveDraft').show()

View File

@ -206,7 +206,7 @@ public class ProjectOrderInfoController extends BaseController
boolean updateFlag = CollUtil.isNotEmpty(todoCompletedList) ?
("产品经理".equals(todoCompletedList.get(0).getTaskName()) || "售前".equals(todoCompletedList.get(0).getTaskName()))
: true;
mmap.put("updateFile", ShiroUtils.getSubject().hasRole("sale_assistant") && updateFlag);
mmap.put("updateFile", (ShiroUtils.getSubject().hasRole("sale_assistant")||ShiroUtils.getSubject().hasRole("business")) && updateFlag);
return prefix + "/edit";
}

View File

@ -367,7 +367,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
put("processTemplate", projectOrderInfo.getProcessTemplate());
put("applyUserName", ShiroUtils.getSysUser().getUserName());
put("applyUser", ShiroUtils.getUserId());
put("partnerUser", existProjectOrderInfo.getSystemUserId());
put("partnerUser",partnerInfos.get(0).getSystemUserId());
put("extendField1", projectOrderInfo.getVersionCode());
}}, orderFlowKey);
complete(null, null, getFlowBusinessKey(existProjectOrderInfo.getOrderCode(), projectOrderInfo.getProcessType()));