From 2ef590774e2d655cdc43ee2c6fa4c674ac4d882d Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 12 二月 2020 10:30:13 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/components/square.vue | 4
src/components/popup/portion/substep.vue | 1069 +++++++++++++++++++++++++++++++++++++++++++++++++-------
src/components/popup/newProject.vue | 8
src/views/list.vue | 5
4 files changed, 945 insertions(+), 141 deletions(-)
diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue
index 7d042cf..a102f54 100644
--- a/src/components/popup/newProject.vue
+++ b/src/components/popup/newProject.vue
@@ -237,10 +237,10 @@
if (!form_obj.mustAttach) {
form_obj.mustAttach = false;
}
- if (form_obj.items.length > 0) {
- form_obj.startTime = form_obj.items[0];
- form_obj.endTime = form_obj.items[1];
- }
+ /* if (form_obj.items_fz.length > 0) {
+ form_obj.startTime = form_obj.items_fz[0];
+ form_obj.endTime = form_obj.items_fz[1];
+ } */
if (form_obj.startTime) {
form_obj.startTime = this.$moment(form_obj.startTime).format('YYYY-MM-DD');
diff --git a/src/components/popup/portion/substep.vue b/src/components/popup/portion/substep.vue
index 7a308f7..bd0e292 100644
--- a/src/components/popup/portion/substep.vue
+++ b/src/components/popup/portion/substep.vue
@@ -80,35 +80,36 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['title'].items"
+ v-model="form_['title'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
style="width: 100%;"
size="mini"
+ @change="title_items"
>
</el-date-picker>
</el-form-item>
- </el-col>
+ </el-col> -->
- <!-- <el-col :span="11" class="z_grid-content3">
+ <el-col :span="11" class="z_grid-content3">
<el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
- :rules="{type: "array", required: true, validator: validateStartTime, trigger: ['change', 'blur']}"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
>
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['title'].startTime" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" :picker-options="pickerOptions01" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['title'].startTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
<el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
- :rules="{required: true, validator: validateEndTime, trigger: ['change', 'blur']}"
+ :rules="{required: true, trigger: ['change', 'blur']}"
>
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['title'].endTime" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" :picker-options="pickerOptions02" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['title'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
- </el-col> -->
+ </el-col>
</el-row>
</el-form>
</div>
@@ -119,7 +120,7 @@
<div v-show="showData['scheme']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂规寮�鍙戞湇鍔�</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['scheme']" ref="ref_scheme" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['scheme']" ref="ref_scheme" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -152,35 +153,36 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['scheme'].items"
+ v-model="form_['scheme'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
style="width: 100%;"
size="mini"
+ @change="scheme_items"
>
</el-date-picker>
</el-form-item>
- </el-col>
+ </el-col> -->
- <!-- <el-col :span="11" class="z_grid-content3">
+ <el-col :span="11" class="z_grid-content3">
<el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
:rules="{required: true, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
>
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['scheme'].startTime" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" :picker-options="pickerOptions11" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['scheme'].startTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
<el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
:rules="{required: true, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
>
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['scheme'].endTime" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" :picker-options="pickerOptions12" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['scheme'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
- </el-col> -->
+ </el-col>
</el-row>
</el-form>
</div>
@@ -191,7 +193,7 @@
<div v-show="showData['search']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂囩尞妫�绱�</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['search']" ref="ref_search" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['search']" ref="ref_search" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -224,10 +226,12 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz"
+ :rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
+ >
<el-date-picker
- v-model="form_['search'].items"
+ v-model="form_['search'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -236,6 +240,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions21" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['search'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions22" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['search'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -248,7 +266,7 @@
<div v-show="showData['select']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂囩尞鍒濈瓫</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['select']" ref="ref_select" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['select']" ref="ref_select" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -281,10 +299,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['select'].items"
+ v-model="form_['select'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -293,6 +311,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions31" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['select'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions32" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['select'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -305,7 +337,7 @@
<div v-show="showData['get']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鍏ㄦ枃鑾峰彇</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['get']" ref="ref_get" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['get']" ref="ref_get" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -338,10 +370,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['get'].items"
+ v-model="form_['get'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -350,6 +382,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions41" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['get'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions42" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['get'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -362,7 +408,7 @@
<div v-show="showData['find']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鍏ㄦ枃绛涙煡</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['find']" ref="ref_find" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['find']" ref="ref_find" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -395,10 +441,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['find'].items"
+ v-model="form_['find'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -407,6 +453,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions51" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['find'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions52" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['find'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -419,7 +479,7 @@
<div v-show="showData['properties']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">瀹氭�т俊鎭�</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['properties']" ref="ref_properties" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['properties']" ref="ref_properties" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -452,10 +512,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['properties'].items"
+ v-model="form_['properties'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -464,6 +524,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions61" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['properties'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions62" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['properties'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -476,7 +550,7 @@
<div v-show="showData['risk']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">椋庨櫓鍋忓�氫俊鎭�</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['risk']" ref="ref_risk" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['risk']" ref="ref_risk" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -509,10 +583,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['risk'].items"
+ v-model="form_['risk'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -521,6 +595,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions71" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['risk'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions72" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['risk'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -533,7 +621,7 @@
<div v-show="showData['target']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">缁撳眬鎸囨爣鏁版嵁</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['target']" ref="ref_target" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['target']" ref="ref_target" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -566,10 +654,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['target'].items"
+ v-model="form_['target'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -578,6 +666,21 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions81" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['target'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions82" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['target'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -590,7 +693,7 @@
<div v-show="showData['propertiesArrangement']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">瀹氭�т俊鎭暣鐞嗘�荤粨</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['propertiesArrangement']" ref="ref_propertiesArrangement" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['propertiesArrangement']" ref="ref_propertiesArrangement" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -623,10 +726,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['propertiesArrangement'].items"
+ v-model="form_['propertiesArrangement'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -635,6 +738,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions91" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['propertiesArrangement'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions92" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['propertiesArrangement'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -647,7 +764,7 @@
<div v-show="showData['riskChart']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">椋庨櫓鍋忓�氬浘琛ㄥ埗浣�</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['riskChart']" ref="ref_riskChart" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['riskChart']" ref="ref_riskChart" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -680,10 +797,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['riskChart'].items"
+ v-model="form_['riskChart'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -692,6 +809,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions101" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['riskChart'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions102" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['riskChart'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -704,7 +835,7 @@
<div v-show="showData['meta']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">Meta 鍒嗘瀽</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['meta']" ref="ref_meta" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['meta']" ref="ref_meta" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -737,10 +868,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['meta'].items"
+ v-model="form_['meta'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -749,6 +880,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions111" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['meta'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions112" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['meta'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -761,7 +906,7 @@
<div v-show="showData['grade']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">GRADE 璇佹嵁璐ㄩ噺璇勪环</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['grade']" ref="ref_grade" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['grade']" ref="ref_grade" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -794,10 +939,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['grade'].items"
+ v-model="form_['grade'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -806,6 +951,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions121" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['grade'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions122" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['grade'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -818,7 +977,7 @@
<div v-show="showData['tsa']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">TSA 鍒嗘瀽</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['tsa']" ref="ref_tsa" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['tsa']" ref="ref_tsa" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -851,10 +1010,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['tsa'].items"
+ v-model="form_['tsa'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -863,6 +1022,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions131" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['tsa'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions132" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['tsa'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -875,7 +1048,7 @@
<div v-show="showData['compose']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂囩鎾板啓</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['compose']" ref="ref_compose" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['compose']" ref="ref_compose" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -908,10 +1081,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['compose'].items"
+ v-model="form_['compose'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -920,6 +1093,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions141" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['compose'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions142" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['compose'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -932,7 +1119,7 @@
<div v-show="showData['translate']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">璇█缈昏瘧鍙婃鼎鑹�</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['translate']" ref="ref_translate" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['translate']" ref="ref_translate" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -965,10 +1152,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['translate'].items"
+ v-model="form_['translate'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -977,6 +1164,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions151" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['translate'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions152" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['translate'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -989,7 +1190,7 @@
<div v-show="showData['evaluation']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂囩璇勪及</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['evaluation']" ref="ref_evaluation" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['evaluation']" ref="ref_evaluation" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -1022,10 +1223,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['evaluation'].items"
+ v-model="form_['evaluation'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -1034,6 +1235,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions161" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['evaluation'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions162" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['evaluation'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -1046,7 +1261,7 @@
<div v-show="showData['recommend']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏉傚織鎺ㄨ崘</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['recommend']" ref="ref_recommend" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['recommend']" ref="ref_recommend" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -1079,10 +1294,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['recommend'].items"
+ v-model="form_['recommend'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -1091,6 +1306,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions171" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['recommend'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions172" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['recommend'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -1103,7 +1332,7 @@
<div v-show="showData['format']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂囩鏍煎紡淇敼</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['format']" ref="ref_format" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['format']" ref="ref_format" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -1136,10 +1365,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['format'].items"
+ v-model="form_['format'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -1148,6 +1377,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions181" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['format'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions182" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['format'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -1160,7 +1403,7 @@
<div v-show="showData['Contribute']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">缃戜笂鎶曠</h3>
<div style="z-index: 1">
- <el-form :show-message="false" :model="form_['Contribute']" ref="ref_Contribute" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :rules="rules_check" :show-message="false" :model="form_['Contribute']" ref="ref_Contribute" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="閲戦" prop="budget"
@@ -1193,10 +1436,10 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="22" class="z_grid-content3">
- <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <!-- <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items_fz">
<el-date-picker
- v-model="form_['Contribute'].items"
+ v-model="form_['Contribute'].items_fz"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -1205,6 +1448,20 @@
size="mini"
>
</el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
+ :rules="{ required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions191" size="mini" placeholder="閫夋嫨寮�濮嬫棩鏈�" v-model="form_['Contribute'].startTime" style="width: 100%;"></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" class="z_grid-content3">
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"
+ :rules="{required: true, trigger: ['change', 'blur']}"
+ >
+ <el-date-picker type="date" :picker-options="pickerOptions192" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['Contribute'].endTime" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -1231,30 +1488,569 @@
}
},
data() {
- var validateItems = (rule, value, callback) => {
- if (value === '' || !value || value.length == 0) {
- callback(new Error('璇烽�夋嫨'));
- }
-
- let aa0 = this.totalItems[0];
- let bb0 = new Date(aa0);
-
- let aa1 = this.totalItems[1];
- let bb1 = new Date(aa1);
-
- if (value[0] < bb0) {
- callback(new Error('蹇呴』澶т簬' + aa0));
- }
- if (value[1] > bb1) {
- callback(new Error('蹇呴』灏忎簬' + aa1));
- }
-
- else {
- callback();
- }
- };
-
return {
+ pickerOptions01: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "title";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions02: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "title";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions11: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "scheme";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions12: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "scheme";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions21: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "search";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions22: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "search";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions31: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "select";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions32: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "select";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions41: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "get";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions42: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "get";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions51: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "find";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions52: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "find";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions61: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "properties";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions62: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "properties";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions71: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "risk";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions72: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "risk";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions81: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "target";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions82: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "target";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions91: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "propertiesArrangement";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions92: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "propertiesArrangement";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions101: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "riskChart";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions102: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "riskChart";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions111: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "meta";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions112: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "meta";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions121: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "grade";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions122: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "grade";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions131: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "tsa";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions132: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "tsa";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions141: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "compose";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions142: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "compose";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions151: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "translate";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions152: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "translate";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions161: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "evaluation";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions162: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "evaluation";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions171: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "recommend";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions172: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "recommend";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+ pickerOptions181: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "format";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions182: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "format";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
+
+ pickerOptions191: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "Contribute";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+ if(this.form_[code].endTime) {
+ return time.getTime() < bb0 || time.getTime() > this.form_[code].endTime;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+ pickerOptions192: {
+ disabledDate: (time) => {
+ if (this.totalItems.length>0) {
+ let code = "Contribute";
+ let bb0 = new Date(this.totalItems[0]);
+ let bb1 = new Date(this.totalItems[1]);
+
+ if(this.form_[code].startTime) {
+ return time.getTime() < this.form_[code].startTime || time.getTime() > bb1;
+ }else {
+ return time.getTime() < bb0 || time.getTime() > bb1;
+ }
+ }}
+ },
+
showData: {},
finish: false,
hideData: {
@@ -1476,15 +2272,7 @@
titleInput_: "",
rules_check: {
- items: [
- {
- required: true,
- totalItems: this.totalItems,
- validator: validateItems,
- type: "array",
- trigger: ["change", "blur"]
- }
- ]
+
},
options_users: [
@@ -1554,38 +2342,49 @@
},
getDetailed() {
+ let me = this;
let url = "/api/detail/parent/" + this.xmId;
this.$axios.get(url).then(data_ => {
- this.defaultCheckedKeys = [];
- this.showData = {};
+ me.defaultCheckedKeys = [];
+ me.showData = {};
let details_ = data_.data.data;
if(details_.length > 0) {//濡傛灉瀛樺湪鏄庣粏
for(let i=0; i<details_.length; i++) {
let detail_ = details_[i];
//璁剧疆鏍戠殑閫変腑
- this.defaultCheckedKeys.push(detail_.type);
+ me.defaultCheckedKeys.push(detail_.type);
//灞曞紑鎵�鏈夋爲鑺傜偣瀵瑰簲鐨刦rom
- this.showData[detail_.type] = true;
+ me.showData[detail_.type] = true;
//缁欐墍鏈夌殑from鐨勬暟鎹祴鍊�
- this.form_[detail_.type] = detail_;
- this.form_[detail_.type].userIds = [];
- this.form_[detail_.type].userIds.push(detail_.roleName);
- this.form_[detail_.type].userIds.push(detail_.userId);
+ me.form_[detail_.type] = detail_;
+ me.form_[detail_.type].userIds = [];
+ me.form_[detail_.type].userIds.push(detail_.roleName);
+ me.form_[detail_.type].userIds.push(detail_.userId);
- this.form_[detail_.type].items = [];
- this.form_[detail_.type].items.push(detail_.startTime);
- this.form_[detail_.type].items.push(detail_.endTime);
+ /* let items_ = "items_" + detail_.type;
+ this.form_[detail_.type][items_] = [];
+ this.form_[detail_.type][items_].push(new Date(detail_.startTime));
+ this.form_[detail_.type][items_].push(new Date(detail_.endTime)); */
+ // me.form_[detail_.type].items_fz = [me.$moment(detail_.startTime).format('YYYY-MM-DD'), me.$moment(detail_.endTime).format('YYYY-MM-DD')];
}
}
- this.finish = true;
+ me.finish = true;
}).catch(error =>{
})
},
+ title_items(value) {
+ this.form_['title'].items_fz = value;
+ },
+
+ scheme_items(value) {
+ this.form_['scheme'].items_fz = value;
+ },
+
handleNodeClick(data,checkedNodes){
console.log(data);
//鑾峰彇鎵�鏈夎閫変腑鐨勬牴鑺傜偣锛�
diff --git a/src/components/square.vue b/src/components/square.vue
index 48b7dde..6b0f9ba 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -113,6 +113,7 @@
return {
rowData:undefined,
dialog_1: false,
+ dialog_2: false,
uploadUrl:"/api/api/file/topicUpload",
form:{},
pageno:1,
@@ -161,6 +162,9 @@
this.$refs.newProject_.Cancel();
this.dialogFormVisible = false;
},
+ Cancel1() {
+
+ },
addProject(selected) {
let url = "/api/topic/exam/" + selected.id;
this.$axios.get(url)
diff --git a/src/views/list.vue b/src/views/list.vue
index a54a89e..ff4631b 100644
--- a/src/views/list.vue
+++ b/src/views/list.vue
@@ -145,7 +145,8 @@
tableChange(val) {
this.selected = val;
this.detailData = val;
- if (this.selected.userId == this.userId) {
+ // this.editShow = true;
+ if (this.selected.userId == this.userId) {
this.editShow = true;
}else {
this.editShow = false;
@@ -226,7 +227,7 @@
},
addProject() {
this.dialog_1 = true;
-
+ this.rowData = {};
},
editProject() {
if(!this.selected || this.selected.status != "edit"){
--
Gitblit v1.8.0