From fe21d23b147ed5cec22b4f76a88840b05495d4ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 18 六月 2022 22:33:59 +0800
Subject: [PATCH] 2022-06-18

---
 src/utils/utils.js |  155 ++++++++++++++++++---------------------------------
 1 files changed, 54 insertions(+), 101 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2b99084..1f78e17 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 ')
   }
 
   /**
@@ -703,63 +705,6 @@
   }
 
   /**
-   * @description 鑾峰彇鎼滅储鐢ㄤ簬姝e垯鏇挎崲
-   * @param {Array}   searches     鎼滅储鏉′欢
-   * @return {String}  searchText  鎷兼帴缁撴灉
-   */
-  static getRegOptions (searches) {
-    if (!searches || searches.length === 0) return []
-
-    let options = []
-    let fieldmap = new Map()
-    searches.forEach(search => {
-      let item = {
-        key: search.field,
-        value: '0'
-      }
-
-      if (fieldmap.has(item.key)) {
-        item.key = item.key + '1'
-      }
-
-      fieldmap.set(item.key, true)
-
-      if (search.type === 'group') {
-        options.push({
-          key: search.field,
-          value: '0'
-        })
-        options.push({
-          key: search.datefield,
-          value: '0'
-        })
-        options.push({
-          key: search.datefield + '1',
-          value: '0'
-        })
-        options.push(item)
-      } else if (['datemonth', 'dateweek', 'daterange'].includes(search.type)) {
-        options.push(item)
-        options.push({
-          key: item.key + '1',
-          value: '0'
-        })
-      } else if (search.type === 'text' || search.type === 'select') {
-        item.key.split(',').forEach(field => {
-          let cell = JSON.parse(JSON.stringify(item))
-          cell.key = field
-
-          options.push(cell)
-        })
-      } else {
-        options.push(item)
-      }
-    })
-
-    return options
-  }
-
-  /**
    * @description 鑾峰彇鍥剧墖鐪熷疄璺緞
    * @return {String}    url 鍥剧墖璺緞
    */
@@ -851,7 +796,7 @@
       sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
     }
 
-    if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+    if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
       console.info(sql)
     }
 
@@ -1143,7 +1088,7 @@
       
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
-    if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+    if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
       let fsql = `
       ${_sql}
       ${_sqlInsert}
@@ -1355,7 +1300,7 @@
       
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
-    if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+    if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
       let fsql = `
       ${_sql}
       ${_sqlInsert}
@@ -1505,7 +1450,7 @@
   }
 
   // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
-  if (data && !btn.$forbid && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
+  if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
     datavars = {...data, ...datavars}
 
     const setField = (col) => {
@@ -1569,6 +1514,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 +1560,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
@@ -2102,7 +2047,7 @@
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
   }
 
-  if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+  if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
     // _sql = _sql.replace(/\n\s{8}/ig, '\n')
     console.info(_sql)
   }
@@ -2122,26 +2067,30 @@
  */
 export function getMark (marks, record, style = {}) {
   let icon = null
-  let color = null
+  let innerStyle = null
   let position = null
   style = JSON.parse(JSON.stringify(style))
 
   marks.some(mark => {
-    let originVal = record[mark.field[0]] + ''
+    let originVal = record[mark.field[0]]
     let contrastVal = ''
     let result = false
 
     if (mark.field[1] === 'static') {
-      contrastVal = mark.contrastValue + ''
+      contrastVal = mark.contrastValue
     } else {
-      contrastVal = record[mark.field[2]] + ''
+      contrastVal = record[mark.field[2]]
     }
+
+    if (originVal === undefined || contrastVal === undefined) return false
 
     if (mark.match === '=') {
       result = originVal === contrastVal
     } else if (mark.match === '!=') {
       result = originVal !== contrastVal
     } else if (mark.match === 'like') {
+      originVal = originVal + ''
+      contrastVal = contrastVal + ''
       result = originVal.indexOf(contrastVal) > -1
     } else if (mark.match === '>') {
       result = parseFloat(originVal) > parseFloat(contrastVal)
@@ -2155,20 +2104,24 @@
 
     if (type === 'font') {
       style.color = mark.color
+      innerStyle = {color: mark.color}
     } else if (type === 'background') {
       style.background = mark.color
       if (mark.fontColor) {
         style.color = mark.fontColor
+        innerStyle = {color: mark.fontColor}
       }
     } else if (type === 'underline') {
       style.textDecoration = 'underline'
       style.color = mark.color
+      innerStyle = {color: mark.color, textDecoration: 'underline'}
     } else if (type === 'line-through') {
       style.textDecoration = 'line-through'
       style.color = mark.color
+      innerStyle = {color: mark.color, textDecoration: 'line-through'}
     } else if (type.indexOf('icon') > -1) {
       icon = mark.signType[mark.signType.length - 1]
-      color = mark.color
+      innerStyle = {color: mark.color}
       if (type === 'iconfront' || mark.signType[1] === 'front') {
         position = 'front'
       } else {
@@ -2182,7 +2135,7 @@
   return {
     style,
     icon,
-    color,
+    innerStyle,
     position
   }
 }

--
Gitblit v1.8.0