From 57737132d22945a653ce396634d42f73992edf23 Mon Sep 17 00:00:00 2001
From: Huluwa22 <2667400744@qq.com>
Date: Thu, 20 Mar 2025 13:56:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=89=98=E7=9B=98=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/http/request.js          |  2 +-
 src/layout/inTaskRecord.vue  |  4 ----
 src/layout/outTaskRecord.vue | 10 ++--------
 src/layout/stock.vue         | 20 +++++++++++++-------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/http/request.js b/src/http/request.js
index d89b7d8..d63d04e 100644
--- a/src/http/request.js
+++ b/src/http/request.js
@@ -43,4 +43,4 @@ const request = axios.create({
 //     }
 // )
 
-export default request
\ No newline at end of file
+export default request
diff --git a/src/layout/inTaskRecord.vue b/src/layout/inTaskRecord.vue
index b712167..d52af74 100644
--- a/src/layout/inTaskRecord.vue
+++ b/src/layout/inTaskRecord.vue
@@ -16,15 +16,11 @@
                 :cell-style="{ 'text-align': 'center' }">
                 <el-table-column prop="goodsId" label="零件号" fixed="left" min-width="120px" />
                 <el-table-column prop="vehicleNo" label="箱号" fixed="left" min-width="120px" />
-                <el-table-column prop="goodsName" label="零件名称" min-width="120px" />
                 <el-table-column prop="taskType" label="任务类型" :formatter="taskTypeFormat" min-width="120px" />
                 <el-table-column prop="taskGroup" label="任务组" min-width="120px" />
                 <el-table-column prop="origin" label="起点" min-width="120px" />
                 <el-table-column prop="destination" label="终点" min-width="120px" />
-                <el-table-column prop="pickStand" label="拣选站台" min-width="120px" />
                 <el-table-column prop="weight" label="重量" min-width="120px" />
-                <el-table-column prop="productionDate" label="生产日期" :formatter="dateFormat" min-width="120px" />
-                <el-table-column prop="expirationDate" label="有效日期" :formatter="dateFormat" min-width="120px" />
                 <el-table-column prop="operateNum" label="操作数量" min-width="120px" />
                 <el-table-column prop="totalNum" label="库存数量" min-width="120px" />
                 <el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
diff --git a/src/layout/outTaskRecord.vue b/src/layout/outTaskRecord.vue
index f0a76ce..d1fa9c6 100644
--- a/src/layout/outTaskRecord.vue
+++ b/src/layout/outTaskRecord.vue
@@ -14,22 +14,16 @@
                 class="table-class" :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
                 <el-table-column prop="goodsId" label="零件号" fixed="left" min-width="120px" />
                 <el-table-column prop="vehicleNo" label="箱号" fixed="left" min-width="120px" />
-                <el-table-column prop="goodsName" label="零件名称" min-width="120px" />
                 <el-table-column prop="taskType" label="任务类型" :formatter="taskTypeFormat" sortable min-width="120px" />
                 <el-table-column prop="taskGroup" label="任务组" min-width="120px" />
                 <el-table-column prop="origin" label="起点" min-width="120px" />
                 <el-table-column prop="destination" label="终点" min-width="120px" />
-                <el-table-column prop="pickStand" label="拣选站台" min-width="120px" />
-                <el-table-column prop="weight" label="重量" min-width="120px" />   
-                <el-table-column prop="productionDate" label="生产日期" :formatter="dateFormat" min-width="120px" />
-                <el-table-column prop="expirationDate" label="有效日期" :formatter="dateFormat" min-width="120px" />
+                <el-table-column prop="weight" label="重量" min-width="120px" />
                 <el-table-column prop="operateNum" label="操作数量" min-width="120px" />
                 <el-table-column prop="totalNum" label="库存数量" min-width="120px" />
                 <el-table-column prop="taskPriority" label="任务优先级" sortable min-width="120px" />
-                <el-table-column prop="kateTaskId" label="配件任务号" sortable min-width="140px" />
                 <el-table-column prop="userName" label="操作人员姓名" min-width="120px" />
                 <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" />
-                <el-table-column prop="finishTime" label="任务完成时间" :formatter="timeFormat" min-width="120px" />
                 <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat" min-width="120px" />
                 <!-- <el-table-column fixed="right" label="操作" width="180px">
                     <template v-slot="scope">
@@ -147,4 +141,4 @@ export default {
 .table-class {
     width: 100%;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/layout/stock.vue b/src/layout/stock.vue
index 2388bf9..591c26e 100644
--- a/src/layout/stock.vue
+++ b/src/layout/stock.vue
@@ -9,22 +9,28 @@
         <el-button type="primary" @click="search()">搜索</el-button>
         <el-button type="warning" @click="reset()">重置</el-button>
         <el-button type="success" @click="exportExcel()">导出表格</el-button>
-        <el-select-v2 v-if="selStock == null" v-model="dataType" style="width: 156px; margin-right: 10px;"
+        <el-date-picker
+            v-model="queryKey"
+            value-format="YYYY-MM-DD"
+            type="date"
+            placeholder="选择时间"
+            size="defalut"
+            style="margin-left: 10px"
+        />
+        <el-select-v2 v-if="selStock == null" v-model="dataType" style="width: 156px; margin-right: 10px;margin-left: 10px"
                       placeholder="请选择库存显示类型" :options="dataTypeOptions" @change="search()"></el-select-v2>
       </el-row>
       <br/>
-      <el-table id="stock-table" :data="displayStocks" stripe border v-loading="loading" class="table-class"
+      <el-table  row-key="stockId" id="stock-table" :data="displayStocks" stripe border v-loading="loading" class="table-class"
                 max-height="650px" highlight-current-row @row-click="getCurrentRow" :row-style="rowStyle"
                 :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
-        <el-table-column width="65px" fixed="left">
-          <template v-slot="scope">
-            <el-radio :label="scope.row.stockId" v-model="stockId">&nbsp;</el-radio>
-          </template>
-        </el-table-column>
+
         <el-table-column prop="stockId" label="库存ID" min-width="120px" show-overflow-tooltip/>
         <el-table-column prop="goodsId" label="物料号" min-width="120px"/>
         <el-table-column prop="singleWeight" label="单重" min-width="120px"/>
         <el-table-column prop="availableNum" v-if="dataType == 1" label="可用数量" min-width="120px"/>
+        <el-table-column prop="realNum" label="初入库数量" min-width="120px"/>
+
         <!--                <el-table-column prop="remainNum" v-if="dataType == 1" label="剩余数量" min-width="120px" />-->
         <!--                <el-table-column prop="realNum" label="实际数量" min-width="120px" />-->
         <el-table-column prop="vehicleId" v-if="dataType == 1" label="料箱号" fixed="left" min-width="120px"/>