Skip to content

严立 / cd-bid

Go to a project
Commit d4fb1cf2 by 严立
Options

LL - 参与竞价状态异常处理

parent 3f66bf67
Expand all
Inline Side-by-side
Showing with 30 additions and 24 deletions
src/view/personal/supplier-info-change.vue
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</el-form-item> </el-form-item>
<el-form-item label="发票类型(单选)：" prop="companyInvoice"> <el-form-item label="发票类型(单选)：" prop="companyInvoice">
<el-radio-group v-model="formRegister.companyInvoice" :value="formRegister.companyInvoice"> <el-radio-group v-model="formRegister.companyInvoice" :value="formRegister.companyInvoice">
<el-radio label="1">增值税普票</el-radio> <el-radio label="0">增值税普票</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="公司名称：" prop="companyName"> <el-form-item label="公司名称：" prop="companyName">
...@@ -370,8 +370,7 @@ ...@@ -370,8 +370,7 @@
'isQuote': funcResponse.isJoinBid, 'isQuote': funcResponse.isJoinBid,
'companyTax': funcResponse.taxType, 'companyTax': funcResponse.taxType,
'companyInvoice': '1', 'companyInvoice': '0',
// 'companyInvoice': funcResponse.invoiceType.split(','),
'companyPhone': funcResponse.phone, 'companyPhone': funcResponse.phone,
'bankName': funcResponse.openBank, 'bankName': funcResponse.openBank,
'bankAccount': funcResponse.bankAccount, 'bankAccount': funcResponse.bankAccount,
...@@ -380,7 +379,7 @@ ...@@ -380,7 +379,7 @@
'receiveType': funcResponse.receiveType ? funcResponse.receiveType : '0', 'receiveType': funcResponse.receiveType ? funcResponse.receiveType : '0',
'receiveContactor': funcResponse.receiveContactor ? funcResponse.receiveContactor : '', 'receiveContactor': funcResponse.receiveContactor ? funcResponse.receiveContactor : '',
'receiveMobile': funcResponse.receiveMobile ? funcResponse.receiveMobile : '', 'receiveMobile': funcResponse.receiveMobile ? funcResponse.receiveMobile : '',
'receiveArea': funcResponse.receiveArea ? JSON.parse(funcResponse.receiveArea) : '', 'receiveArea': [],
'receiveAddress': funcResponse.receiveAddress ? funcResponse.receiveAddress : '', 'receiveAddress': funcResponse.receiveAddress ? funcResponse.receiveAddress : '',
'corporationName': funcResponse.contactName, 'corporationName': funcResponse.contactName,
...@@ -392,11 +391,17 @@ ...@@ -392,11 +391,17 @@
'examineState': Number(funcResponse.auditState), 'examineState': Number(funcResponse.auditState),
} }
// 判断地址数据类型，同时兼容字符串与数组类型
if (Object.prototype.toString.call(funcResponse.receiveArea) === '[object String]') {
this.formRegister.receiveArea = JSON.parse(funcResponse.receiveArea)
} else {
this.formRegister.receiveArea = funcResponse.receiveArea
}
// 恢复区域数据 // 恢复区域数据
if (this.formRegister.receiveArea) { if (this.formRegister.receiveArea) {
this.$store.commit('areaSelection', this.formRegister.receiveArea) this.$store.commit('areaSelection', this.formRegister.receiveArea)
} }
console.log(this.formRegister)
// 设置营业执照图片 // 设置营业执照图片
this.uploadOption.license.image.push({ this.uploadOption.license.image.push({
...@@ -408,7 +413,7 @@ ...@@ -408,7 +413,7 @@
'uid': 1592304942343 'uid': 1592304942343
}) })
// 设置竞技承诺书图片 // 设置竞价承诺书图片
if (this.formRegister.isQuote === '1') { if (this.formRegister.isQuote === '1') {
this.uploadOption.quote.image.push({ this.uploadOption.quote.image.push({
'status': 'success', 'status': 'success',
...@@ -424,6 +429,7 @@ ...@@ -424,6 +429,7 @@
this.$message.error(funcError.message) this.$message.error(funcError.message)
}) })
}, },
reset: function () { reset: function () {
this.formRegister = { this.formRegister = {
'companyName': '', 'companyName': '',
...@@ -463,7 +469,7 @@ ...@@ -463,7 +469,7 @@
'isJoinBid': this.formRegister.isQuote, 'isJoinBid': this.formRegister.isQuote,
'taxType': this.formRegister.companyTax, 'taxType': this.formRegister.companyTax,
'phone': this.formRegister.companyPhone, 'phone': this.formRegister.companyPhone,
'invoiceType': '1', 'invoiceType': '0',
'openBank': this.formRegister.bankName, 'openBank': this.formRegister.bankName,
'bankAccount': this.formRegister.bankAccount, 'bankAccount': this.formRegister.bankAccount,
'contactName': this.formRegister.corporationName, 'contactName': this.formRegister.corporationName,
...@@ -476,13 +482,6 @@ ...@@ -476,13 +482,6 @@
'receiveAddress': this.formRegister.receiveAddress 'receiveAddress': this.formRegister.receiveAddress
} }
// 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()
iRequest.request(iHost.base + 'bid/zUserCompany/saveUserInfo', funcParam, 'json', 'post') iRequest.request(iHost.base + 'bid/zUserCompany/saveUserInfo', funcParam, 'json', 'post')
.then((funcResponse) => { .then((funcResponse) => {
this.$message({ message: '修改已提交，请等待审核', type: 'success' }) this.$message({ message: '修改已提交，请等待审核', type: 'success' })
...@@ -538,9 +537,11 @@ ...@@ -538,9 +537,11 @@
return return
} }
if (this.uploadOption.quote.image[0].status === 'ready') { if (this.formRegister.isQuote === '1') {
this.$refs.uploadQuote.submit() if (this.uploadOption.quote.image[0].status === 'ready') {
return this.$refs.uploadQuote.submit()
return
}
} }
this.registerInfo() this.registerInfo()
} }
......
src/view/personal/supplier-info.vue
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<span>是否参与网上竞价：</span> <span>是否参与网上竞价：</span>
<span>{{formInfo.isQuote === '0' ? '否' : '是'}}</span> <span>{{formInfo.isQuote === '0' ? '否' : '是'}}</span>
</div> </div>
<div class="item-text row align-c" v-if="formInfo.quoteImage"> <div class="item-text row align-c" v-if="formInfo.isQuote === '1'">
<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>
</div> </div>
......
src/view/personal/supplier-orders-detail.vue
...@@ -281,8 +281,8 @@ ...@@ -281,8 +281,8 @@
'agencLiaison': funcResponse.company.contactName, 'agencLiaison': funcResponse.company.contactName,
} }
if (funcResponse.orderBilling.name) { if (funcResponse.orderBilling) {
this.isReceive = true this.isReceive = !Boolean(Number(funcResponse.orderBilling.receiveType))
this.componentReceive = { this.componentReceive = {
'name': funcResponse.orderBilling.name, 'name': funcResponse.orderBilling.name,
'phone': funcResponse.orderBilling.phone, 'phone': funcResponse.orderBilling.phone,
...@@ -300,6 +300,8 @@ ...@@ -300,6 +300,8 @@
this.isReceive = false this.isReceive = false
} }
console.log(this.isReceive)
if (this.componentProject.isPackage) { if (this.componentProject.isPackage) {
// 多个合同 // 多个合同
let funcRawData = funcResponse.order.tenderPackages let funcRawData = funcResponse.order.tenderPackages
......
src/view/register-supplier.vue
...@@ -139,9 +139,9 @@ ...@@ -139,9 +139,9 @@
<el-radio label="2">非增值纳税人</el-radio> <el-radio label="2">非增值纳税人</el-radio>
</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-radio-group v-model="formRegister.companyInvoice" :value="formRegister.companyInvoice"> <el-radio-group v-model="formRegister.companyInvoice" :value="formRegister.companyInvoice">
<el-radio label="0">增值税专票</el-radio> <el-radio label="0">增值税普票</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="公司名称：" prop="companyName"> <el-form-item label="公司名称：" prop="companyName">
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
companyPhone: '', companyPhone: '',
bankName: '', bankName: '',
bankAccount: '', bankAccount: '',
receiveType: '', receiveType: '0',
receiveContactor: '', receiveContactor: '',
receiveMobile: '', receiveMobile: '',
receiveArea: [], receiveArea: [],
...@@ -431,6 +431,9 @@ ...@@ -431,6 +431,9 @@
{ 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'}
], ],
receiveType: [
{ required: true, message: '请输选择发票领取方式', trigger: 'blur' },
],
receiveContactor: [ receiveContactor: [
{ required: true, message: '请输入收件人姓名', trigger: 'blur' }, { required: true, message: '请输入收件人姓名', trigger: 'blur' },
{ validator: iRule.predefineRoutineText, message: '请正确输入姓名', trigger: 'blur'} { validator: iRule.predefineRoutineText, message: '请正确输入姓名', trigger: 'blur'}
...@@ -485,7 +488,7 @@ ...@@ -485,7 +488,7 @@
companyPhone: '', companyPhone: '',
bankName: '', bankName: '',
bankAccount: '', bankAccount: '',
receiveType: '', receiveType: '1',
receiveContactor: '', receiveContactor: '',
receiveMobile: '', receiveMobile: '',
receiveArea: [], receiveArea: [],
......
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