From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 18:37:36 +0800
Subject: [PATCH] 2023-08-27
---
src/utils/option.js | 117 ++++++++++++++++++++--------------------------------------
1 files changed, 41 insertions(+), 76 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index fac69e0..1652359 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -1,7 +1,6 @@
import nortable from '@/assets/img/normaltable.jpg'
// import mainsubtable from '@/assets/img/mainsubtable.jpg'
-import treepage from '@/assets/img/treepage.jpg'
-import calendar from '@/assets/img/calendar.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'
@@ -45,20 +44,20 @@
// 绯荤粺妯℃澘
export const sysTemps = [
- {
- title: '鍩虹琛ㄦ牸',
- type: 'CommonTable',
- url: nortable,
- baseconfig: '',
- isSystem: true
- },
// {
- // title: '鍩虹琛ㄦ牸锛堟柊锛�',
- // type: 'BaseTable',
+ // title: '鍩虹琛ㄦ牸',
+ // type: 'CommonTable',
// url: nortable,
// baseconfig: '',
// isSystem: true
// },
+ {
+ title: '鍩虹琛ㄦ牸',
+ type: 'BaseTable',
+ url: nortable,
+ baseconfig: '',
+ isSystem: true
+ },
// {
// title: '涓诲瓙琛ㄨ〃鏍�',
// type: 'CommonTable',
@@ -74,20 +73,13 @@
baseconfig: '',
isSystem: true
},
- {
- title: '鏍戝舰椤甸潰',
- type: 'TreePage',
- url: treepage,
- baseconfig: '',
- isSystem: true
- },
- {
- title: '鏃ュ巻',
- type: 'CalendarPage',
- url: calendar,
- baseconfig: '',
- isSystem: true
- },
+ // {
+ // title: '鏍戝舰椤甸潰',
+ // type: 'TreePage',
+ // url: treepage,
+ // baseconfig: '',
+ // isSystem: true
+ // },
{
title: '澶栭儴椤甸潰',
type: 'NewPage',
@@ -154,13 +146,17 @@
{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澶�'},
+ {value: '[180, -180]', label: '鍓嶅悗180澶�'},
+ {value: '[365, -365]', label: '鍓嶅悗365澶�'},
{value: '[-1, -1]', text: '鏄庡ぉ'},
{value: '[-2, -2]', text: '鍚庡ぉ'},
{value: 'week', text: '鏈懆'},
{value: 'month', text: '鏈湀'},
+ {value: 'lastMonth', text: '涓婃湀'},
],
datetime: [
{value: '', text: '绌�'},
@@ -188,7 +184,7 @@
// 鍖归厤瑙勫垯
export const matchReg = {
- text: [{
+ class1: [{
value: 'like',
text: 'like'
}, {
@@ -210,20 +206,7 @@
value: '<=',
text: '<='
}],
- multiselect: [{
- value: 'like',
- text: 'like'
- }, {
- value: 'not like',
- text: 'not like'
- }],
- select: [{
- value: 'like',
- text: 'like'
- }, {
- value: 'not like',
- text: 'not like'
- }, {
+ class2: [{
value: '=',
text: '='
}, {
@@ -239,7 +222,14 @@
value: '<=',
text: '<='
}],
- date: [{
+ class3: [{
+ value: 'like',
+ text: 'like'
+ }, {
+ value: 'not like',
+ text: 'not like'
+ }],
+ class4: [{
value: '>=',
text: '>='
}, {
@@ -249,11 +239,7 @@
value: '=',
text: '='
}],
- datemonth: [{
- value: 'between',
- text: 'between'
- }],
- daterange: [{
+ class5: [{
value: 'between',
text: 'between'
}]
@@ -389,36 +375,6 @@
}, {
value: 'border-purple',
text: '鐧藉簳绱'
-}]
-
-// 鎸夐挳棰滆壊闆�
-export const btnCustomClasses = [{
- value: 'primary',
- text: '钃濊壊'
-}, {
- value: 'yellow',
- text: '榛勮壊'
-}, {
- value: 'orange',
- text: '姗欒壊'
-}, {
- value: 'danger',
- text: '绾㈣壊'
-}, {
- value: 'green',
- text: '缁胯壊'
-}, {
- value: 'dgreen',
- text: '娣辩豢鑹�'
-}, {
- value: 'purple',
- text: '绱壊'
-}, {
- value: 'cyan',
- text: '闈掕壊'
-}, {
- value: 'gray',
- text: '鐏拌壊'
}]
export const calendarColors = [
@@ -949,3 +905,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