From 60e8ac11ce15bff0454accc2a2b79780dae63e60 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 22 五月 2022 20:33:32 +0800
Subject: [PATCH] 2022-05-22
---
public/options.json | 14 +++++++-------
src/components/header/index.jsx | 16 ++++++++++++++++
src/views/menudesign/index.jsx | 4 ++--
src/tabviews/custom/components/card/data-card/index.jsx | 18 +++++++++---------
4 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/public/options.json b/public/options.json
index fa76f1c..f5f2215 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,18 +1,18 @@
{
- "appId": "201912040924165801464FF1788654BC5AC73",
- "appkey": "20191106103859640976D6E924E464D029CF0",
+ "appId": "202108312122504607B107A83F55B40C98CCF",
+ "appkey": "20210831212235413F287EC3BF489424496C8",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "mk",
+ "defaultApp": "mkindustry",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "",
- "probation": "",
+ "licenseKey": "7EFE13KIKLILIJB64C12",
+ "probation": "2021-12-31",
"keepPassword": "true",
- "host": "http://qingqiumarket.cn",
- "service": "MKWMS/"
+ "host": "http://demo.mk9h.cn",
+ "service": "erp_new/"
}
\ No newline at end of file
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 3bfe710..240973e 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -405,6 +405,22 @@
this.loginRef.handleConfirm().then(param => {
Api.getusermsg(param.username, param.password, true).then(res => {
if (res.status) {
+ this.setState({
+ loginLoading: false
+ })
+
+ if (res.modifydate) {
+ let s = (new Date().getTime() - new Date(res.modifydate).getTime()) / (1000 * 24 * 60 * 60)
+ if (!isNaN(s) && s > 90) {
+ Modal.warning({
+ width: 520,
+ title: <span>绯荤粺妫�娴嬪埌鎮ㄧ殑璐︽埛瀛樺湪椋庨櫓锛岃鍙婃椂鍒�<a target="_blank" rel="noopener noreferrer" href="https://cloud.mk9h.cn/admin/index.html">浜戜腑蹇�</a>淇敼瀵嗙爜锛�</span>,
+ okText: '鐭ラ亾浜�'
+ })
+ return
+ }
+ }
+
sessionStorage.setItem('CloudUserID', res.UserID)
sessionStorage.setItem('CloudLoginUID', res.LoginUID)
sessionStorage.setItem('CloudUserName', res.UserName)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index ff0e6b9..626c136 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -328,7 +328,15 @@
checkTopLine = (id) => {
const { config, data } = this.state
- if (!data || data.length === 0 || data[0].$disabled) {
+ let index = 0
+ if (id && data) {
+ index = data.findIndex(item => item.$$uuid === id)
+ if (index === -1) {
+ index = 0
+ }
+ }
+
+ if (!data || data.length === 0 || data[index].$disabled) {
this.setState({
activeKey: '',
selectKeys: [],
@@ -340,14 +348,6 @@
MKEmitter.emit('syncBalconyData', config.uuid, [], false)
}
return
- }
-
- let index = 0
- if (id) {
- index = data.findIndex(item => item.$$uuid === id)
- if (index === -1) {
- index = 0
- }
}
this.setState({
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 6f1fbda..1f721d6 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -450,8 +450,8 @@
if (MenuType === 'billPrint') {
config.fstMenuId = 'BillPrintTemp'
config.parentId = 'BillPrintTemp'
- // config.MenuName = MenuName
- // config.MenuNo = MenuNo
+ config.MenuName = MenuName
+ config.MenuNo = MenuNo
config.firstCount = config.firstCount || 15
config.everyPCount = config.everyPCount || 15
config.lastCount = config.lastCount || ''
--
Gitblit v1.8.0