From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/technology/routing/routing-form.vue | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index af7f6b3..38698da 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -58,15 +58,15 @@
style="width: 280px"
></el-input>
</el-form-item>
- <el-form-item prop="wireCore" label="绾胯姱">
+ <!-- <el-form-item prop="wireCore" label="绾胯姱">
<el-input
v-model="dataForm.wireCore"
placeholder="绾胯姱"
style="width: 60px"
></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="BOM" prop="bomId">
- <el-select v-model="dataForm.bomId" placeholder="" filterable>
+ <el-select :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
<el-option
v-for="item in bomList"
:key="item.id"
@@ -75,13 +75,13 @@
/>
</el-select>
</el-form-item>
- <el-form-item prop="version" label="宸ヨ壓鐗堟湰">
+ <!-- <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-form-item> -->
+ <!-- <el-form-item label="宸ヨ壓绫诲瀷" prop="bomTypeDb">
<el-select
v-model="dataForm.bomTypeDb"
placeholder="璇烽�夋嫨宸ヨ壓绫诲瀷"
@@ -96,7 +96,7 @@
>
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="閫愭閲囩敤鏃ユ湡" prop="phaseInDate">
<el-date-picker
v-model="dataForm.phaseInDate"
@@ -115,27 +115,27 @@
>
</el-date-picker>
</el-form-item>
- <el-form-item prop="alternativeNo" label="鏇夸唬">
+ <!-- <el-form-item prop="alternativeNo" label="鏇夸唬">
<el-input
v-model="dataForm.alternativeNo"
placeholder="鏇夸唬"
></el-input>
- </el-form-item>
- <el-form-item prop="alternativeDesc" label="鏇夸唬鎻忚堪">
+ </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">
+ </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-form-item> -->
+ <!-- <el-form-item label="涓诲伐鑹�" prop="master">
<el-switch v-model="dataForm.master"> </el-switch>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
</el-form>
@@ -277,13 +277,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 +310,7 @@
}}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="runTimeCodeDb"
label="鍥犵礌鍗曚綅"
align="center"
@@ -350,7 +350,7 @@
label="鍔冲姏璁剧疆鏃堕棿"
align="center"
>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="laborClassNo"
label="浜哄伐绫诲埆"
@@ -428,7 +428,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 +462,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 +473,7 @@
娌℃湁閰嶇疆鑳藉姏
</label>
- <el-tag
+ <el-tag
size="medium"
v-for="item in capacities"
:key="item.id"
@@ -484,8 +484,8 @@
effect="dark"
>
{{ item.label }}
- </el-tag>
- </div>
+ </el-tag>
+ </div> -->
<el-divider content-position="left">澶囨敞</el-divider>
<div class="node-content-remark">
<rich-text
@@ -494,7 +494,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>
@@ -1036,6 +1036,7 @@
this.$set(e, 'active', false)
})
row.active = true
+ console.log(row)
this.getRoutingTemplate(row.id)
},
// 鏍规嵁宸ヨ壓銆佸伐搴廼d鍘昏幏鍙栧弬鏁伴泦妯℃澘
@@ -1085,7 +1086,6 @@
}
},
dragEnd() {
- console.log(this.dataForm.operations)
this.dataForm.operations.forEach((e, i) => {
e.index = i + 1
})
--
Gitblit v1.9.3