From 2c03209a2c66b749612591c61e7aadb159f53b20 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Tue, 11 Jul 2023 18:06:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=96=B0=E5=A2=9E=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 210793bcb70447f0d88bcbb607f4cb20d67b7b67)

# Conflicts:
#	src/layout/components/Navbar.vue
---
 src/views/inout/DialogCreateOrderSelect.vue    | 2 ++
 src/views/inout/IoAuditedOrder.vue             | 2 ++
 src/views/inout/IoCheckAuditBusOrder.vue       | 2 ++
 src/views/inout/IoCheckAuditNewOrder.vue       | 2 ++
 src/views/inout/IoCheckAuditOrder.vue          | 2 ++
 src/views/inout/IoCheckErrorOrder.vue          | 2 ++
 src/views/inout/IoCheckSuccessOrder.vue        | 2 ++
 src/views/inout/IoCreateBusOrder.vue           | 2 ++
 src/views/inout/IoCreateErrorOrder.vue         | 2 ++
 src/views/inout/IoCreateOrder.vue              | 2 ++
 src/views/inout/IoCreateScanOrder.vue          | 2 ++
 src/views/inout/IoDealOrder.vue                | 2 ++
 src/views/inout/IoEditOrder.vue                | 2 ++
 src/views/inout/IoWaitAllocateOrder.vue        | 3 +++
 src/views/purchase/purApply/pureApplyAudit.vue | 2 ++
 15 files changed, 31 insertions(+)

diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index 5536a78d..8bebd22a 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -141,6 +141,8 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <!--        <el-table-column label="校验状态" prop="status" width="100">-->
         <!--          <template slot-scope="scope">-->
         <!--            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{-->
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index f650fd8b..9d72559a 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -153,6 +153,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckAuditBusOrder.vue b/src/views/inout/IoCheckAuditBusOrder.vue
index 99612ced..1b87e80a 100644
--- a/src/views/inout/IoCheckAuditBusOrder.vue
+++ b/src/views/inout/IoCheckAuditBusOrder.vue
@@ -122,6 +122,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckAuditNewOrder.vue b/src/views/inout/IoCheckAuditNewOrder.vue
index e6a59c10..9feb2291 100644
--- a/src/views/inout/IoCheckAuditNewOrder.vue
+++ b/src/views/inout/IoCheckAuditNewOrder.vue
@@ -120,6 +120,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index 9b46c629..dad61891 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -138,6 +138,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="220" fixed="right">
           <template slot-scope="scope">
 
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 617ee68e..83337fac 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -141,6 +141,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 353e3452..9ea60d9c 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -120,6 +120,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 155705c5..0ca7306c 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -150,6 +150,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
index da88a6ba..2f06082f 100644
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -135,6 +135,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 32bccd1c..a3f20751 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -170,6 +170,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index daaf65f9..d8eed1f9 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -138,6 +138,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
 
           <template slot-scope="scope">
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 55a2f058..68af47cd 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -149,6 +149,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index 97369e4a..67013cf1 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -45,6 +45,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" fixed="right" width="150">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoWaitAllocateOrder.vue b/src/views/inout/IoWaitAllocateOrder.vue
index 95f47406..00d83b91 100644
--- a/src/views/inout/IoWaitAllocateOrder.vue
+++ b/src/views/inout/IoWaitAllocateOrder.vue
@@ -149,6 +149,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -288,6 +290,7 @@
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
+
         </el-table>
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index ef9470e7..7854627a 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -103,6 +103,8 @@
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime"
                          sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="60px">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.status!=2"