From a01feca68569daddc1ab12990570650c2b997fd8 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 16 Oct 2024 16:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8,=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E9=94=80=E6=AF=81=E8=AE=B0=E5=BD=95=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../measure/processDestory.vue                | 80 +++++++++++++------
 .../measure/processPoints.vue                 | 20 ++++-
 2 files changed, 72 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/communityService/measure/processDestory.vue b/src/views/modules/communityService/measure/processDestory.vue
index dddfa5923..f58d06175 100644
--- a/src/views/modules/communityService/measure/processDestory.vue
+++ b/src/views/modules/communityService/measure/processDestory.vue
@@ -1,21 +1,37 @@
 <template>
   <div v-if="pageLoading" class="resi-container">
-<!--    <el-card ref="searchCard" class="search-card">
+  <el-card ref="searchCard" class="search-card">
       <div class="">
 
         <el-form ref="searchForm" :inline="true" :model="searchForm" size="small" label-width="100px" class="demo-form-inline">
           <div>
-            <el-form-item label="申请人姓名" prop="name">
-              <el-input v-model="searchForm.name" placeholder="请输入" class="input-width" clearable></el-input>
+            <el-form-item label="姓名" prop="userName">
+              <el-input v-model="searchForm.userName" placeholder="请输入" class="input-width" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="核销人" prop="operatorName">
+              <el-input v-model="searchForm.operatorName" placeholder="请输入" class="input-width" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="审核时间"
+                          label-width="100px"
+                          prop="startTime">
+              <el-date-picker v-model="timeRange"
+                              size="small"
+                              type="daterange"
+                              value-format="yyyy-MM-dd"
+                              @change="handleTimeChange"
+                              range-separator="至"
+                              start-placeholder="开始时间"
+                              end-placeholder="结束时间">
+              </el-date-picker>
             </el-form-item>
           </div>
           <el-form-item>
-            <el-button class="diy-button&#45;&#45;search" size="small" @click="handleSearch">查询</el-button>
-            <el-button class="diy-button&#45;&#45;reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
-    </el-card>-->
+   </el-card>
     <el-card class="resi-card-table">
       <el-table
         :data="tableData"
@@ -30,31 +46,42 @@
         <el-table-column label="序号" type="index" align="center" width="50">
         </el-table-column>
         <el-table-column
-          prop="exchangedItem"
-          label="核销信息"
-          align="center"
-          width="200"
+                prop="userName"
+                label="姓名"
+                align="center"
+                width="100"
+        />
+        <el-table-column
+                prop="point"
+                label="核销积分"
+                align="center"
+                width="100"
         />
         <el-table-column
-          prop="point"
-          label="核销积分"
-          align="center"
-          min-width="100"
+                prop="createdTime"
+                label="核销时间"
+                align="center"
+                width="200"
         />
         <el-table-column
-          prop="operatorName"
-          label="核销人员"
-          align="center"
-          min-width="200"
-          show-overflow-tooltip
+                prop="operatorName"
+                label="核销人员"
+                align="center"
+                width="150"
+                show-overflow-tooltip
         />
         <el-table-column
-          prop="address"
-          label="地址"
-          align="center"
-          show-overflow-tooltip
-          min-width="100"
+                prop="address"
+                label="核销地点"
+                align="center"
+                show-overflow-tooltip
         />
+<!--        <el-table-column-->
+<!--          prop="exchangedItem"-->
+<!--          label="核销信息"-->
+<!--          align="center"-->
+<!--          width="200"-->
+<!--        />-->
 
 <!--
         <el-table-column fixed="right" label="操作" align="center" width="150">
@@ -224,7 +251,10 @@ export default {
       customerId: '',
       isBatch: false,
       searchForm: {
-        name: ''
+        userName: '',
+        operatorName:'',
+        startTime:'',
+        endTime:''
       },
       form: {
         ids: [],
diff --git a/src/views/modules/communityService/measure/processPoints.vue b/src/views/modules/communityService/measure/processPoints.vue
index 55d50a6a0..0750b7048 100644
--- a/src/views/modules/communityService/measure/processPoints.vue
+++ b/src/views/modules/communityService/measure/processPoints.vue
@@ -8,11 +8,22 @@
             <el-form-item label="申请人姓名" prop="name">
               <el-input v-model="searchForm.name" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
+            <el-form-item label="审核时间"
+                          label-width="100px"
+                          prop="startTime">
+              <el-date-picker v-model="timeRange"
+                              size="small"
+                              type="daterange"
+                              value-format="yyyy-MM-dd"
+                              @change="handleTimeChange"
+                              range-separator="至"
+                              start-placeholder="开始时间"
+                              end-placeholder="结束时间">
+              </el-date-picker>
+            </el-form-item>
           </div>
-          <el-form-item>
             <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
             <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
-          </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -209,6 +220,7 @@ import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
+      times:[],
       dialogVisible: false,
       dialogFormVisible: false,
       dialogFormVisiblePoint: false,
@@ -253,7 +265,9 @@ export default {
       customerId: '',
       isBatch: false,
       searchForm: {
-        name: ''
+        name: '',
+        startTime:'',
+        endTime:''
       },
       form: {
         ids: [],