From 37a6ace3b51bc1d7bb562242c8a70b51ba3b6680 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期三, 18 三月 2020 13:23:09 +0800
Subject: [PATCH] 调整上传和时间限制
---
src/components/popup/newProject.vue | 114 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 91 insertions(+), 23 deletions(-)
diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue
index 3f62450..b004a5e 100644
--- a/src/components/popup/newProject.vue
+++ b/src/components/popup/newProject.vue
@@ -24,6 +24,7 @@
</el-form-item>
<el-form-item label="璧锋鏃堕棿:" prop="items" style="width: 50%;">
+ <!-- :picker-options="pickerOptions01" -->
<el-date-picker
v-model="ruleForm.items"
type="daterange"
@@ -45,7 +46,8 @@
<substep ref="substep_zj" v-bind:xmId="xmId" v-bind:totalItems="totalItems"></substep>
</div>
<div v-if="add_Step == 2" style="width: 100%; height: 100%;" align="center">
- <substepReadOnly v-bind:form_objs="form_objs" v-bind:showData_="showData_"></substepReadOnly>
+ <!-- <substepReadOnly v-bind:form_objs="form_objs" v-bind:showData_="showData_"></substepReadOnly> -->
+ <substepReadOnly v-bind:xmId="xmId"></substepReadOnly>
</div>
</div>
@@ -74,6 +76,38 @@
substepReadOnly
},
data () {
+ var validateTtems = (rule, value, callback) => {
+ if (value.length > 1) {
+ let a1 = new Date(value[0]);
+ let a2 = new Date(this.ruleForm.items[1]);
+
+
+ if (this.rowData.beginDate && !this.rowData.endDate) {
+ let bb0 = new Date(this.rowData.beginDate);
+ let bb0str = this.$moment(bb0).format('YYYY-MM-DD');
+ if (a1 > bb0) {
+ callback(new Error('寮�濮嬫椂闂村簲灏忎簬' + bb0str));
+ }
+ else if (a2 < bb0) {
+ callback(new Error('缁撴潫鏃堕棿搴斿ぇ浜�' + bb0str));
+ }
+ }
+
+ else if (this.rowData.beginDate && this.rowData.endDate) {
+ let bb0 = new Date(this.rowData.beginDate);
+ let bb1 = new Date(this.rowData.endDate);
+ let bb0str = this.$moment(bb0).format('YYYY-MM-DD');
+ let bb1str = this.$moment(bb1).format('YYYY-MM-DD');
+ if (a1 > bb0) {
+ callback(new Error('寮�濮嬫椂闂村簲灏忎簬' + bb0str));
+ }
+ else if (a2 < bb1) {
+ callback(new Error('缁撴潫鏃堕棿搴斿ぇ浜�' + bb1str));
+ }
+ }
+ callback();
+ }
+ };
return {
userId: undefined,
assign: undefined,
@@ -124,9 +158,10 @@
items: [
{
type: "array",
+ validator: validateTtems,
required: true,
- message: "涓嶈兘涓虹┖",
- trigger: ["change", "blur"]
+ //message: "涓嶈兘涓虹┖",
+ trigger: ["change"]
}
]
@@ -173,8 +208,8 @@
}
});
if(is_null1) {
- this.saveStep1();
- this.loading_save = true;
+ // this.loading_nextStep = true;
+ // this.saveStep1();
}
// this.xmId = "c3b7f55c800e4726b53fdc18dd994603";
@@ -191,30 +226,63 @@
},
saveStep1() {
+ let me = this;
let ruleForm_ = this.ruleForm;
var items1 = this.$moment(ruleForm_.items[0]).format('YYYY-MM-DD');
var items2 = this.$moment(ruleForm_.items[1]).format('YYYY-MM-DD');
//let items1 = new Date(ruleForm_.items[0]).Format("yyyy-MM-dd").toLocaleString();
// let items2 = new Date(ruleForm_.items[1]).Format("yyyy-MM-dd").toLocaleString();
+ let listId = "";
+ let params_ = {
+ reseachType: ruleForm_.objective,
+ name: ruleForm_.name,
+ startTime: items1,
+ endTime: items2,
+ id: me.xmId,
+ desp:ruleForm_.desp,
+ userId: me.userId
+ };
- let url = "/api/scheme/addOrUpdate";
- let me = this;
- this.$axios.get(url,{
- params: {
- reseachType: ruleForm_.objective,
- name: ruleForm_.name,
- startTime: items1,
- endTime: items2,
- id: me.xmId,
- desp:ruleForm_.desp,
- userId: me.userId
- }
- }).then(data_ => {
- me.xmId = data_.data.data;
- me.totalItems = ruleForm_.items;
- me.add_Step = 1;
- }).catch(error =>{
- })
+ if (this.rowData.parentid) {
+ listId = this.rowData.parentid;
+ }
+
+ if (!me.xmId && this.rowData.parentid) {
+ let url_ = "/api/scheme/addOrUpdate";
+ this.$axios.get(url_,{
+ params: params_
+ }).then(data_ => {
+ me.xmId = data_.data.data;
+ me.totalItems = ruleForm_.items;
+ let url = "/api/topic/exam/" + listId;
+ this.$axios.get(url,{
+ params: {
+ projectId: me.xmId
+ }
+ }).then(data_1 => {
+ if(data_1.data.success) {
+ me.add_Step = 1;
+ me.loading_nextStep = false;
+ }else {
+ this.$message({message:'鍒涘缓椤圭洰澶辫触', type: 'warning'});
+ }
+ }).catch(error => {
+ })
+ }).catch(error =>{
+ })
+ }
+ else {
+ let url_ = "/api/scheme/addOrUpdate";
+ this.$axios.get(url_,{
+ params: params_
+ }).then(data_ => {
+ me.xmId = data_.data.data;
+ me.totalItems = ruleForm_.items;
+ me.add_Step = 1;
+ me.loading_nextStep = false;
+ }).catch(error =>{
+ })
+ }
},
saveStep2() {
--
Gitblit v1.8.0