From 10c86c1fab41f01c7bf7fcb9d2f8b624142f6a54 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 九月 2022 14:42:33 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/utils/utils.js |  110 +++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 83 insertions(+), 27 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 413aa1e..b97fbde 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -39,6 +39,26 @@
 
 export default class Utils {
   /**
+   * @description 鑾峰彇浼氬憳绛夌骇
+   * @return {String}  level
+   */
+  static getMemberLevel () {
+    let _level = 10
+    let _Mlevel = sessionStorage.getItem('Member_Level')
+
+    if (_Mlevel) {
+      if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 10)) {
+        _level = 10
+      } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 20)) {
+        _level = 20
+      } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 30)) {
+        _level = 30
+      }
+    }
+    return _level
+  }
+
+  /**
    * @description 鏁版嵁婧愬悕绉帮紝鐢ㄤ簬缁熶竴鏌ヨ
    * @return {String}  name
    */
@@ -74,12 +94,11 @@
   static getguid () {
     // 浜х敓涓�涓柊鐨凣UID鍊�
     let uuid = []
-    let d = new Date()
     let options = '0123456789abcdefghigklmnopqrstuv'
     for (let i = 0; i < 19; i++) {
       uuid.push(options.substr(Math.floor(Math.random() * 0x20), 1))
     }
-    uuid = moment().format('YYYYMMDDHHmmss') + d.getMilliseconds() + uuid.join('')
+    uuid = moment().format('YYYYMMDDHHmmssSSS') + uuid.join('')
     return uuid.toUpperCase()
   }
 
@@ -748,7 +767,7 @@
     let arrfield = [item.valueField, item.valueText]
 
     if (item.type === 'checkcard') {
-      arrfield = item.fields.map(f => f.field)
+      arrfield = item.fields ? item.fields.map(f => f.field) : []
       arrfield.push(item.cardValField)
       if (item.urlField) {
         arrfield.push(item.urlField)
@@ -796,6 +815,9 @@
       sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
     }
 
+    sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+    sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+
     if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
       console.info(sql)
     }
@@ -822,7 +844,12 @@
   let RoleID = sessionStorage.getItem('role_id') || ''
   let departmentcode = sessionStorage.getItem('departmentcode') || ''
   let organization = sessionStorage.getItem('organization') || ''
+  let mk_user_type = sessionStorage.getItem('mk_user_type') || ''
+  let nation = sessionStorage.getItem('nation') || ''
+  let province = sessionStorage.getItem('province') || ''
   let city = sessionStorage.getItem('city') || ''
+  let district = sessionStorage.getItem('district') || ''
+  let address = sessionStorage.getItem('address') || ''
   let _sheet = item.sheet
 
   if (sessionStorage.getItem('isEditState') === 'true') {
@@ -1069,9 +1096,9 @@
     _sql = `
       /* 绯荤粺鐢熸垚 */
       declare @${sheet} table (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50) )
-      Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+      Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
       
-      Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}'
+      Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
       ${_initCustomScript}
       `
     _sqlInsert = `Insert into @${sheet} (${fields},jskey,BID)`
@@ -1104,9 +1131,9 @@
     _sql = `
       /* 绯荤粺鐢熸垚 */
       declare @${sheet} table (jskey nvarchar(50))
-      Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+      Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
       
-      Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}'
+      Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
       `
   }
 
@@ -1136,7 +1163,13 @@
   let RoleID = sessionStorage.getItem('role_id') || ''
   let departmentcode = sessionStorage.getItem('departmentcode') || ''
   let organization = sessionStorage.getItem('organization') || ''
+  let mk_user_type = sessionStorage.getItem('mk_user_type') || ''
+  let nation = sessionStorage.getItem('nation') || ''
+  let province = sessionStorage.getItem('province') || ''
   let city = sessionStorage.getItem('city') || ''
+  let district = sessionStorage.getItem('district') || ''
+  let address = sessionStorage.getItem('address') || ''
+
   let _sheet = btn.sheet
   let BID = data[0].$$BID || ''
 
