From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/quality/Packaging_ledger/pack-fromadd.vue | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/views/quality/Packaging_ledger/pack-fromadd.vue b/src/views/quality/Packaging_ledger/pack-fromadd.vue
index 6d16c84..6bf4000 100644
--- a/src/views/quality/Packaging_ledger/pack-fromadd.vue
+++ b/src/views/quality/Packaging_ledger/pack-fromadd.vue
@@ -77,6 +77,15 @@
// 鏍囬
column: [
{
+ minWidth: '120',
+ prop: 'customerOrderNo',
+ label: '鍚堝悓鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
minWidth: 'code',
prop: 'product',
label: '浜у搧',
@@ -159,6 +168,11 @@
watch: {
currshowlist() {
this.innerVisible = this.currshowlist
+ if(this.currshowlist){
+ this.$nextTick(() => {
+ this.getData()
+ });
+ }
}
},
computed: {
@@ -182,4 +196,3 @@
}
}
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3