From 7b5a453de89006033d2ef3adcce55b7d41209fd4 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 10 Jan 2025 13:19:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E6=9C=9F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dashboard/index.vue | 2 +-
src/views/record/components/addRecord.vue | 20 +++++++++++---------
src/views/record/index.vue | 7 +++++--
vue.config.js | 2 +-
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 43571bc..bc79834 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -176,7 +176,7 @@
await this.getStatusList()
},
async getList() {
- this.nowDate = this.$moment().add(1, 'months').format('YYYY-MM-DD')
+ this.nowDate = this.$moment().add(3, 'months').format('YYYY-MM-DD')
this.startDate = this.$moment('1900-01-01').format("YYYY-MM-DD")
const res = await index({
page_size: 9999,
diff --git a/src/views/record/components/addRecord.vue b/src/views/record/components/addRecord.vue
index 1e44db4..d8be852 100644
--- a/src/views/record/components/addRecord.vue
+++ b/src/views/record/components/addRecord.vue
@@ -8,7 +8,7 @@
*标题:
-
+
@@ -31,7 +31,7 @@
*开始日期:
-
@@ -43,7 +43,7 @@
结束日期:
-
@@ -55,7 +55,7 @@
*所属区域:
-
@@ -69,7 +69,7 @@
标签:
-
+
@@ -95,9 +95,9 @@
附件:
-
- 点击上传
+ 点击上传
@@ -108,7 +108,8 @@
内容:
@@ -155,7 +156,8 @@
id: '',
showTinymce: false,
is_next: false, // 是否 可以延续
- catalogList: [],
+ catalogList: [],
+ is_search:false, // 是否到期 预警提醒的编辑
statusList: [{
id: 0,
name: '正常'
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index 74b0df9..5fe45d2 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -170,7 +170,7 @@
查看
编辑
+ size="small" @click="editIndex('editor',scope.row.id,is_search)">编辑
删除
@@ -563,7 +563,10 @@
console.log("row",row)
this.showIndex("show",row.row.id)
},
- editIndex(type, id) {
+ editIndex(type, id,is_search) {
+ if(is_search){
+ this.$refs.addRecord.is_search = true
+ }
if (type == 'editor') {
this.$refs.addRecord.id = id
} else {
diff --git a/vue.config.js b/vue.config.js
index c82404e..5201527 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
* Detail: https://cli.vuejs.org/config/#publicpath
*/
publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
- outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin_test',
+ outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin',
assetsDir: 'static',
css: {
loaderOptions: { // 向 CSS 相关的 loader 传递选项