From 18b36e7a0c3441b36a9afc26d40192d46fafb5f8 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 22 Nov 2024 10:14:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue                 | 17 +++-----
 src/views/record/components/addRecord.vue     |  5 ++-
 src/views/record/components/addRecordLink.vue |  5 ++-
 src/views/record/index.vue                    | 43 ++++++++++++++-----
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index fd76fa6..5b60019 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -59,24 +59,17 @@
     },
     methods: {
       async getList() {
-        this.nowDate = this.$moment().format("YYYY-MM-DD")
-        this.startDate = this.$moment('1900-01-01').format("YYYY-MM-DD")
-        console.log("this.nowDate",this.nowDate,this.startDate)
+        // this.nowDate = this.$moment().format("YYYY-MM-DD")
+        // this.nowDate = this.$moment().add(1, 'months').format('YYYY-MM-DD')
+        // this.startDate = this.$moment('1900-01-01').format("YYYY-MM-DD")
+        // console.log("this.nowDate",this.nowDate,this.startDate)
         const res = await index({
           page_size: 9999,
           page: 1,
           table_name: 'records',
           is_auth: 1,
           catalogs_id: '',
-          filter:[{
-            key:'end_date',
-            op:'range',
-            value:[this.startDate,this.nowDate]
-          },{
-            key:'status',
-            op:'eq',
-            value:0
-          }]
+          records_status:1
         })
         this.list.dateTotal = res.total
       },
diff --git a/src/views/record/components/addRecord.vue b/src/views/record/components/addRecord.vue
index c093203..d9282d4 100644
--- a/src/views/record/components/addRecord.vue
+++ b/src/views/record/components/addRecord.vue
@@ -116,7 +116,7 @@
       <template v-slot:footerContent>
         <div>
           <Button ghost type="primary" @click="isShow = false">取消</Button>
-          <Button type="primary" v-if="form.status<2 || is_next" @click="clickSubmit">确定</Button>
+          <Button type="primary" v-if="form.status!=2 || is_next" @click="clickSubmit">确定</Button>
           <Button type="primary" v-else @click="addLink">延续</Button>
         </div>
       </template>
@@ -160,6 +160,9 @@
           id: 0,
           name: '正常'
         }, {
+          id: 3,
+          name: '已结束'
+        },{
           id: 1,
           name: '已到期'
         }, {
diff --git a/src/views/record/components/addRecordLink.vue b/src/views/record/components/addRecordLink.vue
index 291cf36..153b29c 100644
--- a/src/views/record/components/addRecordLink.vue
+++ b/src/views/record/components/addRecordLink.vue
@@ -148,7 +148,10 @@
         statusList: [{
           id: 0,
           name: '正常'
-        }, {
+        },  {
+          id: 3,
+          name: '已结束'
+        },{
           id: 1,
           name: '已到期'
         }, {
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index bdf1baf..fa1f1dc 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -51,6 +51,12 @@
                   @change="changeEnd" v-model="select.endRange" type="daterange" format="yyyy-MM-dd"
                   value-format="yyyy-MM-dd" range-separator="至" start-placeholder="结束日期" end-placeholder="">
                 </el-date-picker>
+              </div>
+              <div>
+                <el-select style="width:200px" v-model="select.records_status" placeholder="请选择是否到期">
+                  <el-option v-for="item in rsList" :key="item.id" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
               </div>
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
@@ -87,7 +93,7 @@
         <xy-table @getHeight="initHeight" :list="list" :total="total" @pageIndexChange="pageIndexChange"
           @pageSizeChange="pageSizeChange" :table-item="table_item">
           <template v-slot:catalog_name>
-            <el-table-column align='left' label="所属目录" width="240" header-align="left">
+            <el-table-column align='center' label="所属目录" width="240" header-align="center">
               <template slot-scope="scope">
                 <div v-if="scope.row.catalog_id_details && scope.row.catalog_id_details.length>0">
                   <el-tag style="margin-right:5px;margin-bottom:5px" v-for="item in scope.row.catalog_id_details">
@@ -97,7 +103,7 @@
             </el-table-column>
           </template>
           <template v-slot:area_name>
-            <el-table-column align='left' label="所属区域" width="240" header-align="left">
+            <el-table-column align='center' label="所属区域" width="240" header-align="center">
               <template slot-scope="scope">
                 <div v-if="scope.row.area_ids_details && scope.row.area_ids_details.length>0">
                   <el-tag style="margin-right:5px;margin-bottom:5px" v-for="item in scope.row.area_ids_details">
@@ -107,7 +113,7 @@
             </el-table-column>
           </template>
           <template v-slot:tag_name>
-            <el-table-column align='left' label="标签" width="240" header-align="left">
+            <el-table-column align='center' label="标签" width="240" header-align="center">
               <template slot-scope="scope">
                 <div v-if="scope.row.tag_ids_details && scope.row.tag_ids_details.length>0">
                   <el-tag style="margin-right:5px;margin-bottom:5px" v-for="item in scope.row.tag_ids_details">
@@ -146,7 +152,7 @@
           </template>
 
           <template v-slot:btns>
-            <el-table-column align='left' fixed="right" label="操作" width="240" header-align="center">
+            <el-table-column align='center' fixed="right" label="操作" width="240" header-align="center">
               <template slot-scope="scope">
                 <!-- <el-button type="primary" size="small" @click="editIndex('child',scope.row.id,scope.row.name)">子目录</el-button> -->
                 <el-button type="primary" size="small" @click="showIndex('show',scope.row.id)">查看</el-button>
@@ -268,7 +274,14 @@
               picker.$emit('pick', [start, end]);
             }
           }]
-        },
+        },
+        rsList:[{
+          id:1,
+          name:'是'
+        },{
+          id:0,
+          name:'否'
+        }],
         select: {
           title: '',
           table_name: 'records',
@@ -280,7 +293,8 @@
           area_id: '',
           tag_id: '',
           startRange: [],
-          endRange: []
+          endRange: [],
+          records_status:''
         },
         hasMenu: false,
         myHeight: 0,
@@ -304,10 +318,14 @@
           id: 0,
           name: '正常',
           type: ''
+        }, {
+          id: 3,
+          name: '已结束',
+          type: 'info'
         }, {
           id: 1,
           name: '已到期',
-          type: 'info'
+          type: 'warning'
         }, {
           id: 2,
           name: '已延续',
@@ -389,8 +407,9 @@
         this.is_search = true
       }
       if (this.$route.query.dateTotal) {
-        this.select.endRange = [this.startDate, this.nowDate]
-        this.select.status = 0
+        // this.select.endRange = [this.startDate, this.nowDate]
+        // this.select.status = 0
+        this.select.records_status = 1
         this.is_search = true
       }
       // this.getCatalogList()
@@ -530,7 +549,8 @@
         this.select.area_id = []
         this.select.tag_id = []
         this.select.startRange = []
-        this.select.endRange = []
+        this.select.endRange = []
+        this.select.records_status = ""
         if (this.is_search) {
           this.select.catalog_id = ''
           this.select.catalog_name = ''
@@ -566,7 +586,8 @@
           sort_name: 'date',
           catalogs_id: this.select.catalog_id ? this.select.catalog_id : '',
           area_ids: this.select.area_id ? this.select.area_id : '',
-          tag_ids: this.select.tag_id ? this.select.tag_id : '',
+          tag_ids: this.select.tag_id ? this.select.tag_id : '',
+          records_status:this.select.records_status,
           filter: [{
             "key": "title",
             "op": "like",