From a7938fbc431502c0a631f188b6e8d7ae5e67a3d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 一月 2022 18:27:07 +0800
Subject: [PATCH] 2022-01-06
---
src/utils/utils-datamanage.js | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index dc431c4..4b98d65 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -146,18 +146,23 @@
let _search = ''
- if (setting.queryType === 'statistics' && _dataresource) { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
- regoptions.forEach(item => {
- _dataresource = _dataresource.replace(item.reg, item.value)
- })
- } else if (_dataresource && !id) {
- _search = Utils.joinMainSearchkey(search)
- if (_search) {
- _search = 'where ' + _search
+ if (_dataresource) {
+ if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ regoptions.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, item.value)
+ })
+ if (id) {
+ _dataresource = _dataresource + ` where ${setting.primaryKey || 'ID'}='${id}'`
+ }
+ } else if (!id) {
+ _search = Utils.joinMainSearchkey(search)
+ if (_search) {
+ _search = 'where ' + _search
+ }
+ } else if (id) {
+ _search = Utils.joinMainSearchkey(search)
+ _search = `where ${_search ? _search + ' AND ' : ''} ${setting.primaryKey || 'ID'}='${id}'`
}
- } else if (_dataresource && id) {
- _search = Utils.joinMainSearchkey(search)
- _search = `where ${_search ? _search + ' AND ' : ''} ${setting.primaryKey || 'ID'}='${id}'`
}
if (_customScript) {
@@ -196,8 +201,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
- _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText)
+ _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText)
}
if (setting.$name) {
@@ -208,6 +213,25 @@
param.LText = Utils.formatOptions(LText)
param.DateCount = Utils.formatOptions(DateCount)
+ // 澶氬眰缁撴瀯鏁版嵁
+ // LText = `SELECT a.id as bid,a.ID,a.workerCode,a.workerName,a.jobName,a.Initials,case when isnull(m.friend_id ,'') ='' then ''
+ // when isnull(m.status,0)=10 then '宸叉坊鍔�' else '寰呴�氳繃' end as friend_text
+ // ,case when images='' then 'http://epc.mk9h.cn/Content/images/upload/img/kane.jpg' else images end as icon FROM
+ // (select friend_id,status from oa_mail_list where userid='sso202004100959326131C0805998B6745F886F9' and Initials=case when right('0',1)='0' then Initials else '0' end
+ // and status=10 and deleted=0) m
+ // inner join (select * from BD_workers where
+ // Initials=case when right('0',1)='0' then Initials else '0' end and deleted=0 ) a
+ // on a.id=m.friend_id `
+ // param.custom_script = ''
+ // param.LText = Utils.formatOptions(LText)
+ // param.DateCount = ''
+ // param.prm_field = 'workerCode'
+ // param.arr_field = 'workerName,jobName'
+ // param.tabid = 'ID'
+ // param.parid = 'BID'
+ // param.sub_name = 'sub_data'
+ // param.sub_field = 'BID,friend_text,icon,Initials'
+
// exec_type: 'y' 瑙ｇ爜瀛楁锛歀Text銆丩Text1銆丩Text2銆乧ustom_script銆丏ateCount
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
--
Gitblit v1.8.0