Commit 186d6dc4 authored by 张冬's avatar 张冬

采购商对保证金缴纳的行为

parent 25ee2930
...@@ -95,10 +95,11 @@ export function confirmation(confirmId) { ...@@ -95,10 +95,11 @@ export function confirmation(confirmId) {
// 新增 // 新增
// 标书费缴纳详情 // 标书费缴纳详情
export function bidbookDetail(feeId) { export function bidbookDetail(params) {
return request({ return request({
url: `tender-bidbook/detail/${feeId}`, url: "tender-bidbook/detail",
method: 'get', method: 'get',
params:params
}) })
} }
......
...@@ -10,12 +10,15 @@ ...@@ -10,12 +10,15 @@
</el-table-column> </el-table-column>
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100"> <el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.condition=='已缴纳'||scope.row.condition=='待修改'"> <div v-if="scope.row.operation=='4'||scope.row.operation=='5'">
<el-button type="text" size="small">查看</el-button> <el-button type="text" size="small">查看</el-button>
</div> </div>
<div v-if="scope.row.condition=='待审核'"> <div v-else-if="scope.row.condition=='3'">
<el-button type="text" size="small">审核</el-button> <el-button type="text" size="small">审核</el-button>
</div> </div>
<div v-else>
<el-button type="text" size="small"></el-button>
</div>
</template> </template>
</el-table-column> </el-table-column>
</dataTable> </dataTable>
......
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
<dataBreadcrumb :breads="breads"></dataBreadcrumb> <dataBreadcrumb :breads="breads"></dataBreadcrumb>
<h3>{{title}}</h3> <h3>{{title}}</h3>
<h5>{{title}}购标信息、邮寄信息、发票信息、缴费信息</h5> <h5>{{title}}购标信息、邮寄信息、发票信息、缴费信息</h5>
<div class="flex state">
<div>状态:{{state}}</div>
<div></div>
</div>
</div> </div>
<div class="othercontent"> <div class="othercontent">
<el-form ref="ruleForm" :model="ruleForm" label-width="200px" class="demo-ruleForm"> <el-form ref="ruleForm" :model="ruleForm" label-width="200px" class="demo-ruleForm">
...@@ -69,7 +73,6 @@ ...@@ -69,7 +73,6 @@
<div> <div>
<div class="describe">发票信息</div> <div class="describe">发票信息</div>
<div class="message-form"> <div class="message-form">
<div class="flex-between"> <div class="flex-between">
<el-form-item label="发票类型:" prop="invoiceType"> <el-form-item label="发票类型:" prop="invoiceType">
<el-radio-group v-model="ruleForm.invoiceType" disabled> <el-radio-group v-model="ruleForm.invoiceType" disabled>
...@@ -111,7 +114,11 @@ ...@@ -111,7 +114,11 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="上传缴费凭证:" prop="voucherUrl"> <el-form-item label="上传缴费凭证:" prop="voucherUrl">
<ul>
<li v-for="(item,index) in ruleForm.voucherList" :key="index">
<a :href="item.fileUrl">{{item.fileName}}</a>
</li>
</ul>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
...@@ -121,7 +128,7 @@ ...@@ -121,7 +128,7 @@
<!-- 拒绝原因 --> <!-- 拒绝原因 -->
<el-dialog title="审核拒绝" :visible.sync="dialogFormVisible"> <el-dialog title="审核拒绝" :visible.sync="dialogFormVisible">
<el-form :model="form" :rules="rules" ref="form"> <el-form :model="form" :rules="rules" ref="form">
<el-form-item label="拒绝原因" label-width="100"> <el-form-item label="拒绝原因" label-width="100" prop="reason">
<el-input v-model="form.reason" type="textarea" :rows="2" placeholder="请输入内容"></el-input> <el-input v-model="form.reason" type="textarea" :rows="2" placeholder="请输入内容"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -164,6 +171,7 @@ ...@@ -164,6 +171,7 @@
} }
}; };
return { return {
state:"",
dialogFormVisible: false, dialogFormVisible: false,
breads: ['招标管理', '招标项目管理', '工作台'], breads: ['招标管理', '招标项目管理', '工作台'],
ruleForm: {}, ruleForm: {},
...@@ -183,12 +191,15 @@ ...@@ -183,12 +191,15 @@
back() { back() {
this.$router.go(-1) this.$router.go(-1)
}, },
async getBidbookDetail(feeId) { async getBidbookDetail() {
let message={}
message.feeId=this.feeId
message.projectId=localStorage.getItem("projectId")
try { try {
const { const {
data, data,
code code
} = await bidbookDetail(feeId) } = await bidbookDetail(message)
if (code == 200) { if (code == 200) {
this.ruleForm = data this.ruleForm = data
} }
...@@ -253,6 +264,7 @@ ...@@ -253,6 +264,7 @@
} }
}, },
created() { created() {
this.state=this.$route.query.state;
this.type = this.$route.query.type; this.type = this.$route.query.type;
if (this.type == "examine") { if (this.type == "examine") {
this.title = "审核" this.title = "审核"
...@@ -261,7 +273,7 @@ ...@@ -261,7 +273,7 @@
} }
let feeId = this.$route.query.feeId; let feeId = this.$route.query.feeId;
this.feeId = feeId this.feeId = feeId
this.getBidbookDetail(feeId); this.getBidbookDetail();
} }
} }
</script> </script>
...@@ -280,4 +292,12 @@ ...@@ -280,4 +292,12 @@
width: 70%; width: 70%;
margin: 0 auto margin: 0 auto
} }
.content-head{
position: relative;
}
.state{
position: absolute;
right: 10px;
bottom:10px
}
</style> </style>
...@@ -3,13 +3,21 @@ ...@@ -3,13 +3,21 @@
<div> <div>
<div class="content"> <div class="content">
<dataTable :columns="columns" :page-obj="pageObj" :breads="breads" url="/tender-bidbook/operation"> <dataTable :columns="columns" :page-obj="pageObj" :breads="breads" url="/tender-bidbook/operation">
<el-table-column slot="updateTime" label="提交审核时间" align="center" width="100">
<template slot-scope="scope">
<div>{{scope.row.updateTime?scope.row.updateTime:"无"}}</div>
</template>
</el-table-column>
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100"> <el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.condition=='已缴纳'||scope.row.condition=='待修改'"> <div v-if="scope.row.operation==4||scope.row.operation==5">
<el-button type="text" size="small" @click="handleSee(scope.row.feeId)">查看</el-button> <el-button type="text" size="small" @click="handleSee(scope.row)">查看</el-button>
</div>
<div v-else-if="scope.row.operation==3">
<el-button type="text" size="small" @click="handleExamine(scope.row)">审核</el-button>
</div> </div>
<div v-if="scope.row.condition=='未审核'"> <div v-else>
<el-button type="text" size="small" @click="handleExamine(scope.row.feeId)">审核</el-button> <el-button type="text" size="small"></el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -35,8 +43,7 @@ ...@@ -35,8 +43,7 @@
prop: 'projectName' prop: 'projectName'
}, },
{ {
label: '提交审核时间', slot:"updateTime"
prop: 'updateTime'
}, },
{ {
label: '缴费情况', label: '缴费情况',
...@@ -56,21 +63,23 @@ ...@@ -56,21 +63,23 @@
this.pageObj.projectId = localStorage.getItem("projectId") this.pageObj.projectId = localStorage.getItem("projectId")
}, },
methods: { methods: {
handleExamine(feeId) { handleExamine(row) {
this.$router.push({ this.$router.push({
path: "/purchaser/bid/bidStage/tenderFeelist/detail", path: "/purchaser/bid/bidStage/tenderFeelist/detail",
query: { query: {
type: "examine", type: "examine",
feeId: feeId feeId: row.feeId,
state:row.condition
} }
}) })
}, },
handleSee(feeId) { handleSee(row) {
this.$router.push({ this.$router.push({
path: "/purchaser/bid/bidStage/tenderFeelist/detail", path: "/purchaser/bid/bidStage/tenderFeelist/detail",
query: { query: {
type: "see", type: "see",
feeId: feeId feeId: row.feeId,
state:row.condition
} }
}) })
}, },
......
...@@ -105,6 +105,8 @@ export default { ...@@ -105,6 +105,8 @@ export default {
setTimeout(()=>{ setTimeout(()=>{
this.$router.push("/purchaser/bid/administrationList") this.$router.push("/purchaser/bid/administrationList")
},1500) },1500)
}else{
this.$message.error(msg)
} }
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100"> <el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.operaion=='待确认'" type="text" size="small" @click="confirm(scope.row)">确认</el-button> <el-button v-if="scope.row.operaion=='待确认'" type="text" size="small" @click="confirm(scope.row)">确认</el-button>
<el-button v-else type="text" size="small" @click="handleSee(scope.row)">查看</el-button> <el-button type="text" size="small" @click="handleSee(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</dataTable> </dataTable>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100"> <el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.operaion=='待确认'" type="text" size="small" @click="confirm(scope.row)">确认</el-button> <el-button v-if="scope.row.operaion=='待确认'" type="text" size="small" @click="confirm(scope.row)">确认</el-button>
<el-button v-else type="text" size="small" @click="handleSee1(scope.row)">查看</el-button> <el-button type="text" size="small" @click="handleSee1(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</dataTable> </dataTable>
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
</slot> </slot>
</priceDetail> </priceDetail>
<!-- 报价弹窗 --> <!-- 报价弹窗 -->
<el-dialog :visible.sync="dialogFormVisible" title="报价" width="60%"> <el-dialog :visible.sync="dialogFormVisible" title="报价" width="50%">
<dataTable :table-data="commoditylist" :columns="commoditycolumns"> <dataTable :table-data="commoditylist" :columns="commoditycolumns">
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100"> <el-table-column slot="operate" label="操作" align="center" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.cost" :min="0" :controls="false" :precision="2" style="width:100px" placeholder="请输入"></el-input-number> <el-input-number v-model="scope.row.cost" :min="0" :controls="false" :precision="2" style="width:100px" placeholder="请输入"></el-input-number>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment