From a02fc6a77fa1b35c6516b2d37108d80e260c6c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 十一月 2024 22:05:08 +0800
Subject: [PATCH] 2024-11-07
---
src/utils/option.js | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index f001d84..c0016f4 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -1,6 +1,4 @@
import nortable from '@/assets/img/normaltable.jpg'
-// import mainsubtable from '@/assets/img/mainsubtable.jpg'
-// import treepage from '@/assets/img/treepage.jpg'
import customImg from '@/assets/img/custom.jpg'
import newpage from '@/assets/img/newpage.jpg'
import rolemanage from '@/assets/img/rolemanage.jpg'
@@ -44,13 +42,6 @@
// 绯荤粺妯℃澘
export const sysTemps = [
- // {
- // title: '鍩虹琛ㄦ牸',
- // type: 'CommonTable',
- // url: nortable,
- // baseconfig: '',
- // isSystem: true
- // },
{
title: '鍩虹琛ㄦ牸',
type: 'BaseTable',
@@ -58,14 +49,6 @@
baseconfig: '',
isSystem: true
},
- // {
- // title: '涓诲瓙琛ㄨ〃鏍�',
- // type: 'CommonTable',
- // url: mainsubtable,
- // baseconfig: '',
- // isSystem: true,
- // isSubtable: true
- // },
{
title: '鑷畾涔�',
type: 'CustomPage',
@@ -73,13 +56,6 @@
baseconfig: '',
isSystem: true
},
- // {
- // title: '鏍戝舰椤甸潰',
- // type: 'TreePage',
- // url: treepage,
- // baseconfig: '',
- // isSystem: true
- // },
{
title: '澶栭儴椤甸潰',
type: 'NewPage',
@@ -146,6 +122,7 @@
{value: '[3, 0]', text: '杩戜笁澶�'},
{value: '[7, 0]', text: '杩戜竷澶�'},
{value: '[30, 0]', text: '杩�30澶�'},
+ {value: '[90, 0]', text: '杩�90澶�'},
{value: '[7, -7]', text: '鍓嶅悗涓冨ぉ'},
{value: '[30, -30]', text: '鍓嶅悗30澶�'},
{value: '[90, -90]', text: '鍓嶅悗90澶�'},
@@ -155,6 +132,7 @@
{value: '[-2, -2]', text: '鍚庡ぉ'},
{value: 'week', text: '鏈懆'},
{value: 'month', text: '鏈湀'},
+ {value: 'lastMonth', text: '涓婃湀'},
],
datetime: [
{value: '', text: '绌�'},
@@ -240,6 +218,13 @@
class5: [{
value: 'between',
text: 'between'
+ }],
+ class6: [{
+ value: 'between',
+ text: 'between'
+ }, {
+ value: '=',
+ text: '='
}]
}
@@ -903,3 +888,12 @@
}
export const queryTableSql = 'select top 999999 TbName,Remark from (select TbName,Remark from sDataDictb where appkey= @appkey@ and Deleted=0 union select a.TbName,Remark from (select TbName,Remark from sDataDictb where appkey= \'\' and Deleted=0 ) a left join (select TbName from sDataDictb where appkey= @appkey@ and Deleted=0 ) b on a.TbName=b.TbName where b.TbName is null ) t order by TbName'
+
+export const queryPrintSql = `select ID,Images,PrintTempNO+PrintTempName as PN from sPrintTemplate
+ where appkey= @appkey@ and Deleted=0 and typechartwo='web_print'
+ union select ID,Images,a.PrintTempNO+PrintTempName as PN
+ from (select * from sPrintTemplate where appkey= '' and Deleted=0 and typechartwo='web_print') a
+ left join (select PrintTempNO from sPrintTemplate where appkey= @appkey@ and Deleted=0 ) b
+ on a.PrintTempNO=b.PrintTempNO
+ left join (select Srcid from sPrintTemplate_Log where appkey='' and apicode= @appkey@ and Deleted=0 ) c
+ on a.ID=c.Srcid where b.PrintTempNO is null and c.Srcid is null`
\ No newline at end of file
--
Gitblit v1.8.0