From d38c9a99dc9d9450200a6d9e64876d164242177b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 19 十二月 2023 20:12:13 +0800
Subject: [PATCH] 2023-12-19
---
src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx | 22 ++++
src/menu/components/share/actioncomponent/actionform/index.jsx | 14 ---
src/tabviews/basetable/index.jsx | 2
src/templates/zshare/editTable/index.jsx | 2
src/menu/components/share/actioncomponent/formconfig.jsx | 30 ++++++
src/templates/zshare/verifycard/index.jsx | 108 +++++++++++++++++++-------
src/views/systemfunc/sidemenu/index.jsx | 42 +++++++++-
src/assets/css/main.scss | 6 +
8 files changed, 171 insertions(+), 55 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index f18da84..cce812c 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -230,6 +230,12 @@
.ant-modal.ant-modal-confirm {
top: 38vh;
}
+.ant-modal.ant-modal-confirm.ant-modal-confirm-info {
+ top: 100px;
+ .ant-modal-body {
+ padding: 24px;
+ }
+}
.ant-popover {
z-index: 1070!important;
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index be31b72..3ae1f86 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -949,18 +949,8 @@
content = <KeyInterface type={item.key === 'exInterface' ? 'develop' : 'product'}/>
}
- if (help && /func:/.test(help)) {
- try {
- // eslint-disable-next-line
- let func = new Function('record', help.replace(/func:/, ''))
- help = func(this.record)
- if (help) {
- help = <span dangerouslySetInnerHTML={{ __html: help }}></span>
- }
- } catch (e) {
- help = ''
- console.warn(e)
- }
+ if (help && typeof(help) === 'function') {
+ help = help(this.record)
}
fields.push(
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index f05ffb1..2ae150b 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -1,5 +1,5 @@
+import React from 'react'
import { btnClasses } from '@/utils/option.js'
-
/**
* @description 鑾峰彇鎸夐挳琛ㄥ崟閰嶇疆淇℃伅
@@ -469,7 +469,19 @@
key: 'printTemp',
label: '鎵撳嵃妯℃澘',
initVal: card.printTemp || '',
- help: `func: if (record.printTemp) {return '<a target="_blank" rel="noopener noreferrer" href="https://cloud.mk9h.cn/admin/index.html">浼佷笟鐗�</a>'} else {return ''}`,
+ help: (record) => {
+ if (record.printTemp) {
+ return <span onClick={() => {
+ sessionStorage.setItem('mk-print-temp', record.printTemp)
+ window.open('#/hs')
+
+ setTimeout(() => {
+ sessionStorage.removeItem('mk-print-temp')
+ }, 50)
+ }} style={{color: '#1890ff', cursor: 'pointer', fontSize: '13px'}}>#鏌ョ湅妯℃澘</span>
+ }
+ return ''
+ },
required: true
},
{
@@ -1606,7 +1618,19 @@
key: 'printTemp',
label: '鎵撳嵃妯℃澘',
initVal: card.printTemp || '',
- help: `func: if (record.printTemp) {return '<a target="_blank" rel="noopener noreferrer" href="https://cloud.mk9h.cn/admin/index.html">浼佷笟鐗�</a>'} else {return ''}`,
+ help: (record) => {
+ if (record.printTemp) {
+ return <span onClick={() => {
+ sessionStorage.setItem('mk-print-temp', record.printTemp)
+ window.open('#/hs')
+
+ setTimeout(() => {
+ sessionStorage.removeItem('mk-print-temp')
+ }, 50)
+ }} style={{color: '#1890ff', cursor: 'pointer', fontSize: '13px'}}>#鏌ョ湅妯℃澘</span>
+ }
+ return ''
+ },
required: true
},
{
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index f2dd7d0..d0f3bb7 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -208,7 +208,7 @@
}
})
}
-
+
// 鑾峰彇涓绘悳绱㈡潯浠�
config.components.forEach(component => {
if (component.type === 'tabs') return
diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
index 827c5af..1509c78 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
@@ -399,12 +399,16 @@
}
changeTemplate = (val) => {
- const { templates } = this.state
+ const { templates, verify } = this.state
let temp = templates.filter(temp => temp.value === val)[0]
this.setState({
- selectimg: temp.img
+ selectimg: temp.img,
+ verify: {
+ ...verify,
+ Template: val
+ }
})
}
@@ -854,7 +858,19 @@
</Form.Item>
</Col> : null}
{printMode !== 'custom' ? <Col span={8}>
- <Form.Item label="鎵撳嵃妯℃澘">
+ <Form.Item label="鎵撳嵃妯℃澘" help={(() => {
+ if (verify.Template) {
+ return <span onClick={() => {
+ sessionStorage.setItem('mk-print-tab-temp', verify.Template)
+ window.open('#/hs')
+
+ setTimeout(() => {
+ sessionStorage.removeItem('mk-print-tab-temp')
+ }, 50)
+ }} style={{color: '#1890ff', cursor: 'pointer', fontSize: '13px'}}>#鏌ョ湅妯℃澘</span>
+ }
+ return null
+ })()}>
{getFieldDecorator('Template', {
initialValue: verify.Template || '',
rules: [
diff --git a/src/templates/zshare/editTable/index.jsx b/src/templates/zshare/editTable/index.jsx
index 6b4c9f4..7383cea 100644
--- a/src/templates/zshare/editTable/index.jsx
+++ b/src/templates/zshare/editTable/index.jsx
@@ -790,7 +790,9 @@
if (col.copy) {
col.render = (text) => (<Paragraph copyable>{text}</Paragraph>)
}
+
if (!col.editable) return col
+
return {
...col,
onCell: record => ({
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 00076a1..7a22f60 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -18,7 +18,7 @@
import BillcodeForm from './billcodeform'
import VoucherForm from './voucherform'
import asyncComponent from '@/utils/asyncComponent'
-import { updateForm } from '@/utils/utils-update.js'
+// import { updateForm } from '@/utils/utils-update.js'
import MKEmitter from '@/utils/events.js'
import './index.scss'
@@ -530,6 +530,7 @@
}>
<span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
+ {/* <span className="operation-btn" title="SQL" onClick={() => this.orderSql(record)} style={{color: '#1890ff'}}><ConsoleSqlOutlined /></span> */}
</div>)
}
]
@@ -657,37 +658,37 @@
} else if (card.modal && (card.OpenType === 'pop' || !card.OpenType)) {
_fields = card.modal.fields || []
resolve(_fields)
- } else if (card.OpenType === 'pop') {
- Api.getCloudConfig({
- func: 'sPC_Get_LongParam',
- MenuID: card.uuid
- }).then(res => {
- if (res.status) {
- let _LongParam = ''
- if (res.LongParam) {
- try {
- _LongParam = JSON.parse(window.decodeURIComponent(window.atob(res.LongParam)))
- } catch (e) {
- console.warn('Parse Failure')
- _LongParam = ''
- }
- }
+ // } else if (card.OpenType === 'pop') {
+ // Api.getCloudConfig({
+ // func: 'sPC_Get_LongParam',
+ // MenuID: card.uuid
+ // }).then(res => {
+ // if (res.status) {
+ // let _LongParam = ''
+ // if (res.LongParam) {
+ // try {
+ // _LongParam = JSON.parse(window.decodeURIComponent(window.atob(res.LongParam)))
+ // } catch (e) {
+ // console.warn('Parse Failure')
+ // _LongParam = ''
+ // }
+ // }
- if (!_LongParam) {
- message.warning('鏈幏鍙栧埌琛ㄥ崟淇℃伅锛岄儴鍒嗛獙璇佸皢鏃犳硶璁剧疆锛�')
- } else {
- _LongParam = updateForm(_LongParam)
- _fields = _LongParam.fields || []
- }
- } else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
- resolve(_fields)
- })
+ // if (!_LongParam) {
+ // message.warning('鏈幏鍙栧埌琛ㄥ崟淇℃伅锛岄儴鍒嗛獙璇佸皢鏃犳硶璁剧疆锛�')
+ // } else {
+ // _LongParam = updateForm(_LongParam)
+ // _fields = _LongParam.fields || []
+ // }
+ // } else {
+ // notification.warning({
+ // top: 92,
+ // message: res.message,
+ // duration: 5
+ // })
+ // }
+ // resolve(_fields)
+ // })
} else {
resolve(_fields)
}
@@ -1134,6 +1135,51 @@
})
}
+ // orderSql = (record) => {
+ // let _ModularDetailCode = ''
+ // let _lpline = ''
+ // if (record.TypeCharOne === 'Lp') {
+ // if (record.linkField.toLowerCase() === 'bid') {
+ // _lpline = `set @ModularDetailCode= 'Lp'+ right('${record.mark || this.props.card.uuid}'+@BID@,48)`
+ // } else {
+ // _lpline = `set @ModularDetailCode= 'Lp'+ right('${record.mark || this.props.card.uuid}'+@${record.linkField.toLowerCase()},48)`
+ // }
+ // _ModularDetailCode = '@ModularDetailCode'
+ // } else if (record.TypeCharOne === 'BN') {
+ // _ModularDetailCode = `'${record.TypeCharOne}'`
+ // } else {
+ // _ModularDetailCode = `'${record.ModularDetailCode}'`
+ // }
+
+ // let sql = `select @BillCode='', @${record.field}='', @ModularDetailCode=''
+ // ${_lpline}
+ // exec s_get_BillCode
+ // @ModularDetailCode=${_ModularDetailCode},
+ // @Type=${record.Type},
+ // @TypeCharOne='${record.TypeCharOne}',
+ // @TypeCharTwo ='${record.TypeCharTwo}',
+ // @BillCode =@BillCode output,
+ // @ErrorCode =@ErrorCode output,
+ // @retmsg=@retmsg output
+ // if @ErrorCode!=''
+ // goto aaa
+ // set @${record.field}=@BillCode`
+
+ // Modal.info({
+ // title: '',
+ // width: 500,
+ // icon: null,
+ // content: sql.split(/\n\s{4}/ig).map((n, index) => <div key={index} dangerouslySetInnerHTML={{ __html: n.replace(/\s/ig, ' ') }} style={{whiteSpace: 'nowrap'}}></div>)
+ // })
+ // // let oInput = document.createElement('input')
+ // // oInput.value = sql
+ // // document.body.appendChild(oInput)
+ // // oInput.select()
+ // // document.execCommand('Copy')
+ // // document.body.removeChild(oInput)
+ // // message.success('澶嶅埗鎴愬姛銆�')
+ // }
+
uniqueChange = (values) => {
let verify = fromJS(this.state.verify).toJS()
diff --git a/src/views/systemfunc/sidemenu/index.jsx b/src/views/systemfunc/sidemenu/index.jsx
index b6c4b15..53dc77f 100644
--- a/src/views/systemfunc/sidemenu/index.jsx
+++ b/src/views/systemfunc/sidemenu/index.jsx
@@ -40,18 +40,50 @@
}
let tb = sessionStorage.getItem('mk-table-node')
+ let temp = sessionStorage.getItem('mk-print-temp')
+ let tabTemp = sessionStorage.getItem('mk-print-tab-temp')
+
+ sessionStorage.removeItem('mk-table-node')
+ sessionStorage.removeItem('mk-print-temp')
+ sessionStorage.removeItem('mk-print-tab-temp')
this.setState({
subMenulist: menulist,
rootSubmenuKeys: menulist.map(item => item.MenuID),
openKeys: [menulist[0].MenuID]
}, () => {
- if (tb && menulist[0] && menulist[0].children[0] && menulist[0].children[0].MenuNo === 'sDatasM') {
- setTimeout(() => {
- MKEmitter.emit('modifyTabs', fromJS(menulist[0].children[0]).toJS())
- }, 500)
+ if (!menulist[0] || menulist[0].children.length === 0) return
+
+ if (tb) {
+ let menu = menulist[0].children.filter(item => item.MenuNo === 'sDatasM')[0]
+ if (menu) {
+ setTimeout(() => {
+ MKEmitter.emit('modifyTabs', fromJS(menu).toJS())
+ }, 500)
+ }
+ } else if (temp) {
+ let menu = menulist[0].children.filter(item => item.MenuNo === 'sPrintTemplate_webM')[0]
+ if (menu) {
+ menu = fromJS(menu).toJS()
+ menu.param = {}
+ menu.param.$searchkey = 'PrintTempNO'
+ menu.param.$searchval = temp
+ setTimeout(() => {
+ MKEmitter.emit('modifyTabs', menu)
+ }, 500)
+ }
+ } else if (tabTemp) {
+ let menu = menulist[0].children.filter(item => item.MenuNo === 'sPrintTemplateM')[0]
+ if (menu) {
+ menu = fromJS(menu).toJS()
+ menu.param = {}
+ menu.param.$searchkey = 'PrintTempNO'
+ menu.param.$searchval = tabTemp
+ setTimeout(() => {
+ MKEmitter.emit('modifyTabs', menu)
+ }, 500)
+ }
}
- sessionStorage.removeItem('mk-table-node')
})
}
--
Gitblit v1.8.0