From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
minipro_standard/pages_adjust/components/multipleMaterial.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/minipro_standard/pages_adjust/components/multipleMaterial.vue b/minipro_standard/pages_adjust/components/multipleMaterial.vue
index 40549be..3d34724 100644
--- a/minipro_standard/pages_adjust/components/multipleMaterial.vue
+++ b/minipro_standard/pages_adjust/components/multipleMaterial.vue
@@ -3,7 +3,7 @@
<view class="material-content bbox p30 rp">
<view class="tc b f24 c2 mb20">閫夋嫨鐗╂枡</view>
<v-Search @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="鎼滅储鐗╂枡鍚嶇О/缂栫爜" />
- <div class="content_total">鍏眥{form.total}}鏉℃暟鎹�</div>
+ <div class="content_total">鍏眥{form.total}}鏉℃暟鎹�12</div>
<view class="scroll-content">
<!-- refresher-enabled="true"
:refresher-triggered="refreshing"
@@ -157,7 +157,7 @@
this.form.page = 0
this.finished = false
this.list = []
- this.onLoad()
+ this.loadData()
},
// 鎼滅储妗�
searchInput(data) {
@@ -165,7 +165,7 @@
this.finished = false
this.list = []
this.form.smodelLabel = data
- this.onLoad()
+ this.loadData()
},
loadData() {
if (!this.finished) {
@@ -177,7 +177,8 @@
model: {
warehouseId: this.warehouseId,
warehouseQualityType: this.warehouseQualityType,
- ids: this.selected.length > 0 ? this.selected.join(',') : ''
+ ids: this.selected.length > 0 ? this.selected.join(',') : '',
+ materialName: this.form.smodelLabel
}
}).then(res => {
if (this.refreshing) {
--
Gitblit v1.9.3