seimin 1 år sedan
förälder
incheckning
79095f0e88

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-    "target": "http://192.168.4.240",
3
+    "target": "http://192.168.3.108",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

+ 3 - 3
src/app/views/limit-initiation-time/limit-initiation-time.component.ts

@@ -265,7 +265,7 @@ export class LimitInitiationTimeComponent implements OnInit {
265 265
       this.message.info('请设置楼栋或科室!');
266 266
       return;
267 267
     }
268
-    if(/^\s+/.test(this.validateForm.value.remark) || /\s+$/.test(this.validateForm.value.remark)){
268
+    if((/^\s+/.test(this.validateForm.value.remark) || /\s+$/.test(this.validateForm.value.remark)) && !this.validateForm.value.remark.trim()){
269 269
       this.message.info('请设置提示备注!');
270 270
       return;
271 271
     }
@@ -288,7 +288,7 @@ export class LimitInitiationTimeComponent implements OnInit {
288 288
         limitType: this.validateForm.value.limitType,
289 289
         startTime: format(startOfMinute(this.validateForm.value.startTime), "yyyy-MM-dd HH:mm:ss"),
290 290
         endTime: format(endOfMinute(this.validateForm.value.endTime), "yyyy-MM-dd HH:mm:ss"),
291
-        remark: this.validateForm.value.remark,
291
+        remark: this.validateForm.value.remark.trim(),
292 292
         hosId: this.currentHospital.id,
293 293
       };
294 294
     } else {
@@ -302,7 +302,7 @@ export class LimitInitiationTimeComponent implements OnInit {
302 302
         limitType: this.validateForm.value.limitType,
303 303
         startTime: format(startOfMinute(this.validateForm.value.startTime), "yyyy-MM-dd HH:mm:ss"),
304 304
         endTime: format(endOfMinute(this.validateForm.value.endTime), "yyyy-MM-dd HH:mm:ss"),
305
-        remark: this.validateForm.value.remark,
305
+        remark: this.validateForm.value.remark.trim(),
306 306
         hosId: this.currentHospital.id,
307 307
       };
308 308
     }