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

'123'

This commit is contained in:
xd 2024-04-12 13:10:31 +08:00
parent 1c146217d2
commit a366387260
3 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,4 +274,26 @@ public class QuotController extends BaseController
}
return success();
}
/**
* 报价组提交反馈
*/
@PreAuthorize("@ss.hasPermi('quot:quot:feedback')")
@Log(title = "报价组提交反馈", businessType = BusinessType.OTHER)
@PostMapping("/feedbackQuot")
public AjaxResult feedbackQuot(@RequestBody Quot quot)
{
String quot_id = quot.getQuotId();
Quot info = quotService.selectQuotByQuotId(quot_id);
String quot_jsxz_approval_status = quot.getQuotId();
if("1".equals(quot_jsxz_approval_status)){
return error("技术协助还未完成");
}else{
info.setQuotApprovalStatus("2");
}
quotService.updateQuot(info);
return success();
}
}

11
ruoyi-ui/src/api/quot/quot.js
View File

@ -79,3 +79,14 @@ export function commitJsQuot(data) {
})
}
//提交反馈按钮
export function feedbackQuot(data) {
return request({
url: '/quot/quot/feedbackQuot',
method: 'post',
data: data
})
}

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

@ -515,7 +515,7 @@
name="quotFile"
:action="uploadUrl"
:headers="headers"
:data="{ relation_id: this.form.quotId,file_type: 'quotXjFile' }"
:data="{ relation_id: this.form.quotId,file_type: 'quotFkFile' }"
:on-success="handleAvatarSuccess"
:show-file-list="false"
:limit="1"
@ -543,7 +543,7 @@
</el-table>
</el-tab-pane>
</el-tabs>
<!-- 反馈附件对话框 -->
<!-- 特缆、中压、低压、其他协助反馈附件对话框 -->
<el-dialog class="fkfjDialog" :title="addFileTitle" :visible.sync="addFileOpen" width="800px" append-to-body>
<el-upload class="upload-demo"
ref="upload"
@ -583,8 +583,8 @@
<span v-hasPermi="['quot:quot:save']"><el-button @click="saveForm" v-if="this.form.quotApprovalStatus == '0' || this.form.quotApprovalStatus == null">保 存</el-button></span>
<span style="margin-left: 10px" v-hasPermi="['quot:quot:commit']"><el-button type="primary" plain @click="commitForm" v-if="this.form.quotApprovalStatus == '0' || this.form.quotApprovalStatus == null">提 交</el-button></span>
<span v-hasPermi="['quot:quot:assist']"><el-button type="primary" plain @click="commitJsForm" v-if="this.form.quotJsxzApprovalStatus == '0'">提交技术协助</el-button></span>
<span v-hasPermi="['quot:quot:feedback']"><el-button type="primary" plain @click="feedbackQuotForm" v-if="this.form.quotApprovalStatus == '1'">提交反馈</el-button></span>
<span style="margin-left: 10px" v-hasPermi="['quot:quot:reject']"><el-button type="danger" plain @click="rejectQuotForm" v-if="this.form.quotApprovalStatus == '1'">驳回</el-button></span>
<span v-hasPermi="['quot:quot:feedback']"><el-button type="primary" plain @click="feedbackQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'">提交反馈</el-button></span>
<span style="margin-left: 10px" v-hasPermi="['quot:quot:reject']"><el-button type="danger" plain @click="rejectQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'">驳回</el-button></span>
</div>
</el-dialog>
</div>
@ -616,7 +616,7 @@
}
</style>
<script>
import { listQuot, getQuot, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot } from "@/api/quot/quot";
import { listQuot, getQuot, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, feedbackQuot } from "@/api/quot/quot";
import { getToken } from "@/utils/auth";
import { checkPermi } from '@/utils/permission' // 权限判断函数
@ -876,6 +876,22 @@ export default {
this.getList();
});
},
/** 报价组提交反馈按钮 */
feedbackQuotForm() {
var quotFkFileNum = this.quotFkFileList.length;
if(quotFkFileNum==0){
this.$modal.msgError("反馈附件必须上传");
return;
}
feedbackQuot(this.form).then(response => {
this.$modal.msgSuccess("提交反馈成功");
this.open = false;
this.getList();
});
},
/** 删除按钮操作 */
handleDelete(row) {
const quotIds = row.quotId || this.ids;