From 7b3b9f59c5b22e9e8250f02c7039db65d18152a4 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 4 Mar 2025 18:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndRefund/return/dialogFormExame.vue | 24 +++++++++++++++++++
 .../auditing/component/auditingPage1.vue      |  2 +-
 .../claimAndreturn/picking/outbound/index.vue |  9 +++----
 .../return/receive/component/home.vue         |  3 +++
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/views/claimAndRefund/return/dialogFormExame.vue b/src/views/claimAndRefund/return/dialogFormExame.vue
index c3beb2a..c8e8679 100644
--- a/src/views/claimAndRefund/return/dialogFormExame.vue
+++ b/src/views/claimAndRefund/return/dialogFormExame.vue
@@ -13,6 +13,7 @@
             style="height: 500px; overflow-y: scroll; padding: 0 20px"
         >
             <vue-easy-print tableShow ref="printRef">
+                <div style="text-align: center; font-weight: 800;font-size: 18px;margin-bottom: 20px;">{{ billTitle }}</div>
                 <div class="order_box">
                     <div class="order_box_one">
                         <div>
@@ -46,6 +47,7 @@
                         align="center"
                         prop="typeName"
                         :show-overflow-tooltip="true"
+                        class-name="small-padding fixed-width"
                     />
                     <!-- <el-table-column type="expand">
             <template slot-scope="scope">
@@ -86,6 +88,7 @@
                         align="center"
                         prop="typeCode"
                         :show-overflow-tooltip="true"
+                        class-name="small-padding fixed-width"
                     />
                     <el-table-column
                         label="退料数量"
@@ -94,6 +97,18 @@
                         width="200"
                         prop="num"
                     ></el-table-column>
+                    <el-table-column
+                        label="状态"
+                        align="center"
+                        class-name="small-padding fixed-width"
+                        prop="status"
+                    ></el-table-column>
+                    <el-table-column
+                        label="备注"
+                        align="center"
+                        class-name="small-padding fixed-width"
+                        prop="remark"
+                    ></el-table-column>
                     <!-- <el-table-column prop="remarks" label="备注" align="center">
             <template slot-scope="scope">
               <span
@@ -194,6 +209,15 @@ export default {
             type: Object,
             default: {},
         },
+        // 单子title
+        title: {
+            type: String,
+            default: '',
+        },
+        billTitle: {
+            type: String,
+            default: '',
+        },
     },
     watch: {
         isShowFlag(val) {
diff --git a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
index 855fa59..1ffab30 100644
--- a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
@@ -152,7 +152,7 @@
                         :show-overflow-tooltip="true"
                     />
                     <el-table-column
-                        label="出库数量"
+                        label="预出库数量"
                         align="center"
                         prop="outNum"
                         :show-overflow-tooltip="true"
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index 873a6ae..000e509 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -524,7 +524,7 @@
                     prop="maStatus"
                     :show-overflow-tooltip="true"
                 />
-                <el-table-column label="备注" align="center" prop="remark">
+                <!-- <el-table-column label="备注" align="center" prop="remark">
                     <template slot-scope="scope">
                         <el-input
                             v-model="scope.row.remark"
@@ -534,7 +534,7 @@
                             style="width: 100%"
                         />
                     </template>
-                </el-table-column>
+                </el-table-column> -->
             </el-table>
 
             <pagination
@@ -626,7 +626,7 @@
                         />
                     </template>
                 </el-table-column>
-                <el-table-column label="备注" align="center" prop="remark">
+                <!-- <el-table-column label="备注" align="center" prop="remark">
                     <template slot-scope="scope">
                         <el-input
                             v-model="scope.row.remark"
@@ -636,7 +636,7 @@
                             style="width: 100%"
                         />
                     </template>
-                </el-table-column>
+                </el-table-column> -->
             </el-table>
         </el-dialog>
 
@@ -1080,6 +1080,7 @@ export default {
                         outNum: 1,
                         taskId: this.outObj.taskId,
                         leaseType: this.leaseType,
+                        // remark: this.outCodeList.find((v) => v.maId == item).remark,
                     }
                     return obj
                 })
diff --git a/src/views/claimAndreturn/return/receive/component/home.vue b/src/views/claimAndreturn/return/receive/component/home.vue
index e81c61c..e9c9d6f 100644
--- a/src/views/claimAndreturn/return/receive/component/home.vue
+++ b/src/views/claimAndreturn/return/receive/component/home.vue
@@ -266,6 +266,7 @@
         <!-- 退料单 -->
         <dialogForm
             :dialogTitle="title"
+            :billTitle="billTitle"
             :isShowFlag.sync="isShowOneFlag"
             :rowObj="rowObj"
             :priKey="priKey"
@@ -314,6 +315,7 @@ export default {
             typeList: [],
             // 弹出层标题
             title: '',
+            billTitle: '', //单子标题
             // 是否显示弹出层
             open: false,
             // 日期范围
@@ -479,6 +481,7 @@ export default {
         //打开退料单
         handlePrint(row) {
             // this.title = "退料单";
+            this.billTitle = '退料单'
             this.isShowOneFlag = true
             this.rowObj = row
         },