From 2c9274247f47b319a7fcf02c6b05b5d49393909e Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Tue, 14 Oct 2025 18:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/equipCardHall/index.vue | 25 ++++++++-
 src/views/equip/list.vue               | 23 +--------
 src/views/order/index.vue              | 70 +++++++++++++-------------
 3 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/src/components/equipCardHall/index.vue b/src/components/equipCardHall/index.vue
index 7f66bd5..27cbaad 100644
--- a/src/components/equipCardHall/index.vue
+++ b/src/components/equipCardHall/index.vue
@@ -5,7 +5,7 @@
             <li style="margin: 10px 0">
                 <span class="item_1_span"> {{ name }} </span>
                 <span>（{{ typeName }}）</span>
-                <!-- <span class="item_2_span"> 待租 </span> -->
+                <span class="item_2_span"> {{ statusText }} </span>
             </li>
             <li style="color: #b6b6b6; font-size: 14px">{{ company }}</li>
             <li style="color: #b6b6b6; font-size: 14px">
@@ -24,6 +24,7 @@
     </div>
 </template>
 <script lang="ts" setup>
+import { computed } from 'vue'
 const props: any = defineProps({
     url: {
         type: String,
@@ -58,6 +59,10 @@ const props: any = defineProps({
         type: String,
         default: '',
     },
+    ma_status: {
+        type: [String, Number],
+        default: '',
+    },
 })
 
 const emit = defineEmits(['onClick'])
@@ -71,6 +76,24 @@ const cardClick = () => {
 const onHandelLessee = () => {
     console.log('立即租赁')
 }
+
+const statusText = computed(() => {
+    const code = Number(props.ma_status)
+    switch (code) {
+        case 1:
+            return '在库中'
+        case 2:
+            return '租赁中(自用)'
+        case 3:
+            return '租赁中(共享)'
+        case 4:
+            return '已退役'
+        case 5:
+            return '维修中'
+        default:
+            return '未知'
+    }
+})
 </script>
 <style lang="scss" scoped>
 .equipCard {
diff --git a/src/views/equip/list.vue b/src/views/equip/list.vue
index ac815c3..c47baea 100644
--- a/src/views/equip/list.vue
+++ b/src/views/equip/list.vue
@@ -36,31 +36,9 @@
                                     }"
                                 >
                                     <span>{{ val.name }}</span>
-                                    <!-- <span v-else>
-                                        {{ val.name }}
-                                        {{
-                                            index == 0
-                                                ? ''
-                                                : val.maCount
-                                                ? `(${val.maCount})`
-                                                : '(0)'
-                                        }}
-                                    </span> -->
                                 </div>
                             </template>
 
-<!--                            <div v-if="i == 3" style="display: flex; align-items: center">-->
-<!--                                <el-input v-model="startPrice" style="width: 60px" size="small" />-->
-<!--                                <span style="margin: 0 5px">-</span>-->
-<!--                                <el-input v-model="endPrice" style="width: 60px" size="small" />-->
-<!--                                <el-button-->
-<!--                                    @click.stop="onConfirmPrice"-->
-<!--                                    size="small"-->
-<!--                                    type="primary"-->
-<!--                                    style="margin-left: 20px"-->
-<!--                                    >确定</el-button-->
-<!--                                >-->
-<!--                            </div>-->
                         </div>
                     </div>
                 </template>
@@ -137,6 +115,7 @@
                 :company="v.companyName"
                 :personPhone="v.personPhone"
                 :typeName="v.typeName"
+                :ma_status="v.maStatus || v.ma_status"
                 @click="onHandleDetails(v.maId)"
             />
         </div>
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 03dfd2a..da0cecd 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -29,19 +29,19 @@
                 <el-col :span="4">
                     <div>租期</div>
                 </el-col>
-                <el-col :span="2">
-                    <div>日租金/元</div>
-                </el-col>
-                <el-col :span="2">
+<!--                <el-col :span="2">-->
+<!--                    <div>日租金/元</div>-->
+<!--                </el-col>-->
+                <el-col :span="3">
                     <div>天数</div>
                 </el-col>
-                <el-col :span="2">
+                <el-col :span="3">
                     <div>数量</div>
                 </el-col>
-                <el-col :span="2">
-                    <div>总金额/元</div>
-                </el-col>
-                <el-col :span="2">
+<!--                <el-col :span="2">-->
+<!--                    <div>总金额/元</div>-->
+<!--                </el-col>-->
+                <el-col :span="3">
                     <div>操作</div>
                 </el-col>
             </el-row>
@@ -108,17 +108,17 @@
                             />
                         </div>
                     </el-col>
-                    <el-col :span="2">
-                        <div class="red-font">
-                            {{ item.dayLeasePrice }}
-                        </div>
-                    </el-col>
-                    <el-col :span="2">
+<!--                    <el-col :span="2">-->
+<!--                        <div class="red-font">-->
+<!--                            {{ item.dayLeasePrice }}-->
+<!--                        </div>-->
+<!--                    </el-col>-->
+                    <el-col :span="3">
                         <div class="red-font" style="color: #0062ff">
                             {{ item.days }}
                         </div>
                     </el-col>
-                    <el-col :span="2">
+                    <el-col :span="3">
                         <div>
                             <el-input-number
                                 v-model="item.num"
@@ -129,12 +129,12 @@
                             />
                         </div>
                     </el-col>
-                    <el-col :span="2">
-                        <div class="red-font" style="margin-left: 20px">
-                            {{ item.num * item.dayLeasePrice * item.days }}
-                        </div>
-                    </el-col>
-                    <el-col :span="2">
+<!--                    <el-col :span="2">-->
+<!--                        <div class="red-font" style="margin-left: 20px">-->
+<!--                            {{ item.num * item.dayLeasePrice * item.days }}-->
+<!--                        </div>-->
+<!--                    </el-col>-->
+                    <el-col :span="3">
                         <div>
                             <el-button
                                 @click="onDeleteGoods(index)"
@@ -186,14 +186,14 @@
                 </el-row>
                 <el-row style="display: flex; align-items: center">
                     <el-col :span="16">
-                        <div class="checkbox-container">
-                            <el-checkbox v-model="protocolChecked">
-                                我已阅读并同意签署
-                            </el-checkbox>
-                            <a @click.stop="handleViewWord()">
-                                《{{ orderList[0]?.companyName }}公司租赁服务合同》
-                            </a>
-                        </div>
+<!--                        <div class="checkbox-container">-->
+<!--                            <el-checkbox v-model="protocolChecked">-->
+<!--                                我已阅读并同意签署-->
+<!--                            </el-checkbox>-->
+<!--                            <a @click.stop="handleViewWord()">-->
+<!--                                《{{ orderList[0]?.companyName }}公司租赁服务合同》-->
+<!--                            </a>-->
+<!--                        </div>-->
                     </el-col>
                     <el-col :span="3">
                         <div>
@@ -204,11 +204,11 @@
                         </div>
                     </el-col>
                     <el-col :span="3">
-                        <div class="red-font">
-                            订单总金额：<span style="color: #ff4800; font-weight: bold"
-                                >{{ orderAmountPice }} 元</span
-                            >
-                        </div>
+<!--                        <div class="red-font">-->
+<!--                            订单总金额：<span style="color: #ff4800; font-weight: bold"-->
+<!--                                >{{ orderAmountPice }} 元</span-->
+<!--                            >-->
+<!--                        </div>-->
                     </el-col>
                     <el-col :span="2">
                         <div style="text-align: right">