外部采购查询功能-状态值未改

precision-effect-system/src/main/java/com/zehong/system/domain/TPurchase.java

@@ -32,6 +32,25 @@ public class TPurchase extends BaseEntity
     public void setHandled_by_user_id(Long handled_by_user_id) {
         this.handled_by_user_id = handled_by_user_id;
     }
+    private String userName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPurchaseDeptName() {
+        return purchaseDeptName;
+    }
+
+    public void setPurchaseDeptName(String purchaseDeptName) {
+        this.purchaseDeptName = purchaseDeptName;
+    }
+
+    private String purchaseDeptName;
 
     private Long handled_by_user_id;
     /** 采购名称 */

precision-effect-system/src/main/resources/mapper/business/TPurchaseMapper.xml

@@ -23,6 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="purchaseStatus"    column="purchase_status"    />
         <result property="approvedTime"    column="approved_time"    />
+        <result property="purchaseDeptName"    column="purchase_dept_name"    />
+        <result property="userName"    column="user_name"    />
+
     </resultMap>
 
     <sql id="selectTPurchaseVo">
@@ -30,7 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTPurchaseList" parameterType="TPurchase" resultMap="TPurchaseResult">
-        <include refid="selectTPurchaseVo"/>
+        select (select dept_name from sys_dept where dept_id =purchase_dept_id)purchase_dept_name,
+        (select t1.nick_name from sys_user t1 where t1.user_id=t.user_id )user_name,
+            purchase_id, purchase_dept_id, purchase_name, specifications, model_type, application_description, user_id, price, count, total, purchase_dept_manager_id, approved_user_id, remark, create_time, is_del, update_time, purchase_status, approved_time from t_purchase t
         <where>  
             <if test="purchaseDeptId != null "> and purchase_dept_id = #{purchaseDeptId}</if>
             <if test="purchaseName != null  and purchaseName != ''"> and purchase_name like concat('%', #{purchaseName}, '%')</if>

precision-effect-web/src/views/purchase/index.vue

@@ -78,17 +78,17 @@
           v-hasPermi="['system:purchase:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:purchase:edit']"
-        >修改</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['system:purchase:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -100,29 +100,29 @@
           v-hasPermi="['system:purchase:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-		  :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:purchase:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--		  :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['system:purchase:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="purchaseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="采购主键" align="center" prop="purchaseId" />-->
-      <el-table-column label="采购申请部门" align="center" prop="purchaseDeptId" />
+      <el-table-column label="采购申请部门" align="center" prop="purchaseDeptName" />
       <el-table-column label="采购名称" align="center" prop="purchaseName" />
       <el-table-column label="规格" align="center" prop="specifications" />
       <el-table-column label="型号" align="center" prop="modelType" />
       <el-table-column label="用途说明" align="center" prop="applicationDescription" />
-      <el-table-column label="使用人" align="center" prop="userId" />
+      <el-table-column label="使用人" align="center" prop="userName" />
       <el-table-column label="单价" align="center" prop="price" />
       <el-table-column label="数量" align="center" prop="count" />
       <el-table-column label="总价" align="center" prop="total" />
@@ -136,13 +136,13 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:purchase:edit']"
-          >修改</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:purchase:edit']"-->
+<!--          >修改</el-button>-->
           <el-button
             size="mini"
             type="text"