From ef8acbf3859bd13e759fbb9b8ba726039c1fb2c5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 14 十一月 2023 15:51:59 +0800 Subject: [PATCH] 2023-11-14 --- src/utils/option.js | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/src/utils/option.js b/src/utils/option.js index f001d84..6d71ffd 100644 --- a/src/utils/option.js +++ b/src/utils/option.js @@ -146,6 +146,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 +156,7 @@ {value: '[-2, -2]', text: '鍚庡ぉ'}, {value: 'week', text: '鏈懆'}, {value: 'month', text: '鏈湀'}, + {value: 'lastMonth', text: '涓婃湀'}, ], datetime: [ {value: '', text: '绌�'}, @@ -240,6 +242,13 @@ class5: [{ value: 'between', text: 'between' + }], + class6: [{ + value: 'between', + text: 'between' + }, { + value: '=', + text: '=' }] } @@ -903,3 +912,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