From bb8fba76d8c69f6957c606c2f3bb501af952b533 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 04 七月 2024 23:11:17 +0800
Subject: [PATCH] 班制更新
---
src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT.ts | 23 +++++++++++++++++------
.env.production | 4 ++--
src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT_SYS.ts | 6 +++---
3 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/.env.production b/.env.production
index be2d447..456ee85 100644
--- a/.env.production
+++ b/.env.production
@@ -4,7 +4,7 @@
# @version:
# @Date: 2024-06-17 14:51:25
# @LastEditors: Ben Lin
- # @LastEditTime: 2024-06-18 22:25:27
+ # @LastEditTime: 2024-06-28 10:36:06
###
# Whether to open mock
VITE_USE_MOCK = false
@@ -30,5 +30,5 @@
VITE_GLOB_DOWNLOAD_URL=http://localhost:8800/files
# Interface prefix
-VITE_GLOB_API_URL_PREFIX =
+VITE_GLOB_API_URL_PREFIX =4I4BZ-HLFC4-WRLUP-XXYTX-FFHY2-DQFH4
VITE_USE_ORG = 'N'
diff --git a/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT.ts b/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT.ts
index 01e3c46..557b46b 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-04 22:36:40
+ * @LastEditTime: 2024-07-04 23:06:52
*/
import { Ref, h, ref, unref } from 'vue';
@@ -278,13 +278,16 @@
};
}
if (name == 'MES_SHIFT_PRD') {
- item.PRD_BEGIN = dateUtil(item.PRD_BEGIN);
- item.PRD_END = dateUtil(item.PRD_END);
return {
...item,
- // SFT_CODE: d.SFT_CODE,
- // SFT_NAME: d.SFT_NAME,
- // IS_ACROSS_DAY: d.IS_ACROSS_DAY,
+ PRD_CODE: d.PRD_CODE,
+ PRD_NAME: d.PRD_NAME,
+ SFT_CODE: d.SFT_CODE,
+ IS_ACROSS: d.IS_ACROSS,
+ IS_REST: d.IS_REST,
+ SEQ: d.SEQ,
+ PRD_BEGIN: dateUtil(d.PRD_BEGIN),
+ PRD_END: dateUtil(d.PRD_END),
REMARK: d.REMARK,
};
}
@@ -804,6 +807,14 @@
},
},
{
+ label: '鏃舵鎺掑簭',
+ field: 'SEQ',
+ component: 'InputNumber',
+ colProps: {
+ span: 24,
+ },
+ },
+ {
label: '鏄惁璺ㄥぉ',
field: 'IS_ACROSS',
component: 'Select',
diff --git a/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT_SYS.ts b/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT_SYS.ts
index 1e85256..1cbfa0c 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT_SYS.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT_SYS.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-04 09:23:38
+ * @LastEditTime: 2024-07-04 23:08:08
*/
import { ActionItem, BasicColumn } from '/@/components/Table';
@@ -48,7 +48,7 @@
code: 'SFT_CODE',
type: 'all',
keyName: 'MES_SHIFT',
- order: '',
+ order: 'SEQ',
},
], //drawers鏄彸杈瑰脊鍑哄鏀逛晶妗嗙殑鍚嶅瓧鍒楄〃
},
@@ -135,7 +135,7 @@
IsID: false, //鏄惁甯﹁繃鍘讳晶杈规鐨勬槸ID锛宖alse灏辨槸CODE锛宼rue鏄疘D
drawers: [
{ name: 'MES_SHIFT', code: 'SFTS_CODE', type: 'one', keyName: 'MES_SHIFT', order: '' }, //type: one-琛ㄧず闇�瑕乧ode: 'SFTS_CODE'鍙鍞竴鍊�
- { name: 'MES_SHIFT_PRD', code: 'SFT_CODE', type: 'all', keyName: 'MES_SHIFT', order: '' }, //type: all-琛ㄧず闇�瑕乧ode: 'SFT_CODE'鎵�鏈夌殑鍊硷紝keyName锛氳〃绀洪渶瑕佹墍鏈夊�肩殑code鐨勫疄浣撳悕
+ { name: 'MES_SHIFT_PRD', code: 'SFT_CODE', type: 'all', keyName: 'MES_SHIFT', order: 'SEQ' }, //type: all-琛ㄧず闇�瑕乧ode: 'SFT_CODE'鎵�鏈夌殑鍊硷紝keyName锛氳〃绀洪渶瑕佹墍鏈夊�肩殑code鐨勫疄浣撳悕
], //drawers鏄彸杈瑰脊鍑哄鏀逛晶妗嗙殑鍚嶅瓧鍒楄〃
};
// 灏嗗璞¤浆鎹负JSON瀛楃涓插苟淇濆瓨鍒皊essionStorage
--
Gitblit v1.9.3