From 8d7c3eed8bdac1e77c8de90a3227d801708c358e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 五月 2023 21:12:56 +0800
Subject: [PATCH] 2023-05-15
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 111 ++++++++++++++++++++++++++-----------------------------
1 files changed, 52 insertions(+), 59 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 52da922..8cb10c1 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -144,7 +144,7 @@
if (data.length > 0) {
data.forEach(item => {
let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
- if (btn.controlVals.includes(s)) {
+ if (btn.controlVals.includes(s) || item.$lock) {
disabled = true
}
})
@@ -601,7 +601,7 @@
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, false, this.moduleParams, Utils.getAllSearchOptions, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -838,7 +838,7 @@
getSysDeclareSql = (btn, formdata, data, columns, primaryId, BID = '') => {
let datavars = {} // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
- 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 _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', 'mk_deleted', 'bid']
// sql璇彞
let _sql = ''
@@ -964,7 +964,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),@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}
+ 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),@mk_deleted int,@bid nvarchar(50)${_declarefields}
`
let userName = sessionStorage.getItem('User_Name') || ''
@@ -987,7 +987,7 @@
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_sql += `
/* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
- 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}', @bid='${BID}', @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}', @mk_deleted=1, @bid='${BID}', @BillCode='', @ModularDetailCode=''
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -1061,37 +1061,48 @@
if (params[0].$unCheckParam) {
this.checkLoopRequest(params, _resolve)
+ } else if (btn.preFunc && params.length === 1) {
+ let param = params[0]
+ let _param = fromJS(param).toJS()
+ _param.func = btn.preFunc
+
+ Api.genericInterface(_param).then(res => {
+ if (res.status) {
+ if (res.ErrCode !== '-1') {
+ param = {...param, ...res}
+
+ delete param.status
+ delete param.ErrCode
+ delete param.ErrMesg
+ delete param.message
+
+ setTimeout(() => {
+ Api.genericInterface(param).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ }
+ })
+ }, 600)
+ }
+
+ this.triggerNote(res) // 娑堟伅
+ this.execSuccess(res)
+ } else {
+ this.execError(res)
+ }
+ }, () => {
+ this.updateStatus()
+ _resolve()
+ })
} else if (params.length <= 20 && btn.execType !== 'single') {
let deffers = params.map((param, i) => {
return new Promise(resolve => {
setTimeout(() => {
- let _param = null
- if (btn.preFunc) {
- _param = fromJS(param).toJS()
- param.func = btn.preFunc
- }
Api.genericInterface(param).then(res => {
- if (btn.preFunc && res.status && res.ErrCode !== '-1') {
- _param = {..._param, ...res}
-
- delete _param.status
- delete _param.ErrCode
- delete _param.ErrMesg
- delete _param.message
-
- setTimeout(() => {
- Api.genericInterface(_param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
- }, 600)
- }
-
if (res.status) {
this.triggerNote(res) // 娑堟伅
}
@@ -1566,36 +1577,8 @@
loadingNumber: params.length
})
- let _param = null
-
- if (btn.preFunc) {
- _param = fromJS(param).toJS()
- param.func = btn.preFunc
- }
-
Api.genericInterface(param).then(res => {
if (res.status) {
- if (btn.preFunc && res.ErrCode !== '-1') {
- _param = {..._param, ...res}
-
- delete _param.status
- delete _param.ErrCode
- delete _param.ErrMesg
- delete _param.message
-
- setTimeout(() => {
- Api.genericInterface(_param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
- }, 600)
- }
-
this.triggerNote(res) // 娑堟伅
if (params.length === 0) {
@@ -2683,6 +2666,16 @@
_item.type = 'text'
} else if (_item.type === 'date') {
_item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ } else if (_item.type === 'switch' || _item.type === 'check') {
+ if (_readin) {
+ _item.value = _item.value === item.openVal ? item.openVal : item.closeVal
+ } else {
+ if (item.initval === true) {
+ _item.value = item.openVal
+ } else {
+ _item.value = item.closeVal
+ }
+ }
} else if (_item.type === 'rate') {
let count = item.rateCount || 5
_item.value = parseInt(_item.value)
--
Gitblit v1.8.0