From 58040abb94455547a36ed94d0fa36770bbc7c075 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 29 Jul 2020 14:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=90=8E=E5=8F=B0bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=91-=E3=80=90=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=9B=E8=BF=90=E8=90=A5=E5=AF=BC=E5=87=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6=E5=9B=9E=E6=BB=9A?=
 =?UTF-8?q?=E3=80=91--=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07/29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/analysis/export/operation.vue     | 47 ++++---------------
 src/views/modules/events/item-close-list.vue  |  7 +++
 src/views/modules/events/item-deal-list.vue   |  7 +++
 src/views/modules/events/item-end-list.vue    |  7 +++
 4 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/src/views/modules/analysis/export/operation.vue b/src/views/modules/analysis/export/operation.vue
index 7ce5a4a0..b15653e5 100644
--- a/src/views/modules/analysis/export/operation.vue
+++ b/src/views/modules/analysis/export/operation.vue
@@ -27,27 +27,16 @@
           </template>
         </el-form-item>
         <el-row>
-          <el-form-item label="提交时间"
-                        prop="startTime">
-            <el-date-picker v-model="dataForm.operationStartTime"
-                            type="date"
-                            :picker-options="pickerBeginDateBefore"
-                            value-format="yyyy-MM-dd"
-                            format="yyyy-MM-dd"
-                            placeholder="选择日期时间"
-                            style="width:250px;">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="至"
-                        label-width="25px"
-                        prop="endTime">
-            <el-date-picker v-model="dataForm.operationEndTime"
-                            type="date"
-                            :picker-options="pickerBeginDateAfter"
+          <el-form-item prop="newsReleaseStartTime"
+                        v-if="this.timeFlag==1"
+                        label="有效时间">
+            <el-date-picker @change='setRegistTime'
+                            v-model="time"
                             value-format="yyyy-MM-dd"
-                            format="yyyy-MM-dd"
-                            placeholder="选择日期时间"
-                            style="width:250px;">
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
         </el-row>
@@ -105,23 +94,7 @@ export default {
       options: [],
       categorys: [],
       loading: false,
-      timeFlag: '1',
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.operationEndTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.operationStartTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
+      timeFlag: '1'
     }
   },
   activated () {
diff --git a/src/views/modules/events/item-close-list.vue b/src/views/modules/events/item-close-list.vue
index abd4ef78..bbd82ae3 100644
--- a/src/views/modules/events/item-close-list.vue
+++ b/src/views/modules/events/item-close-list.vue
@@ -128,6 +128,13 @@
                         align="center"
                         show-overflow-tooltip
                 ></el-table-column>
+                <el-table-column
+                        prop="mobile"
+                        label="提交人手机号"
+                        header-align="center"
+                        min-width="200"
+                        align="center"
+                ></el-table-column>
                 <el-table-column
                         prop="participantsNum"
                         label="参与人数"
diff --git a/src/views/modules/events/item-deal-list.vue b/src/views/modules/events/item-deal-list.vue
index d5f8b6ce..2dc112a9 100644
--- a/src/views/modules/events/item-deal-list.vue
+++ b/src/views/modules/events/item-deal-list.vue
@@ -128,6 +128,13 @@
                         align="center"
                         show-overflow-tooltip
                 ></el-table-column>
+                <el-table-column
+                        prop="mobile"
+                        label="提交人手机号"
+                        header-align="center"
+                        min-width="200"
+                        align="center"
+                ></el-table-column>
                 <el-table-column
                         prop="participantsNum"
                         label="参与人数"
diff --git a/src/views/modules/events/item-end-list.vue b/src/views/modules/events/item-end-list.vue
index 6b07ecbd..f79309b7 100644
--- a/src/views/modules/events/item-end-list.vue
+++ b/src/views/modules/events/item-end-list.vue
@@ -128,6 +128,13 @@
                         align="center"
                         show-overflow-tooltip
                 ></el-table-column>
+                <el-table-column
+                        prop="mobile"
+                        label="提交人手机号"
+                        header-align="center"
+                        min-width="200"
+                        align="center"
+                ></el-table-column>
                 <el-table-column
                         prop="participantsNum"
                         label="参与人数"