Skip to content

W
web-purchase
Commit 7b1b2079 authored by 张冬's avatar 张冬
Browse files
Options

更新

parent c87bb289
Hide whitespace changes
Inline Side-by-side
Showing with 355 additions and 316 deletions
src/components/common/Sidebar.vue
View file @ 7b1b2079
......@@ -55,184 +55,184 @@ export default {
data() {
return {
collapse: false,
items: [
{
icon: 'el-icon-lx-home',
index: '/purchaser/Home',
title: '首页'
},
{
icon: 'el-icon-lx-home',
index:"2",
title: '招标管理',
subs:[
{
icon: 'el-icon-lx-home',
index: '/purchaser/bid/administrationList',
title: '招标项目管理',
}
]
},
{
icon: 'el-icon-lx-cascades',
title: '应收账款买断管理',
index:'3',
subs:[
{
icon: 'el-icon-lx-home',
index: '/purchaser/buyOut/buyoutList',
title: '应收账款买断列表',
}
]
},
{
icon: 'el-icon-lx-cascades',
title: '供应商管理',
index:'4',
subs:[
{
icon: 'el-icon-lx-home',
index: '/purchaser/supply/allSupplyList',
title: '供应商列表',
},
{
icon: 'el-icon-lx-home',
index: '/purchaser/supply/mySupplyList',
title: '我的供应商',
}
]
},
// items: [
// {
// icon: 'el-icon-lx-home',
// index: '/purchaser/Home',
// title: '首页'
// },
// {
// icon: 'el-icon-lx-home',
// index:"2",
// title: '招标管理',
// subs:[
// {
// icon: 'el-icon-lx-home',
// index: '/purchaser/bid/administrationList',
// title: '招标项目管理',
// }
// ]
// },
// {
// icon: 'el-icon-lx-cascades',
// title: '应收账款买断管理',
// index:'3',
// subs:[
// {
// icon: 'el-icon-lx-home',
// index: '/purchaser/buyOut/buyoutList',
// title: '应收账款买断列表',
// }
// ]
// },
// {
// icon: 'el-icon-lx-cascades',
// title: '供应商管理',
// index:'4',
// subs:[
// {
// icon: 'el-icon-lx-home',
// index: '/purchaser/supply/allSupplyList',
// title: '供应商列表',
// },
// {
// icon: 'el-icon-lx-home',
// index: '/purchaser/supply/mySupplyList',
// title: '我的供应商',
// }
// ]
// },
{
icon: 'el-icon-lx-copy',
title: '组织管理',
index:'5',
subs:[
{
icon: 'el-icon-lx-home',
index: '/purchaser/organization/informationSee',
title: '单位信息',
},
{
icon: 'el-icon-lx-home',
index: '/purchaser/organization/memberManagement',
title: '成员管理',
},
{
icon: 'el-icon-lx-home',
index: '/purchaser/organization/jurisdictionList',
title: '角色管理',
}
]
},
{
icon: 'el-icon-lx-redpacket_fill',
title: '系统管理',
index:'6',
subs:[
{
icon: 'el-icon-lx-home',
index: '/purchaser/organization/jurisdictionList',
title: 'CA绑定与解除',
},
{
icon: 'el-icon-lx-home',
index: '/purchaser/system/logList',
title: '日志列表',
},
]
}
],
// {
// icon: 'el-icon-lx-copy',
// title: '组织管理',
// index:'5',
// subs:[
// {
// icon: 'el-icon-lx-home',
// index: '/purchaser/organization/informationSee',
// title: '单位信息',
// },
// {
// icon: 'el-icon-lx-home',
// index: '/purchaser/organization/memberManagement',
// title: '成员管理',
// },
// {
// icon: 'el-icon-lx-home',
// index: '/purchaser/organization/jurisdictionList',
// title: '角色管理',
// }
// ]
// },
// {
// icon: 'el-icon-lx-redpacket_fill',
// title: '系统管理',
// index:'6',
// subs:[
// {
// icon: 'el-icon-lx-home',
// index: '/purchaser/organization/jurisdictionList',
// title: 'CA绑定与解除',
// },
// {
// icon: 'el-icon-lx-home',
// index: '/purchaser/system/logList',
// title: '日志列表',
// },
// ]
// }
// ],
//供应商
// items: [
// {
// icon: 'el-icon-lx-home',
// index: '/supply/Home',
// title: '首页'
// },
// {
// icon: 'el-icon-lx-home',
// index:"2",
// title: '招标管理',
// subs:[
// {
// icon: 'el-icon-lx-home',
// index: '/supply/bid/signupOnline',
// title: '在线报名',
// },
// {
// icon: 'el-icon-lx-home',
// index: '/supply/bid/joinProject/projectList',
// title: '我参与的项目',
// }
// ]
// },
// {
// icon: 'el-icon-lx-cascades',
// title: '应收账款买断管理',
// index:'3',
// subs:[
// {
// icon: 'el-icon-lx-home',
// index: '/supply/buyOut/buyoutList',
// title: '应收账款买断列表',
// }
// ]
// },
// {
// icon: 'el-icon-lx-copy',
// title: '组织管理',
// index:'5',
// subs:[
// {
// icon: 'el-icon-lx-home',
// index: '/supply/organization/informationSee',
// title: '单位信息',
// },
// {
// icon: 'el-icon-lx-home',
// index: '/supply/organization/memberManagement',
// title: '成员管理',
// },
// {
// icon: 'el-icon-lx-home',
// index: '/supply/organization/jurisdictionList',
// title: '角色管理',
// }
// ]
// },
// {
// icon: 'el-icon-lx-redpacket_fill',
// title: '系统管理',
// index:'6',
// subs:[
// {
// icon: 'el-icon-lx-home',
// index: '/supply/organization/jurisdictionList',
// title: 'CA绑定与解除',
// },
// {
// icon: 'el-icon-lx-home',
// index: '/supply/system/logList',
// title: '日志列表',
// },
// ]
// },
// {
// icon: 'el-icon-lx-cascades',
// title: '制作投标文件',
// index:'4',
// subs:[
// {
// icon: 'el-icon-lx-home',
// index: '/supply/markBid/markBid',
// title: '制作投标文件',
// }
// ]
// },
// ]
items: [
{
icon: 'el-icon-lx-home',
index: '/supply/Home',
title: '首页'
},
{
icon: 'el-icon-lx-home',
index:"2",
title: '招标管理',
subs:[
{
icon: 'el-icon-lx-home',
index: '/supply/bid/signupOnline',
title: '在线报名',
},
{
icon: 'el-icon-lx-home',
index: '/supply/bid/joinProject/projectList',
title: '我参与的项目',
}
]
},
{
icon: 'el-icon-lx-cascades',
title: '应收账款买断管理',
index:'3',
subs:[
{
icon: 'el-icon-lx-home',
index: '/supply/buyOut/buyoutList',
title: '应收账款买断列表',
}
]
},
{
icon: 'el-icon-lx-copy',
title: '组织管理',
index:'5',
subs:[
{
icon: 'el-icon-lx-home',
index: '/supply/organization/informationSee',
title: '单位信息',
},
{
icon: 'el-icon-lx-home',
index: '/supply/organization/memberManagement',
title: '成员管理',
},
{
icon: 'el-icon-lx-home',
index: '/supply/organization/jurisdictionList',
title: '角色管理',
}
]
},
{
icon: 'el-icon-lx-redpacket_fill',
title: '系统管理',
index:'6',
subs:[
{
icon: 'el-icon-lx-home',
index: '/supply/organization/jurisdictionList',
title: 'CA绑定与解除',
},
{
icon: 'el-icon-lx-home',
index: '/supply/system/logList',
title: '日志列表',
},
]
},
{
icon: 'el-icon-lx-cascades',
title: '制作投标文件',
index:'4',
subs:[
{
icon: 'el-icon-lx-home',
index: '/supply/markBid/markBid',
title: '制作投标文件',
}
]
},
]
};
},
computed: {
......
src/pages/supply/bid/joinProject/bidStage/bond.vue
View file @ 7b1b2079
......@@ -76,7 +76,7 @@
<el-input :rows="5" v-model="ruleForm.remark" type="textarea" placeholder="请输入内容">
</el-input>
</el-form-item>
<el-form-item label="上传缴费凭证：" prop="voucherUrl">
<el-form-item label="上传缴费凭证：" prop="voucherList">
<Upload :limit="5" :max="5" tip="完成上传5份文件,每份不超过10M" @input="getfile"></Upload>
</el-form-item>
</div>
......@@ -119,7 +119,7 @@
};
// 测试图片
let checkimg = (rule, value, callback) => {
if (this.ruleForm.voucherUrl.length === 0) {
if (this.ruleForm.voucherList.length === 0) {
callback(new Error('请上传凭证'));
} else {
callback();
......@@ -140,7 +140,7 @@
feeWay: '',
remark: "",
companyEmail: "",
voucherUrl: []
voucherList: []
},
formrules: {
companyName: [{
......@@ -159,7 +159,7 @@
message: '请输入',
trigger: 'blur'
}],
voucherUrl: [{
voucherList: [{
required: true,
validator: checkimg,
trigger: 'blur'
......@@ -169,8 +169,8 @@
},
methods: {
getfile(val) {
this.ruleForm.voucherUrl = val
},
this.ruleForm.voucherList= val
},
async submitData() {
try {
const valid = await this.$refs['ruleForm'].validate()
......@@ -182,8 +182,15 @@
code,
msg
} = await bidderEarnestpayment(message)
if (code === 2000) {
this.$success.success(msg)
if (code === 200) {
this.$message({
message: msg,
type: 'success',
duration: 1500
})
setTimeout(() => {
this.$router.go(-1)
}, 1500)
}
}
} catch (e) {
......@@ -191,6 +198,9 @@
}
}
},
created() {
this.ruleForm.companyName = JSON.parse(localStorage.getItem("userInfo")).companyName
}
}
</script>
......
src/pages/supply/bid/joinProject/bidStage/clearManagement/clearManagement.vue
View file @ 7b1b2079
<template>
<div>
<div class="content">
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<changeNav :navs="navs"></changeNav>
<div class="absolute">
<el-button type="primary" @click="out">退出澄清</el-button>
</div>
<dataTable :columns="columns" :page-obj="pageObj" url="/clarifies/list">
<el-table-column slot="operate" label="状态" align="center" fixed="right" >
<template slot-scope="scope">
<div v-if="scope.row.state==0">已回复</div>
<div v-else>未回复</div>
</template>
</el-table-column>
<el-table-column slot="operate" label="类型" align="center" fixed="right" >
<template slot-scope="scope">
<div v-if="scope.row.clarifiesType==0">提出澄清</div>
<div v-else>回复问题</div>
</template>
</el-table-column>
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope">
<el-button v-if="scope.row.state==1" type="text" size="small" @click="confirm(scope.row)">确认</el-button>
<el-button v-else type="text" size="small" @click="handleSee(scope.row)">查看</el-button>
</template>
</el-table-column>
</dataTable>
</div>
</div>
<div>
<div class="content">
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<changeNav :navs="navs" @getIndex="getIndex"></changeNav>
<div class="absolute">
<el-button type="primary" @click="out">退出澄清</el-button>
</div>
<div v-show="idx==0">
<dataTable :columns="columns" :page-obj="pageObj" url="bidder-clarifies/list">
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope">
<div v-if="scope.row.clarifiesType==0">
<el-button type="text" size="small" @click="handleSee(scope.row)">查看</el-button>
</div>
<div v-else>
<el-button v-if="scope.row.noticeId" type="text" size="small" @click="handleSee(scope.row)">查看</el-button>
<el-button v-else type="text" size="small" @click="handleReply(scope.row)">回复</el-button>
</div>
</template>
</el-table-column>
</dataTable>
</div>
<div v-show="idx==1">
<dataTable :columns="columns" :page-obj="pageObj1" url="bidder-clarifies/list">
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope">
<div v-if="scope.row.clarifiesType==0">
<el-button type="text" size="small" @click="handleSee(scope.row)">查看</el-button>
</div>
<div v-else>
<el-button v-if="scope.row.noticeId" type="text" size="small" @click="handleSee(scope.row)">查看</el-button>
<el-button v-else type="text" size="small" @click="handleReply(scope.row)">回复</el-button>
</div>
</template>
</el-table-column>
</dataTable>
</div>
</div>
</div>
</template>
<script>
// import { getList } from '@api/common/list'
import dataTable from '@components/dataTable.vue'
import changeNav from '@components/changeNav.vue'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
export default {
name: 'bidingList',
components: {
dataTable,
changeNav,
dataBreadcrumb
},
data() {
return {
navs: ['招标文件澄清列表'],
breads: ['招标管理', '招标项目管理', '工作台'],
checklist: [{
title: '公告名称',
type: 'input'
}, {
title: '状态',
type: 'select',
selectlist: [{
value: '1',
label: '公开招标'
}, {
value: '2',
label: '邀请招标'
}],
change: row => ''
}],
tableData: [],
columns: [{
label: '澄清问题标题',
prop: 'title'
},
{
label: '提出时间',
prop: 'createTime',
sortable: true
},
{
label: '提出人',
prop: 'createBy'
},
{
slot: 'operate'
}
], // 操作列
pageObj: {
size: 10,
currentPage: 1
// func: (currentPage) => {
// this.pageTurning(currentPage)
// }
}
}
},
created() {
this.pageObj.projectId = 2
this.pageObj.questionId = 1
},
methods: {
handleSee(id) {
this.$router.push({
path: '/supply/bid/joinProject/bidStage/clearManagement/see',
query: id
})
},
confirm(id){
this.$router.push({
path: '/supply/bid/joinProject/bidStage/clearManagement/confirm',
query: id
})
},
out() {
this.$router.go(-1)
}
}
}
// import { getList } from '@api/common/list'
import dataTable from '@components/dataTable.vue'
import changeNav from '@components/changeNav.vue'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
export default {
name: 'bidingList',
components: {
dataTable,
changeNav,
dataBreadcrumb
},
data() {
return {
idx:0,
navs: ["问题列表","公告列表"],
breads: ['招标管理', '招标项目管理', '工作台'],
checklist: [{
title: '公告名称',
type: 'input'
}, {
title: '状态',
type: 'select',
selectlist: [{
value: '1',
label: '公开招标'
}, {
value: '2',
label: '邀请招标'
}],
change: row => ''
}],
tableData: [],
columns: [{
label: '澄清问题标题',
prop: 'title'
},
{
label: '提出时间',
prop: 'createTime',
sortable: true
},
{
label: '提出人',
prop: 'createBy'
},
{
slot: 'operate'
}
], // 操作列
pageObj: {
size: 10,
currentPage: 1,
type:1,
func: (currentPage) => {
this.pageTurning(currentPage)
}
},
pageObj1: {
size: 10,
currentPage: 1,
type:2,
func: (currentPage) => {
this.pageTurning(currentPage)
}
}
}
},
created() {
this.pageObj.projectId = localStorage.getItem("projectId")
this.pageObj.companyId = localStorage.getItem("companyId")
this.pageObj1.projectId = localStorage.getItem("projectId")
this.pageObj1.companyId = localStorage.getItem("companyId")
},
methods: {
handleSee(id) {
this.$router.push({
path: '/supply/bid/joinProject/bidStage/clearManagement/see',
query: id
})
},
confirm(id) {
this.$router.push({
path: '/supply/bid/joinProject/bidStage/clearManagement/confirm',
query: id
})
},
out() {
this.$router.go(-1)
}
}
}
</script>
<style scoped>
......
src/pages/supply/bid/joinProject/bidStage/tenderFee.vue
View file @ 7b1b2079
......@@ -111,7 +111,7 @@
<el-input :rows="5" v-model.trim="ruleForm.remark" type="textarea" placeholder="请输入内容" maxlength="300">
</el-input>
</el-form-item>
<el-form-item label="上传缴费凭证：" prop="voucherUrl">
<el-form-item label="上传缴费凭证：" prop="voucherList">
<Upload :limit="5" :max="10" tip="完成上传5份文件,每份不超过10M" @input="getfile"></Upload>
</el-form-item>
</div>
......@@ -140,21 +140,21 @@
},
data() {
let checkPhone = async (rule, value, callback) => {
if (!value) {
return callback(new Error('手机号不能为空'));
} else {
const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
console.log(reg.test(value));
if (reg.test(value)) {
callback();
} else {
return callback(new Error('请输入正确的手机号'));
}
}
if (!value) {
return callback(new Error('手机号不能为空'));
} else {
const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
console.log(reg.test(value));
if (reg.test(value)) {
callback();
} else {
return callback(new Error('请输入正确的手机号'));
}
}
};
// 测试图片
let checkimg = (rule, value, callback) => {
if (this.ruleForm.voucherUrl.length === 0) {
if (this.ruleForm.voucherList.length === 0) {
callback(new Error('请上传凭证'));
} else {
callback();
......@@ -181,7 +181,7 @@
feeWay: '',
remark: "",
companyEmail: "",
voucherUrl: []
voucherList: []
},
formrules: {
companyName: [{
......@@ -224,7 +224,7 @@
message: '请输入',
trigger: 'blur'
}],
voucherUrl: [{
voucherList: [{
required: true,
validator: checkimg,
trigger: 'blur'
......@@ -234,21 +234,28 @@
},
methods: {
getfile(val) {
this.ruleForm.voucherUrl = val
this.ruleForm.voucherList = val
},
async submitData() {
try {
const valid = await this.$refs['ruleForm'].validate()
if (valid) {
let message = this.ruleForm
message.companyId =localStorage.getItem("companyId")
message.projectId =localStorage.getItem("projectId")
message.companyId = localStorage.getItem("companyId")
message.projectId = localStorage.getItem("projectId")
const {
code,
msg
} = await bidBookpayment(message)
if (code === 2000) {
this.$success.success(msg)
if (code === 200) {
this.$message({
message: msg,
type: 'success',
duration: 1500
})
setTimeout(() => {
this.$router.go(-1)
}, 1500)
}
}
} catch (e) {
......@@ -257,7 +264,7 @@
}
},
created() {
this.ruleForm.companyName=JSON.parse(localStorage.getItem("userInfo")).companyName
this.ruleForm.companyName = JSON.parse(localStorage.getItem("userInfo")).companyName
}
}
</script>
......
src/utils/request.js
View file @ 7b1b2079
......@@ -5,8 +5,8 @@ import { Message, MessageBox } from 'element-ui'
// 创建axios实例
const service = axios.create({
// baseURL: 'http://192.168.200.201:8082/apis',
baseURL: 'http://192.168.3.35:8085/apis',
baseURL: 'http://192.168.200.201:8082/apis',
// baseURL: 'http://192.168.3.35:8085/apis',
timeout: 35000 // 请求超时时间
})
......@@ -41,8 +41,8 @@ service.interceptors.response.use(
Message.error("登陆失效,请重新登录!")
localStorage.removeItem('token');
setTimeout(function () {
// location.href = 'http://192.168.200.201:8081/login/user/';
location.href = 'http://localhost:3000/login/user/';
location.href = 'http://192.168.200.201:8081/login/user/';
// location.href = 'http://localhost:3000/login/user/';
}, 2000);
}
}
......
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