From 426d3d33f23bd04e7cafda728cdcc82f11d5baa3 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 21 二月 2023 17:09:07 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

---
 src/views/operate/viewEvent/index.vue |   85 +++++++++++++++++++++++++++---------------
 1 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index e7e39ce..bee1938 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="userList">
     <header>
-<!--      <div class="headerTitle">杩愯惀绠＄悊 >> 妗堝嵎鏌ヨ</div>-->
+      <!--      <div class="headerTitle">杩愯惀绠＄悊 >> 妗堝嵎鏌ヨ</div>-->
       <div class="headerContent">
         <div class="contentItem">
           <div style="width: 80px">鎸夌紪鍙�:</div>
@@ -15,15 +15,30 @@
         <div class="contentItem">
           <div style="width: 80px">鎸夌被鍨�:</div>
           <div class="search">
-            <el-select clearable v-model="searchData.categories" placeholder=" 璇烽�夋嫨绫诲瀷">
-              <el-option v-for="option in categoryOptions" :key="option.id" :label="option.label" :value="option.value"></el-option>
+            <el-select
+              clearable
+              v-model="searchData.categories"
+              placeholder=" 璇烽�夋嫨绫诲瀷"
+            >
+              <el-option
+                v-for="option in categoryOptions"
+                :key="option.id"
+                :label="option.label"
+                :value="option.value"
+              ></el-option>
             </el-select>
           </div>
         </div>
         <div class="contentItem">
           <div style="width: 80px">鎸夌ぞ鍖�:</div>
           <div class="search">
-            <el-cascader clearable v-model="searchData.community" :props="communityProps" :options="communityOptions" placeholder="璇烽�夋嫨绀惧尯">
+            <el-cascader
+              clearable
+              v-model="searchData.community"
+              :props="communityProps"
+              :options="communityOptions"
+              placeholder="璇烽�夋嫨绀惧尯"
+            >
             </el-cascader>
           </div>
         </div>
@@ -63,11 +78,11 @@
       <div class="mainContent">
         <!-- 鏁版嵁灞曠ず -->
         <el-table
-            border
-            stripe
+          border
+          stripe
           ref="multipleTable"
           :header-cell-style="{
-          'background':'#F5F5F5',
+            background: '#F5F5F5',
             background: '#fff',
             'font-weight': '650',
             'line-height': '45px',
@@ -75,12 +90,14 @@
           :data="tableData"
           style="width: 100%"
           :row-class-name="tableRowClassName"
-            @selection-change="tableChange"
+          @selection-change="tableChange"
         >
           <el-table-column type="selection" min-width="5"> </el-table-column>
           <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
             <template slot-scope="scope">
-              <el-link @click="handleView(scope.row)">{{ scope.row.code }}</el-link>
+              <el-link @click="handleView(scope.row)">{{
+                scope.row.code
+              }}</el-link>
             </template>
           </el-table-column>
           <el-table-column prop="category" label="闂绫诲埆" min-width="8">
@@ -163,26 +180,26 @@
           <div class="funs">
             <div class="funsItem">
               <el-checkbox v-model="all" @change="selectAll()"
-              >鍏ㄩ��</el-checkbox
+                >鍏ㄩ��</el-checkbox
               >
             </div>
             <div class="funsItem">
               <el-checkbox v-model="unsame" @change="disSame(tableData)"
-              >鍙嶉��</el-checkbox
+                >鍙嶉��</el-checkbox
               >
             </div>
             <div class="funsItem">
               <el-select
-                  v-model="myIdx"
-                  placeholder="鎵归噺鎿嶄綔"
-                  @change="selectChange"
+                v-model="myIdx"
+                placeholder="鎵归噺鎿嶄綔"
+                @change="selectChange"
               >
                 <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                    :disabled="item.disabled"
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
                 >
                 </el-option>
               </el-select>
@@ -261,8 +278,8 @@
       categoryOptions: CATEGOTY,
       communityOptions: [],
       communityProps: {
-        label: 'regionName',
-        value: 'id'
+        label: "regionName",
+        value: "id",
       },
       myproblem: 1,
       number: "",
@@ -339,11 +356,12 @@
 
     // 鑾峰彇绀惧尯鍜岃閬�
     getCommunityOptions() {
-      department.getDepartmentList()
-          .then(res => {
-            this.communityOptions = res;
-          })
-          .catch(err => this.$message.error(err))
+      department
+        .getDepartmentList()
+        .then((res) => {
+          this.communityOptions = res;
+        })
+        .catch((err) => this.$message.error(err));
     },
 
     // 璁剧疆琛ㄦ牸鏂戦┈绾�
@@ -361,11 +379,16 @@
     },
 
     datepickChange() {
-      this.searchData.startTime = this.datepick[0];
-      this.searchData.endTime = this.datepick[1].replace(
-        "00:00:00",
-        "23:59:59"
-      );
+      if (this.datepick) {
+        this.searchData.startTime = this.datepick[0];
+        this.searchData.endTime = this.datepick[1].replace(
+          "00:00:00",
+          "23:59:59"
+        );
+      } else {
+        this.searchData.startTime = null;
+        this.searchData.endTime = null;
+      }
     },
 
     handleClose(done) {

--
Gitblit v1.8.0