feat(purchaseorder): 新增供应商确认功能及相关页面组件

- 新增供应商确认状态枚举及流程类型枚举
- 新增供应商采购单列表查询接口
- 新增供应商确认操作相关API方法
- 新建供应商确认页面vendorConfirm.vue
- 实现采购单供应商确认状态管理
- 更新OrderInfoDisplay组件引用路径
- 修复mapper中applyTime判断逻辑错误
- 添加页面初始化时路由参数打印调试信息
- 实现线上/线下流程类型选择功能
- 增加采购单详情查看和历史版本查看功能
- 实现供应商确认和驳回操作功能
- 添加确认状态和流程类型的查询条件
- 优化采购单列表展示和筛选功能
- 实现供应商确认状态标签显示
- 增加采购单发起日期和负责人信息展示
- 修复审批状态判断逻辑用于控制详情查看权限
- 实现采购单撤回功能及相关提示确认
- 添加含税总金额字段展示
- 增加联系人及联系电话信息展示列

oms_web/oms_vue/src/api/sip/purchaseorder.js

@@ -8,6 +8,13 @@ export function listPurchaseorder(query) {
     params: query
   })
 }
+export function listVendorPurchaseorder(query) {
+  return request({
+    url: '/sip/purchaseorder/vendor/list',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询待审批采购单主表列表
 export function listApprovePurchaseorder(query) {

oms_web/oms_vue/src/views/approve/order/Approve.vue

@@ -138,7 +138,7 @@ import ApproveLayout from '@/views/approve/ApproveLayout.vue';
 import html2canvas from 'html2canvas';
 import jsPDF from 'jspdf';
 
-import OrderInfoDisplay from '@/components/order/OrderInfoDisplay.vue';
+import OrderInfoDisplay from '@/views/project/order/components/OrderInfoDisplay.vue';
 
 export default {
   name: "Approve",

oms_web/oms_vue/src/views/inventory/execution/edit.vue

@@ -88,7 +88,7 @@ import { getDicts } from "@/api/system/dict/data";
 import CheckoutDialog from './CheckoutDialog.vue';
 import OuterDetailDialog from './OuterDetailDialog.vue';
 import OrderDetailDrawer from "@/views/project/order/OrderDetailDrawer.vue";
-import OrderInfo from "@/components/order/OrderInfoDisplay.vue";
+import OrderInfo from "@/views/project/order/components/OrderInfoDisplay.vue";
 
 export default {
   name: "ExecutionEdit",

oms_web/oms_vue/src/views/project/order/OrderDetail.vue

@@ -167,7 +167,7 @@
 import { getOrder, addOrder, updateOrder, delContractFile, uploadContractFile, getProject } from "@/api/project/order";
 import ProductConfig from '@/views/project/info/ProductConfig.vue';
 import SelectCommitType from "./SelectCommitType.vue";
-import OrderInfo from '@/components/order/OrderInfo.vue';
+import OrderInfo from '@/views/project/order/components/OrderInfo.vue';
 import SelectProject from "@/views/project/info/SelectProject";
 import SelectUser from "@/views/system/user/selectUser";
 import SelectPartner from "@/views/system/partner/selectPartner";

oms_web/oms_vue/src/views/project/order/OrderDetailDrawer.vue

@@ -134,7 +134,7 @@
 <script>
 import { getOrder } from "@/api/project/order";
 import ProductConfig from '@/views/project/info/ProductConfig.vue';
-import OrderInfo from '@/components/order/OrderInfoDisplay.vue';
+import OrderInfo from '@/views/project/order/components/OrderInfoDisplay.vue';
 
 export default {
   name: "OrderDetailDrawer",

oms_web/oms_vue/src/views/purchaseorder/index.vue

@@ -339,6 +339,7 @@ export default {
     };
   },
   created() {
+    console.log(this.$route.query)
     this.getList();
   },
   watch:{

oms_web/oms_vue/src/views/purchaseorder/vendorConfirm.vue

@@ -0,0 +1,472 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="采购单号" prop="purchaseNo">
+        <el-input
+          v-model="queryParams.purchaseNo"
+          placeholder="请输入采购单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采购方名称" prop="buyerName">
+        <el-input
+          v-model="queryParams.buyerName"
+          placeholder="请输入采购方名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="制造商名称" prop="vendorName">
+        <el-input
+          v-model="queryParams.vendorName"
+          placeholder="请输入制造商名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="汇智负责人" prop="ownerName">
+        <el-input
+          v-model="queryParams.ownerName"
+          placeholder="请输入汇智负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="供应商确认状态" prop="confirmStatus">
+        <el-select v-model="queryParams.confirmStatus" placeholder="请选择供应商确认状态" clearable>
+          <el-option
+            v-for="dict in dict.type.vendor_confirm_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!--    <el-row :gutter="10" class="mb8">-->
+    <!--      <el-col :span="1.5">-->
+    <!--        <el-button-->
+    <!--          type="primary"-->
+    <!--          plain-->
+    <!--          icon="el-icon-plus"-->
+    <!--          size="mini"-->
+    <!--          @click="handleAdd"-->
+    <!--          v-hasPermi="['sip:purchaseorder:add']"-->
+    <!--        >新增-->
+    <!--        </el-button>-->
+    <!--      </el-col>-->
+    <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+    <!--    </el-row>-->
+
+    <el-table v-loading="loading" :data="purchaseorderList" @selection-change="handleSelectionChange">
+      <!--      <el-table-column type="selection" width="55" align="center" />-->
+      <el-table-column label="采购编号" align="center" prop="purchaseNo" width="180"/>
+      <el-table-column label="采购方名称" align="center" prop="buyerName" />
+      <el-table-column label="制造商名称" align="center" prop="vendorName" width="120"/>
+      <el-table-column label="联系人" align="center" prop="vendorUser" width="100"/>
+      <el-table-column label="联系电话" align="center" prop="vendorPhone" width="120"/>
+      <el-table-column label="含税总计金额" align="center" prop="totalAmount" width="120"/>
+      <el-table-column label="发起日期" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="汇智负责人" align="center" prop="ownerName" width="120"/>
+
+      <el-table-column label="供应商确认状态" align="center" prop="confirmStatus" width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.vendor_confirm_status" :value="scope.row.confirmStatus"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
+        <template slot-scope="scope">
+
+          <el-button
+            v-if="scope.row.approveStatus === '1' || scope.row.approveStatus === '2'"
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleViewDetails(scope.row)"
+            v-hasPermi="['sip:purchaseorder:query']"
+          >查看详情
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改采购单主表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="80vw" append-to-body>
+      <purchase-order-detail ref="purchaseOrderDetail" :order-data="currentOrderData"
+                             @close="open = false"
+                             @success="getList">
+
+      </purchase-order-detail>
+      <template slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </template>
+    </el-dialog>
+
+    <!-- 流程类型选择对话框 -->
+    <el-dialog
+      title="选择流程类型"
+      :visible.sync="openFlowTypeDialog"
+      width="30%"
+      append-to-body
+    >
+      <el-form :model="{ flowType: selectedFlowType }" ref="flowTypeForm" label-width="80px">
+        <el-form-item label="流程类型" prop="flowType"
+                      :rules="[{ required: true, message: '请选择流程类型', trigger: 'change' }]">
+          <el-select v-model="selectedFlowType" placeholder="请选择流程类型" style="width:100%">
+            <el-option label="线上" value="online"></el-option>
+            <el-option label="线下" value="offline"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitApplyWithFlowType">确 定</el-button>
+        <el-button @click="openFlowTypeDialog = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 订单详情 -->
+
+    <template v-if="detailOrderData">
+
+      <el-dialog
+        v-if="detailOrderData.confirmStatus === '0' "
+        :visible.sync="showDetailDrawer"
+        @close="showDetailDrawer=false"
+        width="80vw"
+      >
+        <ApproveLayout title="采购单详情" style="max-height: 70vh;overflow-y: auto">
+          <purchase-order-detail-view ref="dialogViewOnly" :order-data="detailOrderData"
+                                      @close="showDetailDrawer = false"
+                                      @success="getList" :showHistory="true"
+                                      @view-history-detail="handleViewHistoryDetailEvent">
+          </purchase-order-detail-view>
+          <template #footer>
+            <span> {{ currentDetailPurchaseNo }}</span>
+          </template>
+        </ApproveLayout>
+        <template #footer class="dialog-footer">
+          <el-button type="primary" @click="vendorConfirm('1')">确 认</el-button>
+          <el-button type="danger" @click="vendorConfirm('2')">驳 回</el-button>
+        </template>
+      </el-dialog>
+
+      <el-drawer
+        v-else
+        :visible.sync="showDetailDrawer"
+        @close="showDetailDrawer=false"
+        size="80vw"
+      >
+        <ApproveLayout title="采购单详情">
+          <purchase-order-detail-view ref="detailViewOnly" :order-data="detailOrderData"
+                                      @close="showDetailDrawer = false"
+                                      @success="getList" :showHistory="true"
+                                      @view-history-detail="handleViewHistoryDetailEvent">
+          </purchase-order-detail-view>
+          <template #footer>
+            <span>订单编号: {{ currentDetailPurchaseNo }}</span>
+          </template>
+        </ApproveLayout>
+      </el-drawer>
+
+
+    </template>
+
+    <!-- 历史订单详情抽屉 -->
+    <el-drawer
+      title="历史订单详情"
+      :visible.sync="showHistoryDetailDrawer"
+      direction="rtl"
+      size="80%"
+    >
+      <ApproveLayout title="采购单历史详情" v-if="showHistoryDetailDrawer">
+        <purchase-order-detail-view ref="historyDetailView" :order-data="historyDetailOrderData"
+                                    @close="showHistoryDetailDrawer = false">
+        </purchase-order-detail-view>
+        <template #footer>
+          <span>订单编号: {{ historyDetailOrderData ? historyDetailOrderData.purchaseNo : '' }}</span>
+          <span v-if="historyDetailOrderData"> | 版本号: {{ historyDetailOrderData.version }}</span>
+        </template>
+      </ApproveLayout>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import {
+  applyPurchaseorder,
+  delPurchaseorder,
+  getPurchaseorder,
+  getPurchaseOrderHistoryDetail,
+  listVendorPurchaseorder,
+  recallPurchaseorder,
+  vendorConfirmStatus
+} from "@/api/sip/purchaseorder";
+import PurchaseOrderDetail from './components/PurchaseOrderDetail';
+import ApproveLayout from "@/views/approve/ApproveLayout.vue";
+import PurchaseOrderDetailView from "@/views/purchaseorder/components/PurchaseOrderDetailView.vue";
+
+
+export default {
+  name: "Purchaseorder",
+  dicts: ['approve_status', 'vendor_confirm_status', 'purchase_status'],
+  components: {
+    PurchaseOrderDetail,
+    ApproveLayout,
+    PurchaseOrderDetailView
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      currentOrderId: null,
+      // 当前订单数据
+      currentOrderData: null,
+      openFlowTypeDialog: false, // 控制流程类型选择对话框的显示
+      currentApplyingOrder: null, // 当前正在申请采购的订单数据
+      selectedFlowType: null, // 选定的流程类型
+      // 采购单主表表格数据
+      purchaseorderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详情抽屉
+      showDetailDrawer: false,
+      // 详情订单数据
+      detailOrderData: null,
+      // 当前详情订单编号
+      currentDetailPurchaseNo: null,
+      // 是否显示历史详情抽屉
+      showHistoryDetailDrawer: false,
+      // 历史详情订单数据
+      historyDetailOrderData: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        purchaseNo: null,
+        buyerName: null,
+        vendorName: null,
+        ownerName: null,
+        approveStatus: null,
+        confirmStatus: '0',
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {}
+    };
+  },
+  created() {
+    console.log(this.$route.query)
+    this.getList();
+  },
+  watch: {
+    // 监听对话框打开
+    open(val) {
+      if (!val) {
+        this.currentOrderId = null;
+        this.currentOrderData = null;
+        this.$refs.purchaseOrderDetail?.resetForm();
+      }
+    },
+    // 监听详情抽屉变化
+    showDetailDrawer(val) {
+      if (!val) {
+        this.detailOrderData = null;
+        this.currentDetailPurchaseNo = null;
+        this.$refs.detailViewOnly?.resetForm();
+        this.$refs.dialogViewOnly?.resetForm();
+      }
+    },
+    // 监听历史详情抽屉变化
+    showHistoryDetailDrawer(val) {
+      if (!val) {
+        this.historyDetailOrderData = null;
+        this.$refs.historyDetailView?.resetForm();
+      }
+    }
+  },
+  methods: {
+    /** 查询采购单主表列表 */
+    getList() {
+      this.loading = true;
+      listVendorPurchaseorder(this.queryParams).then(response => {
+        this.purchaseorderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+
+    },
+    vendorConfirm(type) {
+// 调用后端发起供应商确认接口
+      let data = {
+        id: this.detailOrderData.id,
+        confirmStatus: type // 设置确认状态为 1 (待确认)
+      };
+      vendorConfirmStatus(data).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("操作成功");
+      });
+    },
+    // 表单重置
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.currentOrderData = null;
+      this.currentOrderId = null;
+      this.open = true;
+      this.title = "添加采购单主表";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      getPurchaseorder(row.id).then(response => {
+        this.currentOrderData = response.data;
+        this.currentOrderId = row.id;
+        this.open = true;
+        this.title = "修改采购单主表";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs.purchaseOrderDetail.submitForm()
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除采购单主表编号为"' + ids + '"的数据项？').then(function () {
+        return delPurchaseorder(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 申请采购按钮操作 */
+    handleApply(row) {
+      this.currentApplyingOrder = row; // 保存当前订单数据
+      this.selectedFlowType = null; // 重置选定的流程类型
+      this.openFlowTypeDialog = true; // 打开流程类型选择对话框
+    },
+    /** 查看详情按钮操作 */
+    handleViewDetails(row) {
+      getPurchaseorder(row.id).then(response => {
+        this.detailOrderData = response.data;
+        console.log(this.detailOrderData)
+        this.currentDetailPurchaseNo = row.purchaseNo;
+        console.log('1111')
+        this.$nextTick(() => {
+          console.log(2222)
+          this.showDetailDrawer = true;
+        });
+      });
+    },
+    /** 处理查看历史详情事件 */
+    handleViewHistoryDetailEvent(row) {
+      getPurchaseOrderHistoryDetail(row.id).then(response => {
+        this.historyDetailOrderData = response.data;
+        this.showHistoryDetailDrawer = true;
+        this.showDetailDrawer = false; // 关闭当前详情抽屉
+      });
+    },
+    /** 提交申请采购（带流程类型） */
+    submitApplyWithFlowType() {
+      this.$refs.flowTypeForm.validate(valid => {
+        if (valid) {
+          let form = {...this.currentApplyingOrder};
+          form.approveStatus = '1'; // 设置审批状态为 1 (审批中)
+          form.flowType = this.selectedFlowType; // 添加流程类型
+          applyPurchaseorder(form).then(() => {
+            this.openFlowTypeDialog = false; // 关闭对话框
+            this.getList();
+            this.$modal.msgSuccess("申请采购成功");
+          }).catch(() => {
+            this.openFlowTypeDialog = false; // 关闭对话框
+          });
+        }
+      });
+    },
+    /** 撤回按钮操作 */
+    handleRecall(row) {
+      this.$modal.confirm('是否确认撤回采购订单编号为"' + row.purchaseNo + '"的数据项？').then(() => {
+        recallPurchaseorder(row.id).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("撤回成功");
+        });
+        this.getList(); // 刷新列表以反映状态变化
+      }).catch(() => {
+      });
+    },
+    /** 发起供应商确认操作 */
+    handleInitiateVendorConfirmation(row) {
+      this.$modal.confirm('是否确认发起供应商确认编号为"' + row.purchaseNo + '"的数据项？', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 调用后端发起供应商确认接口
+        let data = {
+          id: row.id,
+          confirmStatus: '0' // 设置确认状态为 1 (待确认)
+        };
+        vendorConfirmStatus(data).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("发起供应商确认成功");
+        });
+      }).catch(() => {
+      });
+    }
+  }
+};
+</script>

ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.ApproveStatusEnum;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.sip.domain.OmsPurchaseOrder;
@@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -49,6 +51,20 @@ public class OmsPurchaseOrderController extends BaseController
         todoService.fillPurchaseOrderApproveNode(list);
         return getDataTable(list);
     }
+    /**
+     * 查询采购单主表列表
+     */
+    @RequiresPermissions("sip:purchaseorder:list")
+    @GetMapping("/vendor/list")
+    public TableDataInfo listVendor(OmsPurchaseOrder omsPurchaseOrder)
+    {
+
+        omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.APPROVE_COMPLETE.getCode());
+        omsPurchaseOrder.setFlowType(OmsPurchaseOrder.FlowTypeEnum.ONLINE.getCode());
+        startPage();
+        List<OmsPurchaseOrder> list = omsPurchaseOrderService.selectOmsPurchaseOrderList(omsPurchaseOrder);
+        return getDataTable(list);
+    }
 
     /**
      * 查询待审批采购单主表列表

ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.Getter;
 import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -104,5 +105,39 @@ public class OmsPurchaseOrder extends BaseEntity
     /** 采购单明细表信息 */
     private List<OmsPurchaseOrderItem> omsPurchaseOrderItemList;
 
+    @Getter
+    public enum ConfirmStatusEnum {
+        WAIT_CONFIRM("0", "待确认"),
+        CONFIRM("1", "已确认"),
+        REJECT("2", "已驳回"),
+
+        ;
+
+        private final String value;
+        private final String code;
+
+        ConfirmStatusEnum(String code, String value) {
+            this.code = code;
+            this.value = value;
+        }
+
+    }
+    @Getter
+    public enum FlowTypeEnum {
+        ONLINE("online", "线上"),
+        OFFLINE("offline", "线下"),
+
+
+        ;
+
+        private final String value;
+        private final String code;
+
+        FlowTypeEnum(String code, String value) {
+            this.code = code;
+            this.value = value;
+        }
+
+    }
 
 }

ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml

@@ -77,10 +77,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOmsPurchaseOrderList" parameterType="OmsPurchaseOrder" resultMap="OmsPurchaseOrderResult">
         <include refid="selectOmsPurchaseOrderRelationVo"/>
         <where>  
-            <if test="purchaseNo != null  and purchaseNo != ''"> and purchase_no = #{purchaseNo}</if>
+            <if test="purchaseNo != null  and purchaseNo != ''"> and t1.purchase_no = #{purchaseNo}</if>
-            <if test="vendorId != null "> and vendor_id = #{vendorId}</if>
+            <if test="buyerName != null  and buyerName != ''"> and t1.buyer_name = #{buyerName}</if>
-            <if test="status != null "> and status = #{status}</if>
+            <if test="vendorId != null "> and t1.vendor_id = #{vendorId}</if>
-            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="status != null "> and t1.status = #{status}</if>
+            <if test="confirmStatus != null "> and t1.confirm_status = #{confirmStatus}</if>
+            <if test="approveStatus != null "> and t1.approve_status = #{approveStatus}</if>
+            <if test="flowType != null "> and t1.flow_type = #{flowType}</if>
+            <if test="vendorName != null "> and t2.vendor_name = #{vendorName}</if>
+            <if test="ownerName != null "> and t1.owner_name = #{ownerName}</if>
+
         </where>
     </select>
     
@@ -116,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="entity.approveUser != null "> and t3.approve_user = #{entity.approveUser}</if>
             <if test="entity.params.applyTimeStart != null and entity.params.applyTimeEnd != ''">
                 <choose>
-                    <when test="params.applyTimeStart != null and params.applyTimeEnd != null">
+                    <when test="entity.params.applyTimeStart != null and entity.params.applyTimeEnd != null">
                         and t3.apply_time between date_format(#{entity.params.applyTimeStart}, '%Y-%m-%d 00:00:00') and
                         date_format(#{entity.params.applyTimeEnd}, '%Y-%m-%d 23:59:59')
                     </when>