bug修改1.借支流程详情页面布局调整（用途说明长度、审核时间位置）2.外部采购列表搜索使用人报错

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

@@ -59,24 +59,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPurchaseList" parameterType="TPurchase" resultMap="TPurchaseResult">
         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,
+        t2.nick_name user_name,
         (SELECT t1.nick_name FROM sys_user t1 WHERE t1.user_id = t.approved_user_id) approved_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>
-            <if test="specifications != null  and specifications != ''"> and specifications = #{specifications}</if>
-            <if test="modelType != null  and modelType != ''"> and model_type = #{modelType}</if>
-            <if test="applicationDescription != null  and applicationDescription != ''"> and application_description = #{applicationDescription}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="count != null "> and count = #{count}</if>
-            <if test="total != null "> and total = #{total}</if>
-            <if test="purchaseDeptManagerId != null "> and purchase_dept_manager_id = #{purchaseDeptManagerId}</if>
-            <if test="approvedUserId != null "> and approved_user_id = #{approvedUserId}</if>
-            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
-            <if test="purchaseStatus != null  and purchaseStatus != ''"> and purchase_status = #{purchaseStatus}</if>
-            <if test="approvedTime != null "> and approved_time = #{approvedTime}</if>
+        t.purchase_id, t.purchase_dept_id, t.purchase_name, t.specifications, t.model_type, t.application_description, t.user_id, price, count, total, purchase_dept_manager_id, approved_user_id, t.remark, t.create_time, t.is_del, t.update_time, t.purchase_status, t.approved_time from t_purchase t,sys_user t2
+        <where>
+            t.user_id=t2.user_id
+            <if test="purchaseDeptId != null "> and t.purchase_dept_id = #{purchaseDeptId}</if>
+            <if test="purchaseName != null  and purchaseName != ''"> and t.purchase_name like concat('%', #{purchaseName}, '%')</if>
+            <if test="specifications != null  and specifications != ''"> and t.specifications = #{specifications}</if>
+            <if test="modelType != null  and modelType != ''"> and t.model_type = #{modelType}</if>
+            <if test="applicationDescription != null  and applicationDescription != ''"> and t.application_description = #{applicationDescription}</if>
+            <if test="userId != null "> and t.user_id = #{userId}</if>
+            <if test="userName != null "> and t2.nick_name like  concat('%', #{userName}, '%')</if>
+            <if test="price != null "> and t.price = #{price}</if>
+            <if test="count != null "> and t.count = #{count}</if>
+            <if test="total != null "> and t.total = #{total}</if>
+            <if test="purchaseDeptManagerId != null "> and t.purchase_dept_manager_id = #{purchaseDeptManagerId}</if>
+            <if test="approvedUserId != null "> and t.approved_user_id = #{approvedUserId}</if>
+            <if test="isDel != null  and isDel != ''"> and t.is_del = #{isDel}</if>
+            <if test="purchaseStatus != null  and purchaseStatus != ''"> and t.purchase_status = #{purchaseStatus}</if>
+            <if test="approvedTime != null "> and t.approved_time = #{approvedTime}</if>
         </where>
     </select>
     

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

@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tradeStatus != null  and tradeStatus != ''"> and trade_status = #{tradeStatus}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
         </where>
-        order by update_time desc
+        order by update_time,create_time desc
     </select>
     
     <select id="selectTTradeProjectById" parameterType="Long" resultMap="TTradeProjectResult">

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

@@ -445,9 +445,7 @@
           <el-col :span="8">
             <el-form-item label="申请时间">{{form.registrationDate}}</el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="审批时间">{{form.approvalTime}}</el-form-item>
-          </el-col>
+
         </el-row>
         <el-divider></el-divider>
 
@@ -456,7 +454,7 @@
           <el-col :span="7">
             <el-form-item label="小写合计">{{form.totalFigures}}</el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="17">
             <el-form-item label="用途说明">{{form.applicationDescription}}</el-form-item>
           </el-col>
 
@@ -468,13 +466,17 @@
           <el-col :span="24">
             <el-form-item label="备注">{{form.remark}}</el-form-item>
           </el-col>
+
         </el-row>
         <el-divider></el-divider>
 
         <el-row>
-          <el-col :span="24">
+          <el-col :span="7">
             <el-form-item label="审批人">{{form.approvedUserIdName}}</el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="审批时间">{{form.approvalTime}}</el-form-item>
+          </el-col>
         </el-row>
 
         <el-divider></el-divider>

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

@@ -42,9 +42,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="使用人" prop="userId">
+      <el-form-item label="使用人" prop="userName">
         <el-input
-          v-model="queryParams.userId"
+          v-model="queryParams.userName"
           placeholder="请输入使用人"
           clearable
           size="small"