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