From ed51c4e5c2c1701fece85c72b9a02c5becf4702b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E5=AD=A6=E5=9D=A4?= <1107410514@qq.com>
Date: Mon, 11 Nov 2019 12:07:51 +0800
Subject: [PATCH] kun 191111 12:08
---
src/views/InformationQuery.vue | 8 +--
src/views/project/Application.vue | 111 ++++++++++++++++--------------
2 files changed, 62 insertions(+), 57 deletions(-)
diff --git a/src/views/InformationQuery.vue b/src/views/InformationQuery.vue
index e47af60..f165ff9 100644
--- a/src/views/InformationQuery.vue
+++ b/src/views/InformationQuery.vue
@@ -75,8 +75,8 @@
{{info.society_type}} |
{{info.legal_person}} |
{{info.reg_time}} |
- 正常 |
- 异常 |
+ 信用良好 |
+ 活动异常 |
@@ -91,8 +91,8 @@
{{info.society_type}} |
{{info.legal_person}} |
{{info.reg_time}} |
- 正常 |
- 异常 |
+ 信用良好 |
+ 活动异常 |
diff --git a/src/views/project/Application.vue b/src/views/project/Application.vue
index 656a7af..669390c 100644
--- a/src/views/project/Application.vue
+++ b/src/views/project/Application.vue
@@ -553,7 +553,7 @@ export default {
this.sub = s
}
- // this.sub = s
+ this.sub = s
let aterm = new Date(this.aterm).getTime()
let fterm = new Date(this.fterm).getTime()
@@ -568,31 +568,31 @@ export default {
// console.log(this.first_level);
- if (s == 1) {
- if (this.name == '' || this.company == '' || this.tid == '' ||
- this.rid == '' || this.first_level == '' || this.secondary == '' ||
- this.fieldeara == '' || this.attribute == '' || this.aterm == '' ||
- this.fterm == '' || this.postaladdress == '' || this.postalcode == '' ||
- this.pmail == '' || this.plegal == '' || this.plcode == '' ||
- this.pname == '' || this.poster == '' || this.poffice_tel == '' ||
- this.aphone == '' || this.cname == '' || this.cpost == '' || this.coffice_tel == '' ||
- this.cphone == ''
- ) {
- alert('以上内容不可为空!')
- return
- } else if (this.aterm > this.fterm) {
- alert('截止日期应比申请日期晚')
- return
- } else if (!regd.test(this.poffice_tel) || !regd.test(this.coffice_tel)) {
- alert('请填写正确的电话号码!')
- return
- } if (!regs.test(this.aphone) || !regs.test(this.cphone)) {
- alert('请填写正确的手机号码!')
- return
- } else {
- this.sub = s
- }
- }
+ // if (s == 1) {
+ // if (this.name == '' || this.company == '' || this.tid == '' ||
+ // this.rid == '' || this.first_level == '' || this.secondary == '' ||
+ // this.fieldeara == '' || this.attribute == '' || this.aterm == '' ||
+ // this.fterm == '' || this.postaladdress == '' || this.postalcode == '' ||
+ // this.pmail == '' || this.plegal == '' || this.plcode == '' ||
+ // this.pname == '' || this.poster == '' || this.poffice_tel == '' ||
+ // this.aphone == '' || this.cname == '' || this.cpost == '' || this.coffice_tel == '' ||
+ // this.cphone == ''
+ // ) {
+ // alert('以上内容不可为空!')
+ // return
+ // } else if (this.aterm > this.fterm) {
+ // alert('截止日期应比申请日期晚')
+ // return
+ // } else if (!regd.test(this.poffice_tel) || !regd.test(this.coffice_tel)) {
+ // alert('请填写正确的电话号码!')
+ // return
+ // } if (!regs.test(this.aphone) || !regs.test(this.cphone)) {
+ // alert('请填写正确的手机号码!')
+ // return
+ // } else {
+ // this.sub = s
+ // }
+ // }
},
/** 上传文件 */
/*
@@ -654,32 +654,32 @@ export default {
let regd = /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/
let regs = /^(0|86|17951)?(13[0-9]|15[012356789]|166|17[3678]|18[0-9]|14[57])[0-9]{8}$/
- if (this.sub == 1) {
- if (this.prespo == '' || this.respoadd == '' || this.respopcode == '' ||
- this.respomail == '' || this.respopname == '' ||
- this.respopost == '' || this.respoophone == '' ||
- this.respocname == '' || this.respocpost == '' || this.respocophone == '' ||
- this.decldes == '' || this.prodes == '' ||
- this.prodemo == '' || this.prodemojc == '' || this.prodemotj == '' ||
- this.prodemojd == '' || this.prodemoxg == '' || this.prodemofg == '' ||
- this.prodemotwo == '' || this.funds == ''
- ) {
- alert('以上内容不可为空!')
- return
- } else if (!regd.test(this.respoophone) || !regd.test(this.respocophone)) {
- alert('请填写正确的电话号码!')
- return
- } else if (this.thff == false) {
- alert('请同意:申报单位承诺')
- return
- } else if (this.fileLists.length == 0) {
- alert('未上传文件!')
- return
- }
- } else {
- alert('数据出错!')
- return
- }
+ // if (this.sub == 1) {
+ // if (this.prespo == '' || this.respoadd == '' || this.respopcode == '' ||
+ // this.respomail == '' || this.respopname == '' ||
+ // this.respopost == '' || this.respoophone == '' ||
+ // this.respocname == '' || this.respocpost == '' || this.respocophone == '' ||
+ // this.decldes == '' || this.prodes == '' ||
+ // this.prodemo == '' || this.prodemojc == '' || this.prodemotj == '' ||
+ // this.prodemojd == '' || this.prodemoxg == '' || this.prodemofg == '' ||
+ // this.prodemotwo == '' || this.funds == ''
+ // ) {
+ // alert('以上内容不可为空!')
+ // return
+ // } else if (!regd.test(this.respoophone) || !regd.test(this.respocophone)) {
+ // alert('请填写正确的电话号码!')
+ // return
+ // } else if (this.thff == false) {
+ // alert('请同意:申报单位承诺')
+ // return
+ // } else if (this.fileLists.length == 0) {
+ // alert('未上传文件!')
+ // return
+ // }
+ // } else {
+ // alert('数据出错!')
+ // return
+ // }
/**
* if (!regs.test(this.respoptel) || !regs.test(this.respoctel)) {
alert('请填写正确的手机号码!')
@@ -700,9 +700,14 @@ export default {
s = index;
this.subStatus = s
let val = this.proimages
- val = this.fileLists
+ // val = JSON.stringify(this.fileLists)
+ val = this.fileLists.join(',')
this.proimages = val
+ // console.log(this.proimages);
+ // return false;
+
+
if (this.proimages.length == 0) {
alert('文件还未上传!')
return