From 03fe475973b5058aaca6f7e70709196a4dbdde8e Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 7 Nov 2024 14:52:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/relCode/relCode.vue | 47 ++++++++++++++++++---------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/views/collect/relCode/relCode.vue b/src/views/collect/relCode/relCode.vue
index ea060702..db6cb6e5 100644
--- a/src/views/collect/relCode/relCode.vue
+++ b/src/views/collect/relCode/relCode.vue
@@ -93,8 +93,8 @@
         <el-table-column label="备注" prop="comment"></el-table-column>
         <el-table-column label="操作" width="120px">
           <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">详情</el-button>
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
-<!--            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">拼箱</el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -111,24 +111,31 @@
       <el-dialog
         :title="formName"
         :visible.sync="newSpDistributionVisible"
-        width="85%"
+        width="45%"
         append-to-body
         :close-on-click-modal="false"
         :close-on-press-escape="false"
         v-if="newSpDistributionVisible"
         @close='closeDialog'
       >
-        <operateRelCode
-          :closeDialog="closeDialog"
-          :orderQuery="idQuery"
-        ></operateRelCode>
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="800" height="350"
+                  border
+                  ref="multipleTable">
+          <el-table-column label="序号" type="index" width="55"></el-table-column>
+          <el-table-column
+            label="追溯码"
+            prop="curCode"
+            width="280"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
       </el-dialog>
 
     </el-card>
   </div>
 </template>
 <script>
-import {getList,delRelCode} from "@/api/collect/relCode";
+import {getList,delRelCode,getDetailList} from "@/api/collect/relCode";
 import {getAdminId, getToken} from '@/utils/auth';
 import operateRelCode from "@/views/collect/relCode/operateRelCode"
 import Treeselect from "@riophae/vue-treeselect";
@@ -155,6 +162,7 @@ export default {
       formData: null,
       total: 0,
       actDateRange:[],
+      codeArray:[],
       scanCode:null,
       pickerOptions: {
         shortcuts: [
@@ -228,14 +236,23 @@ export default {
       this.showSearch = !this.showSearch;
     },
     newDistributionForm(index, row) {
-      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-        this.idQuery = row;
-        this.formName = "拼箱";
-        this.newSpDistributionVisible = true;
-      } else {
-        this.formName = "新增";
-        this.newSpDistributionVisible = true;
-      }
+        this.formName = "码明细";
+        //获取码明细
+        let post = {
+          batchIdFk: row.id,
+          page: 1,
+          limit: 500
+        }
+      getDetailList(post).then((response) => {
+        if (response.code == 20000) {
+          this.codeArray = response.data.list
+          this.newSpDistributionVisible = true;
+        } else {
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+
+        });
     },
     closeDialog() {
       this.newSpDistributionVisible = false;