From 779898f608ebda63a4b15d2d46aefa3d7748a518 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Wed, 17 Jul 2024 21:53:08 +0800
Subject: [PATCH] fix erp

---
 src/views/erp/stock/check/index.vue                 |  8 +++++---
 src/views/erp/stock/in/index.vue                    |  8 +++++---
 src/views/erp/stock/move/index.vue                  |  9 ++++++---
 src/views/erp/stock/out/index.vue                   |  9 ++++++---
 src/views/erp/stock/record/index.vue                | 13 +++++++++----
 src/views/erp/stock/stock/index.vue                 |  5 +++--
 src/views/mes/producereport/AdminIndex.vue          |  4 ++--
 src/views/mes/producereport/DailyReportIndex.vue    |  4 ++--
 src/views/mes/producereport/ProduceReportForm.vue   |  4 ++--
 .../producereport/components/AdminReplaceForm.vue   |  4 ++--
 src/views/mes/producereport/index.vue               |  4 ++--
 11 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/src/views/erp/stock/check/index.vue b/src/views/erp/stock/check/index.vue
index 16a2571b..29f7b6fa 100644
--- a/src/views/erp/stock/check/index.vue
+++ b/src/views/erp/stock/check/index.vue
@@ -141,7 +141,7 @@
     >
       <el-table-column width="30" label="选择" type="selection" />
       <el-table-column min-width="180" label="盘点单号" align="center" prop="no" />
-      <el-table-column label="产品信息" align="center" prop="productNames" min-width="200" />
+      <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="200" />
       <el-table-column
         label="盘点时间"
         align="center"
@@ -152,13 +152,15 @@
       <el-table-column label="创建人" align="center" prop="creatorName" />
       <el-table-column
         label="数量"
-        align="center"
+        align="right"
+        sortable
         prop="totalCount"
         :formatter="erpCountTableColumnFormatter"
       />
       <el-table-column
         label="金额"
-        align="center"
+        align="right"
+        sortable
         prop="totalPrice"
         :formatter="erpPriceTableColumnFormatter"
       />
diff --git a/src/views/erp/stock/in/index.vue b/src/views/erp/stock/in/index.vue
index b3e59b84..eb18e449 100644
--- a/src/views/erp/stock/in/index.vue
+++ b/src/views/erp/stock/in/index.vue
@@ -163,7 +163,7 @@
     >
       <el-table-column width="30" label="选择" type="selection" />
       <el-table-column min-width="180" label="入库单号" align="center" prop="no" />
-      <el-table-column label="产品信息" align="center" prop="productNames" min-width="200" />
+      <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="200" />
       <el-table-column label="供应商" align="center" prop="supplierName" />
       <el-table-column
         label="入库时间"
@@ -175,13 +175,15 @@
       <el-table-column label="创建人" align="center" prop="creatorName" />
       <el-table-column
         label="数量"
-        align="center"
+        align="right"
+        sortable
         prop="totalCount"
         :formatter="erpCountTableColumnFormatter"
       />
       <el-table-column
         label="金额"
-        align="center"
+        align="right"
+        sortable
         prop="totalPrice"
         :formatter="erpPriceTableColumnFormatter"
       />
diff --git a/src/views/erp/stock/move/index.vue b/src/views/erp/stock/move/index.vue
index 07461556..92a093ea 100644
--- a/src/views/erp/stock/move/index.vue
+++ b/src/views/erp/stock/move/index.vue
@@ -140,24 +140,27 @@
     >
       <el-table-column width="30" label="选择" type="selection" />
       <el-table-column min-width="180" label="调度单号" align="center" prop="no" />
-      <el-table-column label="产品信息" align="center" prop="productNames" min-width="200" />
+      <el-table-column label="产品信息" align="left" prop="productNames" min-width="200" />
       <el-table-column
         label="调度时间"
         align="center"
         prop="moveTime"
