From 18c7068b282db25fd481aba193d2f862cf67c5b2 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Tue, 15 Oct 2024 17:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/goodsInQR.vue         | 10 +++++++++-
 src/layout/inTaskRecord.vue      | 10 ++--------
 src/layout/outTaskRecord.vue     | 21 +++++++++++----------
 src/layout/stockUpdateRecord.vue |  2 +-
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/layout/goodsInQR.vue b/src/layout/goodsInQR.vue
index ba10b68..a2b00dd 100644
--- a/src/layout/goodsInQR.vue
+++ b/src/layout/goodsInQR.vue
@@ -160,7 +160,15 @@ export default {
             })
         },
         addTempTask() {
-            this.workFormEntity.vehicleId = replaceEnglishAndNumberIGAI(this.workFormEntity.vehicleId)
+            if (this.workFormEntity.vehicleId != '') {
+                const vehicleIdString = replaceEnglishAndNumberIGAI(this.workFormEntity.vehicleId)
+                if (!vehicleIdString.startsWith('ASRS') || vehicleIdString.length != 9) {
+                    errorBox('料箱格式不正确')
+                    return
+                } else {
+                    this.workFormEntity.vehicleId = vehicleIdString
+                }
+            }
             if (this.workFormEntity.qrcode != '') {
                 try {
                     const goodsInfo = this.workFormEntity.qrcode.split('-')
diff --git a/src/layout/inTaskRecord.vue b/src/layout/inTaskRecord.vue
index 4fb69f6..579c43c 100644
--- a/src/layout/inTaskRecord.vue
+++ b/src/layout/inTaskRecord.vue
@@ -12,11 +12,6 @@
             <el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px"
                 class="table-class" :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.taskId" v-model="taskId">&nbsp;</el-radio>
-                    </template>
-                </el-table-column>
                 <el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px" />
                 <el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" />
                 <el-table-column prop="vehicleId" label="箱号"  min-width="120px" show-overflow-tooltip />
@@ -30,7 +25,6 @@
                 <el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
                 <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
                 <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="createTime" label="运行时长" :formatter="dueFormat" min-width="120px" show-overflow-tooltip />
                 <el-table-column prop="userName" label="操作人员姓名" min-width="120px" />
                 <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
                     min-width="120px" />
@@ -63,7 +57,7 @@ export default {
             total: 0,
             goodsIdQuery: '',
             vehicleIdQuery: '',
-            loading: true
+            loading: true,
         }
     },
     mounted() {
@@ -144,7 +138,7 @@ export default {
                     errorBox('下载文件失败')
                 }
             }).catch(err => {
-                console.log(e)
+                console.log(err)
                 errorBox('导出失败')
             })
         },
diff --git a/src/layout/outTaskRecord.vue b/src/layout/outTaskRecord.vue
index 998a57e..53244a1 100644
--- a/src/layout/outTaskRecord.vue
+++ b/src/layout/outTaskRecord.vue
@@ -3,8 +3,8 @@
     <div style="margin-bottom: 15px">
         <el-config-provider :locale="zhCn">
             <el-row>
-                <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="物料编号" />
-                <el-input v-model="vehicleIdQuery" style="width: 256px; margin-right: 10px;" placeholder="载具号" />
+                <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="料号" />
+                <el-input v-model="vehicleIdQuery" style="width: 256px; margin-right: 10px;" placeholder="箱号" />
                 <el-button type="primary" @click="search()">搜索</el-button>
                 <el-button type="warning" @click="reset()">重置</el-button>
                 <el-button type="success" @click="exportExcel()">导出记录</el-button>
@@ -12,19 +12,20 @@
             <br />
             <el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px"
                 class="table-class" :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
+                <el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px" />
                 <el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" />
-                <el-table-column prop="goodsType" label="型号"  min-width="120px" />
-                <el-table-column prop="specification" label="规格" min-width="120px" />
-                <el-table-column prop="batchNo" label="批次号" min-width="120px" />
-                <el-table-column prop="taskGroup" label="任务单号" min-width="120px" />
+                <el-table-column prop="vehicleId" label="箱号"  min-width="120px" show-overflow-tooltip />
+                <el-table-column prop="goodsRelated.goodsId" label="料号" min-width="120px" show-overflow-tooltip />
+                <el-table-column prop="goodsRelated.goodsName" label="料名" min-width="120px" show-overflow-tooltip />
+                <el-table-column prop="taskGroup" label="任务组" min-width="120px" show-overflow-tooltip />
                 <el-table-column prop="origin" label="起点" min-width="120px" />
                 <el-table-column prop="destination" 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="goodsRelated.opNum" label="操作数量" min-width="120px" />
+                <el-table-column prop="goodsRelated.originNum" label="库存数量" min-width="120px" />
                 <el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
                 <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" />
-                <!-- <el-table-column prop="userName" label="操作人员姓名" min-width="120px" /> -->
+                <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
+                <el-table-column prop="userName" label="操作人员姓名" min-width="120px" />
                 <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
                     min-width="120px" />
             </el-table>
diff --git a/src/layout/stockUpdateRecord.vue b/src/layout/stockUpdateRecord.vue
index 4c082f8..2d040ef 100644
--- a/src/layout/stockUpdateRecord.vue
+++ b/src/layout/stockUpdateRecord.vue
@@ -34,7 +34,7 @@
                 <el-table-column prop="reason" label="原因" fixed="right" show-overflow-tooltip min-width="120px" />
                 <el-table-column prop="updateTime" label="完成时间" :formatter="timeFormat" min-width="120px"
                     show-overflow-tooltip />
-                <el-table-column prop="updateUser" label="操作用户" min-width="120px" />
+                <el-table-column prop="updateUser" label="操作用户"  show-overflow-tooltip min-width="120px" />
             </el-table>
             <br />
             <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"