From 3728c728f6106b14e2149bcc7f45de437460c71f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十二月 2024 21:27:25 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/index.js | 4
src/utils/utils-datamanage.js | 2
src/tabviews/custom/components/table/base-table/index.jsx | 10 +
src/components/normalform/modalform/index.jsx | 2
src/menu/components/table/normal-table/options.jsx | 5
src/components/header/index.jsx | 18 +++
src/menu/components/card/data-card/options.jsx | 6
src/menu/components/table/base-table/options.jsx | 5
src/tabviews/custom/components/table/normal-table/index.jsx | 10 +
src/utils/utils-custom.js | 2
src/tabviews/zshare/actionList/printbutton/index.jsx | 81 +++++++++++++++
src/menu/components/share/actioncomponent/actionform/index.jsx | 8 +
src/api/index.js | 26 +++++
src/tabviews/custom/components/share/normalTable/index.jsx | 12 ++
src/menu/components/card/prop-card/index.jsx | 2
public/README.txt | 3
src/menu/components/table/edit-table/index.jsx | 4
src/menu/datasource/verifycard/index.jsx | 17 +++
src/assets/css/main.scss | 26 +++-
19 files changed, 212 insertions(+), 31 deletions(-)
diff --git a/public/README.txt b/public/README.txt
index 50a4e1b..e678fa0 100644
--- a/public/README.txt
+++ b/public/README.txt
@@ -24,4 +24,5 @@
execType -- 鑴氭湰浼犺緭鏂瑰紡锛屽�间负x鏃讹紝鍚敤AES鍔犲瘑
SysNotice -- 鏄惁寮�鍚郴缁熸秷鎭�
updateStatus -- 鏄惁鏇存柊寮�鍙戠姸鎬侊紝榛樿寮�鍚紝褰撳�间负 false 鏃剁鐢�
-forcedUpdate -- 浼犺緭鍙峰崌绾ф椂锛屾槸鍚﹁嚜鍔ㄩ��鍑猴紝鏍煎紡涓猴紙YYYY-MM-DD锛夛紝鐢ㄤ簬鍗囩骇鍚庡埛鏂扮敤鎴锋湰鍦伴厤缃�
\ No newline at end of file
+forcedUpdate -- 浼犺緭鍙峰崌绾ф椂锛屾槸鍚﹁嚜鍔ㄩ��鍑猴紝鏍煎紡涓猴紙YYYY-MM-DD锛夛紝鐢ㄤ簬鍗囩骇鍚庡埛鏂扮敤鎴锋湰鍦伴厤缃�
+errorLog -- 璁板綍500銆�504鏃剁殑鎶ラ敊鏃ュ織锛屽�间负 true 鏃跺紑鍚紝涓氬姟绯荤粺鏈夋晥
\ No newline at end of file
diff --git a/src/api/index.js b/src/api/index.js
index 3b725fd..1538ed0 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -86,6 +86,32 @@
placement: 'bottomRight',
duration: 15
})
+ if ([500, 504].includes(response.status) && error.config && error.config.url && error.config.data) {
+ window.mkInfo(error.config.url)
+ window.mkInfo(error.config.data)
+ if (window.GLOB.errorLog && !sessionStorage.getItem('local_error')) {
+ let urlReg = new RegExp('^(' + window.GLOB.baseurl + '|/)webapi/(exstars|dostars)', 'ig')
+ if (urlReg.test(error.config.url) && !/s_special_error_note_log/.test(error.config.url)) {
+ let res = null
+ try {
+ let data = JSON.parse(error.config.data)
+ if (!data.rduri) {
+ res = {
+ api_url: error.config.url,
+ error_code: response.status,
+ error_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+ api_param: error.config.data
+ }
+ }
+ } catch (e) {
+ res = null
+ }
+ if (res) {
+ sessionStorage.setItem('local_error', JSON.stringify(res))
+ }
+ }
+ }
+ }
}
return Promise.reject(response)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index a4891e0..b7610c8 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -168,28 +168,38 @@
background: rgba(0, 0, 0, 0);
}
.ant-calendar-header .ant-calendar-prev-century-btn::before, .ant-calendar-header .ant-calendar-prev-decade-btn::before, .ant-calendar-header .ant-calendar-prev-year-btn::before, .ant-calendar-header .ant-calendar-prev-century-btn::after, .ant-calendar-header .ant-calendar-prev-decade-btn::after, .ant-calendar-header .ant-calendar-prev-year-btn::after {
- border-color: rgba(0, 0, 0, 0.65)!important;
+ border-color: rgba(0, 0, 0, 0.85)!important;
+ border-width: 2px 0 0 2px!important;
}
.ant-calendar-header .ant-calendar-next-century-btn::before, .ant-calendar-header .ant-calendar-next-decade-btn::before, .ant-calendar-header .ant-calendar-next-year-btn::before, .ant-calendar-header .ant-calendar-next-century-btn::after, .ant-calendar-header .ant-calendar-next-decade-btn::after, .ant-calendar-header .ant-calendar-next-year-btn::after {
- border-color: rgba(0, 0, 0, 0.65)!important;
+ border-color: rgba(0, 0, 0, 0.85)!important;
+ border-width: 2px 0 0 2px!important;
}
.ant-calendar-header .ant-calendar-next-century-btn:hover::before, .ant-calendar-header .ant-calendar-next-decade-btn:hover::before, .ant-calendar-header .ant-calendar-next-year-btn:hover::before, .ant-calendar-header .ant-calendar-next-century-btn:hover::after, .ant-calendar-header .ant-calendar-next-decade-btn:hover::after, .ant-calendar-header .ant-calendar-next-year-btn:hover::after {
- border-color: rgba(0, 0, 0, 0.85)!important;
+ border-color: rgba(0, 0, 0, 1)!important;
}
.ant-calendar-header .ant-calendar-prev-century-btn:hover::before, .ant-calendar-header .ant-calendar-prev-decade-btn:hover::before, .ant-calendar-header .ant-calendar-prev-year-btn:hover::before, .ant-calendar-header .ant-calendar-prev-century-btn:hover::after, .ant-calendar-header .ant-calendar-prev-decade-btn:hover::after, .ant-calendar-header .ant-calendar-prev-year-btn:hover::after {
- border-color: rgba(0, 0, 0, 0.85)!important;
+ border-color: rgba(0, 0, 0, 1)!important;
+}
+.ant-calendar-header .ant-calendar-prev-month-btn {
+ left: 35px!important;
+}
+.ant-calendar-header .ant-calendar-next-month-btn {
+ right: 35px!important;
}
.ant-calendar-header .ant-calendar-prev-month-btn::before, .ant-calendar-header .ant-calendar-prev-month-btn::after {
- border-color: rgba(0, 0, 0, 0.65)!important;
+ border-color: rgba(0, 0, 0, 0.85)!important;
+ border-width: 2px 0 0 2px!important;
}
.ant-calendar-header .ant-calendar-next-month-btn::before, .ant-calendar-header .ant-calendar-next-month-btn::after {
- border-color: rgba(0, 0, 0, 0.65)!important;
+ border-color: rgba(0, 0, 0, 0.85)!important;
+ border-width: 2px 0 0 2px!important;
}
.ant-calendar-header .ant-calendar-prev-month-btn:hover::before, .ant-calendar-header .ant-calendar-prev-month-btn:hover::after {
- border-color: rgba(0, 0, 0, 0.85)!important;
+ border-color: rgba(0, 0, 0, 1)!important;
}
.ant-calendar-header .ant-calendar-next-month-btn:hover::before, .ant-calendar-header .ant-calendar-next-month-btn:hover::after {
- border-color: rgba(0, 0, 0, 0.85)!important;
+ border-color: rgba(0, 0, 0, 1)!important;
}
// 閲嶇疆妯℃�佹婊氬姩鏉�
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index ac0967d..167ad7f 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -83,6 +83,24 @@
}
}
})
+
+ if (sessionStorage.getItem('local_error')) {
+ try {
+ let param = JSON.parse(sessionStorage.getItem('local_error'))
+ setTimeout(() => {
+ Api.genericInterface({
+ func: 's_special_error_note_log',
+ ...param
+ }).then(res => {
+ if (res.status) {
+ sessionStorage.removeItem('local_error')
+ }
+ })
+ }, 3000)
+ } catch (e) {
+ sessionStorage.removeItem('local_error')
+ }
+ }
}
shouldComponentUpdate (nextProps, nextState) {
diff --git a/src/components/normalform/modalform/index.jsx b/src/components/normalform/modalform/index.jsx
index 0ab789f..6c7d9f3 100644
--- a/src/components/normalform/modalform/index.jsx
+++ b/src/components/normalform/modalform/index.jsx
@@ -255,7 +255,7 @@
if (_vals.length === new Set(_vals).size) {
m.hidden = true
}
- } else if (!p.values.includes(_val)) {
+ } else if (p.values && !p.values.includes(_val)) {
m.hidden = true
}
})
diff --git a/src/index.js b/src/index.js
index 3e60879..a1157c3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -179,6 +179,10 @@
GLOB.mainSystemApi = systemApi
}
+
+ if (config.errorLog === 'true' && /#\/(login|main|billprint|docprint|tab|iframe|view|ssologin)/.test(window.location.href)) {
+ GLOB.errorLog = true
+ }
}
if (/#\/hs$/.test(window.location.href)) { // hs涓嬩笉鎵撳嵃鑴氭湰
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 8618072..4b010f9 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -273,10 +273,10 @@
required: false,
linkField: 'datatype',
options: [
- {ParentID: '', value: 'static', label: '闈欐�佸��'},
{ParentID: 'dynamic', value: 'dynamic', label: '鍔ㄦ�佸��'},
- {ParentID: 'dynamic', value: 'joint', label: '鎷兼帴鍊�'},
{ParentID: 'public', value: 'dynamic', label: '鍔ㄦ�佸��'},
+ {ParentID: '', value: 'static', label: '闈欐�佸��'},
+ {ParentID: 'dynamic', value: 'joint', label: '鎷兼帴鍊�'},
{ParentID: 'public', value: 'joint', label: '鎷兼帴鍊�'},
],
forbid: subtype !== 'propcard'
@@ -314,7 +314,7 @@
type: 'select',
field: 'selStyle',
label: '閫変腑椋庢牸',
- initval: wrap.selStyle || 'active',
+ initval: wrap.selStyle || 'none',
tooltip: '瀛樺湪杈规鏃讹紝杈规浼氫娇鐢ㄧ郴缁熻壊銆�',
required: false,
options: [
diff --git a/src/menu/components/card/prop-card/index.jsx b/src/menu/components/card/prop-card/index.jsx
index 85ce70f..59cfd1b 100644
--- a/src/menu/components/card/prop-card/index.jsx
+++ b/src/menu/components/card/prop-card/index.jsx
@@ -50,7 +50,7 @@
name: card.name,
subtype: card.subtype,
setting: { interType: 'system' },
- wrap: { name: card.name, width: card.width || 24, title: '', datatype: 'static' },
+ wrap: { name: card.name, width: card.width || 24, title: '', datatype: 'static', cardType: 'radio' },
style: { marginLeft: '0px', marginRight: '0px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 8350b78..6fcaa2f 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -741,6 +741,10 @@
_fieldval.color = 'primary'
}
}
+ this.record.resetPageIndex = 'false'
+ if ([this.record.execSuccess, this.record.execError].includes('grid')) {
+ _fieldval.resetPageIndex = 'false'
+ }
} else if (value === 'audit') {
_fieldval.label = '瀹℃牳'
_fieldval.Ot = 'required'
@@ -757,6 +761,10 @@
} else {
_fieldval.color = 'danger'
}
+ this.record.resetPageIndex = 'true'
+ if ([this.record.execSuccess, this.record.execError].includes('grid')) {
+ _fieldval.resetPageIndex = 'true'
+ }
} else if (value === 'custom') {
_fieldval.Ot = 'required'
}
diff --git a/src/menu/components/table/base-table/options.jsx b/src/menu/components/table/base-table/options.jsx
index 8c3f5fa..281b215 100644
--- a/src/menu/components/table/base-table/options.jsx
+++ b/src/menu/components/table/base-table/options.jsx
@@ -138,13 +138,14 @@
field: 'selected',
label: '鏁版嵁閫変腑',
initval: wrap.selected || 'false',
- tooltip: '鍒濆鍖栵細鏁版嵁鍔犺浇鏃堕�変腑棣栬鏁版嵁锛屼粎鎵ц涓�娆°�傛暟鎹姞杞斤細姣忔鏁版嵁鍔犺浇鏃跺潎閫変腑棣栬锛堝綋鎸夐挳鎵ц瀹屾垚骞惰繑鍥炰富閿�兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇锛夈�傞�変腑鏍囪锛氳繑鍥炴暟鎹腑瀛樺湪 selected 瀛楁锛屼笖鍊间负 true 鐨勬暟鎹閫変腑銆傛敞锛氬惎鐢ㄦ棤浜哄�煎畧鏃舵棤鏁堛��',
+ tooltip: '鍒濆鍖栵細鏁版嵁鍔犺浇鏃堕�変腑棣栬鏁版嵁锛屼粎鎵ц涓�娆°�傛暟鎹姞杞斤細姣忔鏁版嵁鍔犺浇鏃跺潎閫変腑棣栬锛堝綋鎸夐挳鎵ц瀹屾垚骞惰繑鍥炰富閿�兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇锛夈�傞�変腑鏍囪锛氳繑鍥炴暟鎹腑瀛樺湪 selected 瀛楁锛屼笖鍊间负 true 鐨勬暟鎹閫変腑銆傛湰鍦拌褰曪細鏁版嵁鍒锋柊鏃朵笂娆¤閫変腑鐨勮灏嗚嚜鍔ㄩ�変腑銆傛敞锛氬惎鐢ㄦ棤浜哄�煎畧鏃舵棤鏁堛��',
required: false,
options: [
{value: 'false', label: '鏃�'},
{value: 'init', label: '鍒濆鍖�'},
{value: 'always', label: '鏁版嵁鍔犺浇'},
- {value: 'sign', label: '閫変腑鏍囪'}
+ {value: 'sign', label: '閫変腑鏍囪'},
+ {value: 'local', label: '鏈湴璁板綍'},
],
},
{
diff --git a/src/menu/components/table/edit-table/index.jsx b/src/menu/components/table/edit-table/index.jsx
index 0e5e8d8..04d7504 100644
--- a/src/menu/components/table/edit-table/index.jsx
+++ b/src/menu/components/table/edit-table/index.jsx
@@ -71,7 +71,9 @@
if (_card.mergeCol) {
let col = _card.cols[_card.mergeCol[0]]
- _card.cols.splice(_card.mergeCol[0], 1, ...col.pops)
+ if (col.pops) {
+ _card.cols.splice(_card.mergeCol[0], 1, ...col.pops)
+ }
}
if (_card.wrap.commit === 'simple') {
diff --git a/src/menu/components/table/normal-table/options.jsx b/src/menu/components/table/normal-table/options.jsx
index d107f30..94e0641 100644
--- a/src/menu/components/table/normal-table/options.jsx
+++ b/src/menu/components/table/normal-table/options.jsx
@@ -209,13 +209,14 @@
field: 'selected',
label: '鏁版嵁閫変腑',
initval: wrap.selected || 'false',
- tooltip: '鍒濆鍖栵細鏁版嵁鍔犺浇鏃堕�変腑棣栬鏁版嵁锛屼粎鎵ц涓�娆°�傛暟鎹姞杞斤細姣忔鏁版嵁鍔犺浇鏃跺潎閫変腑棣栬锛堝綋鎸夐挳鎵ц瀹屾垚骞惰繑鍥炰富閿�兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇锛夈�傞�変腑鏍囪锛氳繑鍥炴暟鎹腑瀛樺湪 selected 瀛楁锛屼笖鍊间负 true 鐨勬暟鎹閫変腑銆�',
+ tooltip: '鍒濆鍖栵細鏁版嵁鍔犺浇鏃堕�変腑棣栬鏁版嵁锛屼粎鎵ц涓�娆°�傛暟鎹姞杞斤細姣忔鏁版嵁鍔犺浇鏃跺潎閫変腑棣栬锛堝綋鎸夐挳鎵ц瀹屾垚骞惰繑鍥炰富閿�兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇锛夈�傞�変腑鏍囪锛氳繑鍥炴暟鎹腑瀛樺湪 selected 瀛楁锛屼笖鍊间负 true 鐨勬暟鎹閫変腑銆傛湰鍦拌褰曪細鏁版嵁鍒锋柊鏃朵笂娆¤閫変腑鐨勮灏嗚嚜鍔ㄩ�変腑銆�',
required: false,
options: [
{value: 'false', label: '鏃�'},
{value: 'init', label: '鍒濆鍖�'},
{value: 'always', label: '鏁版嵁鍔犺浇'},
- {value: 'sign', label: '閫変腑鏍囪'}
+ {value: 'sign', label: '閫変腑鏍囪'},
+ {value: 'local', label: '鏈湴璁板綍'},
],
},
{
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 3490f83..5a09d3b 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -719,11 +719,24 @@
if (r.custompage && setting.laypage === 'true' && _columns.findIndex(col => col.field === 'mk_total') === -1) {
if (config.subtype !== 'basetable') {
- Modal.warning({
- title: `鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤鑷畾涔夊垎椤垫帓搴忔椂锛岃鍦ㄥ瓧娈甸泦涓坊鍔� mk_total銆俙,
+ const that = this
+ Modal.confirm({
+ title: `鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤鑷畾涔夊垎椤垫帓搴忔椂锛屽瓧娈甸泦涓渶瑕佹坊鍔� mk_total銆俙,
okText: '鐭ラ亾浜�',
+ cancelText: '娣诲姞',
onOk: () => {
reject()
+ },
+ onCancel() {
+ let item = {
+ field: 'mk_total',
+ label: 'mk_total',
+ datatype: 'Int',
+ uuid: Utils.getuuid()
+ }
+
+ that.setState({ columns: [item, ...columns] })
+ reject()
}
})
return
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index db3be11..25310ed 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -927,7 +927,7 @@
this.props.refreshdata({pageIndex})
}
- mkCheckTopLine = (menuId, id, selected) => {
+ mkCheckTopLine = (menuId, id, selected, orikeys) => {
const { MenuID, data, setting } = this.props
if (MenuID !== menuId) return
@@ -955,6 +955,16 @@
index = i
}
})
+ } else if (selected === 'local') {
+ if (orikeys && orikeys.length) {
+ data.forEach((item, i) => {
+ if (!item.$disabled && orikeys.includes(item.$$uuid)) {
+ items.push(item)
+ keys.push(i)
+ index = i
+ }
+ })
+ }
} else if (selected !== 'false') {
if (!data[0].$disabled) {
index = 0
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index d174da9..0099b1e 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -65,7 +65,7 @@
let setting = {..._config.setting, ..._config.wrap}
- if (setting.selected !== 'always' && setting.selected !== 'init' && setting.selected !== 'sign') {
+ if (!['always', 'init', 'sign', 'local'].includes(setting.selected)) {
setting.selected = 'false'
}
@@ -148,7 +148,7 @@
if (result.status) {
if (result.$requestId && this.requestId !== result.$requestId) return
- if (repage === 'false' && result.data.length === 0 && pageIndex > 1) {
+ if (result.data.length === 0 && pageIndex > 1) {
this.reloadIndex()
return
}
@@ -190,8 +190,12 @@
}
if (data.length && (id || setting.selected !== 'false')) {
+ let keys = null
+ if (setting.selected === 'local') {
+ keys = this.state.selectedData.map(cell => cell.$$uuid)
+ }
setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', config.uuid, id, setting.selected)
+ MKEmitter.emit('mkCheckTopLine', config.uuid, id, setting.selected, keys)
}, 200)
} else {
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index a801362..2443066 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -77,7 +77,7 @@
let setting = {..._config.setting, ..._config.wrap}
- if (setting.selected !== 'always' && setting.selected !== 'init' && setting.selected !== 'sign') {
+ if (!['always', 'init', 'sign', 'local'].includes(setting.selected)) {
setting.selected = 'false'
}
@@ -577,7 +577,7 @@
Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
- if (repage === 'false' && result.data.length === 0 && pageIndex > 1) {
+ if (result.data.length === 0 && pageIndex > 1) {
this.reloadIndex()
return
}
@@ -630,8 +630,12 @@
}
if (data.length && (id || setting.selected !== 'false')) {
+ let keys = null
+ if (setting.selected === 'local') {
+ keys = this.state.selectedData.map(cell => cell.$$uuid)
+ }
setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', config.uuid, id, setting.selected)
+ MKEmitter.emit('mkCheckTopLine', config.uuid, id, setting.selected, keys)
}, 200)
} else {
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index e204a75..b0e6202 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -558,9 +558,47 @@
const { btn } = this.props
let callback = null
+ let printReject = null
+ let skip = false
+ let send = false
+
+ let data = fromJS({
+ data: printlist,
+ form: formdata
+ }).toJS()
+
+ if (!window.GLOB.errorLog) {
+ printReject = (msg) => {
+ if (send) return
+
+ send = true
+ data.message = msg
+
+ window.mkInfo(JSON.stringify(data))
+ }
+ } else {
+ printReject = (msg) => {
+ if (send) return
+
+ send = true
+ data.message = msg
+
+ let param = {
+ func: 's_special_error_note_log',
+ api_url: btn.logLabel,
+ error_code: 507,
+ error_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+ api_param: JSON.stringify(data)
+ }
+ Api.genericInterface(param)
+ }
+ }
if (/callback\(\)/.test(btn.verify.printFunc)) {
callback = () => {
+ if (skip) return
+ skip = true
+
this.execSuccess({
ErrCode: '-1',
message: '',
@@ -577,8 +615,8 @@
try {
// eslint-disable-next-line
- let func = new Function('data', 'form', 'printer', 'notification', 'Api', 'systemType', 'callback', btn.verify.printFunc)
- func(printlist, formdata, btn.verify, notification, Api, window.GLOB.systemType, callback)
+ let func = new Function('data', 'form', 'printer', 'notification', 'Api', 'systemType', 'callback', 'printReject', btn.verify.printFunc)
+ func(printlist, formdata, btn.verify, notification, Api, window.GLOB.systemType, callback, printReject)
// 鑷畾涔夋墦鍗扮ず渚�
// let defaultPrinter = printer.defaultPrinter || 'lackprinter'
@@ -779,6 +817,8 @@
message: window.GLOB.dict['func_error'] || '鑷畾涔夊嚱鏁版墽琛岄敊璇紒',
duration: 5
})
+
+ printReject(window.GLOB.dict['func_error'] || '鑷畾涔夊嚱鏁版墽琛岄敊璇紒')
}
}
@@ -1694,6 +1734,41 @@
const { btn } = this.props
const { dict } = this.state
+ let printReject = null
+ let send = false
+
+ let data = fromJS({
+ data: list,
+ template: template
+ }).toJS()
+
+ if (!window.GLOB.errorLog) {
+ printReject = (msg) => {
+ if (send) return
+
+ send = true
+ data.message = msg
+
+ window.mkInfo(JSON.stringify(data))
+ }
+ } else {
+ printReject = (msg) => {
+ if (send) return
+
+ send = true
+ data.message = msg
+
+ let param = {
+ func: 's_special_error_note_log',
+ api_url: btn.logLabel,
+ error_code: 507,
+ error_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+ api_param: JSON.stringify(data)
+ }
+ Api.genericInterface(param)
+ }
+ }
+
let _errors = []
let defaultPrinter = btn.verify.defaultPrinter || 'lackprinter'
@@ -1906,6 +1981,8 @@
message: data.message,
status: false
})
+
+ printReject(data.message)
}
}
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 188585a..00e48a7 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -4707,7 +4707,7 @@
} else if (['mk_address'].includes(s)) {
decSql.push(`@mk_address nvarchar(100)`)
} else if (['mk_deleted'].includes(s)) {
- secSql.push(`@mk_deleted int`)
+ decSql.push(`@mk_deleted int`)
} else {
decSql.push(`@${s} nvarchar(50)`)
}
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 5b0c6e2..9507763 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -73,6 +73,8 @@
}
item.urlkeys && item.urlkeys.forEach(key => {
+ if (values.hasOwnProperty(key.toLowerCase())) return
+
values[key] = item.urlparam[key]
})
--
Gitblit v1.8.0