From 8afb989c9319625dacdb8fa509d377ce77f486d3 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 3 Jul 2025 09:13:04 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E8=A3=85=E5=A4=87?=
 =?UTF-8?q?=E7=A7=9F=E8=B5=81=E4=BB=B7=E6=A0=BC=E5=8F=AF=E4=BB=A5=E4=B8=BA?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/goodsManagement/index.vue | 57 ++++++++++++------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index 8365fd1..6bbfc01 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -41,7 +41,7 @@ const batchAddData: any = ref([]) // 批量新增
 const batchAddColumn: any = ref([
     { label: '装备名称', prop: 'deviceName' },
     { label: '装备型号', prop: 'typeName' },
-    { label: '上传人', prop: 'uploadUser'  },
+    { label: '上传人', prop: 'uploadUser' },
     { label: '上传时间', prop: 'uploadTime' },
 ])
 
@@ -174,7 +174,7 @@ const equipmentDeployment = (row: any) => {
         deviceName: '',
         deviceTypeList: [],
         deviceCount: 1,
-		originaValue:'',
+        originaValue: '',
         unitName: '',
         code: '',
         brand: '',
@@ -271,7 +271,7 @@ const getDetailData = async (row: any) => {
         deviceName,
         // deviceTypeList,
         deviceCount,
-		originaValue,
+        originaValue,
         unitName,
         code,
         brand,
@@ -298,7 +298,7 @@ const getDetailData = async (row: any) => {
     Object.assign(addAndEditForm, {
         deviceName,
         deviceCount,
-		originaValue,
+        originaValue,
         unitName,
         code,
         brand,
@@ -517,7 +517,7 @@ const equipmentDeploymentParams: any = ref({
     deviceName: '',
     deviceTypeList: [],
     deviceCount: 1,
-	originaValue:'',
+    originaValue: '',
     unitName: '',
     code: '',
     brand: '',
@@ -605,12 +605,13 @@ const dialogFormVisibleSettlein: any = ref(false)
 const ruleFormRef: any = ref(null)
 //表单校验规则
 const equipRules = ref({
-	originaValue:[{
-		required: true,
-		message: '请输入原值',
-		trigger: 'blur',
-	 },
-	],
+    originaValue: [
+        {
+            required: true,
+            message: '请输入原值',
+            trigger: 'blur',
+        },
+    ],
     deviceName: [
         {
             required: true,
@@ -1102,7 +1103,7 @@ const addAndEditForm = reactive<any>({
     deviceName: '',
     deviceTypeList: [],
     deviceCount: 1,
-	originaValue:'',
+    originaValue: '',
     unitName: '',
     code: '',
     brand: '',
@@ -1342,7 +1343,7 @@ const onDialogClose = () => {
         deviceName: '',
         deviceTypeList: [],
         deviceCount: 1,
-		originaValue:'',
+        originaValue: '',
         unitName: '',
         code: '',
         brand: '',
@@ -1846,13 +1847,13 @@ const handleDel = (index: any) => {
                         <el-form-item label="租赁价格(天/元)：" prop="dayLeasePrice">
                             <el-input
                                 @input="
-                                    (v) => (addAndEditForm.dayLeasePrice = v.replace(/[^\d.]/g, ''))
+                                    (v:any) => (addAndEditForm.dayLeasePrice = v.replace(/[^\d.]/g, ''))
                                 "
-                                v-model="addAndEditForm.dayLeasePrice"
-                                placeholder="请输入租赁价格"
                                 clearable
                                 maxlength="20"
-                                :disabled="isDisabled || isEditForm"
+                                placeholder="请输入租赁价格"
+                                v-model="addAndEditForm.dayLeasePrice"
+                                :disabled="settleinTitle == '新增详情'"
                             />
                         </el-form-item>
                     </el-col>
@@ -1891,17 +1892,17 @@ const handleDel = (index: any) => {
                                 :disabled="typeDisabled"
                             />
                         </el-form-item>
-					</el-col>
-						<el-col :span="12">
-						    <el-form-item label="原值：" prop="originaValue">
-						        <el-input
-						            v-model="addAndEditForm.originaValue"
-						            placeholder="请输入原值"
-						            clearable
-						            maxlength="11"
-						        />
-						    </el-form-item>
-						</el-col>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="原值：" prop="originaValue">
+                            <el-input
+                                v-model="addAndEditForm.originaValue"
+                                placeholder="请输入原值"
+                                clearable
+                                maxlength="11"
+                            />
+                        </el-form-item>
+                    </el-col>
                 </el-row>
                 <!-- 1.13 需求变动要求隐藏 -->
                 <!-- <el-row :gutter="20">