Skip to content

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

修改bug

parent ca7e3c97
Hide whitespace changes
Inline Side-by-side
Showing with 370 additions and 178 deletions
package-lock.json
View file @ e66d0097
......@@ -11053,6 +11053,11 @@
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
"integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
},
"vue-chat-scroll": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/vue-chat-scroll/-/vue-chat-scroll-1.4.0.tgz",
"integrity": "sha512-taHcwJJadZwJR4C4t/fv+R9ZXXSrwrpQKP17La/ep5q7IyH5i3BvscgSpXwu7s8TPP9T9n5n3JDnO+vRsZ/mBQ=="
},
"vue-clipboard2": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz",
......
package.json
View file @ e66d0097
......@@ -15,6 +15,7 @@
"element-ui": "^2.11.0",
"mavon-editor": "^2.6.17",
"vue": "^2.6.10",
"vue-chat-scroll": "^1.4.0",
"vue-clipboard2": "^0.3.1",
"vue-cropperjs": "^3.0.0",
"vue-i18n": "^8.10.0",
......
src/api/common/list.js
View file @ e66d0097
......@@ -30,14 +30,7 @@ export function cityList(id) {
})
}
// 获取所有供应商列表列表
export function supplierList(data) {
return request({
url: "/company/list",
method: 'post',
data:data
})
}
// 获取所有列表(有分页) 有查询
export function getList(data, url) {
......
src/api/purchaser/bid.js
View file @ e66d0097
......@@ -462,6 +462,15 @@ export function bidsetting(data) {
data:data
})
}
// 开标设置查看
export function bidsettingInfo(projectId) {
return request({
url:`/tender-openBid/bid-setting/info?projectId=${projectId}`,
method: 'get',
})
}
//中标候选人公示提交
export function createcadidate(data) {
return request({
......
src/components/common/Sidebar.vue
View file @ e66d0097
......@@ -236,18 +236,6 @@ export default {
},
]
},
{
icon: 'el-icon-lx-cascades',
title: '制作投标文件',
index:'4',
subs:[
{
icon: 'el-icon-lx-home',
index: '/supply/markBid/markBid',
title: '制作投标文件',
}
]
},
]
}
});
......
src/components/dataTable.vue
View file @ e66d0097
......@@ -218,7 +218,7 @@ export default {
// 重置
rest(data) {
this.$refs[data].resetFields()
this.getqueryList();
this.getauditList(this.pageObj);
},
handlerelease() {
console.log('1')
......
src/main.js
View file @ e66d0097
......@@ -15,6 +15,9 @@ import store from "@/store/index";
import VueClipboard from 'vue-clipboard2'
Vue.use(VueClipboard)
import VueChatScroll from 'vue-chat-scroll'
Vue.use(VueChatScroll)
Vue.config.productionTip = false;
Vue.use(VueI18n);
Vue.use(ElementUI, {
......
src/pages/purchaser/bid/bidEvaluation/review/review.vue
View file @ e66d0097
......@@ -3,8 +3,8 @@
<div class="content">
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<div class="message">
<div class="flex-between" >
<div>招标文件：<span @click="download(bidDetail.fileUrl)">{{bidDetail.fileName}}</span></div>
<div class="flex-between">
<div>招标文件：<span @click="down(bidDetail.fileUrl)">{{bidDetail.fileName}}</span></div>
<div>开标信息：<span>开标一览表</span></div>
</div>
<div class="flex upload">
......@@ -38,26 +38,26 @@
<dataTable :table-data="review" :columns="reviewTitle" :is-index="true">
<el-table-column slot="operate" label="资格审查" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.qualification">通过</div>
<div v-if="!scope.row.qualification">未通过</div>
<div v-if="scope.row.qualification==true">通过</div>
<div v-if="scope.row.qualification==false">未通过</div>
</template>
</el-table-column>
<el-table-column slot="operate" label="符合性审查" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.conformity">通过</div>
<div v-if="!scope.row.conformity">未通过</div>
<div v-if="scope.row.conformityn==true">通过</div>
<div v-if="scope.row.conformityn==false">未通过</div>
</template>
</el-table-column>
<el-table-column slot="operate" label="手动废标" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.bidRejection">通过</div>
<div v-if="!scope.row.bidRejection">未通过</div>
<div v-if="scope.row.bidRejection==true">通过</div>
<div v-if="scope.row.bidRejection==false">未通过</div>
</template>
</el-table-column>
<el-table-column slot="operate" label="结论" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.conclusion">通过</div>
<div v-if="!scope.row.conclusion">未通过</div>
<div v-if="scope.row.conclusion==true">通过</div>
<div v-if="scope.row.conclusion==false">未通过</div>
</template>
</el-table-column>
<el-table-column slot="operate" label="操作" align="center" fixed="right">
......@@ -83,9 +83,9 @@
</template>
</el-table-column>
<el-table-column slot="operate" label="最终得分" align="center" fixed="right">
<template slot-scope="scope">
<template slot-scope="scope">
<div v-if="scope.row.commercialGrade">{{(scope.row.finalScore).toFixed(2)}}</div>
</template>
</template>
</el-table-column>
<el-table-column slot="operate" label="操作" align="center" fixed="right">
<template slot-scope="scope">
......@@ -248,7 +248,27 @@
] // 操作列
}
},
watch: {
rank: {
handler(newVal, oldVal) {
console.log('深度监听rank', newVal, oldVal)
if(newVal!==oldVal){
console.log("改变")
}
},
deep: true
},
review: {
handler(newVal, oldVal) {
console.log('深度监听review', newVal, oldVal)
if(newVal!==oldVal){
console.log("改变")
}
},
deep: true
}
},
created() {
this.getbidFilelist();
this.getchangeNoticelist();
......@@ -256,6 +276,9 @@
this.getbidderlist()
},
methods: {
down(url){
window.open(url)
},
jump() {
this.$router.push("/purchaser/bid/bidEvaluation/review/clear")
},
......@@ -289,7 +312,7 @@
this.$router.go(-1)
}, 1500)
}else{
} else {
this.$message.error(msg)
}
} catch (e) {
......@@ -299,7 +322,7 @@
back() {
this.$router.go(-1)
},
down(url) {
download(url) {
window.open(url)
},
async getbidBookDownload() {
......@@ -343,26 +366,27 @@
Edit(row, index) {
this.rankForm = Object.assign({}, row)
this.isRank = true,
this.RankIdx = index
this.RankIdx = index
},
// 提交排名信息
async editCompanyRank() {
try {
const {
code,
msg
} = await saveCompanyRank(this.rankForm)
if (code === 200) {
this.$message.success(msg)
this.isRank = false
this.rankForm.finalScore=this.rankForm.commercialGrade+this.rankForm.skillGrade+this.rankForm.priceGrade
this.$set(this.rank, this.RankIdx, this.rankForm)
this.rank.sort(this.compare('finalScore'))
}
} catch (e) {
console.log(e)
}
// this.$message.success(msg)
this.isRank = false
this.rankForm.finalScore = this.rankForm.commercialGrade + this.rankForm.skillGrade + this.rankForm.priceGrade
this.$set(this.rank, this.RankIdx, this.rankForm)
this.rank.sort(this.compare('finalScore'))
// try {
// const {
// code,
// msg
// } = await saveCompanyRank(this.rankForm)
// if (code === 200) {
// }
// } catch (e) {
// console.log(e)
// }
},
//评审信息编辑
......
src/pages/purchaser/bid/bidOpen/bidOpenhal.vue
View file @ e66d0097
......@@ -19,7 +19,7 @@
<div class="flex" v-show="openStatus==2">
<p>签名倒计时：</p>
<timeDown :remain-time="signatureTime" @countDowmEnd="signatureTimeEnd"></timeDown>
</div>
</div>
</div>
<div class="flex">
<div class="hal-left">
......@@ -31,7 +31,7 @@
<div @click="isMessge=true">签到解密签名情况</div>
</div>
<div class="hal-center">
<ul id="chatRecord1">
<ul v-chat-scroll>
<li v-for="(item,index) in halList" :key="index" class="flex-item">
<div>{{item.time}}</div>
<div>{{item.name}}</div>
......@@ -48,7 +48,7 @@
</div>
<!-- 在线对话 -->
<div class="dialogue" style="margin-top: 30px;" v-show="dialogue">
<ul class="dialogueList" id="chatRecord">
<ul class="dialogueList" v-chat-scroll>
<li v-for="(item,index) in dialogueList" :key="index" :class="myId==item.userId?'flex-left':'flex-right'">
<div>
<div class="flex-item">
......@@ -69,7 +69,7 @@
<el-button @click="isfailInfo=true" v-if="!isFailed">流标</el-button>
<el-button @click="failDetail" v-else>流标信息</el-button>
<div>
<el-button icon="el-icon-refresh">刷新</el-button>
<el-button icon="el-icon-refresh" @click="refrsh">刷新</el-button>
<el-button>下发开标一览表</el-button>
<el-button @click="isopenInfo=true">查看开标一览表</el-button>
</div>
......@@ -207,7 +207,7 @@
},
data() {
return {
openStatus:'',
openStatus: '',
faildetail: "",
isfailDetail: false,
projectCode: "",
......@@ -311,11 +311,14 @@
this.createWebSocket()
// 长轮训获取
this.timer = setInterval(() => {
this.getsigndetail()
this.getsigndetail()
}, 5000);
},
methods: {
async end() {
refrsh() {
history.go(0)
},
async end() {
try {
let projectId = localStorage.getItem("projectId")
const {
......@@ -332,7 +335,7 @@
this.$router.go(-1)
}, 1500)
} else {
this.$message.error(msg)
this.$message.error(msg)
}
} catch (e) {
console.log(e)
......@@ -388,7 +391,7 @@
// async gettimeInfo() {
// try {
// let projectId = localStorage.getItem("projectId")
// } catch (e) {
// console.log(e)
// }
......@@ -402,7 +405,7 @@
code
} = await startInfo(projectId)
if (code == 200) {
this.startDetail = data
this.startDetail = data
}
} catch (e) {
console.log(e)
......@@ -417,7 +420,7 @@
code,
msg
} = await timeInfo(projectId)
if(code==200){
if (code == 200) {
let remaintime = Number(data.remainTime);
if (remaintime < 0) {
this.openbidButton = true
......@@ -426,15 +429,15 @@
}
this.storagedecodeTime = Number(data.decodeTime)
this.storagesignatureTime = Number(data.signatureTime)
}else{
this.$message({
message: msg,
type: 'error',
duration:3000
})
setTimeout(()=>{
this.$router.go(-1)
},3000)
} else {
this.$message({
message: msg,
type: 'error',
duration: 3000
})
setTimeout(() => {
this.$router.go(-1)
}, 3000)
}
var {
data,
......@@ -442,21 +445,21 @@
} = await signdetail(projectId)
if (code == 200) {
this.leftmessage = data
this.openStatus=data.openStatus
this.isFailed=data.isFailed
if(data.openStatus==2){
let localTime=new Date().getTime();
console.log(this.storagedecodeTime,"..............")
let comparyTime=this.storagedecodeTime-(localTime-data.openBidTime)/1000
this.openStatus = data.openStatus
this.isFailed = data.isFailed
if (data.openStatus == 2) {
let localTime = new Date().getTime();
console.log(this.storagedecodeTime, "..............")
let comparyTime = this.storagedecodeTime - (localTime - data.openBidTime) / 1000
console.log(comparyTime)
if(comparyTime>0){
this.decodeTime=comparyTime
this.signatureTime=this.storagesignatureTime-(localTime-data.openBidTime)/1000
console.log("大于")
}else{
console.log("小于")
this.endbidButton = true
}
if (comparyTime > 0) {
this.decodeTime = comparyTime
this.signatureTime = this.storagesignatureTime - (localTime - data.openBidTime) / 1000
console.log("大于")
} else {
console.log("小于")
this.endbidButton = true
}
}
}
} catch (e) {
......@@ -510,12 +513,11 @@
},
// 解密时间到了
decodeTimeEnd(val) {
this.endbidButton = val
console.log("解密时间到了")
this.endbidButton = val
console.log("解密时间到了")
},
// 签名时间到了
signatureTimeEnd(val) {
},
signatureTimeEnd(val) {},
// 开标
async openbid() {
try {
......@@ -535,7 +537,7 @@
message: '开标成功',
type: 'success'
})
}else{
} else {
this.$message({
message: msg,
type: 'error'
......@@ -569,8 +571,12 @@
this.websocket.onmessage = event => {
// 后端发送的消息在event.data中
let data = JSON.parse(event.data);
console.log(data)
if (data.type == 1) {
this.content = ""
console.log("自己发的")
if(data.userId==this.myId){
this.content = ""
}
this.dialogueList.push(data)
} else {
this.halList.push(data)
......@@ -590,20 +596,25 @@
},
send() {
let content = this.content;
if(content.split(" ").join("").length == 0){
this.$message.error("请输入内容")
}else{
if (content.split(" ").join("").length == 0) {
this.$message.error("请输入内容")
} else {
this.websocket.send(content)
}
}
},
updated(){
// 聊天定位到底部
let ele = document.getElementById('chatRecord');
ele.scrollTop = ele.scrollHeight;
let ele1 = document.getElementById('chatRecord1');
ele1.scrollTop = ele1.scrollHeight;
},
// watch: {
// chatlog() {
// console.log("chatlog change");
// this.$nextTick(() => {
// var container = this.$el.querySelector("#chatContainer");
// console.log(container);
// container.scrollTop = container.scrollHeight;
// })
// // document.getElementById('chatContainer').scrollTop = document.getElementById('chatContainer').scrollHeight+150;
// }
// },
destroyed() {
//清除定时器
clearInterval(this.timer);
......@@ -630,12 +641,7 @@
right: 10%;
}
.dialogue>.dialogueList {
border: 1px solid #DCDFE6;
width: 400px;
height: 300px;
/* overflow: auto; */
}
.hal {
position: relative;
......@@ -721,9 +727,13 @@
.dialogue>.dialogueList {
box-sizing: border-box;
padding: 20px;
overflow: auto
overflow: auto;
border: 1px solid #DCDFE6;
width: 400px;
height: 300px;
}
.dialogueList>li {
margin-bottom: 20px;
}
......
src/pages/purchaser/bid/bidStage/bidSet.vue
View file @ e66d0097
......@@ -62,7 +62,6 @@ import dataTable from '@components/dataTable.vue'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
import changeNav from '@components/changeNav.vue'
export default {
name: 'bidingList',
components: {
dataTable,
changeNav,
......
src/pages/purchaser/bid/bidStage/bondList/bondList.vue
View file @ e66d0097
......@@ -39,10 +39,6 @@
label: '提交审核时间',
prop: 'updateTime'
},
{
label: '缴费情况',
prop: 'condition'
},
{
slot: 'operate'
}
......@@ -57,7 +53,7 @@
}
},
created() {
this.pageObj.projectId = 2
this.pageObj.projectId = localStorage.getItem("projectId")
},
methods: {
examine() {
......
src/pages/purchaser/bid/bidStage/changeList/changeList.vue
View file @ e66d0097
......@@ -7,7 +7,7 @@
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope">
<el-button v-if="scope.row.auditStatus===2" type="text" size="small" @click="handleModify(scope.row.id)">修改 </el-button>
<el-button v-else type="text" size="small" @click="handleSee(scope.row.id)">查看 </el-button>
<el-button v-else type="text" size="small" @click="handleSee(scope.row.noticeId)">查看 </el-button>
</template>
</el-table-column>
</dataTable>
......
src/pages/purchaser/bid/bidStage/clearManagement/reply.vue
View file @ e66d0097
......@@ -44,7 +44,7 @@
</el-form>
<div class="centerButton">
<el-button @click="cancle">取消</el-button>
<el-button type="primary" @click="submit">提交审核</el-button>
<el-button type="primary" @click="submit" :disabled="isSubmit">提交审核</el-button>
</div>
</div>
</div>
......@@ -73,6 +73,7 @@
},
data() {
return {
isSubmit:false,
questionId: 1,
accessoryPOList: [],
detail: '',
......@@ -143,6 +144,7 @@
try {
const valid = await this.$refs['ruleForm'].validate()
if (valid) {
this.isSubmit=true
const {
code,
msg
......
src/pages/purchaser/bid/bidStage/failList/failNotice.vue
View file @ e66d0097
......@@ -96,7 +96,7 @@
//提交表单
async submit() {
let ruleForm = this.ruleForm
ruleForm.projectId = 1
ruleForm.projectId = localStorage.getItem("projectId")
let type = this.$route.query.type
if (type === 'modify') {
ruleForm.changeId = 1
......
src/pages/purchaser/bid/bidStage/seeBidSet.vue 0 → 100644
View file @ e66d0097
<template>
<div>
<div class="content">
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<changeNav :navs="navs"></changeNav>
<div class="set">
<div class="flex-between">
<div>项目编号：{{projectCode}}</div>
<div>项目名称：{{projectName}}</div>
</div>
<div class="flex-between">
<div>开标时间：2020-08-08 18:08:00</div>
<div>项目状态：{{projectStatus}}</div>
</div>
<div>
<el-form ref="ruleForm" :model="ruleForm" label-width="100px" class="demo-ruleForm">
<div class="flex-between">
<el-form-item label="解密时限" prop="decodeTime">
<el-input v-model="ruleForm.decodeTime" style="width: 250px;" disabled></el-input>
</el-form-item>
<el-form-item label="签名时限" prop="signatureTime">
<el-input v-model="ruleForm.signatureTime" style="width: 250px;" disabled ></el-input>
</el-form-item>
</div>
<div>
<el-form-item label="开标人" prop="bidOpener">
<el-select v-model="bidOpener" placeholder="请选择" style="width: 250px;" disabled>
<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</div>
<div class="flex-between">
<!-- <el-form-item label="监标人" prop="supervisionerList">
<ul>
<li v-for="item in ruleForm.supervisionerList" :key="item.id" :label="item.name" :value="item.id"></li>
</ul>
</el-form-item> -->
<el-form-item label="监标人" prop="supervisionerList">
<el-select v-model="ruleForm.supervisionerList" multiple style="width: 250px;" disabled>
<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="列席人员" prop="delegaterList">
<el-select v-model="ruleForm.delegaterList" multiple style="width: 250px;" disabled>
<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="序列人员" prop="delegaterList">
<ul>
<li v-for="item in ruleForm.delegaterList" :key="item.id" :label="item.name" :value="item.id"></li>
</ul>
</el-form-item> -->
</div>
</el-form>
<div class="centerButton">
<el-button @click="cancle">取消</el-button>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import { bidsettingInfo} from '@api/purchaser/bid'
import { opener,mamager} from '@api/common/list'
import dataTable from '@components/dataTable.vue'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
import changeNav from '@components/changeNav.vue'
export default {
components: {
dataTable,
changeNav,
dataBreadcrumb
},
data() {
return {
bidOpener:"",
projectStatus:"",
options: [],
bidOpeners:[],
ruleForm: {
decodeTime: '',
signatureTime: '',
pereson: '选项2',
bidOpener: '',
supervisionerList: '',
delegaterList: ''
},
navs: ['开标设置'],
breads: ['招标管理', '招标项目管理', '工作台'],
projectCode:"",
projectName:""
}
},
created() {
this.projectCode=localStorage.getItem("projectCode")
this.projectName=localStorage.getItem("projectName")
this.projectStatus=localStorage.getItem("projectStatus")
this.getopener()
this.getmamager()
this.getbidsettingInfo();
},
methods: {
cancle() {
this.$router.go(-1)
},
// 获取公司人员列表
async getopener() {
let companyId=localStorage.getItem("companyId")
const {
data,
code
} = await opener(companyId)
if (code === 200) {
this.options=data
}
},
// 获取该项目下的项目经理
async getmamager() {
let projectId=localStorage.getItem("projectId")
const {
data,
code
} = await mamager(projectId)
if (code === 200) {
this.bidOpener=data
}
},
//设置查看
async getbidsettingInfo() {
let projectId=localStorage.getItem("projectId")
const {
data,
code
} = await bidsettingInfo(projectId)
if (code === 200) {
data.decodeTime=data.decodeTime+"分钟"
data.signatureTime=data.signatureTime+"分钟"
this.ruleForm=data
}
},
}
}
</script>
<style scoped>
.set {
width: 50%;
margin: 50px auto;
}
.set>div {
margin-bottom: 50px;
}
</style>
src/pages/purchaser/bid/bidSure/bidResult/list.vue
View file @ e66d0097
......@@ -6,7 +6,7 @@
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false" >
<el-table-column slot="code" label="中标通知书编号" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.code"></div>
<div v-if="scope.row.number">{{scope.row.number}}</div>
<div v-else>(空)</div>
</template>
</el-table-column>
......
src/pages/purchaser/bid/bidSure/winBid/list.vue
View file @ e66d0097
......@@ -4,9 +4,9 @@
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<changeNav :navs="navs"></changeNav>
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false">
<el-table-column slot="code" label="中标通知书编号" align="center" fixed="right">
<el-table-column slot="code" label="中标通知书编号" align="center" >
<template slot-scope="scope">
<div v-if="scope.row.code"></div>
<div v-if="scope.row.number">{{scope.row.number}}</div>
<div v-else>(空)</div>
</template>
</el-table-column>
......
src/pages/purchaser/bid/releaseProject/demand.vue
View file @ e66d0097
......@@ -178,11 +178,11 @@
message: '请输入',
trigger: 'blur'
}],
remark: [{
required: true,
message: '请输入',
trigger: 'blur'
}],
// remark: [{
// required: true,
// message: '请输入',
// trigger: 'blur'
// }],
},
multipleSelection: [],
dialogVisible: false,
......
src/pages/purchaser/bid/releaseProject/message.vue
View file @ e66d0097
......@@ -186,7 +186,7 @@
:margin-top="10"
:margin-bottom="0"
:checklist="checklist"
url="/company/list">
url="/company/bidder/list">
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="choice(scope.row)">选择</el-button>
......@@ -313,16 +313,16 @@ export default {
},
{
label: '联系人',
prop: 'legalPersonName'
prop: 'userName'
},
{
label: '手机号',
prop: 'legalPersonPhone'
prop: 'phonenumber'
},
{
label: '邮件',
prop: 'legalPersonEmail'
prop: 'email'
},
{
slot: 'operate'
......@@ -472,7 +472,6 @@ export default {
this.industryList()
this.projectClassifyList()
this.getGenerateNumber()
// this.supplierList()
},
methods: {
// 删除操作
......@@ -612,21 +611,6 @@ export default {
const {data} = await generateNumber(1)
this.ruleForm.projectCode = data
},
// 获取所有供应商列表
// async supplierList() {
// try {
// const {
// data,
// code
// } = await supplierList(2)
// if (code === 200) {
// this.supplierList = data
// }
// } catch (err) {
// console.log(err)
// }
// }
}
}
......
src/pages/supply/bid/joinProject/bidEvaluation/reply.vue
View file @ e66d0097
......@@ -16,7 +16,7 @@
<div>澄清问题内容：</div>
<div v-html="detail.content"></div>
</div>
<div class="flex">
<div class="flex" v-if="detail.fileName">
<div>澄清问题附件：</div>
<ul>
<li>
......
src/pages/supply/bid/joinProject/bidOpen/bidOpenhal.vue
View file @ e66d0097
......@@ -28,7 +28,7 @@
</div>
</div>
<div class="hal-center">
<ul id="chatRecord1">
<ul v-chat-scroll>
<li v-for="(item,index) in halList" :key="index" class="flex-item">
<div>{{ item.time }}</div>
<div>{{ item.role }}</div>
......@@ -44,7 +44,7 @@
</div>
<!-- 在线对话 -->
<div class="dialogue" style="margin-top: 30px;" v-show="dialogue">
<ul class="dialogueList" id="chatRecord">
<ul class="dialogueList" v-chat-scroll>
<li v-for="(item,index) in dialogueList" :key="index" :class="myId==item.userId?'flex-left':'flex-right'">
<div>
<div class="flex-item">
......@@ -62,7 +62,7 @@
</div>
<div class="flex-center buttons">
<div>
<el-button icon="el-icon-refresh">刷新</el-button>
<el-button icon="el-icon-refresh" @click="refrsh">刷新</el-button>
<el-button @click="isopenInfo=true">查看开标一览表</el-button>
<el-button @click="back">退出大厅<i class="el-icon-right"></i></el-button>
</div>
......@@ -203,7 +203,8 @@
}
},
mounted() {
this.add()
this.add();
},
created() {
// 中国标准时间
......@@ -225,6 +226,9 @@
}, 5000);
},
methods: {
refrsh(){
history.go(0)
},
// 解密
async changeDecode() {
let projectId = localStorage.getItem("projectId")
......@@ -248,8 +252,8 @@
let projectId = localStorage.getItem("projectId")
try {
const {
data,
code
msg,
code,
} = await signature(projectId)
if(code==200){
this.$message.success(msg)
......@@ -276,7 +280,10 @@
let data = JSON.parse(event.data);
console.log(data)
if (data.type == 1) {
this.content = ""
if(data.userId==this.myId){
console.log("自己发的")
this.content = ""
}
this.dialogueList.push(data)
} else {
this.halList.push(data)
......@@ -417,13 +424,13 @@
}
},
},
updated() {
// 聊天定位到底部
let ele = document.getElementById('chatRecord');
ele.scrollTop = ele.scrollHeight;
let ele1 = document.getElementById('chatRecord1');
ele1.scrollTop = ele1.scrollHeight;
},
// updated() {
// // 聊天定位到底部
// let ele = document.getElementById('chatRecord');
// ele.scrollTop = ele.scrollHeight;
// let ele1 = document.getElementById('chatRecord1');
// ele1.scrollTop = ele1.scrollHeight;
// },
destroyed() {
//清除定时器
clearInterval(this.timer1);
......@@ -456,7 +463,10 @@
.dialogue>.dialogueList {
box-sizing: border-box;
padding: 20px;
/* overflow: auto */
overflow: auto;
border: 1px solid #DCDFE6;
width: 400px;
height: 300px;
}
.dialogueList>li {
......@@ -539,10 +549,5 @@
margin-bottom: 30px;
}
.dialogue>.dialogueList {
border: 1px solid #DCDFE6;
width: 400px;
height: 300px;
/* overflow: auto; */
}
</style>
src/pages/supply/bid/joinProject/bidStage/bond.vue
View file @ e66d0097
......@@ -85,7 +85,7 @@
</el-form>
</div>
<div class="bottomButton">
<el-button>取消</el-button>
<el-button @click="back">取消</el-button>
<el-button type="primary" @click="submitData">提交</el-button>
</div>
</div>
......@@ -170,7 +170,10 @@
methods: {
getfile(val) {
this.ruleForm.voucherList= val
},
},
back(){
this.$router.go(-1)
},
async submitData() {
try {
const valid = await this.$refs['ruleForm'].validate()
......
src/pages/supply/bid/joinProject/bidStage/clearManagement/propose.vue
View file @ e66d0097
......@@ -103,7 +103,8 @@
setTimeout(() => {
this.$router.go(-1)
}, 1500)
}else{
this.$message.error(msg)
}
}
} catch (err) {
......
src/pages/supply/bid/joinProject/bidStage/tenderFee.vue
View file @ e66d0097
......@@ -120,7 +120,7 @@
</el-form>
</div>
<div class="bottomButton">
<el-button>取消</el-button>
<el-button @click="back">取消</el-button>
<el-button type="primary" @click="submitData">提交</el-button>
</div>
</div>
......@@ -236,6 +236,9 @@
getfile(val) {
this.ruleForm.voucherList = val
},
back(){
this.$router.go(-1)
},
async submitData() {
try {
const valid = await this.$refs['ruleForm'].validate()
......
src/pages/supply/bid/joinProject/projectList.vue
View file @ e66d0097
......@@ -4,7 +4,7 @@
<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.type==1?"公开招标":"邀请招标"}}</div>
<div>{{scope.row.bidType==1?"公开招标":"邀请招标"}}</div>
</template>
</el-table-column>
<el-table-column slot="operate" align="center" label="项目状态" flexd="right" width="200px">
......
src/pages/supply/bid/signupOnline/seePrice.vue
View file @ e66d0097
......@@ -18,7 +18,7 @@
<dataTable :table-data="commoditylist" :columns="commoditycolumns">
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope">
<el-input-number v-model="scope.row.cost" :min="0" :controls="false" :precision="2" style="width:100px"></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>
</el-table-column>
</dataTable>
......@@ -117,7 +117,7 @@
data
} = await commoditylist(projectId)
for (let item of data) {
item.cost = 0
item.cost = undefined
}
this.commoditylist = data
},
......
src/pages/supply/markBid/markBid.vue
View file @ e66d0097
......@@ -3,7 +3,7 @@
<div class="content-head">
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<h3>制作投标文件</h3>
<h5>新建短信群发</h5>
<h5>制作投标文件</h5>
</div>
<div class="othercontent">
<div class="message">
......@@ -31,7 +31,7 @@
<div>{{companyName}}</div>
</el-form-item>
<el-form-item label="投标报价（元）：" prop="price">
<el-input-number v-model="form.price" :min="0" :controls="false" :precision="2" placeholder="输入"></el-input-number>
<el-input-number v-model="form.price" :min="0" :controls="false" :precision="2" placeholder="请输入"></el-input-number>
</el-form-item>
</el-form>
</div>
......@@ -77,7 +77,7 @@
companyName:"",
form: {
fileList: [],
price: "",
price: undefined,
bidFileName: "",
bidFileUrl: ""
},
......
src/router/index.js
View file @ e66d0097
......@@ -337,6 +337,11 @@ export default new Router({
show: true,
component: () => import('../pages/purchaser/bid/bidStage/bidSet.vue')
},
{
path: '/purchaser/bid/bidStage/seeBidSet',
show: true,
component: () => import('../pages/purchaser/bid/bidStage/seeBidSet.vue')
},
{
path: '/purchaser/bid/bidStage/projectInformation',
show: true,
......
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