Skip to content

严立 / cd-bid

Go to a project
Commit f5081806 by 严立
Options

修复问题

parent ff7ce936
Inline Side-by-side
Showing with 93 additions and 78 deletions
src/common/js/host.js
let output = { let output = {
// 开发路径 // 开发路径
base: 'http://bid-server.meiqicloud.com/', // base: 'http://bid-server.meiqicloud.com/',
resources: 'http://bid-web.meiqicloud.com/', // resources: 'http://bid-web.meiqicloud.com/',
agentSignIn: 'http://bid-vue.meiqicloud.com/' // agentSignIn: 'http://bid-vue.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/'
} }
output.uploadFile = output.base + 'bid/common/webupload/upload' output.uploadFile = output.base + 'bid/common/webupload/upload'
......
src/components/currency-skill.vue
...@@ -85,8 +85,10 @@ ...@@ -85,8 +85,10 @@
}, },
setSkillList: function (funcRankIndex, funcSkillData) { setSkillList: function (funcRankIndex, funcSkillData) {
console.log(funcRankIndex)
console.log(funcSkillData)
function createSkillList () { function createSkillList () {
console.log('funcSkillData', funcSkillData)
if (!funcSkillData) return if (!funcSkillData) return
let funcList = [] let funcList = []
...@@ -164,12 +166,10 @@ ...@@ -164,12 +166,10 @@
funcSkillData = funcSkillData[this.selectIndex[i]].children funcSkillData = funcSkillData[this.selectIndex[i]].children
} }
} }
console.log(funcSelectId)
this.$emit('change', funcSelectId) // 设置完成数据触发一次选择事件使父组件获取选择数据 this.$emit('change', funcSelectId) // 设置完成数据触发一次选择事件使父组件获取选择数据
}, },
onSelect: function (funcItem, funcRankIndex) { onSelect: function (funcItem, funcRankIndex) {
console.log(funcItem, funcRankIndex)
// 清除选择分类之后所有数据 // 清除选择分类之后所有数据
this.selectIndex[funcRankIndex] = funcItem.index this.selectIndex[funcRankIndex] = funcItem.index
this.selectIndexBuffer[funcRankIndex] = funcItem.index this.selectIndexBuffer[funcRankIndex] = funcItem.index
......
src/components/notice-file.vue
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<!-- 下载模板 - 附件下载 --> <!-- 下载模板 - 附件下载 -->
<div v-if="componentFile.length > 0" class="components-file"> <div v-if="componentFile.length > 0" class="components-file">
<div class="row align-c"> <div class="row align-c">
<span>附件下载</span> <span>文件预览</span>
</div> </div>
<div class="col"> <div class="col">
<div class="list row align-c" v-for="(item, index) in componentFile" :key="index" @click="onDownload(item)"> <div class="list row align-c" v-for="(item, index) in componentFile" :key="index" @click="onDownload(item)">
<img src="../assets/notice-file.png" alt=""> <img src="../assets/notice-file.png" alt="">
<div class="row align-c">{{item.name}}</div> <div class="row align-c">{{item.name}}</div>
<div class="row align-c">下载</div> <div class="row align-c">预览</div>
</div> </div>
</div> </div>
</div> </div>
......
src/components/notice-progress.vue
...@@ -90,7 +90,6 @@ ...@@ -90,7 +90,6 @@
<script> <script>
import iMiment from 'miment' import iMiment from 'miment'
import iTime from '@/common/js/time.js' import iTime from '@/common/js/time.js'
export default { export default {
...@@ -219,6 +218,8 @@ ...@@ -219,6 +218,8 @@
* @returns * @returns
*/ */
onEntered: function () { onEntered: function () {
// 公告为预览状态禁止操作
if (this.$route.query.preview) return
this.$emit('entered') this.$emit('entered')
}, },
...@@ -228,10 +229,14 @@ ...@@ -228,10 +229,14 @@
* @returns * @returns
*/ */
onDocument: function () { onDocument: function () {
// 公告为预览状态禁止操作
if (this.$route.query.preview) return
this.$emit('document') this.$emit('document')
}, },
onOffer: function () { onOffer: function () {
// 公告为预览状态禁止操作
if (this.$route.query.preview) return
this.$emit('offer') this.$emit('offer')
}, },
} }
......
src/view/home.vue
...@@ -491,8 +491,9 @@ ...@@ -491,8 +491,9 @@
* @returns * @returns
*/ */
onMoreNotice: function () { onMoreNotice: function () {
let funcNoticeType = iDictionary.noticeType.mapping[this.noticeTabActive + 3] let funcNoticeIndex = this.noticeTab[this.noticeTabActive].value
let funcNoticeUrl = this.$router.resolve({ path: '/bid', query: { type: funcNoticeType } }) console.log(funcNoticeIndex)
let funcNoticeUrl = this.$router.resolve({ path: '/bid', query: { type: funcNoticeIndex } })
window.open(funcNoticeUrl .href, '_blank') window.open(funcNoticeUrl .href, '_blank')
}, },
/** /**
......
src/view/personal/supplier-info-change.vue
...@@ -437,6 +437,7 @@ ...@@ -437,6 +437,7 @@
onUploadChange: function (funcType, funcFile, funcFileList) { onUploadChange: function (funcType, funcFile, funcFileList) {
if (funcFile.status === 'ready') { if (funcFile.status === 'ready') {
if (this.checkFileFormat(funcType, funcFile)) { if (this.checkFileFormat(funcType, funcFile)) {
funcFile.name = Math.round(new Date())
this.formRegister[funcType + 'Image'] = 'image' this.formRegister[funcType + 'Image'] = 'image'
this.uploadOption[funcType].image.push(funcFile) this.uploadOption[funcType].image.push(funcFile)
} else { } else {
...@@ -507,7 +508,7 @@ ...@@ -507,7 +508,7 @@
let funcImageList = this.uploadOption[funcType].image let funcImageList = this.uploadOption[funcType].image
for (let i = 0, len = funcImageList.length; i < len; i++) { for (let i = 0, len = funcImageList.length; i < len; i++) {
if (funcImageList[i] && funcImageList[i].uid === funcFile.uid) { if (funcImageList[i] && funcImageList[i].uid === funcFile.uid) {
funcImageList[i].url = funcResponse.data.url funcImageList[i].url = iHost.resources + funcResponse.data.url
break break
} }
} }
......
src/view/personal/supplier-notice.vue
...@@ -363,7 +363,15 @@ ...@@ -363,7 +363,15 @@
if ([2, 3].indexOf(this.noticeType) >= 0) this.onBidDocument() if ([2, 3].indexOf(this.noticeType) >= 0) this.onBidDocument()
} }
// 竞价公告 - 设置中标
if ([0].indexOf(funcProject.noticeType) >= 0) {
for (let i = 0, l = this.componentContract.length; i < l; i++) {
if (this.componentContract[i].isWin) {
this.projectWin = true
break
}
}
}
// 采购公告 - 查询合同详情 // 采购公告 - 查询合同详情
if ([2, 3].indexOf(funcProject.noticeType) >= 0) { if ([2, 3].indexOf(funcProject.noticeType) >= 0) {
......
src/view/personal/supplier-notify.vue
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
funcList.push(funcItem) funcList.push(funcItem)
} }
this.mainList = funcList this.mainList = funcList
this.pagination.total = funcResponse.count
}) })
.catch((funcError) => { .catch((funcError) => {
this.$message.error(funcError.message) this.$message.error(funcError.message)
......
src/view/public/bid-buy-result.vue
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
methods: { methods: {
init: function () { init: function () {
let funcOrders = JSON.parse(localStorage.getItem('payInfo')) let funcOrders = JSON.parse(localStorage.getItem('payInfo'))
console.log(funcOrders)
if (funcOrders) { if (funcOrders) {
this.ordersId = funcOrders.id this.ordersId = funcOrders.id
this.ordersNumber = funcOrders.number this.ordersNumber = funcOrders.number
......
src/view/public/bid-buy.vue
...@@ -149,7 +149,11 @@ ...@@ -149,7 +149,11 @@
data: function () { data: function () {
return { return {
componentProject: {}, // 项目数据
componentContract: [], // 合同数据
componentAgency: {}, // 供应信息
componentProjectBuffer: {}, componentProjectBuffer: {},
contractSelection: [],
contractSelectionBuffer: {}, contractSelectionBuffer: {},
tableHeaderStyle: { tableHeaderStyle: {
color: '#000000', color: '#000000',
...@@ -165,52 +169,6 @@ ...@@ -165,52 +169,6 @@
} }
}, },
computed: {
componentProject: function () {
return this.$store.state.componentProject
},
componentContract: function () {
return this.$store.state.componentContract
},
componentAgency: function () {
return this.$store.state.componentAgency
},
contractSelection: function () {
return this.$store.state.contractSelection
}
},
watch: {
componentProject: {
handler: function (funcNewValue, funcOldValue) {
this.componentProjectBuffer = funcNewValue
},
deep: true,
immediate: true,
},
componentContract: {
handler: function (funcNewValue, funcOldValue) {
},
deep: true,
immediate: true,
},
componentAgency: {
handler: function (funcNewValue, funcOldValue) {
},
deep: true,
immediate: true,
},
contractSelection: {
handler: function (funcNewValue, funcOldValue) {
this.contractSelectionBuffer = funcNewValue
},
deep: true,
immediate: true,
}
},
created: function () { created: function () {
this.init() this.init()
}, },
...@@ -221,10 +179,16 @@ ...@@ -221,10 +179,16 @@
methods: { methods: {
init: function () { init: function () {
if (JSON.stringify(this.componentProject) === '{}') this.redirectPath() if (localStorage.getItem('buyProject')) {
if (JSON.stringify(this.componentContract) === '{}') this.redirectPath() this.componentProject = JSON.parse(localStorage.getItem('buyProject'))
if (JSON.stringify(this.componentAgency) === '{}') this.redirectPath() this.componentContract = JSON.parse(localStorage.getItem('buyContract'))
if (JSON.stringify(this.contractSelection) === '{}') this.redirectPath() this.componentAgency = JSON.parse(localStorage.getItem('buyAgency'))
this.contractSelection = JSON.parse(localStorage.getItem('buySelection'))
this.componentProjectBuffer = this.componentProject
this.contractSelectionBuffer = this.contractSelection
} else {
this.redirectPath()
}
}, },
queryPayCode: function () { queryPayCode: function () {
if (this.payCode[Number(this.payway)]) { if (this.payCode[Number(this.payway)]) {
......
src/view/public/bid-notice.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</div> </div>
<!-- 附件下载 --> <!-- 附件下载 -->
<div v-if="[0, 1, 2, 3, 4, 5, 7, 9].indexOf(noticeType) >= 0" class="info-item"> <div v-if="[0, 1, 2, 3, 4, 5, 6, 7, 9].indexOf(noticeType) >= 0" class="info-item">
<noticeFile></noticeFile> <noticeFile></noticeFile>
</div> </div>
...@@ -463,6 +463,10 @@ ...@@ -463,6 +463,10 @@
* @returns * @returns
*/ */
onBuy: function () { onBuy: function () {
localStorage.setItem('buyProject', JSON.stringify(this.componentProject))
localStorage.setItem('buyContract', JSON.stringify(this.componentContract))
localStorage.setItem('buyAgency', JSON.stringify(this.componentAgency))
localStorage.setItem('buySelection', JSON.stringify(this.$store.state.contractSelection))
this.$router.push('/bid/buy') this.$router.push('/bid/buy')
}, },
......
src/view/public/question-detail.vue
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<i class="el-icon-user"></i> <i class="el-icon-user"></i>
<span>{{question.name}}</span> <span>{{question.name}}</span>
</div> </div>
<div> <!-- <div>
<i class="el-icon-link"></i> <i class="el-icon-link"></i>
<span>{{question.contact}}</span> <span>{{question.contact}}</span>
</div> </div> -->
</div> </div>
<div class="info-reply"> <div class="info-reply">
<div class="info-reply-title row align-c"> <div class="info-reply-title row align-c">
...@@ -116,6 +116,8 @@ ...@@ -116,6 +116,8 @@
margin: 30px 0 10px 0; margin: 30px 0 10px 0;
padding-bottom: 20px; padding-bottom: 20px;
font-weight: 800; font-weight: 800;
white-space: normal;
word-break: break-all;
border-bottom: 1px @colorGrey90 solid; border-bottom: 1px @colorGrey90 solid;
> span:nth-child(1) { > span:nth-child(1) {
......
src/view/public/question-list.vue
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
} }
span:nth-child(1) { span:nth-child(1) {
max-width: 90%;
padding-right: 80px; padding-right: 80px;
flex-grow: 1; flex-grow: 1;
} }
......
src/view/register-specialist.vue
...@@ -858,6 +858,7 @@ ...@@ -858,6 +858,7 @@
onUploadChange: function (funcType, funcFile, funcFileList) { onUploadChange: function (funcType, funcFile, funcFileList) {
if (funcFile.status === 'ready') { if (funcFile.status === 'ready') {
if (this.checkFileFormat(funcType, funcFile)) { if (this.checkFileFormat(funcType, funcFile)) {
funcFile.name = Math.round(new Date())
this.formRegister[funcType + 'Image'] = 'image' this.formRegister[funcType + 'Image'] = 'image'
this.uploadOption[funcType].image.push(funcFile) this.uploadOption[funcType].image.push(funcFile)
} else { } else {
...@@ -928,7 +929,7 @@ ...@@ -928,7 +929,7 @@
let funcImageList = this.uploadOption[funcType].image let funcImageList = this.uploadOption[funcType].image
for (let i = 0, len = funcImageList.length; i < len; i++) { for (let i = 0, len = funcImageList.length; i < len; i++) {
if (funcImageList[i] && funcImageList[i].uid === funcFile.uid) { if (funcImageList[i] && funcImageList[i].uid === funcFile.uid) {
funcImageList[i].url = iHost.base + funcResponse.data.url funcImageList[i].url = iHost.resources + funcResponse.data.url
break break
} }
} }
......
src/view/register-supplier.vue
...@@ -453,9 +453,16 @@ ...@@ -453,9 +453,16 @@
case 'phone': case 'phone':
if (this.formRegister.corporationPhone === '') { if (this.formRegister.corporationPhone === '') {
this.$message.error('联系人手机号') this.$message.error('联系人手机号不能为空')
return return
} }
let funcRegExp = new RegExp(/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9]|19[0-9])[0-9]{8}$/, 'g')
if (!funcRegExp.test(this.formRegister.corporationPhone)) {
this.$message.error('请正确输入手机号码')
return
}
// 优先校验信息正确性 // 优先校验信息正确性
funcParam = { funcParam = {
'mobile': this.formRegister.corporationPhone, 'mobile': this.formRegister.corporationPhone,
...@@ -670,6 +677,9 @@ ...@@ -670,6 +677,9 @@
} }
funcParam.invoiceType = funcParam.invoiceType.join() funcParam.invoiceType = funcParam.invoiceType.join()
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
...@@ -725,6 +735,10 @@ ...@@ -725,6 +735,10 @@
onNext: function () { onNext: function () {
switch (this.state) { switch (this.state) {
case 1: case 1:
// 测试数据
// this.state = 3
// return
// 基础信息 // 基础信息
this.$refs['formBase'].validate(funcValid => { this.$refs['formBase'].validate(funcValid => {
if (funcValid) { if (funcValid) {
...@@ -734,6 +748,10 @@ ...@@ -734,6 +748,10 @@
break break
case 3: case 3:
// 测试数据
// this.state = 5
// return
// 证照上传 // 证照上传
this.$refs.formLicense.validate(funcValid => { this.$refs.formLicense.validate(funcValid => {
if (funcValid) { if (funcValid) {
...@@ -752,6 +770,10 @@ ...@@ -752,6 +770,10 @@
break break
case 5: case 5:
// 测试数据
// this.state = 7
// return
// 税务信息 // 税务信息
this.$refs['formTax'].validate(funcValid => { this.$refs['formTax'].validate(funcValid => {
if (funcValid) { if (funcValid) {
...@@ -761,6 +783,10 @@ ...@@ -761,6 +783,10 @@
break break
case 7: case 7:
// 测试数据
// this.state = 9
// return
// 短信验证 // 短信验证
this.$refs['formPhone'].validate(funcValid => { this.$refs['formPhone'].validate(funcValid => {
if (funcValid) { if (funcValid) {
...@@ -777,10 +803,6 @@ ...@@ -777,10 +803,6 @@
} }
}) })
break break
case 11:
break
} }
}, },
...@@ -820,6 +842,7 @@ ...@@ -820,6 +842,7 @@
onUploadChange: function (funcType, funcFile, funcFileList) { onUploadChange: function (funcType, funcFile, funcFileList) {
if (funcFile.status === 'ready') { if (funcFile.status === 'ready') {
if (this.checkFileFormat(funcType, funcFile)) { if (this.checkFileFormat(funcType, funcFile)) {
funcFile.name = Math.round(new Date())
this.formRegister[funcType + 'Image'] = 'image' this.formRegister[funcType + 'Image'] = 'image'
this.uploadOption[funcType].image.push(funcFile) this.uploadOption[funcType].image.push(funcFile)
} else { } else {
...@@ -890,7 +913,7 @@ ...@@ -890,7 +913,7 @@
let funcImageList = this.uploadOption[funcType].image let funcImageList = this.uploadOption[funcType].image
for (let i = 0, len = funcImageList.length; i < len; i++) { for (let i = 0, len = funcImageList.length; i < len; i++) {
if (funcImageList[i] && funcImageList[i].uid === funcFile.uid) { if (funcImageList[i] && funcImageList[i].uid === funcFile.uid) {
funcImageList[i].url = iHost.base + funcResponse.data.url funcImageList[i].url = iHost.resources + funcResponse.data.url
break break
} }
} }
......
src/view/specialist/specialist-home.vue
...@@ -204,6 +204,7 @@ ...@@ -204,6 +204,7 @@
funcList.push(funcItem) funcList.push(funcItem)
} }
this.mainList = funcList this.mainList = funcList
this.pagination.total = funcResponse.count
console.log(JSON.stringify(this.mainList)) console.log(JSON.stringify(this.mainList))
}) })
}, },
......
src/view/specialist/specialist-info-change.vue
...@@ -649,6 +649,7 @@ ...@@ -649,6 +649,7 @@
onUploadChange: function (funcType, funcFile, funcFileList) { onUploadChange: function (funcType, funcFile, funcFileList) {
if (funcFile.status === 'ready') { if (funcFile.status === 'ready') {
if (this.checkFileFormat(funcType, funcFile)) { if (this.checkFileFormat(funcType, funcFile)) {
funcFile.name = Math.round(new Date())
this.formRegister[funcType + 'Image'] = 'image' this.formRegister[funcType + 'Image'] = 'image'
this.uploadOption[funcType].image.push(funcFile) this.uploadOption[funcType].image.push(funcFile)
} else { } else {
...@@ -719,7 +720,7 @@ ...@@ -719,7 +720,7 @@
let funcImageList = this.uploadOption[funcType].image let funcImageList = this.uploadOption[funcType].image
for (let i = 0, len = funcImageList.length; i < len; i++) { for (let i = 0, len = funcImageList.length; i < len; i++) {
if (funcImageList[i] && funcImageList[i].uid === funcFile.uid) { if (funcImageList[i] && funcImageList[i].uid === funcFile.uid) {
funcImageList[i].url = iHost.base + funcResponse.data.url funcImageList[i].url = iHost.resources + funcResponse.data.url
break break
} }
} }
......
src/view/specialist/specialist-info.vue
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
<!-- 项目进度 - 采购 --> <!-- 项目进度 - 采购 -->
<div class="supplier-operation"> <div class="supplier-operation">
<button v-if="formRegister.examineState !== 0" @click="onChange()">修改</button> <button @click="onChange()">修改</button>
<!-- <button v-if="formRegister.examineState !== 0" @click="onChange()">修改</button> -->
<button @click="onChangeRecord()">变更记录</button> <button @click="onChangeRecord()">变更记录</button>
</div> </div>
......
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