+        sortable
         :formatter="dateFormatter2"
         width="120px"
       />
       <el-table-column label="创建人" align="center" prop="creatorName" />
       <el-table-column
         label="数量"
-        align="center"
+        align="right"
+        sortable
         prop="totalCount"
         :formatter="erpCountTableColumnFormatter"
       />
       <el-table-column
         label="金额"
-        align="center"
+        align="right"
+        sortable
         prop="totalPrice"
         :formatter="erpPriceTableColumnFormatter"
       />
diff --git a/src/views/erp/stock/out/index.vue b/src/views/erp/stock/out/index.vue
index e8242ff7..fb268707 100644
--- a/src/views/erp/stock/out/index.vue
+++ b/src/views/erp/stock/out/index.vue
@@ -163,11 +163,12 @@
     >
       <el-table-column width="30" label="选择" type="selection" />
       <el-table-column min-width="180" label="出库单号" align="center" prop="no" />
-      <el-table-column label="产品信息" align="center" prop="productNames" min-width="200" />
+      <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="210" />
       <el-table-column label="客户" align="center" prop="customerName" />
       <el-table-column
         label="出库时间"
         align="center"
+        sortable
         prop="outTime"
         :formatter="dateFormatter2"
         width="120px"
@@ -175,13 +176,15 @@
       <el-table-column label="创建人" align="center" prop="creatorName" />
       <el-table-column
         label="数量"
-        align="center"
+        align="right"
+        sortable
         prop="totalCount"
         :formatter="erpCountTableColumnFormatter"
       />
       <el-table-column
         label="金额"
-        align="center"
+        align="right"
+        sortable
         prop="totalPrice"
         :formatter="erpPriceTableColumnFormatter"
       />
diff --git a/src/views/erp/stock/record/index.vue b/src/views/erp/stock/record/index.vue
index ead8875c..b7ebfc98 100644
--- a/src/views/erp/stock/record/index.vue
+++ b/src/views/erp/stock/record/index.vue
@@ -113,7 +113,7 @@
     </el-tabs>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="产品名称" align="center" prop="productName" width="180px"/>
+      <el-table-column label="产品名称" align="left" sortable prop="productName" width="210px"/>
       <el-table-column label="产品分类" align="center" prop="categoryName" />
       <el-table-column label="产品单位" align="center" prop="unitName" />
       <el-table-column label="仓库编号" align="center" prop="warehouseName" />
@@ -125,22 +125,27 @@
       <el-table-column label="出入库单号" align="center" prop="bizNo" width="200" />
       <el-table-column
         label="出入库数量"
-        align="center"
+        align="right"
+        sortable
         prop="count"
+        width="120px"
         :formatter="erpCountTableColumnFormatter"
       />
       <el-table-column
         label="库存量"
-        align="center"
+        align="right"
+        sortable
         prop="totalCount"
+        width="120px"
         :formatter="erpCountTableColumnFormatter"
       />
       <el-table-column
         label="出入库日期"
         align="center"
+        sortable
         prop="recordTime"
         :formatter="dateFormatter2"
-        width="180px"
+        width="120px"
       />
       <el-table-column
         label="创建日期"
diff --git a/src/views/erp/stock/stock/index.vue b/src/views/erp/stock/stock/index.vue
index cb2be219..b57d314c 100644
--- a/src/views/erp/stock/stock/index.vue
+++ b/src/views/erp/stock/stock/index.vue
@@ -79,11 +79,12 @@
     </el-tabs>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="产品" align="center" prop="productName" />
+      <el-table-column label="产品" align="left" sortable prop="productName" />
       <el-table-column label="分类" align="center" prop="categoryName" />
       <el-table-column
         label="库存量"
-        align="center"
+        align="right"
+        sortable
         prop="count"
         :formatter="erpCountTableColumnFormatter"
       />
