From 0e96989aaa9febb2f12c29adab7b383e43ac4285 Mon Sep 17 00:00:00 2001
From: "UNISINSIGHT\\rdpnr_jiangpeng" <Cq258258>
Date: Fri, 10 Apr 2026 17:11:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=8C=89=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=EF=BC=8C=E5=BA=94=E6=94=B6=E5=8D=95=E3=80=81=E5=BA=94?=
 =?UTF-8?q?=E4=BB=98=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=BB=B4=E4=BF=9D=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms_vue/src/views/finance/payable/index.vue  | 16 ++++++++--------
 .../src/views/finance/receivable/index.vue       | 16 ++++++++--------
 .../oms_vue/src/views/manage/service/index.vue   | 11 -----------
 .../oms_vue/src/views/project/order/index.vue    | 13 +++++++++++--
 .../mapper/sip/OmsReceivableBillMapper.xml       |  1 +
 5 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/oms_web/oms_vue/src/views/finance/payable/index.vue b/oms_web/oms_vue/src/views/finance/payable/index.vue
index eb5ebb19..65787ab2 100644
--- a/oms_web/oms_vue/src/views/finance/payable/index.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
-<!--      <el-form-item label="项目编号" prop="projectCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.projectCode"-->
-<!--          placeholder="请输入项目编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="项目编码" prop="projectCode">
+        <el-input
+          v-model="queryParams.projectCode"
+          placeholder="请输入项目编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
         <el-input
           v-model="queryParams.projectName"
diff --git a/oms_web/oms_vue/src/views/finance/receivable/index.vue b/oms_web/oms_vue/src/views/finance/receivable/index.vue
index a8af286b..0545c042 100644
--- a/oms_web/oms_vue/src/views/finance/receivable/index.vue
+++ b/oms_web/oms_vue/src/views/finance/receivable/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
-<!--      <el-form-item label="项目编号" prop="projectCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.projectCode"-->
-<!--          placeholder="请输入项目编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="项目编码" prop="projectCode">
+        <el-input
+          v-model="queryParams.projectCode"
+          placeholder="请输入项目编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
         <el-input
           v-model="queryParams.projectName"
diff --git a/oms_web/oms_vue/src/views/manage/service/index.vue b/oms_web/oms_vue/src/views/manage/service/index.vue
index f1ef92ac..561ca938 100644
--- a/oms_web/oms_vue/src/views/manage/service/index.vue
+++ b/oms_web/oms_vue/src/views/manage/service/index.vue
@@ -71,13 +71,6 @@
         </div>
 
         <template v-if="hasResult">
-          <div class="summary-grid">
-            <div v-for="item in summaryCards" :key="item.label" class="summary-item">
-              <span class="summary-item__label">{{ item.label }}</span>
-              <strong class="summary-item__value">{{ item.value }}</strong>
-            </div>
-          </div>
-
           <div class="table-section">
             <div class="table-section__title">产品信息</div>
             <el-table
@@ -114,10 +107,6 @@
             </el-tab-pane>
 
             <el-tab-pane label="标准保修" name="warranty">
-              <div v-if="warrantyData.length" class="warranty-highlight">
-                <div class="warranty-highlight__status">{{ getWarrantyStatusText(warrantyData[0]) }}</div>
-                <div class="warranty-highlight__text">当前主要服务状态</div>
-              </div>
               <el-table
                 v-if="warrantyData.length"
                 :data="warrantyData"
diff --git a/oms_web/oms_vue/src/views/project/order/index.vue b/oms_web/oms_vue/src/views/project/order/index.vue
index 71658bab..71db1b83 100644
--- a/oms_web/oms_vue/src/views/project/order/index.vue
+++ b/oms_web/oms_vue/src/views/project/order/index.vue
@@ -297,14 +297,23 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
+      let query = { ...this.queryParams };
+      query.params = {};
+      if (this.dateRange && this.dateRange.length === 2) {
+        const timeType = this.queryParams.timeType;
+        const beginKey = `begin${timeType.charAt(0).toUpperCase() + timeType.slice(1)}`;
+        const endKey = `end${timeType.charAt(0).toUpperCase() + timeType.slice(1)}`;
+        query.params[beginKey] = this.dateRange[0];
+        query.params[endKey] = this.dateRange[1];
+      }
+      delete query.timeType;
       this.$confirm('是否确认导出所有订单管理数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
           this.exportLoading = true;
-          return exportOrder(queryParams);
+          return exportOrder(query);
         }).then(response => {
         this.exportLoading = false;
         console.log("response:", response)
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableBillMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableBillMapper.xml
index 1a84ece4..915aa434 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableBillMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableBillMapper.xml
@@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inventoryCode != null  and inventoryCode != ''"> and t1.inventory_code = #{inventoryCode}</if>
             <if test="productType != null  and productType != ''"> and t1.product_type = #{productType}</if>
             <if test="createBy != null  and createBy != ''"> and t1.create_by = #{createBy}</if>
+            <if test="projectCode != null  and projectCode != ''">and t3.project_code = #{projectCode}</if>
             <if test="projectName != null  and projectName != ''"> and t3.project_name like concat('%', #{projectName}, '%')</if>
             <if test="(params.beginPlanReceiptDate != null and params.beginPlanReceiptDate != '') or (params.endPlanReceiptDate != null and params.endPlanReceiptDate!='')">
                 <choose>