From fbd7680927ac274c2502087b612ec1f9afbe414c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 30 Jun 2022 11:57:34 +0800
Subject: [PATCH] bug

---
 .../AppPartyIntegralAudit/components/List.vue | 57 +++++++------------
 .../components/applyForIntegral.vue           |  3 +-
 2 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyIntegralAudit/components/List.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/components/List.vue
index 5952f302..64764866 100644
--- a/project/sanjianxi/apps/AppPartyIntegralAudit/components/List.vue
+++ b/project/sanjianxi/apps/AppPartyIntegralAudit/components/List.vue
@@ -7,7 +7,6 @@
       isShowBottomBorder
       :instance="instance"
       :disabledLevel="disabledLevel"
-      isShowArea
       v-model="search.areaId"
       @change="changeArea">
     </ai-title>
@@ -15,37 +14,15 @@
       <div class="content">
         <ai-search-bar>
           <template #left>
-            <!-- <ai-select
-              v-model="search.applyIntegralType"
-              clearable
-              placeholder="请选择积分类型"
-              :selectList="dict.getDict('atWillReportType')"
-              @change="search.current = 1, getList()">
-            </ai-select> -->
             <ai-select
               v-model="search.auditStatus"
               clearable
               placeholder="请选择审核状态"
-              :selectList="dict.getDict('auditStatus')"
+              :selectList="dict.getDict('integralDeclareStatus')"
               @change="search.current = 1, getList()">
             </ai-select>
-            <el-date-picker
-              value-format="yyyy-MM-dd"
-              v-model="search.createTimeStart"
-              type="date"
-              size="small"
-              unlink-panels
-              placeholder="选择开始日期"
-              @change="search.current = 1, getList()" />
-            <el-date-picker
-              value-format="yyyy-MM-dd"
-              v-model="search.createTimeEnd"
-              type="date"
-              size="small"
-              unlink-panels
-              placeholder="选择结束日期"
-              :picker-options="{start: search.createTimeStart, minTime: search.createTimeStart}"
-              @change="search.current = 1, getList()" />
+            <el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至" @change="timeChange"
+                            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
           </template>
           <template #right>
             <el-input
@@ -95,13 +72,13 @@
         search: {
           current: 1,
           size: 10,
-          residentName: '',
-          applyIntegralType: '',
           areaId: '',
-          auditStatus: '',
+          auditStatus: '', //审核状态
           createTimeStart: '',
-          createTimeEnd: ''
+          createTimeEnd: '',
+          partyName: '',  // 模糊查询
         },
+        searchDotime: [],
         dictList: [{
           dictName: '否',
           dictValue: '0'
@@ -164,6 +141,18 @@
         })
       },
 
+      timeChange() {
+        if (this.searchDotime) {
+          this.search.createTimeStart = this.searchDotime[0]
+          this.search.createTimeEnd = this.searchDotime[1]
+        } else {
+          this.search.createTimeStart = null
+          this.search.createTimeEnd = null
+        }
+        this.search.current = 1
+        this.getList()
+      },
+
       toDetail (id) {
         this.$emit('change', {
           type: 'Detail',
@@ -172,14 +161,6 @@
           }
         })
       },
-
-      changeArea () {
-        this.search.current = 1
-
-        this.$nextTick(() => {
-          this.getList()
-        })
-      }
     }
   }
 </script>
diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
index 877b7803..fe1a4eef 100644
--- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
+++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
@@ -241,6 +241,7 @@ export default {
     
     close() {
       this.form = {
+        classify: '0',
         eventName: '',
         eventDesc: '',
         ruleType: '',
@@ -314,7 +315,7 @@ export default {
             ...this.form,
             id: this.form.id || ''
           }).then((res) => {
-            if (res.code == 0) {
+            if (res?.code == 0) {
               this.$message.success(`${this.isEdit ? '编辑成功' : '添加成功'}`)
               this.dialog = false;
               this.getList()