From 6b8a6b0591e97aa7d175c5f6c61d64534f038124 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 12 五月 2025 14:56:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/equipment/modules/EamEquipmentModal.vue | 34 +++-------------------------------
1 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/src/views/eam/equipment/modules/EamEquipmentModal.vue b/src/views/eam/equipment/modules/EamEquipmentModal.vue
index 63a550d..8f8c0c5 100644
--- a/src/views/eam/equipment/modules/EamEquipmentModal.vue
+++ b/src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -85,30 +85,6 @@
</a-col>
</a-row>
- <a-row :gutter="24">
- <a-col :span="6">
- <a-form-model-item prop="equipmentWeight" label="閲嶉噺">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ラ噸閲�'" v-model="model.equipmentWeight" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="equipmentPort" label="璁惧绔彛">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩鍙�'" v-model="model.equipmentPort" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="coordinateNum" label="鍧愭爣鏁伴噺">
- <a-input-number :placeholder="disableSubmit?'':'璇疯緭鍏ュ潗鏍囨暟閲�'" v-model="model.coordinateNum" style="width: 100%" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="assetStatus" label="璧勪骇鐘舵��">
- <j-dict-select-tag dict-code="asset_status" v-model="model.assetStatus"
- disabled/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
<a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 鍑哄巶淇℃伅
</a-divider>
@@ -211,13 +187,9 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item prop="processParametersFlag" label="鏈夋棤宸ヨ壓鍙傛暟">
- <lx-switch checked-children='鏈�' un-checked-children='鏃�' v-model="model.processParametersFlag" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="precisionParametersFlag" label="鏈夋棤绮惧害鍙傛暟">
- <lx-switch checked-children='鏈�' un-checked-children='鏃�' v-model="model.precisionParametersFlag" :disabled="disableSubmit"/>
+ <a-form-model-item prop="assetStatus" label="璧勪骇鐘舵��">
+ <j-dict-select-tag dict-code="asset_status" v-model="model.assetStatus"
+ disabled/>
</a-form-model-item>
</a-col>
</a-row>
--
Gitblit v1.9.3