Skip to content

W
web-purchase
Commit c28e92e0 authored by zhangdong's avatar zhangdong
Browse files
Options

开吧大厅时间错开,设置开标时间状态，取消开标大厅弹窗

parent a6e51e9e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 57 deletions
src/components/dataTable.vue
View file @ c28e92e0
......@@ -172,6 +172,11 @@ export default {
let url = this.url
const { code, data, total } = await getList(pageObj, url)
if (code === 200) {
for(let item of data){
if(item.endTime){
item.end=getTime1(item.endTime)
}
}
this.tableData = data
this.total = total
}
......
src/pages/purchaser/bid/bidOpen/bidOpenhal.vue
View file @ c28e92e0
......@@ -17,7 +17,7 @@
<timeDown :remain-time="decodeTime" @countDowmEnd="decodeTimeEnd"></timeDown>
</div>
<!-- <div class="flex" v-show="signatureTime"> -->
<div class="flex" v-show="openStatus == 2">
<div class="flex" v-show="openStatus == 2&&endbidButton">
<p>签名倒计时：</p>
<timeDown :remain-time="signatureTime" @countDowmEnd="signatureTimeEnd"></timeDown>
</div>
......@@ -41,7 +41,9 @@
</ul>
</div>
<div class="hal-right">
<el-button type="primary" @click="isdialogue"><i class="el-icon-chat-dot-round"></i>在线对话</el-button>
<el-button type="primary" style="margin-left: 10px" @click="isdialogue"
><i class="el-icon-chat-dot-round"></i>在线对话</el-button
>
<el-button type="primary" @click="openInfo1" :disabled="!endbidButton" v-if="!issueTable">下发开标一览表</el-button>
<el-button type="primary" @click="openInfo" :disabled="!issueTable">查看开标一览表</el-button>
</div>
......@@ -79,17 +81,8 @@
</div>
<div>
<!-- <el-button icon="el-icon-refresh" @click="refrsh">刷新</el-button> -->
<el-button
v-if="openStatus == 1"
type="primary"
@click="confirm"
style="margin-left: 10px"
:disabled="!openbidButton"
>立即开标</el-button
>
<el-button v-if="openStatus == 2" type="primary" @click="end" :disabled="!endbidButton"
>结束开标</el-button
>
<el-button v-if="openStatus == 1" type="primary" @click="confirm" :disabled="!openbidButton">立即开标</el-button>
<el-button v-if="openStatus == 2" type="primary" @click="end" :disabled="!endbidButton">结束开标</el-button>
</div>
</div>
</div>
......@@ -415,9 +408,16 @@ export default {
form.projectId = localStorage.getItem('projectId');
const { code, msg } = await openbidFailed(form);
if (code === 200) {
this.$message.success(msg);
this.isfailInfo = false;
this.isFailed = false;
this.$message({
message: msg,
type: 'success',
duration: 1500
});
setTimeout(() => {
this.$router.push("/purchaser/bid/workbench")
}, 1500);
// this.isfailInfo = false;
// this.isFailed = false;
} else if (code === 500) {
this.$message.error(msg);
this.isfailInfo = false;
......@@ -467,7 +467,9 @@ export default {
} else {
this.remaintime = remaintime;
}
// 解密时间
this.storagedecodeTime = Number(data.decodeTime);
// 签名时间
this.storagesignatureTime = Number(data.signatureTime);
} else {
this.$message({
......@@ -492,11 +494,11 @@ export default {
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;
this.signatureTime = this.storagesignatureTime - (localTime - data.openBidTime) / 1000;
}
}
}
......@@ -581,15 +583,15 @@ export default {
},
// 开标提示
confirm() {
this.$alert('请立即开标', '请立即开标', {
confirmButtonText: '知道了',
callback: (action) => {
if (action === 'confirm') {
this.isOpenbid = true;
this.getstartInfo();
}
}
});
// this.$alert('请立即开标', '请立即开标', {
// confirmButtonText: '知道了',
// callback: (action) => {
// if (action === 'confirm') {
// }
// }
// });
this.isOpenbid = true;
this.getstartInfo();
},
// websocket
createWebSocket() {
......@@ -656,7 +658,7 @@ export default {
<style scoped>
ul {
list-style-type: decimal!important;
list-style-type: decimal !important;
}
.time {
height: 48px;
......@@ -702,8 +704,8 @@ ul {
.buttons {
margin: 100px 0;
}
.buttons>div{
margin-right:20px
.buttons > div {
margin-right: 20px;
}
.hal-left {
width: 198px;
......@@ -733,8 +735,8 @@ ul {
width: 150px;
height: 500px;
}
.hal-right>button{
margin-bottom:16px
.hal-right > button {
margin-bottom: 16px;
}
.hal-center {
......
src/pages/purchaser/bid/bidStage/bidSet.vue
View file @ c28e92e0
This diff is collapsed.
src/pages/purchaser/bid/bidStage/failList/failNotice.vue
View file @ c28e92e0
......@@ -116,7 +116,7 @@ export default {
duration: 1500
});
setTimeout(() => {
this.$router.go(-1);
this.$router.push("/purchaser/bid/workbench")
}, 1500);
} else {
this.$message.error(msg);
......
src/pages/purchaser/bid/bidStage/seeBidSet.vue
View file @ c28e92e0
......@@ -63,7 +63,7 @@
</div>
</template>
<script>
import { bidsettingInfo } from '@api/purchaser/bid';
import { bidsettingInfo ,projectConsole} from '@api/purchaser/bid';
import { timeInfo } from '@api/supply/bid';
import { opener, mamager } from '@api/common/list';
import dataTable from '@components/dataTable.vue';
......@@ -99,13 +99,21 @@ export default {
created() {
this.projectCode = localStorage.getItem('projectCode');
this.projectName = localStorage.getItem('projectName');
this.projectStatus = localStorage.getItem('projectStatus');
// this.projectStatus = localStorage.getItem('projectStatus');
this.getopener();
this.getmamager();
this.getbidsettingInfo();
this.gettimeInfo();
this.getStatus()
},
methods: {
async getStatus(){
let message = {};
message.projectId = localStorage.getItem('projectId');
message.type = 1;
const { data, msg, code } = await projectConsole(message);
this.projectStatus=data[0].remark
},
cancle() {
this.$router.go(-1);
},
......@@ -141,16 +149,16 @@ export default {
data.decodeTime = data.decodeTime + '分钟';
data.signatureTime = data.signatureTime + '分钟';
this.ruleForm = data;
let list = [];
let list1 = [];
for (let item of data.supervisionerList) {
list.push(item.name);
}
for (let item of data.delegaterList) {
list1.push(item.name);
}
data.supervisionerList = list;
data.delegaterList = list1;
// let list = [];
// let list1 = [];
// for (let item of data.supervisionerList) {
// list.push(item.name);
// }
// for (let item of data.delegaterList) {
// list1.push(item.name);
// }
// data.supervisionerList = list;
// data.delegaterList = list1;
}
}
}
......
src/pages/supply/bid/joinProject/bidOpen/bidOpenhal.vue
View file @ c28e92e0
......@@ -15,7 +15,7 @@
<p>解密倒计时：</p>
<timeDown :remain-time="decodeTime" @countDowmEnd="decodeTimeEnd"></timeDown>
</div>
<div class="flex" v-show="openStatus == 2">
<div class="flex" v-show="openStatus == 2 && isDecode">
<p>签名倒计时：</p>
<timeDown :remain-time="signatureTime" @countDowmEnd="signatureTimeEnd"></timeDown>
</div>
......@@ -413,15 +413,23 @@ export default {
} else {
console.log('小于');
this.isDecode = true;
let comparyTime1 = this.storagesignatureTime - (localTime - data.openBidTime) / 1000;
if (comparyTime > 0) {
this.signatureTime = comparyTime1;
console.log('大于');
} else {
console.log('小于');
this.isSignature = true;
}
}
let comparyTime1 = this.storagesignatureTime - (localTime - data.openBidTime) / 1000;
if (comparyTime > 0) {
this.signatureTime = comparyTime1;
console.log('大于');
} else {
console.log('小于');
this.isSignature = true;
}
// let comparyTime1 = this.storagesignatureTime - (localTime - data.openBidTime) / 1000;
// if (comparyTime > 0) {
// this.signatureTime = comparyTime1;
// console.log('大于');
// } else {
// console.log('小于');
// this.isSignature = true;
// }
}
} catch (e) {
console.log(e);
......@@ -523,9 +531,9 @@ ul {
.explain > h1 {
text-align: center;
}
.explain>div{
.explain > div {
line-height: 30px;
margin:30px 0;
margin: 30px 0;
}
.buttons {
......
src/pages/supply/bid/signupOnline/signupList.vue
View file @ c28e92e0
......@@ -54,7 +54,7 @@ export default {
},
{
label: '标书结束时间',
prop: 'endTime'
prop: 'end'
},
{
slot: 'opration'
......
src/utils/request.js
View file @ c28e92e0
......@@ -6,7 +6,7 @@ import {requestUrl,homeUrl} from "./common.js"
// 创建axios实例
const service = axios.create({
baseURL: `apis`,
baseURL: `/apis`,
timeout: 35000 // 请求超时时间
})
......
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