diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..4a2405c Binary files /dev/null and b/dist.zip differ diff --git a/src/components/DivisionLabor.vue b/src/components/DivisionLabor.vue index 4d97478..f16c589 100644 --- a/src/components/DivisionLabor.vue +++ b/src/components/DivisionLabor.vue @@ -26,7 +26,7 @@ export default { mounted () { let t = this this.$nextTick(()=>{ - console.log(t.time,document.getElementById(t.time)) + //console.log(t.time,document.getElementById(t.time)) this.phoneEditor = new E(document.getElementById(t.time)) let phoneEditor = this.phoneEditor phoneEditor.customConfig.pasteFilterStyle = false diff --git a/src/components/HeaderNav.vue b/src/components/HeaderNav.vue index bf173f5..2172efa 100644 --- a/src/components/HeaderNav.vue +++ b/src/components/HeaderNav.vue @@ -73,8 +73,8 @@ export default { diff --git a/src/views/excutes/Submit_mid.vue b/src/views/excutes/Submit_mid.vue index 638cff7..4e7a80c 100644 --- a/src/views/excutes/Submit_mid.vue +++ b/src/views/excutes/Submit_mid.vue @@ -197,7 +197,7 @@ :http-request="uploadfile2" :disabled="subdata.status == 1000" > -
+
- {{filename? filename.split('_')[0]+''+(filename.split('_')[0].includes('.')?'':'.'+filename.split('.')[1]):""}} + + {{filename?filename:''}}

点击上方图标可上传文件

@@ -233,7 +234,7 @@ :http-request="uploadfile1" :disabled="subdata.status == 1000" > -
+
- {{filename1? filename1.split('_')[0]+''+(filename1.split('_')[0].includes('.')?'':'.'+filename1.split('.')[1]):""}} + + {{filename1?filename1:''}}

点击上方图标可上传文件

@@ -267,7 +269,7 @@ :http-request="uploadfile" :disabled="subdata.status == 1000" > -
+
- {{filename2? filename2.split('_')[0]+''+(filename2.split('_')[0].includes('.')?'':'.'+filename2.split('.')[1]):""}} + + {{filename2?filename2:''}}

点击上方图标可上传文件

@@ -313,6 +316,7 @@ right: 168px; z-index:999" @click="add" + v-if="subdata.status!=1000" >添加
@@ -339,6 +343,7 @@ circle style="margin-left:64px" @click="delactive(j)" + v-if="subdata.status!=1000" >
-
+
-
+
- {{filename4? filename4.split('_')[0]+''+(filename4.split('_')[0].includes('.')?'':'.'+filename4.split('.')[1]):""}} + + {{filename4?filename4:''}}

点击上方图标可上传文件

@@ -421,7 +427,7 @@ :http-request="uploadfile4" :disabled="subdata.status == 1000" > -
+
- {{filename5? filename5.split('_')[0]+''+(filename5.split('_')[0].includes('.')?'':'.'+filename5.split('.')[1]):""}} + + {{filename5?filename5:'' }}

点击上方图标可上传文件

@@ -455,7 +462,7 @@ :http-request="uploadfile5" :disabled="subdata.status == 1000" > -
+
- {{filename6? filename6.split('_')[0]+''+(filename6.split('_')[0].includes('.')?'':'.'+filename6.split('.')[1]):""}} + + {{filename6? filename6:""}}

点击上方图标可上传文件

@@ -1085,10 +1093,10 @@ export default { console.log(data, "data"); this.teamtext = data; }, - inform(data) { - console.log(data,44444); - this.infomrText = data; - }, + // inform(data) { + // console.log(data,44444); + // this.infomrText = data; + // }, inform2(data) { console.log(data, "111111e"); this.team = data; @@ -1115,7 +1123,7 @@ export default { this.plementText = data; }, fileloading(e,f,g,m){ - let houzui =e.split('.')[3] + let houzui = e.substring(e.lastIndexOf(".")+1)//e.split('.')[3] console.log(houzui) if (houzui == "doc" || houzui == "docx") { this[g] = "/static/img/word.png"; @@ -1441,7 +1449,7 @@ export default { }, getSubmis() { let t = this; - console.log(t.$route.query.id, "aa"); + //console.log(t.$route.query.id, "aa"); this.$http({ method: "get", url: "v1/test/center", @@ -1451,7 +1459,7 @@ export default { }) .then(res => { // console.log(res.data.code) - console.log(res, 888); + // console.log(res, 888); if (res.data.data.code === 200) { t.subdata=res.data.data.data.center?res.data.data.data.center:res.data.data.data.optimize @@ -1463,8 +1471,8 @@ export default { ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) + "-"; let D = date.getDate() + " "; - console.log(Y + M + D); - console.log(this.getsubs); + // console.log(Y + M + D); + // console.log(this.getsubs); this.visitDate[0] = Y + M + D; var date1 = new Date(parseInt(this.getsubs.fterm) * 1000); @@ -1474,24 +1482,25 @@ export default { ? "0" + (date1.getMonth() + 1) : date1.getMonth() + 1) + "-"; let D1 = date1.getDate() + " "; - console.log(Y1 + M1 + D1); - console.log(this.getsubs); + // console.log(Y1 + M1 + D1); + // console.log(this.getsubs); this.visitDate[1] = Y1 + M1 + D1; let shili = res.data.data.data.optimize.probook; - + console.log(shili) + // var filename = shili.substring(shili.lastIndexOf('/')+1); // console.log(filename) this.shili = shili.substring(shili.lastIndexOf("/") + 1); - console.log(this.shili,'1223') + // console.log(this.shili,'1223') let shili1 = res.data.data.data.optimize.fangan; this.shili1 = shili1.substring(shili.lastIndexOf("/") + 1); // console.log(this.team,121222)s this.team=res.data.data.data.center.people this.infomrText=res.data.data.data.center.develop this.goalsText=res.data.data.data.center.pro_condition - console.log(this.goalsText,"goad") + //console.log(this.goalsText,"goad") this.effectText=res.data.data.data.center.result this.plementText=res.data.data.data.center.summary this.fileurl=res.data.data.data.center.fina @@ -1499,7 +1508,7 @@ export default { this.fileloading(res.data.data.data.center.elereport,'filename1','imageUrl1','fileurl1') this.fileloading(res.data.data.data.center.adjust,'filename2','imageUrl2','fileurl2') let arrlist = JSON.parse(res.data.data.data.center.ziliao) - console.log(arrlist.length) + // console.log(arrlist.length) if (arrlist.length) { this.ziliaoarr=[] @@ -1512,7 +1521,7 @@ export default { this.$set(this.filenamearr, i, filename); this.ziliaoarr.push(1) let houzhui=this.filenamearr[i].substring(filename.lastIndexOf(".")+1) - console.log(houzhui,'10810') + // console.log(houzhui,'10810') if(houzhui=='rar'||houzhui=='zip'){ this.ziliaoarr[i] = "/static/img/zip.png"; }else if(houzhui=='doc'||houzhui=='docx'){ @@ -1531,7 +1540,7 @@ export default { this.ziliaoarr[i] = url; } - console.log(this.filenamearr) + // console.log(this.filenamearr) } } @@ -1566,7 +1575,42 @@ export default { } } // console.log(this.fileurl3, "额"); - + if(!this.fileurl){ + + this.$message({ + message: '请先上传财务报告!', + type: "error" + }); + return false; + }else if(!this.fileurl1){ + this.$message({ + message: '请先上传电子报告!', + type: "error" + }); + return false; + } + else if(!this.fileurl4){ + this.$message({ + message: '请先上财务中期预算表!', + type: "error" + }); + return false; + } + else if(!this.fileurl5){ + this.$message({ + message: '请先上传其他类报告!', + type: "error" + }); + return false; + } + else if(!this.fileurl6){ + this.$message({ + message: '请先上传中期ppt文件!', + type: "error" + }); + return false; + } + else{ this.$http({ method: "post", url: "v1/test/cent-sub", @@ -1596,17 +1640,19 @@ export default { message: res.data.data.msg, type: "success" }); - this.$router.push({ - name: "project" - }); + this.$router.go(-1) + // this.$router.push({ + // name: "project" + // }); } else { this.$message.error(res.data.data.msg); - this.$router.push({path: `/schedule${this.id}`}); + // this.$router.push({path: `/schedule${this.id}`}); } }) .catch(err => { console.log(err); }); + } }); } else if (index == 1) { this.$confirm("请确认是否提交中期评审材料,提交后不可修改!", "提示", { @@ -1627,41 +1673,34 @@ export default { this.$message({ message: '请先上传财务报告!', - type: "danger" + type: "error" }); return false; }else if(!this.fileurl1){ this.$message({ message: '请先上传电子报告!', - type: "danger" - }); - return false; - } - else if(!this.fileurl2){ - this.$message({ - message: '请先上传调整申请表!', - type: "danger" + type: "error" }); return false; } else if(!this.fileurl4){ this.$message({ message: '请先上财务中期预算表!', - type: "danger" + type: "error" }); return false; } else if(!this.fileurl5){ this.$message({ message: '请先上传其他类报告!', - type: "danger" + type: "error" }); return false; } else if(!this.fileurl6){ this.$message({ message: '请先上传中期ppt文件!', - type: "danger" + type: "error" }); return false; } @@ -1695,12 +1734,14 @@ export default { message: res.data.data.msg, type: "success" }); - this.$router.push({ - name: "project" - }); + this.$router.go(-1) + + // this.$router.push({ + // name: "project" + // }); } else { this.$message.error(res.data.data.msg); - this.$router.push({path: `/schedule${this.id}`}); + // this.$router.push({path: `/schedule${this.id}`}); } }) .catch(err => { diff --git a/src/views/project/Appcationnew.vue b/src/views/project/Appcationnew.vue index a7ab875..ba01e30 100644 --- a/src/views/project/Appcationnew.vue +++ b/src/views/project/Appcationnew.vue @@ -1,10 +1,9 @@ @@ -1023,12 +1027,25 @@ export default { } }) .then(res => { - // this.imageUrl = res.data.data - if (this.uploadname[0] === 100) { + if(res.data.code == 200){ + if (this.uploadname[0] === 100) { // this.progressPercent = 0 this.handleAvatarSuccess(res.data.data, f.file.name); // this.uploadfun.fun(res.data.data, f.file.name); } + }else{ + this.$alert("上传的项目申报书文件上传失败,请修改文件名长度后重新上传", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + } + // this.imageUrl = res.data.data + // if (this.uploadname[0] === 100) { + // // this.progressPercent = 0 + // this.handleAvatarSuccess(res.data.data, f.file.name); + // // this.uploadfun.fun(res.data.data, f.file.name); + // } }) .then(error => { console.log(error); @@ -1062,12 +1079,25 @@ export default { } }) .then(res => { - // this.imageUrl = res.data.data - if (this.uploadname[1] === 100) { + if(res.data.code == 200){ + if (this.uploadname[1] === 100) { // this.progressPercent = 0 this.handleAvatarSuccess1(res.data.data, f.file.name); // this.uploadfun.fun(res.data.data, f.file.name); + } + }else{ + this.$alert("上传的实施方案文件上传失败,请修改文件名长度后重新上传", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; } + // this.imageUrl = res.data.data + // if (this.uploadname[1] === 100) { + // // this.progressPercent = 0 + // this.handleAvatarSuccess1(res.data.data, f.file.name); + // // this.uploadfun.fun(res.data.data, f.file.name); + // } }) .then(error => { console.log(error); @@ -1101,12 +1131,25 @@ export default { } }) .then(res => { - // this.imageUrl = res.data.data - if (this.uploadname[2] === 100) { + if(res.data.code == 200){ + if (this.uploadname[2] === 100) { // this.progressPercent = 0 this.handleAvatarSuccess2(res.data.data, f.file.name); // this.uploadfun.fun(res.data.data, f.file.name); } + }else{ + this.$alert("上传的立项批复文件上传失败,请修改文件名长度后重新上传", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + } + // this.imageUrl = res.data.data + // if (this.uploadname[2] === 100) { + // // this.progressPercent = 0 + // this.handleAvatarSuccess2(res.data.data, f.file.name); + // // this.uploadfun.fun(res.data.data, f.file.name); + // } }) .then(error => { console.log(error); @@ -1140,12 +1183,25 @@ export default { } }) .then(res => { - // this.imageUrl = res.data.data - if (this.uploadname[3] === 100) { + if(res.data.code == 200){ + if (this.uploadname[3] === 100) { // this.progressPercent = 0 this.handleAvatarSuccess3(res.data.data, f.file.name); // this.uploadfun.fun(res.data.data, f.file.name); } + }else{ + this.$alert("上传的项目合同文件上传失败,请修改文件名长度后重新上传", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + } + // this.imageUrl = res.data.data + // if (this.uploadname[3] === 100) { + // // this.progressPercent = 0 + // this.handleAvatarSuccess3(res.data.data, f.file.name); + // // this.uploadfun.fun(res.data.data, f.file.name); + // } }) .then(error => { console.log(error); @@ -1180,11 +1236,24 @@ export default { }) .then(res => { // this.imageUrl = res.data.data - if (this.uploadname[4] === 100) { + // if (this.uploadname[4] === 100) { + // // this.progressPercent = 0 + // this.handleAvatarSuccess4(res.data.data, f.file.name); + // // this.uploadfun.fun(res.data.data, f.file.name); + // } + if(res.data.code == 200){ + if (this.uploadname[4] === 100) { // this.progressPercent = 0 this.handleAvatarSuccess4(res.data.data, f.file.name); // this.uploadfun.fun(res.data.data, f.file.name); } + }else{ + this.$alert("上传的服务承诺书文件上传失败,请修改文件名长度后重新上传", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + } }) .then(error => { console.log(error); @@ -1311,13 +1380,13 @@ export default { this.fileurl = file.response.data.url; console.log(file); }, - handleRemove(file, fileList) { - this.picture.forEach(element => { - if (file.name === element.name) { - this.picture.splice(element, 1); - } - }); - }, + // handleRemove(file, fileList) { + // this.picture.forEach(element => { + // if (file.name === element.name) { + // this.picture.splice(element, 1); + // } + // }); + // }, handlePreview(file) { console.log(file); if (!!window.ActiveXObject || "ActiveXObject" in window) { @@ -1584,6 +1653,11 @@ export default { this.picture.splice(element, 1); } }); + this.fileLists.forEach(element => { + if (file.name === element.name) { + this.fileLists.splice(this.fileLists.lastIndexOf(element), 1); + } + }); }, // handlePreview(file) { // console.log(file); @@ -1752,8 +1826,153 @@ export default { for (let m in this.ruleForm1) { this.ruleForm[m] = this.ruleForm1[m]; } - console.log(this.ruleForm); - this.submitYes(index); + console.log(this.ruleForm.prodemo.length); + //if(this.ruleForm.prodes.length<=11){ + // this.$alert("项目简介不能为空并不得低于四个汉字", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemo.length<=29235) { + // this.$alert("项目实施必要性不能为空并不的低于四个汉字", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // } else if (this.ruleForm.prodemojc.length<=29108) { + // this.$alert("项目实施的基础不能为空并不的低于四个汉字", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemotj.length<=29108) { + // this.$alert("具体方法和途径不能为空并不的低于四个汉字", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemojd.length<=29108) { + // this.$alert("进度安排不能为空并不的低于四个汉字", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemoxg.length<=29108) { + // this.$alert("预期效果不能为空并不的低于四个汉字", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemofg.length<=29108) { + // this.$alert("项目团队及分工不能为空并不的低于四个汉字", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemotwo.length<=29108) { + // this.$alert("项目实施涵盖范围,规模,人群及创新等不能为空并不的低于四个汉字", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.funds.length<=29458) { + // this.$alert("经费预算不能为空并不的低于四个汉字", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if ( + // if(this.ruleForm.prodes.length==0){ + // //<=11 并不得低于四个汉字 + // this.$alert("项目简介不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemo.length==0) { + // //<=29235 并不的低于四个汉字 + // this.$alert("项目实施必要性不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // } else if (this.ruleForm.prodemojc.length==0) { + // //<=29108 并不的低于四个汉字 + // this.$alert("项目实施的基础不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemotj.length==0) { + // //<=29235 并不的低于四个汉字 + // this.$alert("具体方法和途径不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemojd.length==0) { + // // <=29108 并不的低于四个汉字 + // this.$alert("进度安排不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemoxg.length==0) { + // // <=29108 并不的低于四个汉字 + // this.$alert("预期效果不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemofg.length==0) { + // //<=29108 并不的低于四个汉字 + // this.$alert("项目团队及分工不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemotwo.length==0) { + // //<=29108 并不的低于四个汉字 + // this.$alert("项目实施涵盖范围,规模,人群及创新等不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.funds.length==0) { + // // <=29458并不的低于四个汉字 + // this.$alert("经费预算不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + if(this.ruleForm.probook.length ==0 //&& + //&& + // this.ruleForm.pifu.length && + // this.ruleForm.pact.length && + // this.ruleForm.promise.length + ) { + this.$alert("请上传项目申报书", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + + } else if(this.ruleForm.fangan.length == 0 ){ + this.$alert("请上传实施方案", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false + }else if(this.picture.length == 0 ){ + this.$alert("请上传项目主责单位意见", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false + }else{ + this.submitYes(index); + } + //this.submitYes(index); } else { this.$message({ type: "info", @@ -1816,8 +2035,97 @@ export default { for (let m in this.ruleForm1) { this.ruleForm[m] = this.ruleForm1[m]; } - console.log(this.ruleForm); - this.submitYes(index); + console.log(this.ruleForm.prodes.length); + // if(this.ruleForm.prodes.length==0){ + // //<=11 并不得低于四个汉字 + // this.$alert("项目简介不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemo.length==0) { + // //<=29235 并不的低于四个汉字 + // this.$alert("项目实施必要性不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // } else if (this.ruleForm.prodemojc.length==0) { + // //<=29108 并不的低于四个汉字 + // this.$alert("项目实施的基础不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemotj.length==0) { + // //<=29235 并不的低于四个汉字 + // this.$alert("具体方法和途径不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemojd.length==0) { + // // <=29108 并不的低于四个汉字 + // this.$alert("进度安排不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemoxg.length==0) { + // // <=29108 并不的低于四个汉字 + // this.$alert("预期效果不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemofg.length==0) { + // //<=29108 并不的低于四个汉字 + // this.$alert("项目团队及分工不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.prodemotwo.length==0) { + // //<=29108 并不的低于四个汉字 + // this.$alert("项目实施涵盖范围,规模,人群及创新等不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + // }else if (this.ruleForm.funds.length==0) { + // // <=29458并不的低于四个汉字 + // this.$alert("经费预算不能为空", "提示", { + // confirmButtonText: "确定", + // callback: action => {} + // }); + // return false; + if ( + this.ruleForm.probook.length ==0 //&& + //&& + // this.ruleForm.pifu.length && + // this.ruleForm.pact.length && + // this.ruleForm.promise.length + ) { + this.$alert("请上传项目申报书", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + + } else if(this.picture.length == 0 ){ + this.$alert("请上传项目主责单位意见", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false + }else if(this.ruleForm.fangan.length == 0 ){ + this.$alert("请上传实施方案", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + }else{ + this.submitYes(index); + } + //this.submitYes(index); } else { this.$message({ type: "info", @@ -1870,13 +2178,13 @@ export default { } else { this.$message({ type: "info", - message: res.data.data.msg + message: res.data.data.message }); } } else { this.$message({ type: "info", - message: res.data.data.msg + message: res.data.data.message }); } }) @@ -2278,7 +2586,8 @@ export default { this.imageUrl4 = "/static/img/txt.jpg"; } } - this.filename =this.bgData.probook? this.bgData.probook.substring( + if(this.bgData){ + this.filename =this.bgData.probook? this.bgData.probook.substring( this.bgData.probook.lastIndexOf("/") + 1 ):''; //sconsole.log(this.filename) @@ -2298,6 +2607,8 @@ export default { let imgs = JSON.parse(this.bgData.proimages); this.fileLists = imgs; this.picture = this.fileLists; + } + // this.assignment(this.bgData); } else { alert("请求失败!"); @@ -2312,7 +2623,8 @@ export default { this.company = sessionStorage.name; }, mounted() { - this.status(); + //this.status(); + this.getData(); } }; diff --git a/src/views/project/Application.vue b/src/views/project/Application.vue index 49002c0..917172e 100644 --- a/src/views/project/Application.vue +++ b/src/views/project/Application.vue @@ -347,7 +347,7 @@
七、项目主责单位意见
-

预览

+
@@ -1063,8 +1063,18 @@ export default { for (let m in this.ruleForm1) { this.ruleForm[m] = this.ruleForm1[m]; } - console.log(this.ruleForm); - this.submitYes(index); + console.log(this.ruleForm.proimages); + if(this.picture.length == 0 || this.picture == ''){ + this.$message({ + type: "info", + message: "请上传项目主责单位意见" + }); + return false + }else{ + console.log(this.ruleForm); + this.submitYes(index); + } + //this.submitYes(index);s } else { this.$message({ type: "info", @@ -1089,13 +1099,23 @@ export default { if (this.ruleForm.thff) { this.ruleForm.party_id = sessionStorage.getItem("party_id"); this.ruleForm.proimages = JSON.stringify(this.picture); - console.log(this.picture,'picture') - console.log(this.fileLists); for (let m in this.ruleForm1) { this.ruleForm[m] = this.ruleForm1[m]; } + if(this.picture.length == 0 || this.picture == ''){ + this.$message({ + type: "info", + message: "请上传项目主责单位意见" + }); + return false + }else{ + console.log(this.ruleForm); + this.submitYes(index); + } + console.log(this.picture,'picture') + console.log(this.fileLists); + console.log(this.ruleForm); - this.submitYes(index); } else { this.$message({ type: "info", diff --git a/src/views/project/Project.vue b/src/views/project/Project.vue index 9a7489b..e18921d 100644 --- a/src/views/project/Project.vue +++ b/src/views/project/Project.vue @@ -169,11 +169,8 @@ - + +
三、项目简介
- + > --> +
四、项目论证

(一) 项目实施的必要性、可行性

- +

(二) @@ -1207,7 +1222,7 @@
上传文件 - 只能上传一张不同的图片 +

@@ -1536,7 +1551,7 @@
  • - {{shili? shili.split('_')[0]+''+(shili.split('_')[0].includes('.')?'':'.'+shili.split('.')[1]):"未上传"}} + >{{shili? shili.split('_')[0]+''+(shili.split('_')[0].includes('.')?'':'.'+shili.split('.')[1]):"未上传"}}
  • - {{shili1?shili1.split('_')[0]+''+(shili1.split('_')[0].includes('.')?'':'.'+shili1.split('.')[1]):"未上传"}} + >{{shili1?shili1.split('_')[0]+''+(shili1.split('_')[0].includes('.')?'':'.'+shili1.split('.')[1]):"未上传"}} - {{shili2?shili2.split('_')[0]+'.'+(shili2.split('_')[0].includes('.')?'':shili2.split('.')[1]):"未上传"}} + + >{{shili2?shili2.split('_')[0]+'.'+(shili2.split('_')[0].includes('.')?'':shili2.split('.')[1]):"未上传"}} - {{shili3?shili3.split('_')[0]+'.'+(shili3.split('_')[0].includes('.')?'':shili3.split('.')[1]):"未上传"}} + >{{shili3?shili3.split('_')[0]+'.'+(shili3.split('_')[0].includes('.')?'':shili3.split('.')[1]):"未上传"}} - {{shili4?shili4.split('_')[0]+'.'+(shili4.split('_')[0].includes('.')?'':shili4.split('.')[1]):"未上传"}} + >{{shili4?shili4.split('_')[0]+'.'+(shili4.split('_')[0].includes('.')?'':shili4.split('.')[1]):"未上传"}} 满意度评估报告:   + {{review_zq?review_zq.split('_')[0]+'.'+(review_zq.split('_')[0].includes('.')?'':review_zq.split('.')[1]):"未上传"}} + >{{review_zq?review_zq:"未上传"}} @@ -1713,18 +1729,19 @@ class="yulan" v-if="review_zq" - >{{review_zq.split('.')[1]=="jpg"||review_zq.split('.')[1]=="jpeg"||review_zq.split('.')[1]=="png"||review_zq.split('.')[1]=="pdf"?'预览':'下载'}} + >{{review_zq.substring(review_zq.lastIndexOf(".")+1)=="jpg"||review_zq.substring(review_zq.lastIndexOf(".")+1)=="jpeg"||review_zq.substring(review_zq.lastIndexOf(".")+1)=="png"||review_zq.substring(review_zq.lastIndexOf(".")+1)=="pdf"?'预览':'下载'}} 主管单位评估报告:   + {{review_jx?review_jx.split('_')[0]+'.'+(review_jx.split('_')[0].includes('.')?'':review_jx.split('.')[1]):"未上传"}} - + >{{review_jx?review_jx:"未上传"}} + {{review_jx.split('.')[1]=="jpg"||review_jx.split('.')[1]=="jpeg"||review_jx.split('.')[1]=="png"||review_jx.split('.')[1]=="pdf"?'预览':'下载'}} + >{{review_jx.substring(review_jx.lastIndexOf(".")+1)=="jpg"||review_jx.substring(review_jx.lastIndexOf(".")+1)=="jpeg"||review_jx.substring(review_jx.lastIndexOf(".")+1)=="png"||review_jx.substring(review_jx.lastIndexOf(".")+1)=="pdf"?'预览':'下载'}} @@ -1753,11 +1770,13 @@ 满意度评估报告:   + {{review_my?review_my.split('_')[0]+'.'+(review_my.split('_')[0].includes('.')?'':review_my.split('.')[1]):"未上传"}} + >{{review_my?review_my:"未上传"}} + @@ -1767,16 +1786,19 @@ class="yulan" v-if="review_my" - >{{review_my.split('.')[1]=="jpg"||review_my.split('.')[1]=="jpeg"||review_my.split('.')[1]=="png"||review_my.split('.')[1]=="pdf"?'预览':'下载'}} + >{{review_my.substring(review_my.lastIndexOf(".")+1)=="jpg"||review_my.substring(review_my.lastIndexOf(".")+1)=="jpeg"||review_my.substring(review_my.lastIndexOf(".")+1)=="png"||review_my.substring(review_my.lastIndexOf(".")+1)=="pdf"?'预览':'下载'}} + 主管单位评估报告:   + {{review_my_zq?review_my_zq.split('_')[0]+'.'+(review_my_zq.split('_')[0].includes('.')?'':review_my_zq.split('.')[1]):"未上传"}} + >{{review_my_zq?review_my_zq:"未上传"}} + @@ -1786,7 +1808,8 @@ class="yulan" v-if="review_my_zq" - >{{review_my_zq.split('.')[1]=="jpg"||review_my_zq.split('.')[1]=="jpeg"||review_my_zq.split('.')[1]=="png"||review_my_zq.split('.')[1]=="pdf"?'预览':'下载'}} + >{{review_my_zq.substring(review_my_zq.lastIndexOf(".")+1)=="jpg"||review_my_zq.substring(review_my_zq.lastIndexOf(".")+1)=="jpeg"||review_my_zq.substring(review_my_zq.lastIndexOf(".")+1)=="png"||review_my_zq.substring(review_my_zq.lastIndexOf(".")+1)=="pdf"?'预览':'下载'}} +
  • @@ -2825,11 +2848,19 @@ export default { }) .then(res => { // this.imageUrl = res.data.data - if (this.uploadname[0] === 100) { + if(res.data.code == 200){ + if (this.uploadname[0] === 100) { // this.progressPercent = 0 this.handleAvatarSuccess(res.data.data, f.file.name); // this.uploadfun.fun(res.data.data, f.file.name); } + }else{ + this.$alert("上传的项目申报书文件上传失败,请修改文件名长度后重新上传", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + } }) .then(error => { console.log(error); @@ -2862,12 +2893,22 @@ export default { } }) .then(res => { - // this.imageUrl = res.data.data - if (this.uploadname[1] === 100) { + //console.log(res,'ddjsaljksadj') + if(res.data.code == 200){ + if (this.uploadname[1] === 100) { // this.progressPercent = 0 this.handleAvatarSuccess1(res.data.data, f.file.name); // this.uploadfun.fun(res.data.data, f.file.name); + } + }else{ + this.$alert("上传的实施方案文件上传失败,请修改文件名长度后重新上传", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; } + // this.imageUrl = res.data.data + }) .then(error => { console.log(error); @@ -2902,11 +2943,20 @@ export default { }) .then(res => { // this.imageUrl = res.data.data - if (this.uploadname[2] === 100) { + if(res.data.code == 200){ + if (this.uploadname[2] === 100) { // this.progressPercent = 0 this.handleAvatarSuccess2(res.data.data, f.file.name); // this.uploadfun.fun(res.data.data, f.file.name); } + }else{ + this.$alert("上传的立项批复文件上传失败,请修改文件名长度后重新上传", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + } + }) .then(error => { console.log(error); @@ -2941,11 +2991,20 @@ export default { }) .then(res => { // this.imageUrl = res.data.data - if (this.uploadname[3] === 100) { + if(res.data.code == 200){ + if (this.uploadname[3] === 100) { // this.progressPercent = 0 this.handleAvatarSuccess3(res.data.data, f.file.name); // this.uploadfun.fun(res.data.data, f.file.name); } + }else{ + this.$alert("上传的项目合同文件上传失败,请修改文件名长度后重新上传", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + } + }) .then(error => { console.log(error); @@ -2979,12 +3038,21 @@ export default { } }) .then(res => { - // this.imageUrl = res.data.data - if (this.uploadname[4] === 100) { + if(res.data.code == 200){ + if (this.uploadname[4] === 100) { // this.progressPercent = 0 this.handleAvatarSuccess4(res.data.data, f.file.name); // this.uploadfun.fun(res.data.data, f.file.name); } + }else{ + this.$alert("上传的服务承诺书文件上传失败,请修改文件名长度后重新上传", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + } + // this.imageUrl = res.data.data + }) .then(error => { console.log(error); @@ -3077,7 +3145,7 @@ export default { // }); } }); - return; + return false; } if (this.filename1.length ) { if (a == 1) { @@ -3096,7 +3164,7 @@ export default { // }); } }); - return; + return false; } } else { console.log("error submit!!"); @@ -3139,9 +3207,6 @@ export default { this.sub1 = e; }, submitYes(e) { - // console.log(111); - console.log(e); - console.log(this.bgData, 155525252); let _this = this; if (e == 1) { @@ -3150,7 +3215,6 @@ export default { } else { _this.ruleForm.subStatus = 2; } - console.log(_this.ruleForm,'123456789') this.$http({ method: "post", url: "v1/project/apply-two", @@ -3171,14 +3235,14 @@ export default { } else { this.$message({ type: "info", - message: res.data.data.msg + message: res.data.data.message }); // alert(res.data.data.msg); } } else { this.$message({ type: "info", - message: res.data.data.msg + message: res.data.data.message }); // alert(res.data.message); } @@ -3251,7 +3315,7 @@ export default { console.log(res, "......."); if (res.data.data.code === 200) { this.ruleForm = res.data.data.data.ProjectDetails; - + // this.ruleForm.prodes="" this.bgData = res.data.data.data.ProjectDetails; if ( res.data.data.data.ProjectDetails.status == 1 || @@ -3585,7 +3649,82 @@ export default { // this.ruleForm.pifu = this.fileurl2; // this.ruleForm.pact = this.fileurl3; // this.ruleForm.promise = this.fileurl4; - this.submitYes(index); + // this.submitYes(index); + console.log(this.ruleForm.prodes,'jkl') + if(this.ruleForm.prodes.length==0){ + this.$alert("项目简介不能为空并不得低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemo.length==0) { + this.$alert("项目实施必要性不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + } else if (this.ruleForm.prodemojc.length==0) { + this.$alert("项目实施的基础不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemotj.length==0 ){ + this.$alert("具体方法和途径不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemojd.length==0) { + this.$alert("进度安排不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemoxg.length==0) { + this.$alert("预期效果不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemofg.length==0) { + this.$alert("项目团队及分工不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemotwo.length==0) { + this.$alert("项目实施涵盖范围,规模,人群及创新等不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.funds.length==0) { + this.$alert("经费预算不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if ( + this.ruleForm.probook.length ==0 //&& + //&& + // this.ruleForm.pifu.length && + // this.ruleForm.pact.length && + // this.ruleForm.promise.length + ) { + this.$alert("请上传项目申报书", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + + } else if(this.ruleForm.fangan.length == 0 ){ + this.$alert("请上传实施方案", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + }else{ + this.submitYes(index); + } }) .catch(() => { this.$message({ @@ -3648,19 +3787,76 @@ export default { // this.ruleForm.pifu = this.fileurl2; // this.ruleForm.pact = this.fileurl3; // this.ruleForm.promise = this.fileurl4; - if ( - this.ruleForm.probook && - this.ruleForm.fangan //&& - // this.ruleForm.pifu.length && - // this.ruleForm.pact.length && - // this.ruleForm.promise.length - ) { - this.submitYes(index); - } else { - this.$alert("请完善资料", "提示", { + // console.log(this.ruleForm.funds.length,'casacsa') + if(this.ruleForm.prodes.length==0){ + this.$alert("项目简介不能为空并不得低于四个汉字", "提示", { confirmButtonText: "确定", callback: action => {} }); + return false; + }else if (this.ruleForm.prodemo.length==0) { + this.$alert("项目实施必要性不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + } else if (this.ruleForm.prodemojc.length==0) { + this.$alert("项目实施的基础不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemotj.length==0) { + this.$alert("具体方法和途径不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemojd.length==0) { + this.$alert("进度安排不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemoxg.length==0) { + this.$alert("预期效果不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemofg.length==0) { + this.$alert("项目团队及分工不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.prodemotwo.length==0) { + this.$alert("项目实施涵盖范围,规模,人群及创新等不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if (this.ruleForm.funds.length==0) { + this.$alert("经费预算不能为空并不的低于四个汉字", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + return false; + }else if ( + this.ruleForm.probook.length ==0 + ) { + this.$alert("请上传项目申报书", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + + } else if(this.ruleForm.fangan.length == 0 ){ + this.$alert("请上传实施方案", "提示", { + confirmButtonText: "确定", + callback: action => {} + }); + }else{ + this.submitYes(index); } }) .catch(() => { @@ -3921,11 +4117,13 @@ export default { // return this.$confirm(`确定移除 ${file.name} ?`); }, beforeRemove(file, fileList) { - return this.$confirm(`确定移除 ${file.name} ?`); - if (!ifupdate) { + console.log(this.ifupdate) + if (this.ifupdate) { this.$message.warning("已提交的的附件不能删除"); - this.fileLists[0] = file; + //this.fileLists[0] = file; + return false; } else { + return this.$confirm(`确定移除 ${file.name} ?`); // this.fileLists = JSON.parse(this.executio.mon); // console.log(file,111) @@ -3987,7 +4185,7 @@ export default { } else { this.$message({ type: "error", - message: res.data.data.msg + message: res.data.data.message }); this.month = ""; this.dianziurl = ""; @@ -4063,7 +4261,7 @@ export default { } else { this.$message({ type: "error", - message: res.data.data.msg + message: res.data.data.message }); this.month = ""; this.xinweiurl = ""; @@ -4210,27 +4408,48 @@ export default { let shili1 = res.data.data.data[0].fangan; _this.shili1 = shili1.substring(shili1.lastIndexOf("/") + 1); let shili2 = res.data.data.data[0].pifu; - _this.shili2 = shili2.substring(shili2.lastIndexOf("/") + 1); + if(shili2){ + _this.shili2 = shili2.substring(shili2.lastIndexOf("/") + 1); + } + let shili3 = res.data.data.data[0].pact; - _this.shili3 = shili3.substring(shili3.lastIndexOf("/") + 1); + if(shili3){ + _this.shili3 = shili3.substring(shili3.lastIndexOf("/") + 1); + } + let shili4 = res.data.data.data[0].promise; - _this.shili4 = shili4.substring(shili4.lastIndexOf("/") + 1); + if(shili4){ + _this.shili4 = shili4.substring(shili4.lastIndexOf("/") + 1); + } + let shili6 = res.data.data.data[0].review_my; - _this.review_my_url=shili6 + if(shili6){ + _this.review_my_url=shili6 _this.review_my = shili6?shili6.substring(shili6.lastIndexOf("/") + 1):''; + } + let shili7 = res.data.data.data[0].review_zq; - _this.review_zq_url=shili7 - _this.review_zq = shili7?shili7.substring(shili7.lastIndexOf("/") + 1):''; - + if(shili7){ + _this.review_zq_url=shili7 + _this.review_zq = shili7?shili7.substring(shili7.lastIndexOf("/") + 1):''; + } + + let shili8 = res.data.data.data[0].review_my_zq; - _this.review_my_zq_url=shili8 + if(shili8){ + _this.review_my_zq_url=shili8 _this.review_my_zq = shili8?shili8.substring(shili8.lastIndexOf("/") + 1):''; + } + let shili5 = res.data.data.data[0].review_jx; - _this.review_jx_url = shili5; + if(shili5){ + _this.review_jx_url = shili5; _this.review_jx = shili5?shili5.substring(shili5.lastIndexOf("/") + 1):''; + } + // console.log(_this.review_jx,_this.review_zq,_this.review_my,'123') @@ -4255,9 +4474,10 @@ export default { }, aboutUs(data) { console.log(data); - this.ruleForm.aboutUsText = data; + this.ruleForm.decldes = data; }, projectBrief(data) { + console.log(123) this.ruleForm.prodes = data; }, existingBasis(data) { @@ -4288,10 +4508,10 @@ export default { if (this.bgData.status == 1 || this.bgData.status == 4) { this.$message.warning("已提交的的附件不能修改"); } else { - console.log(res, 1002); + //console.log(res, 1002); let houzui = file.split("."); houzui = houzui[houzui.length - 1]; - console.log(res, file); + // console.log(res, file); this.fileurl1 = res.url; this.filename1 = res.name; +"." + res.extension; diff --git a/src/views/project/fuzhi2.vue b/src/views/project/fuzhi2.vue new file mode 100644 index 0000000..69f9b16 --- /dev/null +++ b/src/views/project/fuzhi2.vue @@ -0,0 +1,3040 @@ + + + + + + diff --git a/src/views/socialcredit.vue b/src/views/socialcredit.vue index 9eaee7b..01e6fc6 100644 --- a/src/views/socialcredit.vue +++ b/src/views/socialcredit.vue @@ -21,12 +21,13 @@ 社会组织名称 -
    {{result.name?result.name:"无"}}
    +
    {{result.name?result.name:"无"}}
    组织状态 - 已注销 - 异常 + 信用良好 + 活动异常 + 统一社会信用代码 @@ -53,8 +54,10 @@ {{result.start_time}}--{{result.end_time}} - 年检情况 - {{result.sec_age?result.sec_age:"无"}} + 行政处罚情况 + {{result.admini_punish?result.admini_punish:"无"}} + 评估情况 {{result.assess?result.assess:"无"}} @@ -74,43 +77,52 @@ - 行政处罚情况 - {{result.admini_punish?result.admini_punish:"无"}} + 活动异常情况 {{result.activity_unusual?result.activity_unusual:"无"}} - - - +
    活动异常情况时限

    {{result.activity_unusual_start}}--{{result.activity_unusual_end}}

    + + +

    严重失信情况

    {{result.break_faith?result.break_faith:"无"}}
    + 严重失信情况时限 + {{result.break_faith_start}}--{{result.break_faith_end}} - - - + + + - + - + +
    严重失信情况时限{{result.break_faith_start}}--{{result.break_faith_end}}
    +
    年检情况
    +
    +
    {{item.year}}年年检:{{item.status=='1'?'已通过':'未通过'}}
    + +
    业务范围业务范围 {{result.business?result.business:"无"}}
    +
    变更信息
    {{result.change_info?result.change_info:"无"}}
    @@ -142,8 +154,8 @@ export default { url: "v1/soc/credit", params: { id: this.$route.query.id } }).then(res => { - console.log(res); - this.result = res.data.data[0]; + console.log(res,'房间里卡什么地方撒'); + this.result = res.data.data; }); }, methods:{ @@ -155,6 +167,9 @@ export default {