Skip to content

严立 / cd-bid

Go to a project
Commit 6755508d by 严立
Options

修复问题

parent 90e1db50
Inline Side-by-side
Showing with 142 additions and 104 deletions
src/common/js/request/interceptors.js
......@@ -62,12 +62,6 @@ let output = {
}
if (funcDataType === 'object') {
// console.log('api: ', funcConfigure.url)
// console.log('par: ', JSON.parse(funcConfigure.data))
// console.log('res: ')
// console.log(JSON.parse(funcResult))
// console.log('■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■')
let funcResultData = JSON.parse(funcResult)
switch (Number(funcResultData.code)) {
......@@ -77,7 +71,7 @@ let output = {
this.$store.commit('redirectPath', null)
localStorage.clear()
iVue.$router.push('/')
return false
return { state: false, response: { message: funcResultData.msg }}
break
// 请求正常直接返回 data 内容
......@@ -90,12 +84,6 @@ let output = {
return { state: false, response: { message: funcResultData.msg }}
break
}
} else {
// console.log('api: ', funcConfigure.url)
// console.log('par: ', JSON.parse(funcConfigure.data))
// console.log('res: ')
// console.log(funcResult)
// console.log('■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■')
}
return funcResult
}
......
src/common/js/request/request.js
......@@ -2,6 +2,7 @@ import iHeader from './header.js'
import iDataform from './dataform.js'
import iConfigure from './configure.js'
import iInterceptors from './interceptors.js'
import iVue from '../../../main.js'
let output = {
/**
......@@ -51,19 +52,12 @@ let output = {
}
let funStatus = funcXMLHttpRequest.status
if ((funStatus >= 200 && funStatus < 300) || funStatus === 304) {
try {
let funcInterceptorsResponse = iInterceptors.response(funcConfigure, funcXMLHttpRequest.responseText)
if (funcInterceptorsResponse.state) {
funcResolve(funcInterceptorsResponse.response)
} else {
funcReject(funcInterceptorsResponse.response)
iVue.$message.error(funcInterceptorsResponse.response.message)
}
} catch (funError) {
funcReject(funError)
}
} else {
let funcResponse = iInterceptors.response(funcConfigure, funcXMLHttpRequest.responseText)
funcReject(funcResponse.response)
}
}
}).catch((funcError) => {
......@@ -94,19 +88,12 @@ let output = {
}
let funStatus = funcXMLHttpRequest.status
if ((funStatus >= 200 && funStatus < 300) || funStatus === 304) {
try {
let funcInterceptorsResponse = iInterceptors.response(funcConfigure, funcXMLHttpRequest.responseText)
if (funcInterceptorsResponse.state) {
funcResolve(funcInterceptorsResponse.response)
} else {
funcReject(funcInterceptorsResponse.response)
iVue.$message.error(funcInterceptorsResponse.response.message)
}
} catch (funError) {
funcReject(funError)
}
} else {
let funcResponse = iInterceptors.response(funcConfigure, funcXMLHttpRequest.responseText)
funcReject(funcResponse.response)
}
}
}).catch((funcError) => {
......
src/components/currency-header.vue
......@@ -115,7 +115,6 @@
*/
init: function () {
let funcToken = localStorage.getItem('token')
console.log('funcToken - 1', funcToken)
if (!funcToken) {
this.$store.commit('isSignIn', false)
this.$store.commit('info', null)
......
src/components/currency-skill.vue
......@@ -30,6 +30,9 @@
componentSkill: function () {
return this.$store.state.componentSkill
},
componentSkillData: function () {
return this.$store.state.componentSkillData
}
},
watch: {
......@@ -42,42 +45,32 @@
},
componentSkill: {
handler: function (funcNewValue, funcOldValue) {
if (funcNewValue.length > 0 && this.skillAll.length > 0) {
this.selectionIndex = funcNewValue[this.identity]
this.isReady()
}
},
deep: true,
immediate: true,
},
componentSkillData: {
handler: function (funcNewValue, funcOldValue) {
if (funcNewValue.length > 0) {
this.skillAll = funcNewValue
this.isReady()
}
},
deep: true,
immediate: true,
},
created: function () {
this.querySkill()
},
methods: {
querySkill: function () {
if (this.$store.getters.componentSkillData.length) {
this.skillAll = this.$store.getters.componentSkillData
// 读取选择缓存
this.selectionIndex = this.$store.getters.componentSkill[this.identity]
if (!this.selectionIndex) this.selectionIndex = [0, 0, 0, 0, 0]
this.ergodicSkill(this.skillAll)
} else {
iRequest.request(iHost.base + 'bid/common/getApiProjectTypeOptions', {}, 'json', 'get')
.then((funcResponse) => {
this.skillAll = funcResponse
this.$store.commit('componentSkillData', this.skillAll)
this.selectionIndex = this.$store.getters.componentSkill[this.identity]
if (!this.selectionIndex) this.selectionIndex = [0, 0, 0, 0, 0]
isReady: function () {
if (this.skillAll.length > 0) {
this.ergodicSkill(this.skillAll)
})
}
},
ergodicSkill: function (funcSkillAll) {
function setSkillOption (funcSelectionIndex, funcSkillList) {
let funcList = []
......@@ -90,9 +83,14 @@
}
funcList.push(funcItem)
}
// console.log('funcList', funcList)
// console.log('funcSelectionIndex', funcSelectionIndex)
funcSkillOption.push(funcList)
funcSkillItem.push(funcList[funcSelectionIndex])
// console.log(funcSkillItem)
// 判断是否需要继续遍历
if (funcSkillItem[funcSkillItem.length - 1].isChildren) {
let funcSelectionIndex = funcLevel
......@@ -101,6 +99,8 @@
}
}
if (!funcSkillAll || funcSkillAll.length === 0) return
// 重置变量
let This = this
this.skillList = []
......
src/components/notice-project.vue
......@@ -36,7 +36,7 @@
<div class="item-text row align-s">
<span>竞价标的：</span>
<el-table :data="componentContract" stripe :header-cell-style="tableHeaderStyle">
<el-table-column type="index" label="合同包" width="80" align="center"></el-table-column>
<el-table-column prop="index" label="合同包" width="80" align="center"></el-table-column>
<el-table-column prop="object" label="标的" min-width="140"></el-table-column>
<el-table-column prop="requirement" label="参数要求" min-width="230"></el-table-column>
<el-table-column prop="quantity" label="数量" min-width="120" align="center"></el-table-column>
......
src/store/store.js
......@@ -23,7 +23,7 @@ export default new Vuex.Store({
// 专家注册组件
componentSkill: [],
componentSkillData: {},
componentSkillData: [],
......
src/view/public/bid-notice.js
......@@ -66,10 +66,26 @@ let output = function (thisVue, id, type, isPreview) {
// 竞价表格
let funcRawData = funcResponse.package
let funcRawData = funcResponse.packageAll
funcRawData.sort(function(a, b) {
let funcMainWeight = 1000
// 计算 a 的索引权重
let funcIndex = a.index.toString().split('-')
let funcA = Number(funcIndex[0]) * funcMainWeight
if (funcIndex[1]) funcA = funcA + Number(funcIndex[1])
// 计算 b 的索引权重
funcIndex = b.index.toString().split('-')
let funcB = Number(funcIndex[0]) * funcMainWeight
if (funcIndex[1]) funcB = funcB + Number(funcIndex[1])
return funcA - funcB
})
for (let i = 0, len = funcRawData.length; i < len; i++) {
let funcItem = {
'index': i + 1, // 序号
'index': funcRawData[i].index.toString(), // 序号
'id': funcRawData[i].biddingPackageId, // 标识
'object': funcRawData[i].name ? funcRawData[i].name : '', // 标的
'budget': funcRawData[i].fixedPrice, // 预算金额
......
src/view/public/bid-notice.vue
......@@ -146,7 +146,7 @@
</div>
<!-- 竞价报价 -->
<el-dialog title="我要报价" :visible.sync="winOffer" :lock-scroll="false" width="1000px" :close-on-click-modal="false">
<el-dialog title="我要报价" :visible.sync="winOffer" :lock-scroll="false" width="1200px" :close-on-click-modal="false">
<div v-if="winOfferSelect">
<div class="offer-progress row">
<div class="offer-progress-select offer-progress-active row con-c align-c">
......@@ -158,7 +158,7 @@
</div>
<el-table :data="componentContract" key="select" stripe :header-cell-style="tableHeaderStyle" @selection-change="(selection) => onTableSelectionChange('offer', selection)">
<el-table-column type="selection" width="60" align="center" :selectable="onTableUnableSelection"></el-table-column>
<el-table-column type="index" label="合同包" width="120" align="center"></el-table-column>
<el-table-column prop="index" label="合同包" width="120" align="center"></el-table-column>
<el-table-column prop="object" label="标的" min-width="100"></el-table-column>
<el-table-column prop="requirement" label="参数要求" min-width="230"></el-table-column>
<el-table-column prop="quantity" label="数量" min-width="120" align="center"></el-table-column>
......@@ -192,6 +192,15 @@
</div>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" min-width="300" align="center">
<template slot-scope="scope">
<div class="quote-table col">
<span>　</span>
<el-input size="small" v-model="scope.row.remark" maxlength="50" @change="(value) => { onQuoteInput(value, scope.$index, scope.row) }"></el-input>
<span class="global-color-red">{{scope.row.tip}}</span>
</div>
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer row con-c align-c">
<el-button class="global-routine-button" @click="onPricePrevious()">上一步</el-button>
......@@ -359,6 +368,8 @@
this.componentFile = funcFile
this.componentNotice = funcOther
console.log(JSON.stringify(this.componentContract))
// 竞价公告查询最新报价
if ([0].indexOf(funcProject.noticeType) >= 0) {
iRequest.request(iHost.base + 'bid/zBiddingProject/recentQuotation', { 'projectId': funcProject.projectId }, 'json', 'post')
......@@ -576,11 +587,11 @@
'budget': funcSelection[i].budget,
'quantity': funcSelection[i].quantity,
'requirement': funcSelection[i].requirement,
'tip': ''
'tip': '',
'remark': ''
}
console.log(funcSelection[i].index)
this.tableQuoteBuffer.push(funcItem)
console.log(JSON.stringify(this.tableQuoteBuffer))
this.tableQuote[i] = { 'packageId': funcItem.id, 'price': '' }
}
break
......
src/view/register-specialist.vue
......@@ -406,6 +406,7 @@
created: function () {
this.reset()
this.init()
this.setButtonDisable('email')
this.setButtonDisable('phone')
},
......@@ -417,7 +418,7 @@
* @returns
*/
reset: function () {
this.state = 3
this.state = 1
this.formRegister = {
// 基础信息
name: '',
......@@ -453,6 +454,13 @@
this.$store.commit('componentSkillData', [])
},
init: function () {
iRequest.request(iHost.base + 'bid/common/getApiProjectTypeOptions', {}, 'json', 'get')
.then((funcResponse) => {
this.$store.commit('componentSkillData', funcResponse)
})
},
/**
......@@ -620,6 +628,8 @@
'password': this.formRegister.password,
}
console.log(JSON.stringify(funcParam))
// 设置政府专家证明材料
let funcOfficial = []
for (let i = 0, len = this.uploadOption.official.image.length; i < len; i++) {
......@@ -722,7 +732,6 @@
}
}
}
this.state = 7
}
})
......
src/view/specialist/specialist-info-change.vue
......@@ -211,8 +211,8 @@
data: function () {
return {
formRegister: {},
skillRawData: {},
skillText: [],
skillAll: [],
skillSelectionIndex: [],
skillQuantity: 1,
skillQuantityMax: 5,
......@@ -356,18 +356,35 @@
// 设置职称标识
for (let i = 0, l = this.formRegister.skillId.length; i < l; i++) {
this.skillSelectionIndex[i] = this.formRegister.skillId[i].split(',')
this.formRegister.skillId[i] = this.formRegister.skillId[i].split(',')
}
this.skillQuantity = this.formRegister.skillId.length
// 设置区域标识
this.formRegister.areaArray = funcResponse.area.split(',')
this.$store.commit('areaSelection', this.formRegister.areaArray)
let funImageUrl
// 设置入库声明图片
if (funcResponse.statement !== '') {
funImageUrl = [funcResponse.statement]
for (let i = 0, len = funImageUrl.length; i < len; i++) {
this.uploadOption.statement.image.push({
'status': 'success',
'url': funImageUrl[0],
'name': 'image.png',
'size': 100,
'percentage': 100,
'uid': 1000000000000
})
}
}
// 设置政府专家图片
if (funcResponse.multipleStatement !== '') {
funImageUrl = funcResponse.multipleStatement.split(',')
funImageUrl = funcResponse.multipleStatement.split('|')
for (let i = 0, len = funImageUrl.length; i < len; i++) {
this.uploadOption.official.image.push({
'status': 'success',
......@@ -375,7 +392,7 @@
'name': 'image.png',
'size': 100,
'percentage': 100,
'uid': 1000000000000 + i
'uid': 2000000000000 + i
})
}
}
......@@ -390,7 +407,7 @@
'name': 'image.png',
'size': 100,
'percentage': 100,
'uid': 2000000000000
'uid': 3000000000000
})
}
}
......@@ -405,7 +422,7 @@
'name': 'image.png',
'size': 100,
'percentage': 100,
'uid': 3000000000000 + i
'uid': 4000000000000 + i
})
}
}
......@@ -413,13 +430,13 @@
let funcSkillDictionary = iRequest.request(iHost.base + 'bid/common/getApiProjectTypeOptions', {}, 'json', 'get')
.then((funcResponse) => {
this.skillRawData = funcResponse
this.$store.commit('componentSkillData', this.skillRawData)
this.skillAll = funcResponse
this.$store.commit('componentSkillData', this.skillAll)
})
Promise.all([ funcInfo, funcSkillDictionary ])
.then(() => {
this.setInfo()
this.setSelectionSkill()
})
.catch((funcError) => {
console.log(funcError)
......@@ -468,38 +485,42 @@
this.$store.commit('componentSkillData', {})
},
setInfo: function () {
function queryData (funcSearchData, funcMatchData, funcRankIndex, funcResult, funcResultIndex) {
if (funcRankIndex === undefined) {
funcRankIndex = 0
}
setSelectionSkill: function () {
function setSelectionIndex (funcSelectionId) {
let funcSkillList = This.skillAll
let funcIndexList = []
index: for (let i = 0, l = funcSelectionId.length; i < l; i++) {
item: for (let ii = 0, ll = funcSkillList.length; ii < ll; ii++) {
if (funcSelectionId[i] === funcSkillList[ii].value) {
funcIndexList.push(ii)
for (let i = 0, len = funcMatchData.length; i < len; i++) {
if (funcSearchData[funcRankIndex] === funcMatchData[i].value) {
funcResult.push(funcMatchData[i])
funcResultIndex.push(i)
break
if (funcSkillList[ii].children) {
funcSkillList = funcSkillList[ii].children
break item
}
}
funcRankIndex = funcRankIndex + 1
if (funcSearchData[funcRankIndex]) {
queryData(funcSearchData, funcResult[funcRankIndex - 1].children, funcRankIndex, funcResult, funcResultIndex)
}
}
funcSelectionIndex.push(funcIndexList)
}
let funcSkillItemArray = []
let funcSkillIndexArray = []
for (let i = 0, l = this.formRegister.skillId.length; i < l; i++) {
let funcSkillItem = []
let funcSkillIndex = []
queryData(this.formRegister.skillId[i], this.skillRawData, 0, funcSkillItem, funcSkillIndex)
funcSkillItemArray.push(funcSkillItem)
funcSkillIndexArray.push(funcSkillIndex)
let This = this
let funcSelectionIndex = []
for (let i = 0, l = this.skillSelectionIndex.length; i < l; i++) {
setSelectionIndex(this.skillSelectionIndex[i])
}
this.$store.commit('componentSkill', funcSkillIndexArray)
// 计算所有索引之后补充到最大位置
for (let i = 0, l = funcSelectionIndex.length; i < l; i++) {
while (funcSelectionIndex[i].length < 5) {
funcSelectionIndex[i].push(0)
}
}
console.log(JSON.stringify(funcSelectionIndex))
this.$store.commit('componentSkill', funcSelectionIndex)
},
/**
......@@ -523,6 +544,7 @@
'company': this.formRegister.company,
'multipleExpert': this.formRegister.isOfficial,
'multipleStatement': '',
'statement': this.uploadOption.statement.image[0].url,
'projectTypeIds': '',
'postCertificate': funcPostCertificate.join('|'),
......@@ -548,7 +570,7 @@
funcSkillId.push(this.formRegister.skillId[i].join(','))
}
funcParam.projectTypeIds = funcSkillId.join('|')
console.log(JSON.stringify(funcParam))
iRequest.request(iHost.base + 'bid/zUserExpert/saveUserInfo', funcParam, 'json', 'post')
.then((funcResponse) => {
this.$message({ message: '修改已提交，请等待审核', type: 'success' })
......@@ -572,6 +594,13 @@
}
}
for (let i = 0, l = this.uploadOption.statement.image.length; i < l; i++) {
if (this.uploadOption.statement.image[i].status === 'ready') {
this.$refs.uploadStatement.submit()
return
}
}
for (let i = 0, l = this.uploadOption.education.image.length; i < l; i++) {
if (this.uploadOption.education.image[i].status === 'ready') {
this.$refs.uploadEducation.submit()
......@@ -654,8 +683,8 @@
break
case 'statement':
if (funcFile.raw.type !== 'image/png' && funcFile.raw.type !== 'image/jpeg' && funcFile.raw.type !== 'application/pdf') {
this.$message.error('请上传图片或PDF文档')
if (funcFile.raw.type !== 'image/png' && funcFile.raw.type !== 'image/jpeg') {
this.$message.error('请上传图片')
return false
}
if (funcFile.size >= 6291456) {
......
src/view/specialist/specialist-info.vue
......@@ -21,8 +21,8 @@
<!-- 项目进度 - 采购 -->
<div class="supplier-operation">
<button @click="onChange()">修改</button>
<!-- <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>
</div>
......
src/view/specialist/specialist.vue
......@@ -59,7 +59,6 @@
},
methods: {
authority: function (funcPath) {
console.log(this.info)
if (!this.info) return
switch(this.info.register) {
// 注册账号未通过初审
......
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