Skip to content

严立 / cd-bid

Go to a project
Commit cb0fb689 by 严立
Options

修复问题

parent ad65a90d
Inline Side-by-side
Showing with 102 additions and 14 deletions
favicon.ico 0 → 100644
No preview for this file type
index.html
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<title>建信招标采购平台</title> <title>建信招标采购平台</title>
</head> </head>
<body> <body>
......
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/',
...@@ -10,9 +10,9 @@ let output = { ...@@ -10,9 +10,9 @@ let output = {
// agentSignIn: 'http://bid-vue.meiqicloud.com/' // agentSignIn: 'http://bid-vue.meiqicloud.com/'
// 正式环境 // 正式环境
// base: '/Api/', base: '/Api/',
// resources: 'https://www.fjbidding.com', resources: 'https://www.fjbidding.com',
// agentSignIn: 'https://www.fjbidding.com/admin/' agentSignIn: 'https://www.fjbidding.com/admin/'
} }
output.uploadFile = output.base + 'bid/common/webupload/upload' output.uploadFile = output.base + 'bid/common/webupload/upload'
......
src/components/currency-footer.vue
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<div class="record-info global-maxwidth row con-c align-c"> <div class="record-info global-maxwidth row con-c align-c">
<span>©2020</span> <span>©2020</span>
<span>建信发展(厦门)采购招标有限公司</span> <span>建信发展(厦门)采购招标有限公司</span>
<span>备案号：闽ICP备05001567</span> <span><a href="http://www.beian.miit.gov.cn/" target="view_window">备案号：闽ICP备18026805号-4</a></span>
</div> </div>
</div> </div>
</template> </template>
...@@ -159,10 +159,12 @@ ...@@ -159,10 +159,12 @@
height: 50px; height: 50px;
border-top: 1px #DDDDDD solid; border-top: 1px #DDDDDD solid;
a,
span { span {
margin: 0 6px; margin: 0 6px;
font-size: @fontSize00; font-size: @fontSize00;
color: #888888; color: #888888;
text-decoration: none;
} }
} }
} }
......
src/view/home.vue
...@@ -761,7 +761,7 @@ ...@@ -761,7 +761,7 @@
.notice-type-active { .notice-type-active {
border: 1px @colorBlue solid; border: 1px @colorBlue solid;
color: @colorWhite; color: @colorWhite;
background: @colorBlue; background: #3e8ddc;
} }
.notice-list { .notice-list {
width: 1044px; width: 1044px;
......
src/view/personal/supplier-info-change.vue
...@@ -57,6 +57,44 @@ ...@@ -57,6 +57,44 @@
<el-form-item label=""> <el-form-item label="">
<span>复印件需盖有公司印章，大小不超过5MB</span> <span>复印件需盖有公司印章，大小不超过5MB</span>
</el-form-item> </el-form-item>
<el-form-item label="是否参与网上竞价：" prop="isQuote">
<div>
<el-radio-group v-model="formRegister.isQuote">
<el-radio label="0">否</el-radio>
<el-radio label="1">是</el-radio>
</el-radio-group>
</div>
</el-form-item>
<el-form-item v-if="formRegister.isQuote === '1'" label="上传竞价承诺书：" prop="quoteImage">
<!-- 此处 input 是为了模拟校验而设置的隐藏组件 -->
<el-input class="global-none" v-model="formRegister.quoteImage"></el-input>
<el-upload :class="uploadOption.quote.image.length > 0 ? 'upload-none' : ''"
ref="uploadQuote"
list-type="picture-card"
:auto-upload="false"
:limit="1"
:file-list="uploadOption.quote.image"
:action="uploadOption.quote.url"
:data="uploadOption.quote.params"
:on-preview="onUploadPreviewFile"
:on-remove="(file, fileList) => { onUploadRemove('quote', file, fileList) }"
:on-change="(file, fileList) => { onUploadChange('quote', file, fileList) }"
:on-success="(respons, file, fileList) => { onUploadSuccess('quote', respons, file, fileList) }"
:on-error="(error) => { onUploadFail('quote', error) }"
>
<div class="col">
<i class="el-icon-plus"></i>
<span>点击上传网上竞价承诺书</span>
</div>
</el-upload>
</el-form-item>
<el-form-item v-if="formRegister.isQuote === '1'" label="">
<span>（请查看</span>
<span class="global-color-red">网上竞价须知</span>
<span>，并下载</span>
<span class="global-cursor global-color-red" @click="onLoadStatement">网上竞价承诺书</span>
<span>，签名盖章后扫描上传，大小不超过5MB）</span>
</el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -153,6 +191,14 @@ ...@@ -153,6 +191,14 @@
}, },
image: [] image: []
}, },
quote: {
url: iHost.uploadFile,
params: {
'file': '',
'uploadPath': 'register/supplier/license/',
},
image: []
},
}, },
uploadFileUrl: '', uploadFileUrl: '',
winUploadFile: false, winUploadFile: false,
...@@ -202,6 +248,9 @@ ...@@ -202,6 +248,9 @@
licenseImage: [ licenseImage: [
{ required: true, message: '请上传营业执照', trigger: 'blur' } { required: true, message: '请上传营业执照', trigger: 'blur' }
], ],
quoteImage: [
{ required: true, message: '请上传网上竞价承诺书', trigger: 'blur' }
],
companyTax: [ companyTax: [
{ required: true, message: '请选择税务资质', trigger: 'blur' } { required: true, message: '请选择税务资质', trigger: 'blur' }
], ],
...@@ -288,6 +337,8 @@ ...@@ -288,6 +337,8 @@
'companyAddress': funcResponse.address, 'companyAddress': funcResponse.address,
'email': funcResponse.email, 'email': funcResponse.email,
'licenseImage': funcResponse.license, 'licenseImage': funcResponse.license,
'quoteImage': funcResponse.bidStatement,
'isQuote': funcResponse.isJoinBid,
'companyTax': funcResponse.taxType, 'companyTax': funcResponse.taxType,
'companyInvoice': funcResponse.invoiceType.split(','), 'companyInvoice': funcResponse.invoiceType.split(','),
...@@ -330,6 +381,18 @@ ...@@ -330,6 +381,18 @@
'percentage': 100, 'percentage': 100,
'uid': 1592304942343 'uid': 1592304942343
}) })
// 设置竞技承诺书图片
if (this.formRegister.isQuote === '1') {
this.uploadOption.quote.image.push({
'status': 'success',
'url': this.formRegister.quoteImage,
'name': 'image.png',
'size': 100,
'percentage': 100,
'uid': 1592304942344
})
}
}) })
.catch((funcError) => { .catch((funcError) => {
this.$message.error(funcError.message) this.$message.error(funcError.message)
...@@ -368,6 +431,8 @@ ...@@ -368,6 +431,8 @@
'address': this.formRegister.companyAddress, 'address': this.formRegister.companyAddress,
'email': this.formRegister.email, 'email': this.formRegister.email,
'license': this.uploadOption.license.image[0].url, 'license': this.uploadOption.license.image[0].url,
'bidStatement': this.uploadOption.quote.image[0].url,
'isJoinBid': this.formRegister.isQuote,
'taxType': this.formRegister.companyTax, 'taxType': this.formRegister.companyTax,
'phone': this.formRegister.companyPhone, 'phone': this.formRegister.companyPhone,
'invoiceType': this.formRegister.companyInvoice, 'invoiceType': this.formRegister.companyInvoice,
...@@ -390,7 +455,7 @@ ...@@ -390,7 +455,7 @@
this.$router.push('/supplier/info') this.$router.push('/supplier/info')
}) })
.catch((funcError) => { .catch((funcError) => {
this.$message.error(funcError.message) // this.$message.error(funcError.message)
}) })
}, },
......
src/view/personal/supplier-info.vue
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<!-- 项目进度 - 采购 --> <!-- 项目进度 - 采购 -->
<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>
...@@ -56,6 +57,12 @@ ...@@ -56,6 +57,12 @@
<img :src="formInfo.licenseImage" alt=""> <img :src="formInfo.licenseImage" alt="">
</div> </div>
</div> </div>
<div v-if="formInfo.isQuote === '1'" class="item-text row">
<span>竞价承诺书：</span>
<div class="item-img">
<img :src="formInfo.quoteImage" alt="">
</div>
</div>
</div> </div>
<div class="detail-title row align-c"> <div class="detail-title row align-c">
...@@ -138,6 +145,8 @@ ...@@ -138,6 +145,8 @@
companyAddress: '', // 地址 companyAddress: '', // 地址
email: '', // 邮箱 email: '', // 邮箱
licenseImage: '', // 营业执照 licenseImage: '', // 营业执照
quoteImage: '', // 竞价承诺书
isQuote: '',
companyTax: '', // 税务资质 companyTax: '', // 税务资质
companyInvoice: [], // 发票类型 companyInvoice: [], // 发票类型
...@@ -174,6 +183,8 @@ ...@@ -174,6 +183,8 @@
'companyAddress': funcResponse.address, 'companyAddress': funcResponse.address,
'email': funcResponse.email, 'email': funcResponse.email,
'licenseImage': funcResponse.license, 'licenseImage': funcResponse.license,
'quoteImage': funcResponse.bidStatement,
'isQuote': funcResponse.isJoinBid,
'companyTax': Number(funcResponse.taxType), 'companyTax': Number(funcResponse.taxType),
'companyInvoice': funcResponse.invoiceType.split(','), 'companyInvoice': funcResponse.invoiceType.split(','),
......
src/view/personal/supplier-orders-bills.vue
...@@ -75,10 +75,10 @@ ...@@ -75,10 +75,10 @@
<el-form-item label="收件人电话：" prop="phone"> <el-form-item label="收件人电话：" prop="phone">
<el-input v-model="formBills.phone" maxlength="20" placeholder="请输入电话"></el-input> <el-input v-model="formBills.phone" maxlength="20" placeholder="请输入电话"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="formBills.receiveType === '0'" label="收件地址：" prop="area"> <el-form-item v-if="formBills.receiveType === '0'" label="收件地址：">
<currencyArea @change="onAreaChange"></currencyArea> <currencyArea @change="onAreaChange"></currencyArea>
</el-form-item> </el-form-item>
<el-form-item v-if="formBills.receiveType === '0'" label="" prop="area"> <el-form-item v-if="formBills.receiveType === '0'" label="">
<el-input v-model="formBills.area" maxlength="100" placeholder="请输入详细地址"></el-input> <el-input v-model="formBills.area" maxlength="100" placeholder="请输入详细地址"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="form-button row"> <el-form-item class="form-button row">
......
src/view/register-supplier.vue
...@@ -93,8 +93,8 @@ ...@@ -93,8 +93,8 @@
<el-form-item v-if="formRegister.isQuote === '1'" label="上传竞价承诺书：" prop="quoteImage"> <el-form-item v-if="formRegister.isQuote === '1'" label="上传竞价承诺书：" prop="quoteImage">
<!-- 此处 input 是为了模拟校验而设置的隐藏组件 --> <!-- 此处 input 是为了模拟校验而设置的隐藏组件 -->
<el-input class="global-none" v-model="formRegister.quoteImage"></el-input> <el-input class="global-none" v-model="formRegister.quoteImage"></el-input>
<el-upload :class="uploadOption.license.image.length > 0 ? 'upload-none' : ''" <el-upload :class="uploadOption.quote.image.length > 0 ? 'upload-none' : ''"
ref="uploadLicense" ref="uploadQuote"
list-type="picture-card" list-type="picture-card"
:auto-upload="false" :auto-upload="false"
:limit="1" :limit="1"
...@@ -707,7 +707,7 @@ ...@@ -707,7 +707,7 @@
'emailCode': this.formRegister.emailCode, 'emailCode': this.formRegister.emailCode,
'license': this.uploadOption.license.image[0].url, 'license': this.uploadOption.license.image[0].url,
'bidStatement': this.uploadOption.quote.image[0].url, 'bidStatement': this.formRegister.isQuote === '0' ? '' : this.uploadOption.quote.image[0].url,
'isJoinBid': this.formRegister.isQuote, 'isJoinBid': this.formRegister.isQuote,
'taxType': this.formRegister.companyTax, 'taxType': this.formRegister.companyTax,
...@@ -838,6 +838,15 @@ ...@@ -838,6 +838,15 @@
} }
} }
if (this.uploadOption.license.image.length > 0) {
for (let i = 0, len = this.uploadOption.quote.image.length; i < len; i++) {
if (this.uploadOption.quote.image[i].status === 'ready') {
this.$refs.uploadQuote.submit()
return
}
}
}
this.state = 5 this.state = 5
} }
}) })
......
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