From fa2f172812de8344fa22c4ef088ea2a67257a0d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 05 九月 2023 10:21:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev
---
minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue b/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
index e0e9a8d..3ac271f 100644
--- a/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
+++ b/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
@@ -48,13 +48,15 @@
</div>
</u-swipe-action-item>
</u-swipe-action>
- <SelectMaterial ref="selectMaterial" @selectAction="getValue"/>
+ <SelectMaterial ref="selectMaterial" @selectAction="getValue"/>
+ <SelectMultipleMaterial ref="selectMultipleMaterial"/>
</view>
</template>
<script>
import workOrderInfo from '@/components/workOrderInfo.vue'
import SelectMaterial from '@/components/selectMaterial.vue'
+ import SelectMultipleMaterial from '@/components/SelectMultipleMaterial.vue'
import {
positiveInteger,
@@ -63,7 +65,8 @@
export default {
components: {
workOrderInfo,
- SelectMaterial
+ SelectMaterial,
+ SelectMultipleMaterial
},
data() {
return {
@@ -100,7 +103,8 @@
},
methods: {
open1(index) {
- this.$refs.selectMaterial.open({})
+ // this.$refs.selectMaterial.open({})
+ this.$refs.selectMultipleMaterial.open({})
},
deleItem(index) {
if (this.materialList.length === 1) {
--
Gitblit v1.9.3