From ad2437550eb0c8f3c3c8736df1a38a713f920ec2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 10:13:40 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/equipment/index.vue | 12 ++++++------
vue.config.js | 4 ++--
src/views/technology/routing/routing-form.vue | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index f19e542..083640d 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -236,12 +236,12 @@
type: 'primary',
fun: this.labelPrint
},
- // {
- // text: '鍚屾',
- // type: 'primary',
- // loading: false,
- // fun: this.pullEquipFun
- // }
+ {
+ text: '鍚屾',
+ type: 'primary',
+ loading: false,
+ fun: this.pullEquipFun
+ }
],
operator: [
{
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 9a1e3d4..2fda547 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -699,14 +699,14 @@
},
dataRule: {
partNo: [
- { required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'change' }
+ { required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'blur' }
],
bomTypeDb: [
{ required: true, message: '宸ヨ壓绫诲瀷涓嶈兘涓虹┖', trigger: 'change' }
],
bomId: [{ required: true, message: 'BOM涓嶈兘涓虹┖', trigger: 'change' }],
phaseInDate: [
- { required: true, message: '閫愭閲囩敤鏃ユ湡涓嶈兘涓虹┖', trigger: 'blur' }
+ { required: true, message: '閫愭閲囩敤鏃ユ湡涓嶈兘涓虹┖', trigger: 'change' }
],
alternativeNo: [
{ required: true, message: '鏇夸唬涓嶈兘涓虹┖', trigger: 'blur' }
diff --git a/vue.config.js b/vue.config.js
index 15bb96d..d4ab213 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,12 +5,12 @@
// const url = 'http://192.168.2.7:9999'
-const url = 'http://localhost:9999'
+const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
-// const url = 'http://localhost:9999'
+const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3