From eabd16cc605204e4cc03d714c9b3a45131bd4269 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 28 三月 2024 17:23:48 +0800
Subject: [PATCH] 标签
---
src/views/technology/routing/routing-form.vue | 145 +++++++++++++++++++----------------------------
1 files changed, 59 insertions(+), 86 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index af7f6b3..9b71564 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -7,31 +7,35 @@
<h2 v-if="!editable">鏌ョ湅-宸ヨ壓璺嚎</h2>
</div>
<div class="btn-group header-right" v-if="editable">
- <el-button :disabled="isSubmit" v-thinclick="`allSave`">淇濆瓨</el-button>
+ <el-button :disabled="isSubmit" type="primary" v-thinclick="`allSave`">淇濆瓨</el-button>
</div>
</div>
<div class="page-main">
<div class="routing-basic">
<el-form
- :inline="true"
:model="dataForm"
:rules="dataRule"
ref="dataForm"
+ label-width="100px"
style="width: 100%"
class="l-mes"
:disabled="!editable"
>
<el-row>
- <el-col :span="24">
- <el-form-item prop="routingNo" label="宸ヨ壓缂栧彿">
+ <el-col :span="6">
+ <el-form-item style="width:100%" prop="routingNo" label="宸ヨ壓缂栧彿">
<el-input
+ style="width:100%"
v-model="dataForm.routingNo"
placeholder="宸ヨ壓缂栧彿"
disabled
></el-input>
</el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item prop="partNo" label="闆朵欢鍙�">
<el-input
+ style="width:100%"
v-model="dataForm.partNo"
placeholder="闆朵欢鍙�"
disabled
@@ -43,60 +47,33 @@
></el-button>
</el-input>
</el-form-item>
+ </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: 300px"
+ style="width: 100%"
></el-input>
+ </el-tooltip>
</el-form-item>
- <el-form-item prop="description" label="鎻忚堪">
- <el-input
- v-model="dataForm.description"
- placeholder="鎻忚堪"
- style="width: 280px"
- ></el-input>
- </el-form-item>
- <el-form-item prop="wireCore" label="绾胯姱">
- <el-input
- v-model="dataForm.wireCore"
- placeholder="绾胯姱"
- style="width: 60px"
- ></el-input>
- </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="BOM" prop="bomId">
- <el-select 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"
:label="item.number"
- :value="item.id"
- />
+ :value="item.id" />
</el-select>
</el-form-item>
- <el-form-item prop="version" label="宸ヨ壓鐗堟湰">
- <el-input
- v-model="dataForm.version"
- placeholder="宸ヨ壓鐗堟湰"
- ></el-input>
- </el-form-item>
- <el-form-item label="宸ヨ壓绫诲瀷" prop="bomTypeDb">
- <el-select
- v-model="dataForm.bomTypeDb"
- placeholder="璇烽�夋嫨宸ヨ壓绫诲瀷"
- style="width:100%"
- @change="bomTypeDbChange"
- >
- <el-option
- v-for="(item, index) in bomTypeDbOptions"
- :label="item.label"
- :value="item.value"
- :key="index"
- >
- </el-option>
- </el-select>
- </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
<el-form-item label="閫愭閲囩敤鏃ユ湡" prop="phaseInDate">
<el-date-picker
v-model="dataForm.phaseInDate"
@@ -106,6 +83,8 @@
>
</el-date-picker>
</el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="閫愭娣樻卑鏃ユ湡" prop="phaseOutDate">
<el-date-picker
v-model="dataForm.phaseOutDate"
@@ -115,27 +94,17 @@
>
</el-date-picker>
</el-form-item>
- <el-form-item prop="alternativeNo" label="鏇夸唬">
+ </el-col>
+ <el-col :span="6">
+ <el-form-item prop="description" label="鎻忚堪">
<el-input
- v-model="dataForm.alternativeNo"
- placeholder="鏇夸唬"
+ v-model="dataForm.description"
+ placeholder="鎻忚堪"
+ style="width: 100%"
></el-input>
</el-form-item>
- <el-form-item prop="alternativeDesc" label="鏇夸唬鎻忚堪">
- <el-input
- v-model="dataForm.alternativeDesc"
- placeholder="鏇夸唬鎻忚堪"
- ></el-input>
- </el-form-item>
- <el-form-item label="宸插悓姝ヨ嚦IFS" prop="ifsSync">
- <span
- style="width: 146px;display: inline-block;font-size:12px;font-weight:bold;"
- >{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span
- >
- </el-form-item>
- <el-form-item label="涓诲伐鑹�" prop="master">
- <el-switch v-model="dataForm.master"> </el-switch>
- </el-form-item>
+ </el-col>
+ <el-col :span="6">
</el-col>
</el-row>
</el-form>
@@ -167,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
@@ -277,13 +238,13 @@
<span v-if="!editable">{{ scope.row.operationName }}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="outsideOpItem"
label="澶栭儴宸ュ簭椤圭洰"
align="center"
show-overflow-tooltip
>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="partName"
label="闆朵欢"
@@ -310,7 +271,7 @@
}}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="runTimeCodeDb"
label="鍥犵礌鍗曚綅"
align="center"
@@ -350,7 +311,7 @@
label="鍔冲姏璁剧疆鏃堕棿"
align="center"
>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="laborClassNo"
label="浜哄伐绫诲埆"
@@ -428,7 +389,7 @@
</el-input>
</div>
- <el-divider content-position="left">閰嶇疆椤�</el-divider>
+ <!-- <el-divider content-position="left">閰嶇疆椤�</el-divider>
<div class="node-content-config">
<el-checkbox-group
@@ -462,9 +423,9 @@
>宸ュ崟棰勭暀</el-checkbox-button
>
</el-checkbox-group>
- </div>
+ </div> -->
- <el-divider content-position="left">鑳藉姏</el-divider>
+ <!-- <el-divider content-position="left">鑳藉姏</el-divider>
<div class="node-content">
<label
v-if="capacities == null || capacities.length == 0"
@@ -473,7 +434,7 @@
娌℃湁閰嶇疆鑳藉姏
</label>
- <el-tag
+ <el-tag
size="medium"
v-for="item in capacities"
:key="item.id"
@@ -485,7 +446,7 @@
>
{{ item.label }}
</el-tag>
- </div>
+ </div> -->
<el-divider content-position="left">澶囨敞</el-divider>
<div class="node-content-remark">
<rich-text
@@ -494,7 +455,7 @@
></rich-text>
</div>
</el-tab-pane>
- <el-tab-pane label="宸ュ簭鍙傛暟" style="height: 100%">
+ <el-tab-pane label="宸ュ簭鍙傛暟" style="height: 100%" v-if="dataForm.routingNo!=null">
<el-card class="params-template">
<div slot="header">
<span>鍙傛暟闆�</span>
@@ -714,6 +675,7 @@
routingNo: null,
name: null,
partId: null,
+ partNo: null,
partName: null,
description: null,
state: null,
@@ -731,15 +693,15 @@
wireCore: null
},
dataRule: {
- partName: [
- { required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'change' }
+ partNo: [
+ { 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' }
@@ -1036,6 +998,7 @@
this.$set(e, 'active', false)
})
row.active = true
+ console.log(row)
this.getRoutingTemplate(row.id)
},
// 鏍规嵁宸ヨ壓銆佸伐搴廼d鍘昏幏鍙栧弬鏁伴泦妯℃澘
@@ -1085,7 +1048,6 @@
}
},
dragEnd() {
- console.log(this.dataForm.operations)
this.dataForm.operations.forEach((e, i) => {
e.index = i + 1
})
@@ -1435,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