From 937971881c3a2b2d0d8935ab18ca7c1b59ccaff7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 三月 2023 09:51:26 +0800
Subject: [PATCH] 2023-03-22
---
public/options.json | 10 +-
src/components/breadview/index.jsx | 14 ++--
src/api/index.js | 9 --
src/menu/components/share/actioncomponent/formconfig.jsx | 12 ++++
src/views/systemfunc/sidemenu/config.jsx | 115 +++++++++++++-------------------------
src/templates/comtableconfig/updatetable/index.jsx | 3 +
6 files changed, 69 insertions(+), 94 deletions(-)
diff --git a/public/options.json b/public/options.json
index bedcbee..4e405d0 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,12 +1,12 @@
{
- "appId": "202108312122504607B107A83F55B40C98CCF",
- "appkey": "20210831212235413F287EC3BF489424496C8",
+ "appId": "201912040924165801464FF1788654BC5AC73",
+ "appkey": "20191106103859640976D6E924E464D029CF0",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "",
"lineColor": "",
"filter": "false",
- "defaultApp": "mkindustry",
+ "defaultApp": "mk",
"defaultLang": "zh-CN",
"WXAppID": "",
"WXminiAppID": "",
@@ -17,6 +17,6 @@
"transfer": "false",
"keepPassword": "true",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
- "host": "http://demo.mk9h.cn",
- "service": "erp_new/"
+ "host": "http://qingqiumarket.cn",
+ "service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/api/index.js b/src/api/index.js
index 2f88dfc..7d9a350 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -12,11 +12,6 @@
// window.GLOB.WebSql = null
window.GLOB.IndexDB = null
window.GLOB.OuterToken = {}
-const systemMenuKeys = `1581067625930haged11ieaivpavv77k,1581734956310scks442ul2d955g9tu5,1583991994144ndddg0bhh0is6shi0v1,1583979633842550imkchl4qt4qppsiv,
- 1585192949946f3et2ts8tn82krmumdf,15855615451212m12ip23vpcm79kloro,1587005717541lov40vg61q7l1rbveon,1590458676585agbbr63t6ihighg2i1g,1602315375262ikd33ii0nii34pt861o,1582771068837vsv54a089lgp45migbg,
- 1582777675954ifu05upurs465omoth7,158294809668898cklbv6c5bou8e1fpu,1584676379094iktph45fb8imhg96bql,1584695125339vo5g7iqgfn01qmrd6s2,1584699661372vhmpp9dn9foo0eob722,15848421131551gg04ie8sitsd3f7467,
- 1589782279158ngr675kk3oksin35sul,1589788042787ffdt9hle4s45k9r1nvs,1594095599055qicg2eb642v5qglhnuo,1577972969199lei1g0qkvlh4tkc908m,16044812935562g807p3p12huk8kokmb,
- 1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv,15827879285193g85m3i2uprektpgmpf`
let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
let db = `mkdb${service}`
@@ -469,7 +464,7 @@
// let reg = new RegExp(_appkey + '$', 'ig')
// list.forEach(mid => {
- // if (systemMenuKeys.indexOf(mid) > -1 || reg.test(mid)) {
+ // if (reg.test(mid)) {
// clear = true
// }
// })
@@ -541,7 +536,7 @@
let reg = new RegExp(_appkey + '$', 'ig')
list.forEach(mid => {
- if (systemMenuKeys.indexOf(mid) > -1 || reg.test(mid)) {
+ if (reg.test(mid)) {
clear = true
}
})
diff --git a/src/components/breadview/index.jsx b/src/components/breadview/index.jsx
index 7158fbb..b1f59ca 100644
--- a/src/components/breadview/index.jsx
+++ b/src/components/breadview/index.jsx
@@ -87,20 +87,20 @@
selectcomponent = (view) => {
// 鏍规嵁tab椤典腑鑿滃崟淇℃伅锛岄�夋嫨鎵�闇�鐨勭粍浠�
- if (view.type === 'Home') {
- return (<Home MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
- } else if (view.type === 'CommonTable') {
- return (<CommonTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param} changeTemp={this.changeTemp}/>)
- } else if (view.type === 'BaseTable') {
+ if (view.type === 'BaseTable') {
return (<BaseTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param} changeTemp={this.changeTemp}/>)
} else if (view.type === 'CustomPage') {
return (<CustomPage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param} changeTemp={this.changeTemp}/>)
+ } else if (view.type === 'Home') {
+ return (<Home MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
+ } else if (view.type === 'RolePermission') {
+ return (<RoleManage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
+ } else if (view.type === 'CommonTable') {
+ return (<CommonTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param} changeTemp={this.changeTemp}/>)
} else if (view.type === 'TreePage') {
return (<TreePage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
} else if (view.type === 'CalendarPage') {
return (<CalendarPage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
- } else if (view.type === 'RolePermission') {
- return (<RoleManage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
} else if (view.type === 'FormTab') {
return (<FormTab MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
} else if (view.type === 'iframe') {
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 98b7ea2..296fa66 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -158,6 +158,12 @@
{ value: 'pay', text: '鏀粯' },
{ value: 'custom', text: '閾炬帴' }
]
+ } else {
+ if (card.pageTemplate === 'print') { // 鍘熺被鍨嬫敮鎸�
+ pageTemps.unshift({ value: 'print', text: '鏍囩鎵撳嵃妯℃澘' })
+ } else if (card.pageTemplate === 'billprintTemp') { // 鍘熺被鍨嬫敮鎸�
+ pageTemps.unshift({ value: 'billprintTemp', text: '鍗曟嵁鎵撳嵃妯℃澘' })
+ }
}
if (type === 'chart' && appType !== 'mob') {
@@ -1194,6 +1200,12 @@
{ value: 'custom', text: '鑷畾涔�' }
]
+ if (card.pageTemplate === 'print') { // 鍘熺被鍨嬫敮鎸�
+ pageTemps.unshift({ value: 'print', text: '鏍囩鎵撳嵃妯℃澘' })
+ } else if (card.pageTemplate === 'billprintTemp') { // 鍘熺被鍨嬫敮鎸�
+ pageTemps.unshift({ value: 'billprintTemp', text: '鍗曟嵁鎵撳嵃妯℃澘' })
+ }
+
let funTypes = [
{ value: 'print', text: '鏍囩鎵撳嵃' },
{ value: 'refund', text: '閫�娆�' },
diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index ffe2380..f17ec72 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -983,6 +983,9 @@
if (_btn.intertype === 'inner' && !_btn.innerFunc) {
_btn.intertype = 'system'
}
+ if ((_btn.intertype === 'outer' || _btn.intertype === 'custom') && !_btn.procMode) { // 鍏煎澶栭儴鍑芥暟鐩翠紶绫诲瀷
+ _btn.procMode = !_btn.innerFunc ? 'none' : 'inner'
+ }
if (_btn.funcType === 'print' && _btn.execMode) {
_btn.OpenType = 'funcbutton'
} else if (_btn.OpenType === 'blank') {
diff --git a/src/views/systemfunc/sidemenu/config.jsx b/src/views/systemfunc/sidemenu/config.jsx
index 9adbd43..e62128f 100644
--- a/src/views/systemfunc/sidemenu/config.jsx
+++ b/src/views/systemfunc/sidemenu/config.jsx
@@ -12,33 +12,26 @@
MenuName: '鏁版嵁瀛楀吀',
}, {
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1581734956310scks442ul2d955g9tu5',
MenuNo: 'sVersionM',
MenuName: '浼犺緭鍙风鐞�',
}, {
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1583991994144ndddg0bhh0is6shi0v1',
MenuNo: 'sVersionQueryM',
MenuName: '浼犺緭鍙锋煡璇�',
}, {
src: '',
systems: ['production', 'local', 'SSO', 'cloud'],
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1583979633842550imkchl4qt4qppsiv',
MenuNo: 'sVersionMUpgrade',
MenuName: '鐗堟湰鍗囩骇',
- // }, {
- // src: '',
- // PageParam: {OpenType: 'newtab', Template: 'TabManage'},
- // type: 'TabManage',
- // MenuID: 'TabManageView',
- // MenuNo: 'TabManage',
- // MenuName: '鏍囩椤电鐞�',
}, {
src: '',
PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
@@ -48,60 +41,46 @@
MenuName: '鏍囩鎵撳嵃妯℃澘',
}, {
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '16044812935562g807p3p12huk8kokmb',
MenuNo: 'sPrintTemplate_webM',
MenuName: '鍗曟嵁鎵撳嵃妯℃澘',
}, {
src: '',
systems: ['SSO', 'cloud'],
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1585192949946f3et2ts8tn82krmumdf',
MenuNo: 'MyAppManage',
MenuName: '绯荤粺UI',
}, {
src: '',
systems: ['SSO', 'cloud'],
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '15855615451212m12ip23vpcm79kloro',
MenuNo: 'sUsersAppM',
MenuName: '绯荤粺鐢ㄦ埛绠＄悊',
}, {
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1587005717541lov40vg61q7l1rbveon',
MenuNo: 's_custom_scriptM',
MenuName: '鑷畾涔夊嚱鏁�',
}, {
- // src: '',
- // PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- // type: 'CommonTable',
- // MenuID: '1590458676585agbbr63t6ihighg2i1g',
- // MenuNo: 'LdropdownmenuNewM',
- // MenuName: '閫氱敤涓嬫媺鑿滃崟',
- // }, {
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1602315375262ikd33ii0nii34pt861o',
MenuNo: 's_worksflow_roleM',
MenuName: '鍏抽敭瑙掕壊绠＄悊',
- // }, {
- // src: '',
- // PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- // type: 'CommonTable',
- // MenuID: '1606794243739c5ihs58lucpskp3r4s2',
- // MenuNo: 's_custom_componentsM',
- // MenuName: '鑷畾涔夌粍浠�',
}, {
src: '',
systems: ['production', 'local'],
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '15827879285193g85m3i2uprektpgmpf',
MenuNo: 'bd_mes_techM',
MenuName: '宸ヨ壓涓绘暟鎹�',
@@ -112,8 +91,8 @@
PageParam: {Icon: 'folder'},
children: [{
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1582771068837vsv54a089lgp45migbg',
MenuNo: 'KUNTitleM',
MenuName: '鎺ュ彛涓绘暟鎹�',
@@ -154,8 +133,8 @@
MenuName: '鍐欏叆鎺ュ彛',
}, {
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '15848421131551gg04ie8sitsd3f7467',
MenuNo: 'KUNOsMainM',
MenuName: '澶栭儴鎺ュ彛',
@@ -166,32 +145,18 @@
PageParam: {Icon: 'folder'},
children: [{
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1589782279158ngr675kk3oksin35sul',
MenuNo: 'bd_msn_emailM',
MenuName: '閭欢鏈嶅姟鍣�',
}, {
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1589788042787ffdt9hle4s45k9r1nvs',
MenuNo: 'bd_msn_email_tempM',
MenuName: '閭欢妯℃澘',
- // }, {
- // src: '',
- // PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- // type: 'CommonTable',
- // MenuID: '15900310928174dro07ihfckghpb5h13',
- // MenuNo: 'bd_msn_sms_tempM',
- // MenuName: '澶т簬鐭俊妯℃澘',
- // }, {
- // src: '',
- // PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- // type: 'CommonTable',
- // MenuID: '1599613340050c8nu6rbst9d4emnnbsq',
- // MenuNo: 's_sms_qxM',
- // MenuName: '濂囦簯鐭俊妯℃澘',
}]
}, {
MenuID: 'systemPayManage',
@@ -200,8 +165,8 @@
children: [{
src: '',
systems: ['local', 'cloud'],
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1594095599055qicg2eb642v5qglhnuo',
MenuNo: 's_weixin_pay_bdM',
MenuName: '寰俊鏀粯',
@@ -213,46 +178,46 @@
children: [{
src: '',
systems: ['production', 'local', 'SSO', 'cloud'],
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1577972969199lei1g0qkvlh4tkc908m',
MenuNo: 'sModularM',
MenuName: '绯荤粺妯″潡',
}, {
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1578479100252lfbp29v1kafk4s4q4ig',
MenuNo: 'BDLanguagePacksM',
MenuName: '璇█鍖�',
}, {
src: '',
systems: ['production', 'local', 'SSO', 'cloud'],
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1577971621421tg4v0i1ur8873k7e0ob',
MenuNo: 'sSystemParametersM',
MenuName: '鎺ュ彛鍦板潃',
}, {
src: '',
systems: ['production', 'local', 'SSO', 'cloud'],
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1577929944419lgc5h3hepum765e2k7u',
MenuNo: 'sProcExcepM',
MenuName: '鎶ラ敊鏃ュ織',
}, {
src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
+ PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
+ type: 'BaseTable',
MenuID: '1588493493409k9guqp067d31lu7blsv',
MenuNo: 's_job_stepM',
MenuName: '璁″垝浠诲姟',
}, {
src: '',
systems: ['production', 'local', 'SSO', 'cloud'],
- PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
- type: 'BaseTable',
+ PageParam: {OpenType: 'newtab', Template: 'CustomPage'},
+ type: 'CustomPage',
MenuID: '1670296054432ab9d5c0pf76o93315ag',
MenuNo: 's_sys_job_history_M',
MenuName: '浠ｇ悊浣滀笟璁板綍',
--
Gitblit v1.8.0