From cf320a66c1aa0c55d4446b9751dc0f08530e2448 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 23 May 2024 16:30:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=200523=E5=BC=80=E5=8F=91=E8=AF=A2?=
=?UTF-8?q?=E4=BB=B7=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/purchase/purInquiry.js | 8 ++++
src/api/purchase/purInquiryOffer.js | 8 ++++
.../purchase/purInquiry/purInquiryFinish.vue | 28 ++++++++++-
.../purInquiryOffer/purInquiryOffer.vue | 46 +++++++++++++++----
.../purInquiryOffer/purInquiryOfferFinish.vue | 2 +-
.../purInquiryOfferReviewed.vue | 2 +-
6 files changed, 80 insertions(+), 14 deletions(-)
diff --git a/src/api/purchase/purInquiry.js b/src/api/purchase/purInquiry.js
index 6a6e21e7..4174870a 100644
--- a/src/api/purchase/purInquiry.js
+++ b/src/api/purchase/purInquiry.js
@@ -77,3 +77,11 @@ export function delInquiryItem(id) {
})
}
+//发起报价
+export function submitOffer(data) {
+ return request({
+ url: "/purchase/purInquiry/submitOffer",
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/api/purchase/purInquiryOffer.js b/src/api/purchase/purInquiryOffer.js
index 55f806e4..64360897 100644
--- a/src/api/purchase/purInquiryOffer.js
+++ b/src/api/purchase/purInquiryOffer.js
@@ -77,3 +77,11 @@ export function delInquiryItem(id) {
})
}
+export function submitApproval(data) {
+ return request({
+ url: "/purchase/purInquiryOffer/submitApproval",
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/src/views/purchase/purInquiry/purInquiryFinish.vue b/src/views/purchase/purInquiry/purInquiryFinish.vue
index 796cbf38..1bce33aa 100644
--- a/src/views/purchase/purInquiry/purInquiryFinish.vue
+++ b/src/views/purchase/purInquiry/purInquiryFinish.vue
@@ -247,7 +247,7 @@
import approvalFlowDetail from "@/components/ApprovalFlow";
import purInquiryEdit from "@/views/purchase/purInquiry/purInquiryEditDialog";
import purInquirySelectPlan from "@/views/purchase/purInquiry/purInquirySelectPlan";
-import {selectPurInquiryDetail as listItem, list, listItemDetail ,delInquiryItemAll,inserThrOrderWeb} from "@/api/purchase/purInquiry";
+import {selectPurInquiryDetail as listItem, list, listItemDetail ,delInquiryItemAll,inserThrOrderWeb,submitOffer} from "@/api/purchase/purInquiry";
import {findInvByUser} from "@/api/system/invSubWarehouse";
export default {
@@ -378,10 +378,34 @@ export default {
},
methods: {
+ submitOffer(row){
+ this.$confirm("是否确定发起报价?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.loading = true;
+ submitOffer(row)
+ .then(response => {
+ this.loading = false;
+ if (response.code === 20000) {
+ this.$message.success("提交成功！");
+ this.getList();
+ } else {
+ this.$message.error(response.message);
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ })
+ })
+ .catch(() => {
+ });
+ },
itemDetailDialog(row){
this.handleItemDetail(row)
this.itemDetailDialogVisible = true;
-
},
showApprovalFlowDetail(row) {
this.idQuery.approvalFlowId = row.approvalFlowId
diff --git a/src/views/purchase/purInquiryOffer/purInquiryOffer.vue b/src/views/purchase/purInquiryOffer/purInquiryOffer.vue
index 2b949935..341a9f48 100644
--- a/src/views/purchase/purInquiryOffer/purInquiryOffer.vue
+++ b/src/views/purchase/purInquiryOffer/purInquiryOffer.vue
@@ -42,7 +42,7 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
- <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增询价计划单</el-button>
+<!-- <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增询价计划单</el-button>-->
<!-- <el-button type="primary" icon="el-icon-plus" @click="newDistributionFormPlan()" :loading="loading">导入申购</el-button>-->
</el-button-group>
</div>
@@ -76,13 +76,14 @@
<el-table-column label="操作" width="120">
<template slot-scope="scope">
- <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)" v-show="(scope.row.status=='' || scope.row.status == 1) ">编辑
- </el-button>
- <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button>
+<!-- <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)" v-show="(scope.row.status=='' || scope.row.status == 1) ">编辑-->
+<!-- </el-button>-->
+<!-- <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button>-->
- <el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)"
- v-show=" scope.row.status != 1 && scope.row.status !='' && scope.row.approvalFlowId != null">审批详情
- </el-button>
+<!-- <el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)"-->
+<!-- v-show=" scope.row.status != 1 && scope.row.status !='' && scope.row.approvalFlowId != null">审批详情-->
+<!-- </el-button>-->
+ <el-button type="text" size="small" @click.native.stop="submitApproval(scope.row)" >发起审批</el-button>
</template>
</el-table-column>
@@ -235,7 +236,7 @@
import approvalFlowDetail from "@/components/ApprovalFlow";
import purInquiryEdit from "@/views/purchase/purInquiryOffer/purInquiryOfferEditDialog";
import purInquirySelectPlan from "@/views/purchase/purInquiryOffer/purInquiryOfferSelectPlan";
-import {selectPurInquiryDetail as listItem, list, listItemDetail ,delInquiryItemAll,inserThrOrderWeb} from "@/api/purchase/purInquiryOffer";
+import {selectPurInquiryDetail as listItem, list, listItemDetail ,delInquiryItemAll,inserThrOrderWeb,submitApproval} from "@/api/purchase/purInquiryOffer";
import {findInvByUser} from "@/api/system/invSubWarehouse";
export default {
@@ -274,7 +275,7 @@ export default {
selectPlan: "选择申购单",
},
statusMap: {
- 1: "草稿",
+ 1: "待报价",
2: "审核中",
3: "通过",
4: "拒绝"
@@ -285,7 +286,7 @@ export default {
{name: '短期' ,code: 3 }
],
statusList:[
- {name: '草稿' ,code: 1 },
+ {name: '待报价' ,code: 1 },
{name: '未审核' ,code: 2 },
{name: '已审核' ,code: 3 }
],
@@ -366,6 +367,31 @@ export default {
},
methods: {
+ submitApproval(row){
+ this.$confirm("是否确定发起审批?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.loading = true;
+ submitApproval(row)
+ .then(response => {
+ this.loading = false;
+ if (response.code === 20000) {
+ this.$message.success("提交成功！");
+ this.getList();
+ } else {
+ this.$message.error(response.message);
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ })
+ })
+ .catch(() => {
+ });
+ },
itemDetailDialog(row){
this.handleItemDetail(row)
this.itemDetailDialogVisible = true;
diff --git a/src/views/purchase/purInquiryOffer/purInquiryOfferFinish.vue b/src/views/purchase/purInquiryOffer/purInquiryOfferFinish.vue
index d2c66357..12beb82c 100644
--- a/src/views/purchase/purInquiryOffer/purInquiryOfferFinish.vue
+++ b/src/views/purchase/purInquiryOffer/purInquiryOfferFinish.vue
@@ -42,7 +42,7 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
- <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增询价计划单</el-button>
+<!-- <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增询价计划单</el-button>-->
<!-- <el-button type="primary" icon="el-icon-plus" @click="newDistributionFormPlan()" :loading="loading">导入申购</el-button>-->
</el-button-group>
</div>
diff --git a/src/views/purchase/purInquiryOffer/purInquiryOfferReviewed.vue b/src/views/purchase/purInquiryOffer/purInquiryOfferReviewed.vue
index c331045e..5a5e1c70 100644
--- a/src/views/purchase/purInquiryOffer/purInquiryOfferReviewed.vue
+++ b/src/views/purchase/purInquiryOffer/purInquiryOfferReviewed.vue
@@ -42,7 +42,7 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
- <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增询价计划单</el-button>
+<!-- <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增询价计划单</el-button>-->
<!-- <el-button type="primary" icon="el-icon-plus" @click="newDistributionFormPlan()" :loading="loading">导入申购</el-button>-->
</el-button-group>
</div>