From 69cd43786253e299f6856a200554ae7fc0621877 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 六月 2021 21:26:20 +0800
Subject: [PATCH] 2021-06-27
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 1384f9c..f937f81 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -117,6 +117,7 @@
if (!_verify.script && card.intertype === 'system') {
let search = this.formatSearch(config.search)
search = Utils.joinMainSearchkey(search)
+ search = search.replace(/@\$@/ig, '')
search = search ? 'where ' + search : ''
defaultscript = `update ${config.setting.tableName || ''} set idefine5= idefine5+1 ,modifydate=getdate(),cdefine5='宸插鍑�',modifyuserid=@userid@ ${search}`
@@ -138,34 +139,37 @@
let newsearches = []
searches.forEach(search => {
+ if (!search.field) return
+
let item = {
key: search.field,
match: search.match,
type: search.type,
label: search.label,
- value: `@${search.field}@`,
+ value: search.initval,
required: search.required === 'true'
}
if (item.type === 'group') {
- let copy = fromJS(item).toJS()
-
- item.value = `@${search.field}@`
- item.match = '='
-
- copy.key = search.datefield
- copy.type = 'daterange'
- copy.match = 'between'
- copy.value = [`@${search.datefield}@`, `@${search.datefield}1@`]
+ item.key = search.datefield
+ item.type = 'daterange'
+ item.match = 'between'
+ item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
newsearches.push(item)
- newsearches.push(copy)
return
+ } else if (item.type === 'date') {
+ item.value = moment().format('YYYY-MM-DD')
+ } else if (item.type === 'datemonth') {
+ item.value = moment().format('YYYY-MM')
} else if (item.type === 'dateweek') {
- item.value = [`@${search.field}@`, `@${search.field}1@`]
+ item.value = moment().format('YYYY-MM-DD')
} else if (item.type === 'daterange') {
- item.value = [`@${search.field}@`, `@${search.field}1@`]
- } else if (item.type === 'multiselect') {
- item.value = [`@${search.field}@`]
+ item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
+ } else if (item.type === 'multiselect' || (item.type === 'checkcard' && search.multiple === 'true')) {
+ item.type = 'multi'
+ item.value = '@$@'
+ } else {
+ item.value = '@$@'
}
newsearches.push(item)
})
--
Gitblit v1.8.0