Skip to content

严立 / cd-bid

Go to a project
Commit 3f66bf67 by 严立
Options

LL - 发票邮寄信息修改

parent 7b7f1087
Expand all
Inline Side-by-side
Showing with 312 additions and 80 deletions
src/common/js/host.js
let output = { let output = {
// 测试环境 // 测试环境
base: 'http://bid-server.meiqicloud.com/', // 开发路径 // base: 'http://bid-server.meiqicloud.com/', // 开发路径
// base: '/Api/', // 部署路径 base: '/Api/', // 部署路径
resources: 'http://bid-web.meiqicloud.com', resources: 'http://bid-web.meiqicloud.com',
agentSignIn: 'http://bid-vue.meiqicloud.com/' agentSignIn: 'http://bid-vue.meiqicloud.com/'
......
src/components/currency-header.vue
...@@ -183,6 +183,7 @@ ...@@ -183,6 +183,7 @@
// 2 - 拒绝 // 2 - 拒绝
this.info.name = funcResponse.companyName this.info.name = funcResponse.companyName
this.info.register = Number(funcResponse.state) this.info.register = Number(funcResponse.state)
this.info.isJoinBid = Number(funcResponse.isJoinBid) === 0 ? false : true
this.$store.commit('info', this.info) this.$store.commit('info', this.info)
localStorage.setItem('info', JSON.stringify(this.info)) localStorage.setItem('info', JSON.stringify(this.info))
}) })
......
src/components/notice-file.vue
...@@ -41,6 +41,23 @@ ...@@ -41,6 +41,23 @@
methods: { methods: {
onDownload: function (funcItem) { onDownload: function (funcItem) {
console.log('onDownload')
// 未登录的全部跳转登录界面
if (!this.$store.getters.isSignIn) {
this.$message.error('请先登录后查看')
this.$store.commit('redirectPath', this.$route.fullPath)
this.$router.push('/signIn')
return
}
console.log('this.$store.getters.info', this.$store.getters.info)
if (this.$store.getters.info.register !== 1) {
this.$message.error('注册信息审核通过才可以进行预览')
return
}
// 下载文档 // 下载文档
// window.open(iHost.base + funcItem.url) // window.open(iHost.base + funcItem.url)
......
src/components/notice-progress.vue
...@@ -74,13 +74,13 @@ ...@@ -74,13 +74,13 @@
<div class="col con-c align-c"> <div class="col con-c align-c">
<img v-if="componentProject.noticeType === 0" class="operate-img" src="../assets/notice-bitton.png" alt=""> <img v-if="componentProject.noticeType === 0" class="operate-img" src="../assets/notice-bitton.png" alt="">
<div v-if="operateText !== ''" class="operate-button"> <div v-if="operateText !== ''" class="operate-button">
<button v-if="[2].indexOf(componentProgress.state) >= 0" class="global-enable" @click="onOffer()">立即报价</button> <button v-if="[0, 2].indexOf(componentProgress.state) >= 0" class="global-enable" @click="onOffer()">立即报价</button>
<button v-if="[3, 4].indexOf(componentProgress.state) >= 0" class="global-disable" disabled>报价已结束</button> <button v-if="[3, 4].indexOf(componentProgress.state) >= 0" class="global-disable" disabled>报价已结束</button>
<button v-if="[5].indexOf(componentProgress.state) >= 0" class="global-disable" disabled>报价已暂停</button> <button v-if="[5].indexOf(componentProgress.state) >= 0" class="global-disable" disabled>报价已暂停</button>
<button v-if="[6].indexOf(componentProgress.state) >= 0" class="global-disable" disabled>报价已终止</button> <button v-if="[6].indexOf(componentProgress.state) >= 0" class="global-disable" disabled>报价已终止</button>
</div> </div>
<div class="operate-tip"> <div class="operate-tip">
<span v-if="progressState === 1">距离报价开始仅剩 <span class="global-color-red">{{operateDay}}</span> 天 <span class="global-color-red">{{operateHour}}</span> 小时</span> <span v-if="progressState === 1 && !([5, 6].indexOf(componentProgress.state) >= 0)">距离报价开始仅剩 <span class="global-color-red">{{operateDay}}</span> 天 <span class="global-color-red">{{operateHour}}</span> 小时</span>
<span v-if="[2].indexOf(componentProgress.state) >= 0 && !operateIsBuy">报价仅剩 <span class="global-color-red">{{operateDay}}</span> 天 <span class="global-color-red">{{operateHour}}</span> 小时</span> <span v-if="[2].indexOf(componentProgress.state) >= 0 && !operateIsBuy">报价仅剩 <span class="global-color-red">{{operateDay}}</span> 天 <span class="global-color-red">{{operateHour}}</span> 小时</span>
</div> </div>
</div> </div>
......
src/components/notice-project.vue
...@@ -345,10 +345,10 @@ ...@@ -345,10 +345,10 @@
<span>联系电话：</span> <span>联系电话：</span>
<span>{{componentProject.buyPhone}}</span> <span>{{componentProject.buyPhone}}</span>
</div> </div>
<div class="item-text row align-c"> <!-- <div class="item-text row align-c">
<span>竞价时间：</span> <span>竞价时间：</span>
<span>{{componentProject.timeBegin + '　-　' + componentProject.timeEnd}}</span> <span>{{componentProject.timeBegin + '　-　' + componentProject.timeEnd}}</span>
</div> </div> -->
</div> </div>
</div> </div>
</template> </template>
......
src/view/home.vue
...@@ -17,9 +17,11 @@ ...@@ -17,9 +17,11 @@
<!-- 今日开标 --> <!-- 今日开标 -->
<div class="new-bid row con-c"> <div class="new-bid row con-c">
<div class="global-maxwidth row con-b"> <div class="global-maxwidth row con-b">
<!--
下次更新内容，暂时隐藏。
<div class="calendar"> <div class="calendar">
<span class="calendar-title">开标日历</span> <span class="calendar-title">开标日历</span>
<calendar :markDate="['2020/10/13','2020/10/14']"></calendar> <calendar :markDate="calendarMarkDate"></calendar>
</div> </div>
<div> <div>
<div class="row align-e"> <div class="row align-e">
...@@ -37,6 +39,24 @@ ...@@ -37,6 +39,24 @@
<span>今日暂无开标项目</span> <span>今日暂无开标项目</span>
</div> </div>
</div> </div>
-->
<div>
<div class="row align-e">
<span class="title">今日开标</span>
<span class="title-extra global-color-red">{{timeDate + '开标项目'}}</span>
</div>
<div v-if="listBid.length" class="list col">
<div class="global-hover row con-b align-e" v-for="(item, index) in listBid" :key="index" @click="onDetail(item)">
<span class="global-cursor global-overflow-ellipsis ">{{item.noticeTitle}}</span>
<span>{{item.timeRelease}}</span>
</div>
</div>
<div v-if="!listBid.length" class="nothing col con-c align-c">
<img src="../assets/nothing.png" alt="">
<span>今日暂无开标项目</span>
</div>
</div>
<!-- 未登录状态展示 --> <!-- 未登录状态展示 -->
<div v-if="!isSignIn" class="home-signin col"> <div v-if="!isSignIn" class="home-signin col">
<div class="home-signin-entry row"> <div class="home-signin-entry row">
...@@ -264,6 +284,8 @@ ...@@ -264,6 +284,8 @@
dealIndex: 0, // 最新交易缓存数组索引 dealIndex: 0, // 最新交易缓存数组索引
dealActive: 0, // 最新交易选中 dealActive: 0, // 最新交易选中
dealMax: 0, // 最新交易数据条目 dealMax: 0, // 最新交易数据条目
calendarMarkDate: [],
} }
}, },
computed: { computed: {
...@@ -297,7 +319,9 @@ ...@@ -297,7 +319,9 @@
this.queryNotice(2, 0) this.queryNotice(2, 0)
this.onQueryAuction(0) this.onQueryAuction(0)
this.queryData() this.queryData()
this.queryBidMark()
}, },
methods: { methods: {
queryNotify: function () { queryNotify: function () {
if (this.info.identity) { if (this.info.identity) {
...@@ -355,6 +379,42 @@ ...@@ -355,6 +379,42 @@
console.log(funcError) console.log(funcError)
}) })
}, },
queryBidMark: function () {
let funcResponse = [{
date: '2020-10-13',
quantity: 8,
}, {
date: '2020-10-15',
quantity: 9,
}, {
date: '2020-10-18',
quantity: 12,
}, {
date: '2020-10-21',
quantity: 14,
}]
let funcMarkDate = []
let funcMarkQuantity = []
let funcMarkQuantityCss = ''
for (let i = 0, l = funcResponse.length; i < l; i++) {
funcMarkDate.push(iMiment(funcResponse[i].date).format('YYYY/MM/DD'))
funcMarkQuantity.push(funcResponse[i].quantity)
}
this.calendarMarkDate = funcMarkDate
this.$nextTick(function () {
let funcMark = document.getElementsByClassName('wh_isMark')
console.log(funcMark)
for (let i = 0, l = funcMark.length; i < l; i++) {
funcMark[i].setAttribute( 'data-content' , funcMarkQuantity[i] )
}
})
},
setHome: function () { setHome: function () {
this.setBid() this.setBid()
this.setNew() this.setNew()
...@@ -499,9 +559,7 @@ ...@@ -499,9 +559,7 @@
*/ */
onMoreNotice: function () { onMoreNotice: function () {
let funcNoticeIndex = this.noticeTab[this.noticeTabActive].value let funcNoticeIndex = this.noticeTab[this.noticeTabActive].value
console.log(funcNoticeIndex) let funcNoticeUrl = this.$router.push({ path: '/bid', query: { type: funcNoticeIndex } })
let funcNoticeUrl = this.$router.resolve({ path: '/bid', query: { type: funcNoticeIndex } })
window.open(funcNoticeUrl .href, '_blank')
}, },
/** /**
* 公告点击跳转详情 * 公告点击跳转详情
...@@ -715,12 +773,16 @@ ...@@ -715,12 +773,16 @@
.wh_isMark::after { .wh_isMark::after {
position: absolute; position: absolute;
bottom: 4px; right: 0;
content: ''; bottom: 0;
width: 10px; content: attr(data-content);
height: 10px; width: 20px;
border-radius: 50%; height: 16px;
background: #D02F1E; background: #D02F1E;
font-size: 12px;
line-height: 20px;
} }
.wh_isToday { .wh_isToday {
...@@ -756,7 +818,8 @@ ...@@ -756,7 +818,8 @@
padding-bottom: 4px; padding-bottom: 4px;
} }
.list { .list {
width: 750px; width: 940px;
// width: 750px;
span:nth-child(1) { span:nth-child(1) {
max-width: 830px; max-width: 830px;
margin-top: 32px; margin-top: 32px;
...@@ -768,7 +831,8 @@ ...@@ -768,7 +831,8 @@
} }
} }
.nothing { .nothing {
width: 750px; width: 940px;
// width: 750px;
height: 200px; height: 200px;
img { img {
height: 100px; height: 100px;
...@@ -776,9 +840,9 @@ ...@@ -776,9 +840,9 @@
} }
} }
.home-signin { .home-signin {
position: absolute; // position: absolute;
top: 60px; // top: 60px;
right: 0; // right: 0;
width: 206px; width: 206px;
height: 300px; height: 300px;
padding: 24px 0; padding: 24px 0;
......
src/view/personal/component/personal-header.vue
...@@ -140,6 +140,7 @@ ...@@ -140,6 +140,7 @@
// 2 - 拒绝 // 2 - 拒绝
this.info.name = funcResponse.companyName this.info.name = funcResponse.companyName
this.info.register = Number(funcResponse.state) this.info.register = Number(funcResponse.state)
this.info.isJoinBid = Number(funcResponse.isJoinBid) === 0 ? false : true
this.$store.commit('info', this.info) this.$store.commit('info', this.info)
localStorage.setItem('info', JSON.stringify(this.info)) localStorage.setItem('info', JSON.stringify(this.info))
}) })
......
src/view/personal/supplier-info.vue
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
<!-- 项目进度 - 采购 --> <!-- 项目进度 - 采购 -->
<div class="supplier-operation"> <div class="supplier-operation">
<!-- <button @click="onChange()">修改</button> -->
<button v-if="formInfo.examineState !== 0" @click="onChange()">修改</button> <button v-if="formInfo.examineState !== 0" @click="onChange()">修改</button>
<button @click="onChangeRecord()">变更记录</button> <button @click="onChangeRecord()">变更记录</button>
</div> </div>
...@@ -51,6 +50,10 @@ ...@@ -51,6 +50,10 @@
<span>机构邮箱：</span> <span>机构邮箱：</span>
<span>{{formInfo.email}}</span> <span>{{formInfo.email}}</span>
</div> </div>
<div class="item-text row align-c">
<span>是否参与网上竞价：</span>
<span>{{formInfo.isQuote === '0' ? '否' : '是'}}</span>
</div>
<div class="item-text row align-c" v-if="formInfo.quoteImage"> <div class="item-text row align-c" v-if="formInfo.quoteImage">
<span>竞价承诺书：</span> <span>竞价承诺书：</span>
<el-button size="small" type="primary" @click.prevent="onUploadDownloadFile">点击下载</el-button> <el-button size="small" type="primary" @click.prevent="onUploadDownloadFile">点击下载</el-button>
...@@ -99,6 +102,25 @@ ...@@ -99,6 +102,25 @@
<span>银行账号：</span> <span>银行账号：</span>
<span>{{formInfo.bankAccount}}</span> <span>{{formInfo.bankAccount}}</span>
</div> </div>
<div class="item-text row align-c">
<span>寄送方式：</span>
<span>{{formInfo.receiveType === '0' ? '寄送' : '自取'}}</span>
</div>
<template v-if="formInfo.receiveType === '0'">
<div class="item-text row align-c">
<span>收件人：</span>
<span>{{formInfo.receiveContactor}}</span>
</div>
<div class="item-text row align-c">
<span>收件人电话：</span>
<span>{{formInfo.receiveMobile}}</span>
</div>
<div class="item-text row align-c">
<span>收件地址：</span>
<span>{{formInfo.receiveArea + formInfo.receiveAddress}}</span>
</div>
</template>
</div> </div>
<div class="detail-title row align-c"> <div class="detail-title row align-c">
...@@ -147,11 +169,12 @@ ...@@ -147,11 +169,12 @@
isQuote: '', isQuote: '',
companyTax: '', // 税务资质 companyTax: '', // 税务资质
companyInvoice: [], // 发票类型 companyInvoice: '0', // 发票类型
companyPhone: '', // 公司电话 companyPhone: '', // 公司电话
bankName: '', // 开户银行 bankName: '', // 开户银行
bankAccount: '', // 银行账号 bankAccount: '', // 银行账号
corporationName: '', // 联系人 corporationName: '', // 联系人
corporationIdcard: '', // 联系人身份证 corporationIdcard: '', // 联系人身份证
corporationPhone: '', // 联系手机 corporationPhone: '', // 联系手机
...@@ -186,10 +209,15 @@ ...@@ -186,10 +209,15 @@
'isQuote': funcResponse.isJoinBid, 'isQuote': funcResponse.isJoinBid,
'companyTax': Number(funcResponse.taxType), 'companyTax': Number(funcResponse.taxType),
'companyInvoice': funcResponse.invoiceType.split(','), 'companyInvoice': '0',
'companyPhone': funcResponse.phone, 'companyPhone': funcResponse.phone,
'bankName': funcResponse.openBank, 'bankName': funcResponse.openBank,
'bankAccount': funcResponse.bankAccount, 'bankAccount': funcResponse.bankAccount,
'receiveType': funcResponse.receiveType ? funcResponse.receiveType : '1',
'receiveContactor': funcResponse.receiveContactor ? funcResponse.receiveContactor : '',
'receiveMobile': funcResponse.receiveMobile ? funcResponse.receiveMobile : '',
'receiveArea': [],
'receiveAddress': funcResponse.receiveAddress ? funcResponse.receiveAddress : '',
'corporationName': funcResponse.contactName, 'corporationName': funcResponse.contactName,
'corporationIdcard': funcResponse.idcard, 'corporationIdcard': funcResponse.idcard,
...@@ -202,6 +230,13 @@ ...@@ -202,6 +230,13 @@
'examineReason': funcResponse.reason, 'examineReason': funcResponse.reason,
} }
// 判断地址数据类型，同时兼容字符串与数组类型
if (Object.prototype.toString.call(funcResponse.receiveArea) === '[object String]') {
this.formInfo.receiveArea = JSON.parse(funcResponse.receiveArea).join(' ')
} else {
this.formInfo.receiveArea = funcResponse.receiveArea.join(' ')
}
console.log(this.formInfo) console.log(this.formInfo)
switch(this.formInfo.companyTax) { switch(this.formInfo.companyTax) {
...@@ -217,24 +252,7 @@ ...@@ -217,24 +252,7 @@
this.formInfo.companyTaxText = '非增值税纳税人' this.formInfo.companyTaxText = '非增值税纳税人'
break break
} }
this.formInfo.companyInvoiceText = '增值税普票'
// 设置税务类型
for (let i = 0, len = this.formInfo.companyInvoice.length; i < len; i++) {
switch (Number(this.formInfo.companyInvoice[i])) {
case 0:
this.formInfo.companyInvoice[i] = '增值税专票'
break
case 1:
this.formInfo.companyInvoice[i] = '增值税普票'
break
case 2:
this.formInfo.companyInvoice[i] = '其他类型'
break
}
}
this.formInfo.companyInvoiceText = this.formInfo.companyInvoice.join('，')
}) })
.catch((funcError) => { .catch((funcError) => {
this.$message.error(funcError.message) this.$message.error(funcError.message)
...@@ -250,7 +268,7 @@ ...@@ -250,7 +268,7 @@
licenseImage: '', // 营业执照 licenseImage: '', // 营业执照
companyTax: '', // 税务资质 companyTax: '', // 税务资质
companyInvoice: [], // 发票类型 companyInvoice: '0', // 发票类型
companyPhone: '', // 公司电话 companyPhone: '', // 公司电话
bankName: '', // 开户银行 bankName: '', // 开户银行
bankAccount: '', // 银行账号 bankAccount: '', // 银行账号
......
src/view/personal/supplier-notice.vue
...@@ -200,6 +200,10 @@ ...@@ -200,6 +200,10 @@
</el-dialog> </el-dialog>
<el-dialog title="报价记录" :visible.sync="winQuoteRecord" :lock-scroll="false" width="1000px" :close-on-click-modal="false"> <el-dialog title="报价记录" :visible.sync="winQuoteRecord" :lock-scroll="false" width="1000px" :close-on-click-modal="false">
<div v-if="quoteRecord.length === 0">
<span>暂无报价</span>
</div>
<!-- 附属合同样式 --> <!-- 附属合同样式 -->
<div v-if="quoteRecordHaveChild" class="col"> <div v-if="quoteRecordHaveChild" class="col">
<div v-for="(item, index) in quoteRecord" :key="index" class="col"> <div v-for="(item, index) in quoteRecord" :key="index" class="col">
......
src/view/personal/supplier-orders-detail.vue
...@@ -7,9 +7,12 @@ ...@@ -7,9 +7,12 @@
</div> </div>
<!-- 项目进度 - 采购 --> <!-- 项目进度 - 采购 -->
<!-- 升级成自动开票功能，暂时隐藏 -->
<!--
<div v-if="!componentOrder.isMakeBill && componentOrder.paymentAmount !== 0" class="detail-operation"> <div v-if="!componentOrder.isMakeBill && componentOrder.paymentAmount !== 0" class="detail-operation">
<button @click="onOpenBill()">申请开票</button> <button @click="onOpenBill()">申请开票</button>
</div> </div>
-->
<div class="detail-block"> <div class="detail-block">
<!-- 订单金额为零样式 --> <!-- 订单金额为零样式 -->
...@@ -283,9 +286,16 @@ ...@@ -283,9 +286,16 @@
this.componentReceive = { this.componentReceive = {
'name': funcResponse.orderBilling.name, 'name': funcResponse.orderBilling.name,
'phone': funcResponse.orderBilling.phone, 'phone': funcResponse.orderBilling.phone,
'area': funcResponse.orderBilling.area.replace(/\//g, ''), 'area': '',
'address': funcResponse.orderBilling.address, 'address': funcResponse.orderBilling.address,
} }
// 判断地址数据类型，同时兼容字符串与数组类型
if (Object.prototype.toString.call(funcResponse.orderBilling.area) === '[object String]') {
this.componentReceive.area = JSON.parse(funcResponse.orderBilling.area).join(' ')
} else {
this.componentReceive.area = funcResponse.orderBilling.area.join(' ')
}
} else { } else {
this.isReceive = false this.isReceive = false
} }
......
src/view/personal/supplier-orders.vue
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="global-cursor list-operation row con-c"> <div class="global-cursor list-operation row con-c">
<span @click="onOrdersDetail(scope.row)">查看</span> <span @click="onOrdersDetail(scope.row)">查看</span>
<span v-if="!scope.row.isMakeBill && scope.row.paymentAmount !== 0" class="global-color-blue" @click="onOrdersBill(scope.row)">申请开票</span> <!-- 升级成自动开票功能，暂时隐藏 -->
<!-- <span v-if="!scope.row.isMakeBill && scope.row.paymentAmount !== 0" class="global-color-blue" @click="onOrdersBill(scope.row)">申请开票</span> -->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
......
src/view/public/bid-list.vue
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="main global-maxwidth"> <div class="main global-maxwidth">
<!-- 全局搜索 --> <!-- 全局搜索 -->
<div class="query-key row"> <div class="query-key row">
<el-input v-model="limitKeyword" placeholder="请输入您要搜索的内容" @keyup.enter.native="queryList()"></el-input> <el-input v-model="limitKeyword" placeholder="请输入您要搜索的内容" @keyup.enter.native="onSearchContent()"></el-input>
<el-button @click="queryList()"> <el-button @click="onSearchContent()">
<span>搜　　索</span> <span>搜　　索</span>
</el-button> </el-button>
</div> </div>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<!-- 列表分页 --> <!-- 列表分页 -->
<div class="pagination row con-c"> <div class="pagination row con-c">
<el-pagination :total="pagination.total" layout="total, sizes, prev, pager, next, jumper" @size-change="(size) => {onPagination(size, 'size', pagination)}" @current-change="(size) => {onPagination(size, 'current', pagination)}"></el-pagination> <el-pagination :total="pagination.total" :current-page="pagination.current" layout="total, sizes, prev, pager, next, jumper" @size-change="(size) => {onPagination(size, 'size', pagination)}" @current-change="(size) => {onPagination(size, 'current', pagination)}"></el-pagination>
<button>确定</button> <button>确定</button>
</div> </div>
</div> </div>
...@@ -250,6 +250,12 @@ ...@@ -250,6 +250,12 @@
} }
}, },
onSearchContent: function () {
this.pagination.size = 10
this.pagination.current = 1
this.queryList()
},
/** /**
* 条件选择 - 标签选择 * 条件选择 - 标签选择
* @function * @function
...@@ -262,12 +268,15 @@ ...@@ -262,12 +268,15 @@
switch (funcRankIndex) { switch (funcRankIndex) {
case 0: case 0:
this.limitInformation = funcItem.value this.limitInformation = funcItem.value
this.pagination.size = 10
this.pagination.current = 1
if (funcItem.value === '') { if (funcItem.value === '') {
this.$router.push('/bid') this.$router.push('/bid')
} else { } else {
this.$router.push('/bid?type=' + funcItem.value) this.$router.push('/bid?type=' + funcItem.value)
} }
this.queryList()
break break
case 1: case 1:
...@@ -296,6 +305,8 @@ ...@@ -296,6 +305,8 @@
* @returns * @returns
*/ */
onLimitOrder: function (funcType) { onLimitOrder: function (funcType) {
this.pagination.size = 10
this.pagination.current = 1
switch (funcType) { switch (funcType) {
case 'old': case 'old':
this.limitTimeOrder = 0 this.limitTimeOrder = 0
......
src/view/public/bid-notice.js
...@@ -1286,36 +1286,61 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -1286,36 +1286,61 @@ let output = function (thisVue, id, type, isPreview) {
} }
} }
console.log('funcProject')
console.log(funcProject)
thisVue.$store.commit('componentProject', funcProject) thisVue.$store.commit('componentProject', funcProject)
let funcRawData let funcRawData
if (funcProject.isPackage) { if (funcProject.isPackage) {
funcRawData = funcResponse.packages funcRawData = funcResponse.packages
funcRawData.sort(function(a, b) {
let funcMainWeight = 1000
a.index = a.no
b.index = b.no
// 计算 a 的索引权重
let funcIndex = a.index.toString().split('-')
let funcA = Number(funcIndex[0]) * funcMainWeight
if (funcIndex[1]) {
a.isChild = true
funcA = funcA + Number(funcIndex[1])
} else {
a.isChild = false
}
// 计算 b 的索引权重
funcIndex = b.index.toString().split('-')
let funcB = Number(funcIndex[0]) * funcMainWeight
if (funcIndex[1]) {
b.isChild = true
funcB = funcB + Number(funcIndex[1])
} else {
b.isChild = false
}
return funcA - funcB
})
for (let i = 0, len = funcRawData.length; i < len; i++) { for (let i = 0, len = funcRawData.length; i < len; i++) {
let funcItem = { let funcItem = {
'index': i + 1, // 序号 'index': funcRawData[i].index.toString(), // 序号
'id': funcRawData[i].biddingPackageId, // 标识 'id': funcRawData[i].biddingPackageId, // 标识
'object': funcRawData[i].name, // 标的 'object': funcRawData[i].name ? funcRawData[i].name : '', // 标的
'budget': funcRawData[i].fixedPrice, // 预算金额 'budget': funcRawData[i].fixedPrice, // 预算金额
'quantity': funcRawData[i].num, // 标的数量 'quantity': funcRawData[i].num, // 标的数量
'requirement': funcRawData[i].requirement, // 竞价参数要求 'requirement': funcRawData[i].requirement, // 竞价参数要求
'isChild': funcRawData[i].isChild,
} }
if (!funcItem.isChild) {
if (funcRawData[i].company) { if (funcRawData[i + 1] && funcRawData[i + 1].isChild) {
funcItem.resultName = funcRawData[i].company funcItem.haveChild = true
} else { } else {
funcItem.resultName = '流标' funcItem.haveChild = false
} }
if (funcRawData[i].price && funcRawData[i].price !== 0) {
funcItem.resultPrice = funcRawData[i].price
} else { } else {
funcItem.resultPrice = 0 funcItem.haveChild = false
} }
funcPackage.push(funcItem) funcPackage.push(funcItem)
} }
thisVue.$store.commit('componentContract', funcPackage) thisVue.$store.commit('componentContract', funcPackage)
} }
......
src/view/public/bid-notice.vue
...@@ -119,16 +119,28 @@ ...@@ -119,16 +119,28 @@
</div> </div>
<!-- 竞价变更信息 --> <!-- 竞价变更信息 -->
<div v-if="[10].indexOf(noticeType) >= 0 && (componentProject.isChangeTime || componentProject.isChangePackage)" class="info-item"> <div v-if="[10].indexOf(noticeType) >= 0" class="info-item">
<div class="title title-decorate row align-c"> <div class="title title-decorate row align-c">
<span>变更信息</span> <span>变更信息</span>
</div> </div>
<div v-if="componentProject.isPause" class="change col">
<span>{{'是否暂停竞价：是'}}</span>
</div>
<div v-if="componentProject.isRecover" class="change col">
<span>{{'是否恢复竞价：是'}}</span>
</div>
<div v-if="componentProject.isTermination" class="change col">
<span>{{'是否终止竞价：是'}}</span>
</div>
<div v-if="componentProject.isChangeTime" class="change col"> <div v-if="componentProject.isChangeTime" class="change col">
<span>{{'更改竞价时间：' + componentProject.timeBegin + ' - ' + componentProject.timeEnd}}</span> <span>{{'更改竞价时间：' + componentProject.timeBegin + ' - ' + componentProject.timeEnd}}</span>
</div> </div>
<div v-if="componentProject.isPackage" class="change col"> <div v-if="componentProject.isChangePackage" class="change col">
<div v-if="componentContract.length > 0" class="row align-s"> <div v-if="componentContract.length > 0" class="row align-s">
<span>更改竞价标的：</span> <span>更改竞价标的：</span>
<el-table :data="componentContract" stripe :header-cell-style="tableHeaderStyle"> <el-table :data="componentContract" stripe :header-cell-style="tableHeaderStyle">
...@@ -661,6 +673,13 @@ ...@@ -661,6 +673,13 @@
return return
} }
// 供应身份但注册时未选择参与竞价不能报价
if (!this.$store.getters.info.isJoinBid) {
this.tipText = '您的注册信息尚未参与网上竞价，暂不能报价；如需报价，请您在企业信息中上传竞价承诺书，信息审核通过后，我们将为您开通报价功能。'
this.winTip = true
return
}
// 供应身份而且通过审核 // 供应身份而且通过审核
if (this.$store.getters.info.identity === 2 && this.$store.getters.info.register === 1) { if (this.$store.getters.info.identity === 2 && this.$store.getters.info.register === 1) {
this.winQuote = true this.winQuote = true
...@@ -1027,7 +1046,8 @@ ...@@ -1027,7 +1046,8 @@
} }
span:nth-child(3) { span:nth-child(3) {
min-width: 160px; display: inline-block;
min-width: 100px;
margin-right: 20px; margin-right: 20px;
} }
......
src/view/register-supplier.vue
...@@ -140,11 +140,9 @@ ...@@ -140,11 +140,9 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="发票类型(可多选)：" prop="companyInvoice"> <el-form-item label="发票类型(可多选)：" prop="companyInvoice">
<el-checkbox-group v-model="formRegister.companyInvoice"> <el-radio-group v-model="formRegister.companyInvoice" :value="formRegister.companyInvoice">
<el-checkbox label="增值税专票"></el-checkbox> <el-radio label="0">增值税专票</el-radio>
<el-checkbox label="增值税普票"></el-checkbox> </el-radio-group>
<el-checkbox label="其他类型"></el-checkbox>
</el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="公司名称：" prop="companyName"> <el-form-item label="公司名称：" prop="companyName">
<span>{{formRegister.companyName}}</span> <span>{{formRegister.companyName}}</span>
...@@ -164,6 +162,29 @@ ...@@ -164,6 +162,29 @@
<el-form-item label="银行账户：" prop="bankAccount"> <el-form-item label="银行账户：" prop="bankAccount">
<el-input v-model="formRegister.bankAccount" maxlength="30" placeholder="请输入银行账户"></el-input> <el-input v-model="formRegister.bankAccount" maxlength="30" placeholder="请输入银行账户"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="发票领取方式：">
<el-radio-group v-model="formRegister.receiveType">
<el-radio label="0">寄送</el-radio>
<el-radio label="1">自取</el-radio>
</el-radio-group>
</el-form-item>
<template v-if="formRegister.receiveType === '0'">
<el-form-item label="收件人：" prop="receiveContactor">
<el-input v-model="formRegister.receiveContactor" maxlength="30" placeholder="请输入姓名"></el-input>
</el-form-item>
<el-form-item label="收件人电话：" prop="receiveMobile">
<el-input v-model="formRegister.receiveMobile" maxlength="20" placeholder="请输入电话"></el-input>
</el-form-item>
<el-form-item label="收件地址：" prop="receiveArea">
<currencyArea @change="onAreaChange"></currencyArea>
</el-form-item>
<el-form-item label="" prop="receiveAddress">
<el-input v-model="formRegister.receiveAddress" maxlength="100" placeholder="请输入详细地址"></el-input>
</el-form-item>
</template>
<el-form-item class="register-info-button row con-c"> <el-form-item class="register-info-button row con-c">
<el-button type="primary" @click.prevent="onPrevious()">上一步</el-button> <el-button type="primary" @click.prevent="onPrevious()">上一步</el-button>
<el-button type="primary" @click.prevent="onNext()">下一步</el-button> <el-button type="primary" @click.prevent="onNext()">下一步</el-button>
...@@ -234,10 +255,12 @@ ...@@ -234,10 +255,12 @@
import iRule from '@/common/js/rule/rule.js' import iRule from '@/common/js/rule/rule.js'
import iRequest from '@/common/js/request/request.js' import iRequest from '@/common/js/request/request.js'
import iCurrencyMap from '@/components/currency-map.vue' import iCurrencyMap from '@/components/currency-map.vue'
import iCurrencyArea from '@/components/currency-area.vue'
export default { export default {
components: { components: {
currencyMap: iCurrencyMap, currencyMap: iCurrencyMap,
currencyArea: iCurrencyArea,
}, },
data: function () { data: function () {
...@@ -260,10 +283,15 @@ ...@@ -260,10 +283,15 @@
// 税务信息 // 税务信息
companyTax: '', companyTax: '',
companyInvoice: [], companyInvoice: '0',
companyPhone: '', companyPhone: '',
bankName: '', bankName: '',
bankAccount: '', bankAccount: '',
receiveType: '',
receiveContactor: '',
receiveMobile: '',
receiveArea: [],
receiveAddress: '',
// 短信验证 // 短信验证
corporationName: '', corporationName: '',
...@@ -361,7 +389,7 @@ ...@@ -361,7 +389,7 @@
{ required: true, message: '请选择税务资质', trigger: 'blur' } { required: true, message: '请选择税务资质', trigger: 'blur' }
], ],
companyInvoice: [ companyInvoice: [
{ type: 'array', required: true, message: '请选择发票类型', trigger: 'change' } { required: true, message: '请选择发票类型', trigger: 'blur' }
], ],
companyPhone: [ companyPhone: [
{ required: true, message: '请输入公司电话', trigger: 'blur' }, { required: true, message: '请输入公司电话', trigger: 'blur' },
...@@ -403,6 +431,22 @@ ...@@ -403,6 +431,22 @@
{ required: true, message: '请再次输入登录密码', trigger: 'blur' }, { required: true, message: '请再次输入登录密码', trigger: 'blur' },
{ validator: (funcRule, funcValue, funcCallback) => iRule.passwordRepeat(funcRule, funcValue, funcCallback, this.formRegister.password), message: '与登录密码不一致，请重新输入', trigger: 'blur'} { validator: (funcRule, funcValue, funcCallback) => iRule.passwordRepeat(funcRule, funcValue, funcCallback, this.formRegister.password), message: '与登录密码不一致，请重新输入', trigger: 'blur'}
], ],
receiveContactor: [
{ required: true, message: '请输入收件人姓名', trigger: 'blur' },
{ validator: iRule.predefineRoutineText, message: '请正确输入姓名', trigger: 'blur'}
],
receiveMobile: [
{ required: true, message: '请输入收件人电话', trigger: 'blur' },
{ validator: iRule.fixedPhone, message: '请正确输入收件人电话', trigger: 'blur'}
],
receiveArea: [
{ required: true, message: '请输入详细地址', trigger: 'blur' },
{ validator: iRule.predefineRoutineText, trigger: 'blur'}
],
receiveAddress: [
{ required: true, message: '请输入详细地址', trigger: 'blur' },
{ validator: iRule.predefineRoutineText, trigger: 'blur'}
],
}, },
} }
}, },
...@@ -437,10 +481,15 @@ ...@@ -437,10 +481,15 @@
// 税务信息 // 税务信息
companyTax: '', companyTax: '',
companyInvoice: [], companyInvoice: '0',
companyPhone: '', companyPhone: '',
bankName: '', bankName: '',
bankAccount: '', bankAccount: '',
receiveType: '',
receiveContactor: '',
receiveMobile: '',
receiveArea: [],
receiveAddress: '',
// 短信验证 // 短信验证
corporationName: '', corporationName: '',
...@@ -703,9 +752,15 @@ ...@@ -703,9 +752,15 @@
'taxType': this.formRegister.companyTax, 'taxType': this.formRegister.companyTax,
'phone': this.formRegister.companyPhone, 'phone': this.formRegister.companyPhone,
'invoiceType': this.formRegister.companyInvoice, 'invoiceType': '0',
'openBank': this.formRegister.bankName, 'openBank': this.formRegister.bankName,
'bankAccount': this.formRegister.bankAccount, 'bankAccount': this.formRegister.bankAccount,
'receiveType': this.formRegister.receiveType,
'receiveContactor': this.formRegister.receiveContactor,
'receiveMobile': this.formRegister.receiveMobile,
'receiveArea': this.formRegister.receiveArea,
'receiveAddress': this.formRegister.receiveAddress,
'contactName': this.formRegister.corporationName, 'contactName': this.formRegister.corporationName,
'idcard': this.formRegister.corporationIdcard, 'idcard': this.formRegister.corporationIdcard,
...@@ -714,17 +769,7 @@ ...@@ -714,17 +769,7 @@
'password': this.formRegister.password, 'password': this.formRegister.password,
} }
for (let i = 0, len = funcParam.invoiceType.length; i < len; i++) {
if (funcParam.invoiceType[i] === '增值税专票') funcParam.invoiceType[i] = 0
if (funcParam.invoiceType[i] === '增值税普票') funcParam.invoiceType[i] = 1
if (funcParam.invoiceType[i] === '其他类型') funcParam.invoiceType[i] = 2
}
funcParam.invoiceType = funcParam.invoiceType.join()
console.log(JSON.stringify(funcParam)) console.log(JSON.stringify(funcParam))
// return
iRequest.request(iHost.base + 'bid/zUserCompany/registerCompany', funcParam, 'json', 'post') iRequest.request(iHost.base + 'bid/zUserCompany/registerCompany', funcParam, 'json', 'post')
.then((funcResponse) => { .then((funcResponse) => {
this.state = 11 this.state = 11
...@@ -881,6 +926,19 @@ ...@@ -881,6 +926,19 @@
/** /**
* 地域选择组件
* @function
* @param {array } funcArea - ['省份', '城市', '区域' ]
* @returns
*/
onAreaChange: function (funcArea) {
this.formRegister.receiveArea = funcArea
this.$store.commit('areaSelection', funcArea)
},
/**
* 上传组件 - 文件格式 * 上传组件 - 文件格式
* @function * @function
* @param {string} funcType * @param {string} funcType
......
src/view/sign-in-input.vue
...@@ -209,6 +209,7 @@ ...@@ -209,6 +209,7 @@
// 2 - 拒绝 // 2 - 拒绝
this.info.name = funcResponse.companyName this.info.name = funcResponse.companyName
this.info.register = Number(funcResponse.state) this.info.register = Number(funcResponse.state)
this.info.isJoinBid = Number(funcResponse.isJoinBid) === 0 ? false : true
this.$store.commit('isSignIn', true) this.$store.commit('isSignIn', true)
this.$store.commit('info', this.info) this.$store.commit('info', this.info)
localStorage.setItem('info', JSON.stringify(this.info)) localStorage.setItem('info', JSON.stringify(this.info))
......
src/view/specialist/component/specialist-header.vue
...@@ -142,6 +142,7 @@ ...@@ -142,6 +142,7 @@
// 2 - 拒绝 // 2 - 拒绝
this.info.name = funcResponse.companyName this.info.name = funcResponse.companyName
this.info.register = Number(funcResponse.state) this.info.register = Number(funcResponse.state)
this.info.isJoinBid = Number(funcResponse.isJoinBid) === 0 ? false : true
this.$store.commit('info', this.info) this.$store.commit('info', this.info)
localStorage.setItem('info', JSON.stringify(this.info)) localStorage.setItem('info', JSON.stringify(this.info))
}) })
......
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 sign in to comment