Merge branch 'dev' of http://1.13.177.47:3000/yinq/hwbm-ui into dev

src/api/oa/erp/projectPurchase/types.ts

@@ -56,6 +56,11 @@ export interface ProjectPurchaseVO {
    */
   deputyName?: string;
 
+  /**
+   * 版本
+   */
+  version?: number;
+
   /**
    * 提报人
    */
@@ -164,6 +169,11 @@ export interface ProjectPurchaseForm extends BaseEntity {
    */
   deputyId?: string | number;
 
+  /**
+   * 版本
+   */
+  version?: number;
+
   /**
    * 部门ID
    */
@@ -332,6 +342,11 @@ export interface ProjectPurchaseQuery extends PageQuery {
    * 日期范围参数
    */
   params?: any;
+
+  /**
+   * 项目经理名称
+   */
+  managerName?: string;
 }
 
 

src/views/oa/erp/projectPurchase/index.vue

@@ -4,17 +4,17 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
-            <el-form-item label="项目号" prop="projectCode">
-              <el-input v-model="queryParams.projectCode" placeholder="请输入项目号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="采购编号" prop="purchaseCode">
               <el-input v-model="queryParams.purchaseCode" placeholder="请输入采购编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="项目号" prop="projectCode">
+              <el-input v-model="queryParams.projectCode" placeholder="请输入项目号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
             <el-form-item label="项目名称" prop="projectName">
               <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="项目经理" prop="managerId">
-              <el-input v-model="queryParams.managerId" placeholder="请输入项目经理" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="项目经理" prop="managerName">
+              <el-input v-model="queryParams.managerName" placeholder="请输入项目经理" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="项目采购状态" prop="projectPurchaseStatus">
               <el-select v-model="queryParams.projectPurchaseStatus" placeholder="请选择项目采购状态" clearable>
@@ -59,6 +59,11 @@
         <el-table-column label="项目经理" align="center" prop="managerName" width="120" v-if="columns[5].visible" />
         <el-table-column label="部门负责人" align="center" prop="chargeName" width="120" v-if="columns[6].visible" />
         <el-table-column label="分管副总" align="center" prop="deputyName" width="120" v-if="columns[7].visible" />
+        <el-table-column label="版本" align="center" prop="version" width="100" v-if="columns[8].visible">
+          <template #default="scope">
+            <span>v{{ scope.row.version }}.0</span>
+          </template>
+        </el-table-column>
         <el-table-column label="提报人" align="center" prop="reporterName" width="120" v-if="columns[9].visible" />
         <el-table-column label="收货人" align="center" prop="consigneeUser" width="120" v-if="columns[10].visible" />
         <el-table-column label="收货地址" align="center" prop="consigneeAddress" width="200" show-overflow-tooltip v-if="columns[11].visible" />