From 8b2b155c61d3a5b2b33c9ca969956d366ab0fb57 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 21 Aug 2024 17:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/store/tools/toolsType.vue           |  4 +-
 .../warehouseManage/machinery/type/index.vue  | 52 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/views/store/tools/toolsType.vue b/src/views/store/tools/toolsType.vue
index 78921d4..831812d 100644
--- a/src/views/store/tools/toolsType.vue
+++ b/src/views/store/tools/toolsType.vue
@@ -351,7 +351,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="12">
+                    <!-- <el-col :span="12">
                         <el-form-item label="外部租赁价" prop="rentPrice">
                             <el-input
                                 v-model="form.rentPrice"
@@ -360,7 +360,7 @@
                                 maxlength="30"
                             />
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                 </el-row>
 
                 <el-row>
diff --git a/src/views/warehouseManage/machinery/type/index.vue b/src/views/warehouseManage/machinery/type/index.vue
index 9fec6c6..e796523 100644
--- a/src/views/warehouseManage/machinery/type/index.vue
+++ b/src/views/warehouseManage/machinery/type/index.vue
@@ -366,20 +366,6 @@
                             />
                         </el-form-item>
                     </el-col>
-
-                    <el-col :span="12">
-                        <el-form-item label="外部租赁价" prop="rentPrice">
-                            <el-input
-                                v-model="form.rentPrice"
-                                type="number"
-                                placeholder="请输入外部租赁价"
-                                maxlength="30"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
                     <el-col :span="12">
                         <el-form-item label="原值" prop="buyPrice">
                             <el-input
@@ -390,6 +376,20 @@
                             />
                         </el-form-item>
                     </el-col>
+
+                    <!-- <el-col :span="12">
+                        <el-form-item label="外部租赁价" prop="rentPrice">
+                            <el-input
+                                v-model="form.rentPrice"
+                                type="number"
+                                placeholder="请输入外部租赁价"
+                                maxlength="30"
+                            />
+                        </el-form-item>
+                    </el-col> -->
+                </el-row>
+
+                <el-row>
                     <el-col :span="12">
                         <el-form-item label="计量单位" prop="unitName">
                             <el-input
@@ -399,6 +399,16 @@
                             />
                         </el-form-item>
                     </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input
+                                v-model="form.remark"
+                                type="textarea"
+                                placeholder="请输入备注内容"
+                                maxlength="150"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
@@ -447,18 +457,6 @@
                             ></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="备注" prop="remark">
-                            <el-input
-                                v-model="form.remark"
-                                type="textarea"
-                                placeholder="请输入备注内容"
-                                maxlength="150"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
                     <el-col :span="12">
                         <el-form-item label="文档资料" prop="field101">
                             <el-upload
@@ -481,6 +479,8 @@
                             </el-upload>
                         </el-form-item>
                     </el-col>
+                </el-row>
+                <el-row>
                     <el-col :span="12">
                         <el-form-item label="图片" prop="photoName">
                             <el-upload