From d5f375ef44b44030afb05d5a70967ed966c3c504 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 8 Dec 2025 10:32:36 +0800
Subject: [PATCH] genggai

---
 src/views/car/driveStatistics.vue             |  2 +-
 src/views/inventorys/index.vue                | 16 ++++--
 src/views/inventorys/stocktaking.vue          | 50 ++++++++++++-----
 src/views/maintenance/maintenance_records.vue | 55 +++++++++++++------
 4 files changed, 85 insertions(+), 38 deletions(-)

diff --git a/src/views/car/driveStatistics.vue b/src/views/car/driveStatistics.vue
index 52c1e8d..6e0e360 100644
--- a/src/views/car/driveStatistics.vue
+++ b/src/views/car/driveStatistics.vue
@@ -41,7 +41,7 @@
           </el-col>
           <el-col :span="12">
             <el-card class="stat-card blue">
-              <div class="card-title">平均在线时长</div>
+              <div class="card-title">平均行驶里程</div>
               <div class="card-value">{{ overviewData.avgMileage }}<span class="unit">km</span></div>
             </el-card>
           </el-col>
diff --git a/src/views/inventorys/index.vue b/src/views/inventorys/index.vue
index e94e0a3..57fa09d 100644
--- a/src/views/inventorys/index.vue
+++ b/src/views/inventorys/index.vue
@@ -295,17 +295,23 @@
             prop: 'kucun',
             align: 'left',
             multiHd: [{
-                label: '入库批次',
-                width: 120,
-                prop: 'rukupici'
-              },
-              {
                 label: '在库数量',
                 width: 120,
                 prop: 'zaikushuliang',
                 customFn: (row) => {
                   return (<span>{row.row.zaikushuliang}{row.row.jiliangdanwei?row.row.jiliangdanwei:''}</span>)
                 }
+              },{
+                label: '原库存数量',
+                width: 120,
+                prop: 'chushishuliang',
+                customFn: (row) => {
+                  return (<span>{row.row.chushishuliang}{row.row.jiliangdanwei?row.row.jiliangdanwei:''}</span>)
+                }
+              },{
+                label: '入库批次',
+                width: 120,
+                prop: 'rukupici'
               },
               {
                 label: '顺序号',
diff --git a/src/views/inventorys/stocktaking.vue b/src/views/inventorys/stocktaking.vue
index f7ec90e..70b27d7 100644
--- a/src/views/inventorys/stocktaking.vue
+++ b/src/views/inventorys/stocktaking.vue
@@ -687,7 +687,7 @@
     </Modal>
 
     <!-- 盘点小结 Modal -->
-    <Modal v-model="summaryModal.visible" title="盘点小结" width="1100">
+    <Modal v-model="summaryModal.visible" title="盘点小结" width="1200">
       <div>
         <div id="print-table">
           <div style="text-align: center; font-size: 20px; font-weight: bold; margin-bottom: 12px">
@@ -1398,11 +1398,19 @@ export default {
         {
           title: '物资名称',
           key: 'zichanmingcheng',
-          width: 110,
+          width: 120,
           render: (h, params) => {
             return h('span', params.row.inventory ? params.row.inventory.zichanmingcheng : '-')
           }
         },
+        {
+          title: '入库批次-顺序号',
+          key: 'rukupici',
+          width: 160,
+          render: (h, params) => {
+            return h('span', params.row.inventory ? params.row.inventory.rukupici + '-' + params.row.inventory.shunxuhao : '-')
+          }
+        },
         {
           title: '物资型号',
           key: 'guigexinghao',
@@ -1475,7 +1483,7 @@ export default {
         {
           title: '备注',
           key: 'remark',
-          width: 120,
+          // width: 120,
           tooltip: true
         }
       ],
@@ -2273,19 +2281,13 @@ export default {
       this.previewUrl = ''
     },
     getPlanProgress(row) {
-      // 根据状态值判断进度
-      const status = row.status
-      if (status === 0) {
-        // 未开始
+      // 根据 material_infos_plan_links 数组中 status=1 的条数计算进度
+      if (!row.material_infos_plan_links || !Array.isArray(row.material_infos_plan_links) || row.material_infos_plan_links.length === 0) {
         return 0
-      } else if (status === 1) {
-        // 进行中
-        return 50
-      } else if (status === 2) {
-        // 已完成
-        return 100
       }
-      return 0
+      const totalCount = row.material_infos_plan_links.length
+      const completedCount = row.material_infos_plan_links.filter(item => item.status === 1).length
+      return Math.round((completedCount / totalCount) * 100)
     },
     viewPlanDetail(row) {
       this.planDetailModal.visible = true
@@ -2366,7 +2368,25 @@ export default {
 
         const res = await getStocktakingPlanLinkList(qs.stringify(params))
         if (res && res.list) {
-          this.summaryModal.inventoryList = res.list.data || []
+          const list = res.list.data || []
+          // 对数据进行排序：盘点数量和原库存数量不同的排在前面
+          list.sort((a, b) => {
+            // 判断 a 是否不同
+            const aQuantity = a.check_num || '-'
+            const aOriginalQuantity = a.inventory?.chushishuliang
+            const aIsDifferent = (aOriginalQuantity == null || aOriginalQuantity === '') || (aOriginalQuantity != null && String(aQuantity) !== String(aOriginalQuantity))
+
+            // 判断 b 是否不同
+            const bQuantity = b.check_num || '-'
+            const bOriginalQuantity = b.inventory?.chushishuliang
+            const bIsDifferent = (bOriginalQuantity == null || bOriginalQuantity === '') || (bOriginalQuantity != null && String(bQuantity) !== String(bOriginalQuantity))
+
+            // 不同的排在前面（返回负数表示 a 排在前面，正数表示 b 排在前面）
+            if (aIsDifferent && !bIsDifferent) return -1
+            if (!aIsDifferent && bIsDifferent) return 1
+            return 0
+          })
+          this.summaryModal.inventoryList = list
         }
       } catch (e) {
         this.$Message.error('获取盘点物资列表失败')
diff --git a/src/views/maintenance/maintenance_records.vue b/src/views/maintenance/maintenance_records.vue
index faafc09..2650832 100644
--- a/src/views/maintenance/maintenance_records.vue
+++ b/src/views/maintenance/maintenance_records.vue
@@ -34,14 +34,26 @@
               <span>-</span>
               <DatePicker v-model="select.date_end" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="结束日期" style="width: 120px" />
             </div>
+            <div class="search-item">
+              <span>截止日期:</span>
+              <DatePicker v-model="select.end_date_start" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="截止日期" style="width: 120px" />
+              <span>-</span>
+              <DatePicker v-model="select.end_date_end" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="结束日期" style="width: 120px" />
+            </div>
             <div class="search-item">
               <span>关键词:</span>
-              <Input v-model="select.keyword" placeholder="维护物资/运维内容" style="width: 200px" />
+              <Input v-model="select.keyword" placeholder="维护物资" style="width: 120px" />
+            </div>
+            <div class="search-item">
+              <span>运维内容:</span>
+              <Input v-model="select.content" placeholder="运维内容" style="width: 120px" />
+            </div>
+            <div style="margin-top: 8px;">
+              <Button type="primary" style="margin-left: 8px;" @click="getList">查询</Button>
+              <Button type="primary" style="margin-left: 8px;" @click="resetSearch">重置</Button>
+              <Button type="primary" style="margin-left: 8px;" @click="createMaintenance">新增</Button>
+              <Button type="primary" style="margin-left: 8px;" @click="exportExcel(new Date().getTime().toString())">导出</Button>
             </div>
-            <Button type="primary" style="margin-left: 8px;" @click="getList">查询</Button>
-            <Button type="primary" style="margin-left: 8px;" @click="resetSearch">重置</Button>
-            <Button type="primary" style="margin-left: 8px;" @click="createMaintenance">新增</Button>
-            <Button type="primary" style="margin-left: 8px;" @click="exportExcel(new Date().getTime().toString())">导出</Button>
           </div>
         </slot>
       </lx-header>
@@ -452,7 +464,10 @@ export default {
         is_expire:'',
         date_start: '',
         date_end: '',
-        keyword: ''
+        end_date_start:'',
+        end_date_end:'',
+        keyword: '',  
+        content: ''
       },
       stats: {
         total: 0,
@@ -703,13 +718,18 @@ export default {
             value:this.select.status?this.select.status:(this.select.status===0?0:'')
           },{
             'key':'planned_maintenance_date',
-            op:'eq',
-            value:this.select.date_start?this.formatDate(this.select.date_start):''
+            op:'range',
+            value:this.select.date_start?this.formatDate(this.select.date_start)+','+this.formatDate(this.select.date_end):''
           },{
-            'key':'maintenance_date',
-            op:'eq',
-            value:this.select.date_end?this.formatDate(this.select.date_end):''
-          }],
+            'key':'end_date',
+            op:'range',
+            value:this.select.end_date_start?this.formatDate(this.select.end_date_start)+','+this.formatDate(this.select.end_date_end):''
+          },{
+            'key':'content',
+            op:'like',
+            value:this.select.content?this.select.content:''
+          }
+        ],
           //
         }
         const res = await getOperationList(params)
@@ -1196,9 +1216,6 @@ export default {
           "export_fields[status_text]" : "状态",
           is_export:1,
           // warehouse: this.select.warehouse,
-          // status: this.select.status,
-          // date_start: this.select.date_start,
-          date_end: this.select.date_end,
           keyword: this.select.keyword,
           filter:[{
             'key':'status',
@@ -1210,8 +1227,12 @@ export default {
             value:this.select.date_start?this.formatDate(this.select.date_start):''
           },{
             'key':'maintenance_date',
-            op:'eq',
-            value:this.select.date_end?this.formatDate(this.select.date_end):''
+            op:'range',
+            value:this.select.end_date_start?this.formatDate(this.select.end_date_start)+','+this.formatDate(this.select.end_date_end):''
+          },{
+            'key':'content',
+            op:'like',
+            value:this.select.content?this.select.content:''
           }],
           //
         }