From 18f93f25e8aea5eb0a35a5526fa8de7f4553b75f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 24 四月 2024 18:33:58 +0800
Subject: [PATCH] 合并
---
src/views/basic/template/index.vue | 6 ++++++
vue.config.js | 4 ++--
src/views/technology/routing/routing-form.vue | 15 ++++++---------
src/views/plan/manufacturingorder/productorder-form.vue | 15 ++++++---------
src/views/plan/operationtask/operationtask-form.vue | 3 +++
5 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/views/basic/template/index.vue b/src/views/basic/template/index.vue
index 5f9d185..8a1bfd7 100644
--- a/src/views/basic/template/index.vue
+++ b/src/views/basic/template/index.vue
@@ -616,6 +616,12 @@
var obj = {}
obj.technologyOperationParamId = row.id
obj.technologyOperationTemplateId = row.technologyOperationTemplateId
+ if(row.defaultValue!=null){
+ row.defaultValue=row.defaultValue.replace(',','锛�').replace('(','锛�').replace(')','锛�')
+ if (!isNaN(row.defaultValue)) {
+ row.defaultValue='='+row.defaultValue
+ }
+ }
obj.defaultValue = row.defaultValue
putRelateOperationParamTemplate(obj).then((response) => {
this.$message.success('鍙傛暟淇濆瓨鎴愬姛')
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index ef8922c..126761a 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -2100,18 +2100,15 @@
},
// 淇濆瓨鎵�鏈夊弬鏁扮殑淇敼
saveAllParamChange() {
- const paramJson = { routingOperationParam: this.templateParamList }
- let num = 0
this.templateParamList.forEach(e=>{
- var regex=/^[^\(\)|^,]+$/;
- if(!regex.test(e.paramValue)){
- num+=1
+ if(e.paramValue!=null){
+ e.paramValue=e.paramValue.replace(',','锛�').replace('(','锛�').replace(')','锛�')
+ if (!isNaN(e.paramValue)) {
+ e.paramValue='='+e.paramValue
+ }
}
})
- if(num>0){
- this.$message.error("鍙傛暟鍊间笉鑳藉寘鍚嫳鏂囨嫭鍙锋垨閫楀彿,璇锋鏌�")
- return
- }
+ const paramJson = { routingOperationParam: this.templateParamList }
putRoutingTemplateParamForOrder(paramJson).then((response) => {
const data = response.data
if (data.code === 0) {
diff --git a/src/views/plan/operationtask/operationtask-form.vue b/src/views/plan/operationtask/operationtask-form.vue
index ab935ba..515d65d 100644
--- a/src/views/plan/operationtask/operationtask-form.vue
+++ b/src/views/plan/operationtask/operationtask-form.vue
@@ -592,6 +592,9 @@
workCenter: [
{ required: true, message: '宸ヤ綔涓績涓嶈兘涓虹┖', trigger: 'change' }
],
+ workstations: [
+ { required: true, message: '宸ヤ綔绔欎笉鑳戒负绌�', trigger: 'change' }
+ ],
plannedQuantity: [
{ required: true, message: '鎺ユ敹鏁伴噺涓嶈兘涓虹┖', trigger: 'blur' },
{ validator: validateSixDecimalNotNull, trigger: 'blur' }
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index cf29055..e7da9de 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -1429,18 +1429,15 @@
},
// 淇濆瓨鎵�鏈夊弬鏁扮殑淇敼
saveAllParamChange() {
- const paramJson = { routingOperationParam: this.paramData }
- let num = 0
this.paramData.forEach(e=>{
- var regex=/^[^\(\)|^,]+$/;
- if(!regex.test(e.paramValue)){
- num+=1
+ if(e.paramValue!=null){
+ e.paramValue=e.paramValue.replace(',','锛�').replace('(','锛�').replace(')','锛�')
+ if (!isNaN(e.paramValue)) {
+ e.paramValue='='+e.paramValue
+ }
}
})
- if(num>0){
- this.$message.error("鍙傛暟鍊间笉鑳藉寘鍚嫳鏂囨嫭鍙锋垨閫楀彿,璇锋鏌�")
- return
- }
+ const paramJson = { routingOperationParam: this.paramData }
putRoutingTemplateParam(paramJson).then((response) => {
const data = response.data
if (data.code == 0) {
diff --git a/vue.config.js b/vue.config.js
index 7f15d0b..c871988 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,8 +13,8 @@
-const url = 'https://ztms-mes.chinaztt.cn/'
-// const url = 'http://localhost:9999'
+//const url = 'https://ztms-mes.chinaztt.cn/'
+const url = 'http://localhost:9999'
// const url = 'http://192.168.32.45:9999'
--
Gitblit v1.9.3