diff --git a/src/views/mes/producereport/AdminIndex.vue b/src/views/mes/producereport/AdminIndex.vue
index 9673345f..316ec70f 100644
--- a/src/views/mes/producereport/AdminIndex.vue
+++ b/src/views/mes/producereport/AdminIndex.vue
@@ -116,8 +116,8 @@
         </template>
       </el-table-column>
       <el-table-column label="工位" align="center" prop="orgName" width="130px"/>
-      <el-table-column label="计件时段" align="center" prop="reportTime" />
-      <el-table-column label="计件时长" align="center" prop="totalTime" />
+      <el-table-column label="计时时段" align="center" prop="reportTime" />
+      <el-table-column label="计时时长" align="center" prop="totalTime" />
       <el-table-column label="班别" align="center" prop="groupType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
diff --git a/src/views/mes/producereport/DailyReportIndex.vue b/src/views/mes/producereport/DailyReportIndex.vue
index 9eeb3757..77f1f2d5 100644
--- a/src/views/mes/producereport/DailyReportIndex.vue
+++ b/src/views/mes/producereport/DailyReportIndex.vue
@@ -158,8 +158,8 @@
         </template>
       </el-table-column>
       <el-table-column label="工位" align="center" prop="orgName" sortable/>
-      <el-table-column label="计件时段" align="center" prop="reportTime" />
-      <el-table-column label="计件时长" align="center" prop="totalTime" />
+      <el-table-column label="计时时段" align="center" prop="reportTime" />
+      <el-table-column label="计时时长" align="center" prop="totalTime" />
       <el-table-column label="状态" align="center" prop="reportStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" />
diff --git a/src/views/mes/producereport/ProduceReportForm.vue b/src/views/mes/producereport/ProduceReportForm.vue
index fa59fb2c..3f2d53f3 100644
--- a/src/views/mes/producereport/ProduceReportForm.vue
+++ b/src/views/mes/producereport/ProduceReportForm.vue
@@ -83,12 +83,12 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="计件时段" prop="reportTime">
+          <el-form-item label="计时时段" prop="reportTime">
             <el-input v-model="formData.reportTime" placeholder="请输入计件时段" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计件时长" prop="totalTime">
+          <el-form-item label="计时时长" prop="totalTime">
             <el-input-number v-model="formData.totalTime" :min="0"  :precision="2" placeholder="请输入时长" class="!w-260px"/>
           </el-form-item>
         </el-col>
diff --git a/src/views/mes/producereport/components/AdminReplaceForm.vue b/src/views/mes/producereport/components/AdminReplaceForm.vue
index 3705d2eb..0ebfbb33 100644
--- a/src/views/mes/producereport/components/AdminReplaceForm.vue
+++ b/src/views/mes/producereport/components/AdminReplaceForm.vue
@@ -99,12 +99,12 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="计件时段" prop="reportTime">
+          <el-form-item label="计时时段" prop="reportTime">
             <el-input v-model="formData.reportTime" placeholder="请输入计件时段" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计件时长" prop="totalTime">
+          <el-form-item label="计时时长/h" prop="totalTime">
             <el-input-number v-model="formData.totalTime" :min="0"  :precision="2" placeholder="请输入时长" class="!w-260px"/>
           </el-form-item>
         </el-col>
diff --git a/src/views/mes/producereport/index.vue b/src/views/mes/producereport/index.vue
index 24035e25..72e04da8 100644
--- a/src/views/mes/producereport/index.vue
+++ b/src/views/mes/producereport/index.vue
@@ -99,8 +99,8 @@
         </template>
       </el-table-column>
       <el-table-column label="工位" align="center" prop="orgName" width="130px"/>
-      <el-table-column label="计件时段" align="center" prop="reportTime" />
-      <el-table-column label="计件时长" align="center" prop="totalTime" />
+      <el-table-column label="计时时段" align="center" prop="reportTime" />
+      <el-table-column label="计时时长" align="center" prop="totalTime" />
       <el-table-column label="状态" align="center" prop="reportStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" />