From c172f50f28cb37b982eb39a0a9a257cbc60b3a3e Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 18 三月 2025 18:04:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/ProductStructure/ProcessStep/ProcessStepModalForm.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/ProcessStep/ProcessStepModalForm.vue b/src/views/dnc/base/modules/ProductStructure/ProcessStep/ProcessStepModalForm.vue
index d6982b6..63d9a73 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProcessStep/ProcessStepModalForm.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProcessStep/ProcessStepModalForm.vue
@@ -4,12 +4,12 @@
<a-row>
<a-col :span="12">
<a-form-model-item label="宸ユ鍙�" prop="stepCode">
- <a-input v-model="model.stepCode" placeholder="璇疯緭鍏ュ伐搴忓彿"></a-input>
+ <a-input v-model="model.stepCode" placeholder="璇疯緭鍏ュ伐姝ュ彿"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="宸ユ鍚嶇О" prop="stepName">
- <a-input v-model="model.stepName" placeholder="璇疯緭鍏ュ伐搴忓悕绉�"></a-input>
+ <a-input v-model="model.stepName" placeholder="璇疯緭鍏ュ伐姝ュ悕绉�"></a-input>
</a-form-model-item>
</a-col>
</a-row>
@@ -17,20 +17,20 @@
<a-row>
<a-col :span="24">
<a-form-model-item label="鍔犲伐璁惧缂栧彿" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-select v-model="model.deviceNo" placeholder="璇烽�夋嫨鍔犲伐璁惧缂栧彿"></a-select>
+ <j-dict-select-tag v-model="model.deviceNo" placeholder="璇烽�夋嫨鍔犲伐璁惧缂栧彿" dictCode="mdc_equipment,equipment_id,equipment_id"/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
- <a-form-model-item label="宸ヨ壓缂栧彿">
- <a-input v-model="model.craftNo" placeholder="璇疯緭鍏ュ伐鑹虹紪鍙�"></a-input>
+ <a-form-model-item label="鍔犲伐璁惧鍨嬪彿">
+ <a-input v-model="model.processingEquipmentModel" placeholder="璇疯緭鍏ュ姞宸ヨ澶囧瀷鍙�"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="宸ヨ壓瑙勭▼鐗堟湰">
- <a-input v-model="model.craftVersion" placeholder="璇疯緭鍏ュ伐鑹鸿绋嬬増鏈�"></a-input>
+ <a-form-model-item label="鍔犲伐璁惧绫诲瀷">
+ <a-input v-model="model.processingEquipmentOs" placeholder="璇疯緭鍏ュ姞宸ヨ澶囩被鍨�"></a-input>
</a-form-model-item>
</a-col>
</a-row>
--
Gitblit v1.9.3