From 89ba01e8e0bec7fdadc5278c95850cfe68b9e62a Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期二, 11 二月 2020 17:33:01 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/components/popup/portion/substep.vue | 499 ++++++++++++++++++++++++++++---------------------------
1 files changed, 256 insertions(+), 243 deletions(-)
diff --git a/src/components/popup/portion/substep.vue b/src/components/popup/portion/substep.vue
index c628b12..7a308f7 100644
--- a/src/components/popup/portion/substep.vue
+++ b/src/components/popup/portion/substep.vue
@@ -38,7 +38,7 @@
</el-col>
</el-row>
<el-row v-if="form_['title'].titleType">
- <el-col :span="22" class="z_grid-content2">
+ <el-col :span="22" class="z_grid-content1">
<el-form-item label="鎻忚堪" prop="titleType"
:rules="[{required: true, message: '璇疯緭鍏�', trigger: ['blur', 'change']}]"
>
@@ -80,17 +80,20 @@
</el-col>
</el-row>
<el-row>
- <el-form-item label="璧锋鏃堕棿:" prop="items">
- <el-date-picker
- v-model="form_['title'].items"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- style="width: 100%;"
- >
- </el-date-picker>
- </el-form-item>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['title'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
<!-- <el-col :span="11" class="z_grid-content3">
<el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
@@ -149,17 +152,20 @@
</el-col>
</el-row>
<el-row>
- <el-form-item label="璧锋鏃堕棿:" prop="items">
- <el-date-picker
- v-model="form_['scheme'].items"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- style="width: 100%;"
- >
- </el-date-picker>
- </el-form-item>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['scheme'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
<!-- <el-col :span="11" class="z_grid-content3">
<el-form-item label="寮�濮嬫棩鏈�" prop="startTime"
@@ -218,18 +224,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['search'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['search'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -275,18 +281,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['select'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['select'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -332,18 +338,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['get'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['get'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -389,18 +395,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['find'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['find'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -446,18 +452,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['properties'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['properties'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -503,18 +509,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['risk'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['risk'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -560,18 +566,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['target'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['target'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -617,18 +623,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['propertiesArrangement'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['propertiesArrangement'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -674,18 +680,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['riskChart'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['riskChart'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -731,18 +737,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['meta'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['meta'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -788,18 +794,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['grade'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['grade'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -845,18 +851,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['tsa'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['tsa'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -902,18 +908,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['compose'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['compose'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -959,18 +965,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['translate'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['translate'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -1016,18 +1022,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['evaluation'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['evaluation'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -1073,18 +1079,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['recommend'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['recommend'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -1130,18 +1136,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['format'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['format'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -1187,18 +1193,18 @@
</el-col>
</el-row>
<el-row>
- <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_['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, message: '璇烽�夋嫨', trigger: ['change', 'blur']}"
- >
- <el-date-picker type="date" size="mini" placeholder="閫夋嫨缁撴潫鏃ユ湡" v-model="form_['Contribute'].endTime" style="width: 100%;"></el-date-picker>
+ <el-col :span="22" class="z_grid-content3">
+ <el-form-item label="璧锋鏃堕棿:" prop="items">
+ <el-date-picker
+ v-model="form_['Contribute'].items"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 100%;"
+ size="mini"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -1230,11 +1236,17 @@
callback(new Error('璇烽�夋嫨'));
}
- if (value[0] < this.totalItems[0]) {
- callback(new Error('蹇呴』澶т簬' + this.$moment(ruleForm_.items[0]).format('YYYY-MM-DD')));
+ 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] > this.totalItems[1]) {
- callback(new Error('蹇呴』灏忎簬' + this.$moment(ruleForm_.items[1]).format('YYYY-MM-DD')));
+ if (value[1] > bb1) {
+ callback(new Error('蹇呴』灏忎簬' + aa1));
}
else {
@@ -1467,6 +1479,7 @@
items: [
{
required: true,
+ totalItems: this.totalItems,
validator: validateItems,
type: "array",
trigger: ["change", "blur"]
--
Gitblit v1.8.0