Skip to content

W
web-purchase
Commit ec6d194e authored by 单鹏冲's avatar 单鹏冲
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents c3ae65ab 1b1bec90
Hide whitespace changes
Inline Side-by-side
Showing with 222 additions and 175 deletions
src/pages/purchaser/bid/bidStage/changeList/changeNotice.vue
View file @ ec6d194e
......@@ -5,7 +5,7 @@
<h3>{{ title }}</h3>
<h5>{{ title }}</h5>
<div class="abs">
<div>拒绝原因：{{ruleForm.reason}}</div>
<div v-if="state">拒绝原因：{{ruleForm.reason}}</div>
</div>
</div>
<div class="content">
......
src/pages/purchaser/bid/bidStage/failList/failNotice.vue
View file @ ec6d194e
......@@ -5,7 +5,7 @@
<h3>{{ title }}</h3>
<h5>{{ title }}</h5>
<div class="abs">
<div>拒绝原因：{{ruleForm.reason}}</div>
<div v-if="state">拒绝原因：{{ruleForm.reason}}</div>
</div>
</div>
<div class="content">
......
src/pages/purchaser/bid/seeProject/fileUpload.vue
View file @ ec6d194e
......@@ -5,7 +5,7 @@
<div class="details">
<el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
<el-form-item label="上传附件" prop="file">
<dataTable :table-data="ruleForm.bidBookDO" :columns="columns" :is-pageobj="false">
<dataTable :table-data="ruleForm.bidBookPO" :columns="columns" :is-pageobj="false">
<el-table-column slot="operate" label="文件大小" align="center" fixed="right" width="300">
<template slot-scope="scope">
<div>{{ getMb(scope.row.size) }}KB</div>
......@@ -13,8 +13,8 @@
</el-table-column>
<el-table-column slot="operate" label="价格" align="center" fixed="right" width="300">
<template slot-scope="scope">
<div>{{ scope.row.free ? scope.row.free : '无' }}</div>
</template>
<div>{{ scope.row.free ? scope.row.price : '无' }}</div>
</template>
</el-table-column>
</dataTable>
</el-form-item>
......@@ -42,7 +42,7 @@ export default {
dataTable
},
props: {
allForm: {
ruleForm: {
type: Object,
default() {
return {};
......@@ -62,21 +62,17 @@ export default {
columns: [
{
label: '文件名称',
prop: 'name'
prop: 'fileName'
},
{
label: '上传时间',
prop: 'time'
prop: 'createTime'
},
{
slot: 'operate'
}
],
ruleForm: {
bidBookPO: [],
bidBookAccessoryPOList: []
},
fileList: [],
rules: {
file: [
......@@ -90,6 +86,11 @@ export default {
};
},
methods: {
getMb(size) {
let sieze1 = size / 1024;
let integer = sieze1.toFixed(0);
return integer;
},
getfile(val) {
this.ruleForm.bidBookPO = val;
},
......
src/pages/purchaser/bid/seeProject/message.vue
View file @ ec6d194e
......@@ -150,10 +150,6 @@
</el-form-item>
</el-form>
<div v-show="ruleForm.bidType == 1">
<div style="margin-bottom: 20px">
<el-button type="primary" @click="dialogFormVisible = true">添加</el-button>
<el-button @click="delAllSelection">删除</el-button>
</div>
<dataTable
:table-data="ruleForm.companyVOList"
:columns="columns"
......
src/pages/purchaser/bid/seeProject/seeProject.vue
View file @ ec6d194e
......@@ -24,7 +24,7 @@
</div>
<!-- 招标文件上传 -->
<div class="fileUpload">
<fileUpload ref="fileUpload" :detail="detail"></fileUpload>
<fileUpload ref="fileUpload" :ruleForm="detail"></fileUpload>
</div>
</div>
<div class="centerButton">
......@@ -51,17 +51,15 @@ export default {
return {
activeIdx: 0,
allForm: {},
detail: {
}
detail: {}
};
},
created() {
this.getenquiryProjectId();
},
methods: {
back(){
this.$router.go(-1)
back() {
this.$router.go(-1);
},
// 获取详情
async getenquiryProjectId() {
......@@ -71,11 +69,15 @@ export default {
data.endTime = getTime1(data.endTime);
data.startTime = getTime1(data.startTime);
data.createTime = data.createTime.substring(0, 10);
data.bidBookInfoPO=data.bidBookInfoDO
data.earnestInfoPO=data.earnestInfoDO
let userInfo=JSON.parse(localStorage.getItem("userInfo"))
data.purchaseAgent=userInfo.companyName
data.bidBookInfoPO = data.bidBookInfoDO;
data.earnestInfoPO = data.earnestInfoDO;
let userInfo = JSON.parse(localStorage.getItem('userInfo'));
data.purchaseAgent = userInfo.companyName;
let bidBookPO = [];
bidBookPO.push(data.bidBookPO);
data.bidBookPO = bidBookPO;
this.detail = data;
console.log(data)
}
}
}
......
src/pages/purchaser/home/home.vue
View file @ ec6d194e
......@@ -3,26 +3,41 @@
<div class="user">
<div>你好 ，MaikoXie , 欢迎开始一天的工作！</div>
<ul class="user-list flex-between">
<li class="flex-colunm">
<li class="flex-colunm">
<img src="@static/images/user.png" alt="" />
<div>今日可报名项目</div>
<div>{{ detail.applyProjects }}</div>
<div>全部项目</div>
<div>{{ detail.projectCount }}</div>
</li>
<li class="flex-colunm">
<li class="flex-colunm">
<img src="@static/images/user.png" alt="" />
<div>我的供应商</div>
<div>{{ detail.bidderCount }}</div>
</li>
<li class="flex-colunm">
<img src="@static/images/user.png" alt="" />
<div>已定定标项目</div>
<div>{{ detail.calibrated }}</div>
</li>
<li class="flex-colunm">
<img src="@static/images/user.png" alt="" />
<div>已流标项目</div>
<div>{{ detail.bidFailed }}</div>
</li>
<li class="flex-colunm">
<img src="@static/images/user.png" alt="" />
<div>中标项目</div>
<div>{{ detail.winProjects }}</div>
<div>已经终止项目</div>
<div>{{ detail.end }}</div>
</li>
</ul>
<h1>项目信息</h1>
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false">
</dataTable>
<!-- <h1>待办事项</h1>
<h1>待办事项</h1>
<ul class="flex-between project-list">
<li class="flex-colunm">
<img src="@static/images/item.png" alt="" />
<div>待修改项目</div>
<div>{{ detail.projectCount }}</div>
<div>{{ detail.projectAduitNeedModify }}</div>
</li>
<li class="flex-colunm">
<img src="@static/images/item.png" alt="" />
......@@ -44,7 +59,7 @@
<div>待确认供应商凭证</div>
<div>{{ detail.credentials }}</div>
</li>
</ul> -->
</ul>
</div>
</div>
</template>
......@@ -67,7 +82,12 @@ export default {
url: ''
},
{
state: '处于招投标阶段的项目',
state: '处于售标&投标阶段的项目',
number: '10',
url: ''
},
{
state: '处于投标阶段的项目',
number: '10',
url: ''
},
......@@ -80,6 +100,16 @@ export default {
state: '处于开标阶段的项目',
number: '10',
url: ''
},
{
state: '处于评标阶段的项目',
number: '10',
url: ''
},
{
state: '处于定标阶段的项目',
number: '10',
url: ''
}
],
columns: [
......@@ -130,10 +160,6 @@ export default {
};
},
created() {
let token = getSearchString('token');
if (token !== 'undefined') {
localStorage.setItem('token', token);
}
this.gethome();
},
methods: {
......@@ -143,12 +169,12 @@ export default {
async gethome() {
const { data, code } = await home();
this.detail = data;
this.tableData[0].number = data.sellingBidding;
this.tableData[1].number = data. bidding;
this.tableData[2].number = data.open;
this.tableData[3].number = data.bidOpening;
this.tableData[4].number = data.bidOevaluating;
this.tableData[5].number = data.bidDecide;
this.tableData[0].number = data.prePublic;
this.tableData[1].number = data.sellingBidding;
this.tableData[2].number = data.bidding;
this.tableData[3].number = data.open;
this.tableData[4].number = data.bidOpening;
this.tableData[5].number = data.bidOevaluating;
}
}
};
......
src/pages/supply/bid/joinProject/projectList.vue
View file @ ec6d194e
<template>
<div>
<div class="content">
<dataTable :columns = "columns" :breads = "breads" :checklist = "checklist" :page-obj = "pageobj" :margin-top="100" url="/bidder/project/takePart/list">
<el-table-column slot="operate" label = "项目类型" fixed="right" width="100">
<template slot-scope="scope">
<div>{{scope.row.bidType==0?"公开招标":"邀请招标"}}</div>
</template>
</el-table-column>
<el-table-column slot="operate" align="center" label="项目状态" flexd="right" width="200px">
<template slot-scope="scope">
<div>{{totalMarks(scope.row.status)}}</div>
</template>
</el-table-column>
<el-table-column slot="operate" label = "操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type ="text" size = "small " @click="send(scope.row)">工作台</el-button>
</template>
</el-table-column>
</dataTable>
<div>
<div class="content">
<dataTable
:columns="columns"
:breads="breads"
:checklist="checklist"
:page-obj="pageobj"
:margin-top="100"
url="/bidder/project/takePart/list"
>
<el-table-column slot="operate" label="项目类型" fixed="right" width="100">
<template slot-scope="scope">
<div>{{ scope.row.bidType == 0 ? '公开招标' : '邀请招标' }}</div>
</template>
</el-table-column>
<el-table-column slot="operate" align="center" label="项目状态" flexd="right" width="200px">
<template slot-scope="scope">
<div>{{ totalMarks(scope.row.status) }}</div>
</template>
</el-table-column>
<el-table-column slot="operate" label="操作" fixed="right" width="200">
<template slot-scope="scope">
<div v-if="scope.row.type == 1">
<el-button type="text" size="small" @click="handlesee(scope.row)">查看投标邀请书 </el-button>
<el-button type="text" size="small" @click="jump(scope.row)">查看询价公告 </el-button>
</div>
<div v-else class="flex-center">
<el-button type="text" size="small " @click="send(scope.row)">工作台</el-button>
</div>
</template>
</el-table-column>
</dataTable>
</div>
</div>
</div>
</template>
<script>
import {projectStatusList} from '@api/common/list'
import dataTable from '@components/dataTable.vue'
import { projectStatusList } from '@api/common/list';
import dataTable from '@components/dataTable.vue';
export default {
components: {
dataTable
},
data() {
return {
//分页
pageobj: {
size: 10,
currentPage: 1,
func: (currentPage) => {
this.pageTurning(currentPage)
}
},
//表格第一行
columns: [
{
label: '项目编号',
prop: 'projectCode'
},
{
label: '项目名称',
prop: 'projectName'
},
{
label: '采购商',
prop: 'companyName'
},
{
label: '投标截止时间',
prop: 'endTime'
},
{
slot: 'operate'
}],
checklist: [{
title: '采购商:',
type: 'input',
model: 'companyName'
},
{
title: '项目名称:',
type: 'input',
model: 'projectName'
},
{
title: '状态',
type: 'select',
selectlist: [],
change: row => '',
model: 'status'
},
{
title: '项目类型',
type: 'select',
selectlist: [{
value: '1',
label: '公开招标'
components: {
dataTable
},
data() {
return {
//分页
pageobj: {
size: 10,
currentPage: 1,
func: (currentPage) => {
this.pageTurning(currentPage);
}
},
//表格第一行
columns: [
{
label: '项目编号',
prop: 'projectCode'
},
{
label: '项目名称',
prop: 'projectName'
},
{
label: '采购商',
prop: 'companyName'
},
{
label: '投标截止时间',
prop: 'endTime'
},
{
slot: 'operate'
}
],
checklist: [
{
title: '采购商:',
type: 'input',
model: 'companyName'
},
{
title: '项目名称:',
type: 'input',
model: 'projectName'
},
{
title: '状态',
type: 'select',
selectlist: [],
change: (row) => '',
model: 'status'
},
{
title: '项目类型',
type: 'select',
selectlist: [
{
value: '1',
label: '公开招标'
},
{
value: '2',
label: '邀请招标'
}
],
change: (row) => '',
model: 'type'
}
],
breads: ['投标管理', '我参与的项目']
};
},
methods: {
handlesee(row) {
this.$router.push('/supply/bid/signupOnline/seeAnnouncement');
// this.$router.push(`/supply/bid/signupOnline/seeAnnouncement?id=${row.projectId}`)
localStorage.setItem('projectId', row.projectId);
},
jump(row) {
this.$router.push('/supply/bid/signupOnline/seePrice');
localStorage.setItem('projectId', row.projectId);
},
{
value: '2',
label: '邀请招标'
totalMarks: function (status) {
let value = this.map.get(status);
return value;
},
send(row) {
this.$router.push('/supply/bid/joinProject/workbench');
localStorage.setItem('projectId', row.projectId);
localStorage.setItem('projectName', row.projectName);
localStorage.setItem('projectCode', row.projectCode);
},
async getprojectStatusList() {
const data = await projectStatusList();
this.map = new Map();
for (let item of data) {
item.value = item.id;
item.label = item.name;
this.map.set(item.id, item.name);
}
this.checklist[2].selectlist = data;
}
],
change: row => '',
model: 'type'
}
],
breads: ['投标管理', '我参与的项目']
}
},
methods: {
totalMarks: function (status) {
let value=this.map.get(status)
return value
},
send(row) {
this.$router.push("/supply/bid/joinProject/workbench")
localStorage.setItem("projectId",row.projectId)
localStorage.setItem("projectName",row.projectName)
localStorage.setItem("projectCode",row.projectCode)
},
async getprojectStatusList(){
const data = await projectStatusList()
this.map = new Map();
for(let item of data){
item.value=item.id;
item.label=item.name
this.map.set(item.id,item.name)
}
this.checklist[2].selectlist=data
},
},
created(){
this.getprojectStatusList();
this.pageobj.companyId=localStorage.getItem("companyId")
}
}
created() {
this.getprojectStatusList();
this.pageobj.companyId = localStorage.getItem('companyId');
}
};
</script>
<style scoped>
</style>
src/pages/supply/home/home.vue
View file @ ec6d194e
......@@ -191,21 +191,18 @@ export default {
methods: {
async gethome() {
const { data, code } = await home();
this.detail = data;
this.tableData[0].number = data.prePublic;
this.tableData[1].number = data.sellingBidding;
this.tableData[2].number = data.bidding;
this.tableData[3].number = data.open;
this.tableData[4].number = data.bidOpening;
this.tableData[5].number = data.bidOevaluating;
this.imglist[0].num=data.applyProjects
this.imglist[1].num=data.winProjects
this.tabledata[0].number = data.sellingBidding;
this.tabledata[1].number = data.bidding;
this.tabledata[2].number = data.open;
this.tabledata[3].number = data.bidOpening;
this.tabledata[4].number = data.bidOevaluating;
this.tabledata[5].number = data.bidDecide;
}
},
created() {
this.gethome();
let token = getSearchString('token');
if (token !== 'undefined') {
localStorage.setItem('token', token);
}
}
};
</script>
......
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