@@ -1281,9 +1314,9 @@
     _sql = `
       /* 绯荤粺鐢熸垚 */
       declare @${sheet} table (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50) )
-      Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+      Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
       
-      Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}'
+      Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
       ${_initCustomScript}
       `
     _sqlInsert = `Insert into @${sheet} (${fields},jskey,data_type,BID)`
@@ -1316,9 +1349,9 @@
     _sql = `
       /* 绯荤粺鐢熸垚 */
       declare @${sheet} table (jskey nvarchar(50))
-      Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+      Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
       
-      Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}'
+      Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
       `
   }
 
@@ -1385,7 +1418,7 @@
   })
 
   // 闇�瑕佸０鏄庣殑鍙橀噺闆�
-  let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'login_city', 'bid']
+  let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'bid']
 
   // 涓婚敭瀛楁
   let primaryKey = setting.primaryKey || 'id'
@@ -1450,7 +1483,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) => {
@@ -1511,7 +1544,7 @@
     _declarefields = ',' + _declarefields
   }
   _sql = `/* 绯荤粺鐢熸垚 */
-      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}
+      Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@bid nvarchar(50)${_declarefields}
     `
 
   let userName = sessionStorage.getItem('User_Name') || ''
@@ -1519,7 +1552,12 @@
   let RoleID = sessionStorage.getItem('role_id') || ''
   let departmentcode = sessionStorage.getItem('departmentcode') || ''
   let organization = sessionStorage.getItem('organization') || ''
+  let mk_user_type = sessionStorage.getItem('mk_user_type') || ''
+  let nation = sessionStorage.getItem('nation') || ''
+  let province = sessionStorage.getItem('province') || ''
   let city = sessionStorage.getItem('city') || ''
+  let district = sessionStorage.getItem('district') || ''
+  let address = sessionStorage.getItem('address') || ''
 
   if (sessionStorage.getItem('isEditState') === 'true') {
     userName = sessionStorage.getItem('CloudUserName') || ''
@@ -1529,7 +1567,7 @@
   // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
   _sql += `
       /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
-      select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}', @BillCode='', @ModularDetailCode=''
+      select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @BillCode='', @ModularDetailCode=''
       `
 
   // 琛ㄥ崟鍙橀噺璧嬪��
@@ -1609,9 +1647,6 @@
         }
       })
       regoptions.push({
-        reg: new RegExp('@login_city@', 'ig'),
-        value: `'${city}'`
-      }, {
         reg: new RegExp('@userName@', 'ig'),
         value: `'${userName}'`
       }, {
@@ -1931,11 +1966,14 @@
       if (!_arr.includes('submitdate')) {
         _form.push('submitdate=getdate()')
       }
-      if (!_arr.includes('submituserid')) {
-        _form.push('submituserid=@userid@')
-      }
       if (!_arr.includes('submituser')) {
         _form.push('submituser=@username')
+      }
+      if (!_arr.includes('submitstaff')) {
+        _form.push('submitstaff=@fullname')
+      }
+      if (!_arr.includes('submituserid')) {
+        _form.push('submituserid=@userid@')
       }
     } else {
       if (!_arr.includes('modifydate')) {
@@ -1943,6 +1981,9 @@
       }
       if (!_arr.includes('modifyuser')) {
         _form.push('modifyuser=@username')
+      }
+      if (!_arr.includes('modifystaff')) {
+        _form.push('modifystaff=@fullname')
       }
       if (!_arr.includes('modifyuserid')) {
         _form.push('modifyuserid=@userid@')
@@ -2047,6 +2088,13 @@
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
   }
 
+  _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
+  _sql = _sql.replace(/@BID@/ig, `'${BID || ''}'`)
+  _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+  _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+  _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+  _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+
   if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
     // _sql = _sql.replace(/\n\s{8}/ig, '\n')
     console.info(_sql)
@@ -2067,26 +2115,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)
@@ -2100,20 +2152,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 {
@@ -2127,7 +2183,7 @@
   return {
     style,
     icon,
-    color,
+    innerStyle,
     position
   }
 }

--
Gitblit v1.8.0