From ca9e62e85e12763c611b3d602c00ca0a4d842d9a Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Fri, 14 Mar 2025 09:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cart/index.vue                 |  4 ++--
 src/views/equip/detail.vue               |  4 ++++
 src/views/order/index.vue                |  4 ++--
 src/views/user/goodsManagement/index.vue | 27 +++++++++++++++++++++++-
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/views/cart/index.vue b/src/views/cart/index.vue
index 5037644..03db46d 100644
--- a/src/views/cart/index.vue
+++ b/src/views/cart/index.vue
@@ -138,7 +138,7 @@
                             <el-input-number
                                 v-model="goods.num"
                                 style="width: 100px"
-                                :min="1"
+                                :min="goods.num || 1"
                                 :max="goods.deviceCount || 1"
                                 size="small"
                                 :disabled="goods.maStatus != 2"
@@ -343,7 +343,7 @@ const getBookCarDetailsData = async () => {
         e.protocolChecked = false
         e.devInfoVoList.forEach((j: any) => {
             j.days = 0
-            j.num = 1
+            j.num = j.deviceCount
             j.costs = 0
             j.rentBeginTime = ''
             j.rentEndTime = ''
diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue
index 3939235..ef6a2b9 100644
--- a/src/views/equip/detail.vue
+++ b/src/views/equip/detail.vue
@@ -677,6 +677,10 @@ const equipBaseInfoList = reactive([
         label: '装备型号',
         key: 'typeName',
     },
+    {
+        label: '上架数量',
+        key: 'deviceCount',
+    },
     {
         label: '联系人',
         key: 'person',
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 016b67e..55b45e6 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -123,7 +123,7 @@
                             <el-input-number
                                 v-model="item.num"
                                 style="width: 100px; margin-left: 10px"
-                                :min="1"
+                                :min="item.num"
                                 :max="item.deviceCount"
                                 size="small"
                             />
@@ -291,7 +291,7 @@ const getOrderListData = async () => {
         rentEndTime: '',
         lease_date: '',
         days: 0,
-        num: 1,
+        num: res.data.deviceCount ? res.data.deviceCount : 1,
         ...res.data,
     }
 
diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index b8442c3..202ca74 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -520,6 +520,13 @@ const dialogTypeChange = async () => {
     // }
     console.log('deviceTypeList', deviceTypeList[0].data)
     warningDays.value = deviceTypeList[0].data.maintenanceAlarmDay
+    if(deviceTypeList[0].data.manageType == 0){
+      addAndEditForm.deviceCount = 1
+      typeDisabled.value = true
+    }else{
+      addAndEditForm.deviceCount = 1
+      typeDisabled.value = false
+    }
     if (deviceTypeList[0].data.maTypeProperties == null) {
         propertyNames.value = []
     } else {
@@ -580,7 +587,7 @@ const equipRules = ref({
     deviceCount: [
         {
             required: true,
-            message: '请输入装备数量',
+            message: '请输入上架数量',
             trigger: 'blur',
         },
     ],
@@ -625,7 +632,9 @@ const equipRules = ref({
             message: '请输入日租金',
             trigger: 'blur',
         },
+
     ],
+
     person: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
     checkDate: [{ required: true, message: '校验日期不能为空', trigger: 'blur' }],
     checkCycle: [{ required: true, message: '校验周期不能为空', trigger: 'blur' }],
@@ -1112,6 +1121,8 @@ const onAddDescription = () => {
     })
 }
 
+const typeDisabled = ref(false)
+
 const addAndEditForm = reactive<any>({
     deviceName: '',
     deviceTypeList: [],
@@ -1833,6 +1844,20 @@ const getUpdateTimeBgColor = (row: any) => {
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="上架数量：" prop="deviceCount">
+                            <el-input
+                                v-model="addAndEditForm.deviceCount"
+                                placeholder="请输入上架数量"
+                                type="number"
+                                clearable
+                                maxlength="10"
+                                :disabled="typeDisabled"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
                 <!-- 1.13 需求变动要求隐藏 -->
                 <!-- <el-row :gutter="20">
                     <el-col :span="12">