diff --git a/.env.production b/.env.production
index 4ff92e4..4cb67a1 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
# 平潭
-# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
# 文明懂
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
@@ -33,7 +33,7 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.17:9150/UDI_SPMS_SERVER/'
# 大田
-VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
# 云霄妇幼
# VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/'
@@ -45,8 +45,7 @@ VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
# 东山
# VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API = 'http://192.168.0.247:9150/UDI_SPMS_SERVER/'
-
+# VUE_APP_BASE_API = 'http://192.168.0.125:9150/UDI_SPMS_SERVER/'
# 应用访问路径 例如使用前缀 /admin/
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 0c948e0..b1bbac0 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -617,7 +617,7 @@ export default {
},
deleteOrders(data) {
this.loading = true;
- this.deleteData.billNo = data;
+ this.deleteData.billNo = data.billNo;
deleteByOrderId(this.deleteData)
.then((response) => {
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index fe27b2b..570ba29 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -571,7 +571,7 @@ export default {
},
deleteOrders(data) {
this.loading = true;
- this.deleteData.billNo = data;
+ this.deleteData.billNo = data.billNo;
deleteByOrderId(this.deleteData)
.then((response) => {
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index fb12927..a5f7d72 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -738,7 +738,7 @@ export default {
},
deleteOrders(data) {
this.loading = true;
- this.deleteData.billNo = data;
+ this.deleteData.billNo = data.billNo;
deleteByOrderId(this.deleteData)
.then((response) => {
if (response.code == 20000) {
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 884aaac..7de4133 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -15,7 +15,8 @@
-
+
+
{
@@ -426,6 +428,23 @@ export default {
});
},
+ validateAndSetDate(row, fieldName) {
+ if (!row || !Object.prototype.hasOwnProperty.call(row, fieldName)) {
+ this.$message.error('日期字段缺失');
+ return false;
+ }
+ if (row[fieldName] === '') {
+ row[fieldName] = null;
+ } else {
+ let msg = this.checkTimeFormat(row[fieldName]);
+ if (msg !== "") {
+ this.$message.error(msg);
+ return false;
+ }
+ }
+ return true;
+ },
+
copyDetail(row) {
let data = {
relId: row.bindRlFk,
@@ -521,6 +540,43 @@ export default {
this.refreshPanel();
}
,
+
+ checkTimeFormat(dateStr) {
+ let errorMessage = '';
+
+ // 异常处理和边界条件覆盖
+ if (typeof dateStr !== 'string' || dateStr === null || dateStr === undefined) {
+ errorMessage = '输入参数必须是非空字符串';
+ return errorMessage;
+ }
+
+ const regex = /^\d{6}$/;
+ if (!regex.test(dateStr)) {
+ errorMessage = '时间格式不正确,应为 yyMMdd';
+ } else {
+ // 增强日期有效性检查
+ const year = parseInt(dateStr.substring(0, 2), 10);
+ const month = parseInt(dateStr.substring(2, 4), 10);
+ const day = parseInt(dateStr.substring(4, 6), 10);
+
+ // 检查年、月、日的有效性
+ if (year < 0 || year > 99 ||
+ month < 1 || month > 12 ||
+ day < 1 || day > 31) {
+ errorMessage = '时间格式有效,但日期不存在';
+ } else {
+ // 修正年份的两位数到四位数
+ const fullYear = year < 50 ? 2000 + year : 1900 + year;
+ const dateObj = new Date(fullYear, month - 1, day);
+
+ // 检查是否为有效日期
+ if (dateObj.getFullYear() !== fullYear || dateObj.getMonth() + 1 !== month || dateObj.getDate() !== day) {
+ errorMessage = '时间格式有效,但日期不存在';
+ }
+ }
+ }
+ return errorMessage;
+ },
}
,
filters: {}