From 9515a4ba1a558521a8184c9f23860775b93578b4 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Thu, 29 May 2025 20:15:00 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E6=96=99=E5=8F=B7=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=89=93=E5=8D=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0SAP?=
 =?UTF-8?q?=E6=96=99=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/label/newMaterialSpecLabelPrint/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/label/newMaterialSpecLabelPrint/index.vue b/src/views/label/newMaterialSpecLabelPrint/index.vue
index 139bbd5..49e7e90 100644
--- a/src/views/label/newMaterialSpecLabelPrint/index.vue
+++ b/src/views/label/newMaterialSpecLabelPrint/index.vue
@@ -277,7 +277,7 @@ export default {
 }
 </script>
 <script lang="ts" setup>
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted, getCurrentInstance } from 'vue'
 import { ElForm, ElMessageBox, ElTable } from 'element-plus'
 import { getQueryPageList, BpelEvent, getQueryList } from '@/api/common'
 import {
@@ -301,6 +301,7 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
 const queryFormRef = ref(ElForm)
 const formDataRef = ref(ElForm)
 const store: any = queryListStore()
+const { proxy }: any = getCurrentInstance();
 
 /***---------------------------------------------------------------------------
  * -------------------------------------页面SQL语句配置------------------------------------------ */
@@ -438,7 +439,8 @@ onMounted(() => {
     { header: '仓库', field: 'ERPLOCATIONNAME', hide: false },
     { header: '货位', field: 'LOCATIONNAMEDESC', hide: false },
     { header: '标签编号', field: 'MATERIALPACKINGNAME', hide: false },
-    { header: '物料编码', field: 'MATERIALSPECNAME', hide: false },
+    { header: 'NC物料编码', field: 'MATERIALSPECNAME', hide: false },
+    { header: 'SAP物料编码', field: 'OLDMATERIALSPECNAME', hide: false },
     { header: '品名', field: 'DESC_CN', hide: false },
     { header: '批次', field: 'CHARGE', hide: false },
     { header: '数量', field: 'MATERIALQUANTITY', hide: false },
@@ -534,8 +536,8 @@ const handleQuery = () => {
       LOCATIONNAME: locationNameString,
       DESC_CN: state.queryParams.params.DESC_CN,
     },
-    pageNum: 1,
-    pageSize: 10
+    pageNum: state.queryParams.pageNum,
+    pageSize: state.queryParams.pageSize
   })
     .then((res: any) => {
       if (res.data.list.length == 0) {