From eec619b6e3339e9999a7a1c2c5454cef5d763b24 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 29 四月 2022 18:38:55 +0800
Subject: [PATCH] 2022-04-29
---
src/utils/utils.js | 68 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 6e6596a..b3a0d14 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -249,9 +249,9 @@
item.required = !item.hidden && item.required === 'true'
item.advanced = item.advanced === 'true'
item.$forbid = item.query === 'false'
+ item.precision = item.precision || 'day'
if (item.type === 'date') { // 鏃堕棿鎼滅储
- item.precision = item.precision || 'day'
let format = 'YYYY-MM-DD'
if (item.precision === 'day') {
@@ -269,7 +269,6 @@
} else if (item.type === 'dateweek') {
item.initval = item.initval ? moment().subtract(item.initval * 7, 'days').format('YYYY-MM-DD') : ''
} else if (item.type === 'daterange') {
- item.precision = item.precision || 'day'
let format = 'YYYY-MM-DD'
if (item.precision === 'day') {
@@ -381,7 +380,7 @@
label: cell.label,
value: cell.initval,
required: cell.required,
- precision: cell.precision || '',
+ precision: cell.precision || 'day',
forbid: cell.$forbid
}
@@ -507,20 +506,23 @@
static joinMainSearchkey (searches) {
if (!searches || searches.length === 0) return ''
- let searchText = ''
+ let searchText = []
searches.forEach(item => {
if (item.forbid || !item.value) return
- searchText += (searchText !== '' ? ' AND ' : '')
if (item.type === 'text' || item.type === 'select') { // 缁煎悎鎼滅储锛屾枃鏈垨涓嬫媺锛屾墍鏈夊瓧娈垫嫾鎺�
- let str = item.match === '=' ? '' : '%'
+ let str = item.match === 'like' || item.match === 'not like' ? '%' : ''
let fields = item.key.split(',').map(field => {
return field + ' ' + item.match + ' \'' + str + item.value + str + '\''
})
- searchText += '(' + fields.join(' OR ') + ')'
+ searchText.push('(' + fields.join(' OR ') + ')')
+ } else if (item.type === 'checkcard') {
+ let str = item.match === 'like' || item.match === 'not like' ? '%' : ''
+
+ searchText.push('(' + item.key + ' ' + item.match + ' \'' + str + item.value + str + '\')')
} else if (item.type === 'multi') {
- searchText += `'${item.value}' ${item.match} '%'+${item.key}+'%'`
+ searchText.push(`('${item.value}' ${item.match} '%'+${item.key}+'%')`)
} else if (item.type === 'date') {
let _val = item.value
let timetail = ''
@@ -544,17 +546,17 @@
timetail = '.000'
}
- searchText += '(' + item.key + ' ' + _match + ' \'' + _val + timetail + '\')'
+ searchText.push('(' + item.key + ' ' + _match + ' \'' + _val + timetail + '\')')
} else if (item.type === 'datemonth') { // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫锛岀粨鏉熸椂闂翠负鏈堟湯鍔犱竴澶╃殑0鐐癸紝鏂瑰紡涓�<
let _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
let _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
- searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
+ searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
} else if (item.type === 'dateweek') { // 鍛�-杩囨护鏉′欢
let _startval = moment(item.value, 'YYYY-MM-DD' ).startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000'
let _endval = moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
- searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
+ searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
} else if (item.type === 'daterange') {
let val = item.value.split(',')
let _startval = ''
@@ -574,17 +576,17 @@
_endval = val[1] + '.000'
}
- searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
+ searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
} else if (item.type === 'range') {
let val = item.value.split(',')
- searchText += '(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')'
+ searchText.push('(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')')
} else {
- searchText += '(' + item.key + ' ' + item.match + ' \'' + item.value + '\')'
+ searchText.push('(' + item.key + ' ' + item.match + ' \'' + item.value + '\')')
}
})
- return searchText
+ return searchText.join(' AND ')
}
/**
@@ -1569,6 +1571,24 @@
Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@bid nvarchar(50),@ModularDetailCode nvarchar(50)${_declarefields}
`
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let RoleID = sessionStorage.getItem('role_id') || ''
+ let departmentcode = sessionStorage.getItem('departmentcode') || ''
+ let organization = sessionStorage.getItem('organization') || ''
+ let city = sessionStorage.getItem('city') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
+
+ // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
+ _sql += `
+ /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
+ select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}', @BillCode='', @ModularDetailCode=''
+ `
+
// 琛ㄥ崟鍙橀噺璧嬪��
if (_initFormfields.length > 0) {
_sql += `
@@ -1597,24 +1617,6 @@
if (verify.billcodes) {
verify.billcodes = verify.billcodes.filter(item => item.status !== 'false')
}
-
- let userName = sessionStorage.getItem('User_Name') || ''
- let fullName = sessionStorage.getItem('Full_Name') || ''
- let RoleID = sessionStorage.getItem('role_id') || ''
- let departmentcode = sessionStorage.getItem('departmentcode') || ''
- let organization = sessionStorage.getItem('organization') || ''
- let city = sessionStorage.getItem('city') || ''
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
-
- // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
- _sql += `
- /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
- select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}', @BillCode='', @ModularDetailCode=''
- `
if (retmsg) {
_callbacksql = _sql
--
Gitblit v1.8.0