From 450db962c4bc94de0cb0aacf47ba12ec314961d3 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 08 十二月 2023 11:29:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 03b6b62..f3afcc9 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1357,7 +1357,7 @@
required: true,
trigger: 'blur',
validator: (rule, value, callback) => {
- const Formats = ['yy', 'yyyy', 'yyyy-MM', 'yy-MM', 'yyyy-MM-dd', 'yy-MM-dd', 'yyyy-MM-dd HH:mm:ss', 'yy-MM-dd HH:mm:ss', 'HH:mm:ss'];
+ const Formats = ['yy', 'yyyy', 'yyyy-MM', 'yyyyMM','yyMM','yyyyMMdd','yyyyMMdd HH:mm:ss','yyMMdd HH:mm:ss','yy-MM', 'yyyy-MM-dd', 'yy-MM-dd', 'yyyy-MM-dd HH:mm:ss', 'yy-MM-dd HH:mm:ss', 'HH:mm:ss'];
if (!Formats.includes(this.form.codeDateFormatStr)) {
return callback(new Error('璇疯緭鍏ユ纭棩鏈熸牸寮忥紝渚嬪yyyy-MM-dd锛堝苟鍖哄垎澶у皬鍐欙級锛�'));
}
@@ -2313,6 +2313,7 @@
},
/** 涓婄Щ涓嬬Щ绛夋搷浣滅殑淇濆瓨*/
async saveCodeFixedOrClassifyValueOption(condition, editOrderNumdata) {
+
//淇濆瓨瀵瑰浐瀹氱爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
if (condition == "fixedValue") {
let data = {
@@ -2448,6 +2449,8 @@
},
{
data: [],
+
+
title: "鎻忚堪",
fieldType: "text",
queryField: "description",
@@ -2789,6 +2792,11 @@
},
/** 鏂板鍩虹鐮佹*/
async saveOrEditBasicCode() {
+ const Formats = ['yy', 'yyyy', 'yyyy-MM', 'yyyyMM','yyMM','yyyyMMdd','yyyyMMdd HH:mm:ss','yyMMdd HH:mm:ss','yy-MM', 'yyyy-MM-dd', 'yy-MM-dd', 'yyyy-MM-dd HH:mm:ss', 'yy-MM-dd HH:mm:ss', 'HH:mm:ss'];
+ if (!Formats.includes(this.form.codeDateFormatStr)) {
+ this.$message.error('璇锋鏌ユ棩鏈熸牸寮忥紒');
+ return;
+ }
if (
this.selectionList[0].oid == null ||
this.selectionList[0].oid == ""
--
Gitblit v1.9.3