From 7fca02745d606514a22dc2f4673e3ea1475495b6 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 30 一月 2024 16:54:52 +0800
Subject: [PATCH] 质检报告修改
---
src/views/technology/routing/routing-form.vue | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index a2b260e..9b71564 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -50,17 +50,19 @@
</el-col>
<el-col :span="6">
<el-form-item prop="partName" label="闆朵欢鍚嶇О">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
<el-input
v-model="dataForm.partName"
placeholder="闆朵欢鍚嶇О"
readonly
style="width: 100%"
></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="BOM" prop="bomId">
- <el-select style="width:100%" :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
+ <el-select style="width:100%" v-model="dataForm.bomId" placeholder="" filterable>
<el-option
v-for="item in bomList"
:key="item.id"
@@ -134,16 +136,8 @@
'--dragitemwidth': '250px'
}"
>
- <div
- :style="{
- width: 265 * dataForm.operations.length - 15 + 'px'
- }"
- >
- <div
- class="dragHead"
- v-for="x in dataForm.operations.length"
- :key="x"
- >
+ <div :style="{ width: 265 * dataForm.operations.length - 15 + 'px' }">
+ <div class="dragHead" v-for="x in dataForm.operations.length" :key="x" >
<div class="idx">{{ x }}</div>
</div>
<zttdraggable
@@ -451,7 +445,7 @@
effect="dark"
>
{{ item.label }}
- </el-tag>
+ </el-tag>
</div> -->
<el-divider content-position="left">澶囨敞</el-divider>
<div class="node-content-remark">
@@ -657,8 +651,7 @@
typeOptions: [],
paramTemplateSelArr: [],
paramTemplateSelCol: 'operationTemplateNo',
- // templateDefaultObj: { dataType: '鐢熶骇瑕佹眰' },
- templateDefaultObj: {},
+ templateDefaultObj: { dataType: '鐢熶骇瑕佹眰' },
paramSelArr: [],
paramSelCol: 'code',
operationIndex: null,
@@ -702,7 +695,7 @@
dataRule: {
partNo: [
{ required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'blur' }
- ],
+ ],
bomTypeDb: [
{ required: true, message: '宸ヨ壓绫诲瀷涓嶈兘涓虹┖', trigger: 'change' }
],
@@ -1404,6 +1397,17 @@
// 淇濆瓨鎵�鏈夊弬鏁扮殑淇敼
saveAllParamChange() {
const paramJson = { routingOperationParam: this.paramData }
+ let num = 0
+ this.paramData.forEach(e=>{
+ var regex=/^[^\(\)|^,]+$/;
+ if(!regex.test(e.paramValue)){
+ num+=1
+ }
+ })
+ if(num>0){
+ this.$message.error("鍙傛暟鍊间笉鑳藉寘鍚嫳鏂囨嫭鍙锋垨閫楀彿,璇锋鏌�")
+ return
+ }
putRoutingTemplateParam(paramJson).then((response) => {
const data = response.data
if (data.code == 0) {
--
Gitblit v1.9.3