From e846abad450a3d1b948bd5ff8c1c84d7561d61df Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Fri, 23 Jan 2026 16:00:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/cst/truck/Truck.vue  | 54 +++++++++++++++-------------------
 src/pages/cst/truck/truck.d.ts | 52 +++++---------------------------
 2 files changed, 30 insertions(+), 76 deletions(-)

diff --git a/src/pages/cst/truck/Truck.vue b/src/pages/cst/truck/Truck.vue
index 02a1a81..a7e6ced 100644
--- a/src/pages/cst/truck/Truck.vue
+++ b/src/pages/cst/truck/Truck.vue
@@ -10,45 +10,37 @@
       <ElFormItem label="车架号">
         <ElInput v-model="searchForm.vnCode" placeholder="车架号"/>
       </ElFormItem>
+      <ElFormItem label="归属客户">
+        <ElInput v-model="searchForm.customerName" placeholder="归属客户"/>
+      </ElFormItem>
+      <ElFormItem label="归属企业">
+        <ElInput v-model="searchForm.orgName" placeholder="归属企业"/>
+      </ElFormItem>
+    </template>
+    <template #simpleSearchFormItem="{ searchForm }">
+      <ElFormItem>
+        <ElInput v-model="searchForm.licensePlate" placeholder="车牌"/>
+      </ElFormItem>
     </template>
     <template #columns>
-      <ElTableColumn label="车牌" prop="licensePlate" width="100px"/>
-      <!-- <ElTableColumn label="行驶证图片" prop="truckLicense" /> -->
-      <ElTableColumn label="行驶证图片" width="100px">
-        <template #default="{ row }">
-          <el-image :preview-src-list="[AppApi.fileUrl(row.truckLicense[0])]"
-            :src="AppApi.fileUrl(row.truckLicense[0])"
-            preview-teleported
-            show-progress style="width: 60px; height: 60px"/>
-        </template>
-      </ElTableColumn>
+      <ElTableColumn label="归属客户" prop="customerName"/>
+      <ElTableColumn label="归属企业" prop="orgName"/>
+      <ElTableColumn label="车牌号" prop="licensePlate"/>
       <ElTableColumn label="车架号" prop="vnCode"/>
-      <!-- <ElTableColumn label="合格证图片" prop="qualification" /> -->
-      <ElTableColumn label="合格证图片" width="100px">
-        <template #default="{ row }">
-          <el-image :preview-src-list="[AppApi.fileUrl(row.qualification[0])]" :src="AppApi.fileUrl(row.qualification[0])" preview-teleported show-progress style="width: 60px; height: 60px"></el-image>
-        </template>
-      </ElTableColumn>
-      <!-- <ElTableColumn label="最大载重（千克）" prop="carryingCapacity" /> -->
-
-      <ElTableColumn label="行驶证有效期" width="120px">
-        <template #default="{ row }"> {{ row.licenseStartDate }} ~ {{ row.licenseEndDate }}</template>
-      </ElTableColumn>
-      <ElTableColumn label="合格证有效期" width="120px">
-        <template #default="{ row }"> {{ row.qualificationStartDate }} ~ {{ row.qualificationEndDate }}</template>
-      </ElTableColumn>
       <ElTableColumn label="车辆类型" prop="truckCategory"/>
-      <ElTableColumn label="车辆图片" width="100px">
+      <ElTableColumn label="车辆图片" width="80">
         <template #default="{ row }">
-          <el-image :preview-src-list="[AppApi.fileUrl(row.picture)]" :src="AppApi.fileUrl(row.picture)" preview-teleported show-progress style="width: 60px; height: 60px"></el-image>
+          <ElImage
+            :preview-src-list="[AppApi.fileUrl(row.picture)]"
+            :src="AppApi.fileUrl(row.picture)" preview-teleported show-progress
+            style="width: 32px; height: 32px"/>
         </template>
       </ElTableColumn>
-      <ElTableColumn label="状态" prop="busy">
+      <ElTableColumn label="状态" prop="busy" width="80">
         <template #default="{ row }">
-          {{ row.busy ? '运输中' : '空闲' }}
+          <ElTag :type="row.busy ? 'warning' : 'success'">{{ row.busy ? '运输中' : '空闲' }}</ElTag>
         </template>
       </ElTableColumn>
-      <ElTableColumn label="创建时间" prop="createTime" width="100px"/>
     </template>
     <TruckForm ref="truckForm" :research="research"/>
     <TruckDetail ref="truckDetail"/>
@@ -76,7 +68,7 @@ const actionColumn = reactive<ActionColumnType<TruckTypes.SearchTruckResult>>({
         truckDetailIns.value?.open(row)
       },
     },
-    {
+    /*  {
       icon: 'Delete',
       loading: false,
       type: 'danger',
@@ -91,7 +83,7 @@ const actionColumn = reactive<ActionColumnType<TruckTypes.SearchTruckResult>>({
             return true
           })
       },
-    },
+     }, */
   ],
 })
 
diff --git a/src/pages/cst/truck/truck.d.ts b/src/pages/cst/truck/truck.d.ts
index 2948de1..e340746 100644
--- a/src/pages/cst/truck/truck.d.ts
+++ b/src/pages/cst/truck/truck.d.ts
@@ -3,48 +3,14 @@ export {}
 declare global {
   namespace TruckTypes {
     interface SearchTruckParam extends G.PageParam {
-      // Id
-      id?: string
-      // 归属客户 Id；cst_customer.id
-      customerId?: string
+      // 归属客户
+      customerName?: string
       // 归属企业
-      orgId?: string
+      orgName?: string
       // 车牌
       licensePlate?: string
-      // 行驶证图片
-      truckLicense?: string
       // 车架号
       vnCode?: string
-      // 合格证图片
-      qualification?: string
-      // 最大载重；单位：千克
-      carryingCapacity?: number
-      // 皮重；单位：千克
-      tareWeight?: number
-      // 行驶证有效期
-      licenseStartDate?: string
-      // 行驶证有效期
-      licenseEndDate?: string
-      // 合格证有效期
-      qualificationStartDate?: string
-      // 合格证有效期
-      qualificationEndDate?: string
-      // 车辆类型
-      truckCategory?: string
-      // 车辆图片
-      picture?: string
-      // 忙碌中
-      busy?: boolean
-      // 创建人 Id； sys_user.id
-      creatorId?: string
-      // 修改人 Id； sys_user.id
-      modifierId?: string
-      // 创建时间
-      createTime?: string
-      // 修改时间
-      modifyTime?: string
-      // 是否删除； 0-->未删除、1-->已删除
-      deleted?: boolean
     }
 
     interface SearchTruckResult {
@@ -52,6 +18,10 @@ declare global {
       id?: string
       // 归属客户 Id；cst_customer.id
       customerId?: string
+      // 归属客户
+      customerName?: string
+      // 归属企业
+      orgName?: string
       // 归属企业
       orgId?: string
       // 车牌
@@ -80,16 +50,8 @@ declare global {
       picture?: string
       // 忙碌中
       busy?: boolean
-      // 创建人 Id； sys_user.id
-      creatorId?: string
-      // 修改人 Id； sys_user.id
-      modifierId?: string
       // 创建时间
       createTime?: string
-      // 修改时间
-      modifyTime?: string
-      // 是否删除； 0-->未删除、1-->已删除
-      deleted?: boolean
     }
 
     interface AddTruckParam {