mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：订单管理按条件查询导出，应收单、应付单添加项目编号查询，维保服务页面调整

dev_1.0.2
UNISINSIGHT\rdpnr_jiangpeng 2026-04-10 17:11:38 +08:00
parent 9fd0d3caf4
commit 0e96989aaa
5 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oms_web/oms_vue/src/views/finance/payable/index.vue
View File

@ -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"

16
oms_web/oms_vue/src/views/finance/receivable/index.vue
View File

@ -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"

11
oms_web/oms_vue/src/views/manage/service/index.vue
View File

@ -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"

13
oms_web/oms_vue/src/views/project/order/index.vue
View File

@ -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)

1
ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableBillMapper.xml
View File

@ -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>