fix：采购列表页面优化

oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue

@@ -94,14 +94,14 @@
             <span>{{ selectedVendor.payType===1?'出库付款':'入库付款' }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+<!--        <el-col :span="12">-->
-          <el-form-item label="汇智负责人" prop="ownerId">
+<!--          <el-form-item label="汇智负责人" prop="ownerId">-->
-            <el-input v-model="form.ownerName" placeholder="请选择汇智负责人" @click.native="ownerSelectOpen=true"
+<!--            <el-input v-model="form.ownerName" placeholder="请选择汇智负责人" @click.native="ownerSelectOpen=true"-->
-                      :readonly="true">
+<!--                      :readonly="true">-->
-               <el-button slot="append" icon="el-icon-search" @click="ownerSelectOpen=true"></el-button>
+<!--               <el-button slot="append" icon="el-icon-search" @click="ownerSelectOpen=true"></el-button>-->
-            </el-input>
+<!--            </el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-        </el-col>
+<!--        </el-col>-->
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
             <el-input type="textarea" v-model="form.remark" placeholder="请输入备注"></el-input>

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

@@ -9,14 +9,6 @@
           @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"
@@ -115,11 +107,8 @@
               @sort-change="handleSortChange">
       <!--      <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" width="120"/>
+      <el-table-column label="制造商简称" align="center" prop="vendorName" width="120"/>
-      <el-table-column label="制造商名称" align="center" prop="vendorName" width="120"/>
+      <el-table-column label="产品编码" align="center" width="110">
-      <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" width="150">
         <template slot-scope="scope">
           <div v-if="scope.row.omsPurchaseOrderItemList && scope.row.omsPurchaseOrderItemList.length > 0">
             <span v-if="scope.row.omsPurchaseOrderItemList.length === 1">
@@ -157,29 +146,33 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="含税总计金额" align="center" prop="totalAmount" width="120"/>
+      <el-table-column label="含税总计" align="center" prop="totalAmount" width="120">
-      <el-table-column label="发起日期" align="center" prop="createTime" width="180" sortable>
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ formatAmount(scope.row.totalAmount) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="汇智负责人" align="center" prop="ownerName" width="120"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" width="90">
-      <el-table-column label="审批状态" align="center" prop="approveStatus" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="审批节点" align="center" prop="approveNode" width="100">
+      <el-table-column label="审批节点" align="center" prop="approveNode" width="90">
         <template slot-scope="scope">
           <span>{{ scope.row.approveNode || '-' }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="发起日期" align="center" prop="createTime" width="120" sortable>
+        <template slot-scope="scope">
+          <span>{{ timeProcessing(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="汇智负责人" align="center" prop="ownerName" width="90"/>
       <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" prop="status" width="100">
+      <el-table-column label="采购状态" align="center" prop="status" width="90">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.purchase_status" :value="scope.row.status"/>
         </template>
@@ -591,6 +584,19 @@ export default {
         });
       }).catch(() => {
       });
+    },
+    /** 格式化金额 */
+    formatAmount(value) {
+      if (value === null || value === undefined || value === '') return '0.00';
+      return Number(value).toLocaleString('en-US', {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2
+      });
+    },
+    /** 时间处理 */
+    timeProcessing(value) {
+      if (value === null || value === undefined || value === '') return '';
+      return value.substring(0, 10);
     }
   }
 };

ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java

@@ -129,6 +129,9 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
     @Override
     public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder)
     {
+        omsPurchaseOrder.setOwnerId(ShiroUtils.getSysUser().getUserId());
+        omsPurchaseOrder.setOwnerName(ShiroUtils.getSysUser().getUserName());
+
         omsPurchaseOrder.setCreateTime(DateUtils.getNowDate());
         omsPurchaseOrder.setPurchaseNo(generatePurchaseNo(omsPurchaseOrder.getVendorId()));
         // 设置初始版本号为 1