xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-07-10 14:41:17 +08:00
parent 9ac5bfa311
commit 4724fca487
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
View File

@ -732,10 +732,10 @@ public class QuotController extends BaseController
@PostMapping("/commitOAQuot") @PostMapping("/commitOAQuot")
public AjaxResult commitOAQuot(@RequestBody Quot quot) public AjaxResult commitOAQuot(@RequestBody Quot quot)
{ {
//金思维协助中不允许提交OA //金思维协助状态不是已完成不允许提交OA
String quot_jsw_approval_status = quot.getQuotJswApprovalStatus(); String quot_jsw_approval_status = quot.getQuotJswApprovalStatus();
if("1".equals(quot_jsw_approval_status)){ if(!"2".equals(quot_jsw_approval_status)){
return error("金思维协助还未完成"); return error("金思维未协助完成,不能提交OA");
} }
// 报价单提交OA,插入中间表 sys_oa_quot sys_oa_quot_material // 报价单提交OA,插入中间表 sys_oa_quot sys_oa_quot_material

2
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -987,7 +987,7 @@
<!-- 报价组提交金思维、OA--> <!-- 报价组提交金思维、OA-->
<span style="margin-left: 10px;float:left" v-hasPermi="['quot:quot:assistJsw']"><el-button type="warning" plain @click="commitJswForm" v-if="this.form.quotApprovalStatus == '1'&&(this.form.quotJswApprovalStatus == '0'||this.form.quotJswApprovalStatus == '2')">提交金思维</el-button></span> <span style="margin-left: 10px;float:left" v-hasPermi="['quot:quot:assistJsw']"><el-button type="warning" plain @click="commitJswForm" v-if="this.form.quotApprovalStatus == '1'&&(this.form.quotJswApprovalStatus == '0'||this.form.quotJswApprovalStatus == '2')">提交金思维</el-button></span>
<span style="margin-left: 10px;float:left" v-hasPermi="['quot:quot:assistOA']"><el-button type="warning" plain @click="commitOAForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotOAApprovalStatus == '0'">提交OA</el-button></span> <span style="margin-left: 10px;float:left" v-hasPermi="['quot:quot:assistOA']"><el-button type="warning" plain @click="commitOAForm" v-if="this.form.quotApprovalStatus == '1'&&(this.form.quotOAApprovalStatus == '0'||this.form.quotOAApprovalStatus == '3')">提交OA</el-button></span>
<!-- 报价组提交反馈、驳回报价单--> <!-- 报价组提交反馈、驳回报价单-->
<span style="margin-left: 10px" v-hasPermi="['quot:quot:feedback']"><el-button type="primary" plain @click="feedbackQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'&&this.form.quotJswApprovalStatus != '1'&&this.form.quotOAApprovalStatus != '1'">提交反馈</el-button></span> <span style="margin-left: 10px" v-hasPermi="['quot:quot:feedback']"><el-button type="primary" plain @click="feedbackQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'&&this.form.quotJswApprovalStatus != '1'&&this.form.quotOAApprovalStatus != '1'">提交反馈</el-button></span>