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 |  124 +++++++++++------------------------------
 1 files changed, 34 insertions(+), 90 deletions(-)

diff --git a/src/utils/option.js b/src/utils/option.js
index 2183750..c0016f4 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -1,14 +1,7 @@
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
 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 customImg from '@/assets/img/custom.jpg'
 import newpage from '@/assets/img/newpage.jpg'
 import rolemanage from '@/assets/img/rolemanage.jpg'
-
-const _dict =  sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
 
 // 琛ㄥ崟鏍¢獙瑙勫垯
 export const formRule = {
@@ -51,44 +44,15 @@
 export const sysTemps = [
   {
     title: '鍩虹琛ㄦ牸',
-    type: 'CommonTable',
+    type: 'BaseTable',
     url: nortable,
     baseconfig: '',
     isSystem: true
   },
-  // {
-  //   title: '鍩虹琛ㄦ牸锛堟柊锛�',
-  //   type: 'BaseTable',
-  //   url: nortable,
-  //   baseconfig: '',
-  //   isSystem: true
-  // },
-  // {
-  //   title: '涓诲瓙琛ㄨ〃鏍�',
-  //   type: 'CommonTable',
-  //   url: mainsubtable,
-  //   baseconfig: '',
-  //   isSystem: true,
-  //   isSubtable: true
-  // },
   {
     title: '鑷畾涔�',
     type: 'CustomPage',
     url: customImg,
-    baseconfig: '',
-    isSystem: true
-  },
-  {
-    title: '鏍戝舰椤甸潰',
-    type: 'TreePage',
-    url: treepage,
-    baseconfig: '',
-    isSystem: true
-  },
-  {
-    title: '鏃ュ巻',
-    type: 'CalendarPage',
-    url: calendar,
     baseconfig: '',
     isSystem: true
   },
@@ -113,7 +77,7 @@
 // 鏃ユ湡榛樿鍊奸�夋嫨鑼冨洿
 export const dateOptions = {
   date: [
-    {value: '', text: _dict['model.empty']},
+    {value: '', text: '绌�'},
     {value: '0', text: '浠婂ぉ'},
     {value: 1, text: '鏄ㄥぉ'},
     {value: 2, text: '鍓嶅ぉ'},
@@ -136,7 +100,7 @@
     {value: -7300, text: '鍚�20骞�'},
   ],
   dateweek: [
-    {value: '', text: _dict['model.empty']},
+    {value: '', text: '绌�'},
     {value: '0', text: '鏈懆'},
     {value: 1, text: '涓婂懆'},
     {value: 3, text: '鍓嶄笁鍛�'},
@@ -144,7 +108,7 @@
     {value: -1, text: '涓嬪懆'}
   ],
   datemonth: [
-    {value: '', text: _dict['model.empty']},
+    {value: '', text: '绌�'},
     {value: '0', text: '鏈湀'},
     {value: 1, text: '涓婃湀'},
     {value: 3, text: '鍓嶄笁鏈�'},
@@ -152,22 +116,26 @@
     {value: -1, text: '涓嬫湀'}
   ],
   daterange: [
-    {value: '', text: _dict['model.empty']},
+    {value: '', text: '绌�'},
     {value: '[0, 0]', text: '浠婂ぉ'},
     {value: '[1, 1]', text: '鏄ㄥぉ'},
     {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: _dict['model.empty']},
+    {value: '', text: '绌�'},
     {value: '0', text: '褰撳墠'},
     {value: 1, text: '鏄ㄥぉ'},
     {value: 3, text: '鍓嶄笁澶�'},
@@ -192,7 +160,7 @@
 
 // 鍖归厤瑙勫垯
 export const matchReg = {
-  text: [{
+  class1: [{
     value: 'like',
     text: 'like'
   }, {
@@ -214,20 +182,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: '='
   }, {
@@ -243,7 +198,14 @@
     value: '<=',
     text: '<='
   }],
-  date: [{
+  class3: [{
+    value: 'like',
+    text: 'like'
+  }, {
+    value: 'not like',
+    text: 'not like'
+  }],
+  class4: [{
     value: '>=',
     text: '>='
   }, {
@@ -253,13 +215,16 @@
     value: '=',
     text: '='
   }],
-  datemonth: [{
+  class5: [{
     value: 'between',
     text: 'between'
   }],
-  daterange: [{
+  class6: [{
     value: 'between',
     text: 'between'
+  }, {
+    value: '=',
+    text: '='
   }]
 }
 
@@ -393,36 +358,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 = [
@@ -953,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