From 1ebd4c6c457dbe50344b0ba704ecbff6ae49291a Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 8 Jul 2024 18:23:05 +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

---
 .../invoicing/components/operatingDetail.vue  | 19 +++++++++++--------
 src/views/invoicing/operating_record.vue      |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/views/invoicing/components/operatingDetail.vue b/src/views/invoicing/components/operatingDetail.vue
index 86dbc1b..9cce97b 100644
--- a/src/views/invoicing/components/operatingDetail.vue
+++ b/src/views/invoicing/components/operatingDetail.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dialog title="详情" width="80%" :visible.sync="dialogVisible" @close="dialogVisible = false">
         <div class="head-container">
-            <span>【{{ tableData.detail.subType == '-1' ? '退货出库' : '供应商入库' }}】</span>
+            <span>【{{ row.type }}】</span>
         </div>
         <div class="head-container">
             <el-table :data="tableData.detail.stockSnap" v-loading="tableData.loading" height="400px">
@@ -10,13 +10,14 @@
                 <el-table-column label="原库存" prop="stockNumber"></el-table-column>
                 <el-table-column label="变动数量" prop="number">
                     <template v-slot="scope">
-                        <span v-if="tableData.detail.subType==-1">-</span> {{ scope.row.number }} {{ scope.row.unitName }}
+                        <span v-if="tableData.detail.subType == -1">-</span> {{ scope.row.number }} {{
+                            scope.row.unitName
+                        }}
                     </template>
                 </el-table-column>
                 <el-table-column label="现有库存" prop="number">
                     <template v-slot="scope">
-                        {{ returnNowHasNumbr( scope.row)}}
-                       
+                        {{ returnNowHasNumbr(scope.row) }}
                         <!-- {{ scope.row.stockNumber*1 + scope.row.number*1   }} {{ scope.row.unitName }} -->
                     </template>
                 </el-table-column>
@@ -37,6 +38,7 @@ export default {
     data() {
         return {
             dayjs,
+            row: '',
             dialogVisible: false,
             tableData: {
                 loading: false,
@@ -51,12 +53,13 @@ export default {
     },
     methods: {
         //返回现有库存数量
-        returnNowHasNumbr(row){
-            return  row.stockNumber*1 + row.number*1 +row.unitName
+        returnNowHasNumbr(row) {
+            return row.stockNumber * 1 + row.number * 1 + row.unitName
         },
-        show(id) {
+        show(row) {
             this.dialogVisible = true
-            this.getTableData(id)
+            this.row = row
+            this.getTableData(row.id)
         },
         async getTableData(id) {
             this.tableData.loading = true
diff --git a/src/views/invoicing/operating_record.vue b/src/views/invoicing/operating_record.vue
index 47e2c47..817cd55 100644
--- a/src/views/invoicing/operating_record.vue
+++ b/src/views/invoicing/operating_record.vue
@@ -33,9 +33,9 @@
                         {{ dayjs(scope.row.stockTime).format('YYYY-MM-DD HH:mm:ss') }}
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="120">
+                <el-table-column label="操作" width="80">
                     <template v-slot="scope">
-                        <el-button type="text" size="mini" @click="$refs.operatingDetail.show(scope.row.id)">
+                        <el-button type="text" size="mini" @click="$refs.operatingDetail.show(scope.row)">
                             详情
                         </el-button>
                         <!-- <el-button type="text" size="mini" @click="$refs.operatingDetail.show(scope.row.id)">