From 721bfaa6a1cf9bed6cf416cba077284643271fee Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 11 九月 2023 18:33:50 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue b/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
index 08a5346..367bb5f 100644
--- a/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
+++ b/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
@@ -84,6 +84,7 @@
<u-toast ref="uToast"></u-toast>
<!-- 浠撳簱 -->
<Warehouse :show="warehouseShow" @close="close" @value="getValue" />
+<<<<<<< HEAD
<!-- 鐗╂枡 -->
<Material :show="materialsShow" @close="close1" @value="getValue1" />
<!-- 璐т綅 -->
@@ -94,11 +95,14 @@
<u-picker :show="typeShow" keyName="name" :columns="typeList" @confirm="confirm" @cancel="typeClose"></u-picker>
<!-- 璐ㄩ噺灞炴�� -->
<u-picker :show="qualityShow" :columns="columns" @cancel="qualityShow = false" keyName="name" @confirm="onConfirm1"></u-picker>
+=======
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
</view>
</template>
<script>
import Warehouse from '../../components/Warehouse.vue'
+<<<<<<< HEAD
import location from '../../components/location.vue'
import Material from '../../components/Material.vue'
import ProductionProcess from '../../components/ProductionProcess.vue'
@@ -106,6 +110,10 @@
import { getListByMaterialId } from '@/util/api/ExWarehouse'
export default {
components: { Warehouse, location, Material, ProductionProcess },
+=======
+ export default {
+ components: { Warehouse },
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
data() {
return {
i: 0,
@@ -115,6 +123,7 @@
type: '',
typeName: ''
},
+<<<<<<< HEAD
locationList: [],
productionList: [],
columns: [
@@ -334,6 +343,16 @@
typeClose() {
this.typeShow = false
},
+=======
+ list: [],
+ warehouseShow: false
+ };
+ },
+ methods: {
+ getValue(val) {
+ this.warehouseShow = false
+ },
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
close() {
this.warehouseShow = false
},
--
Gitblit v1.9.3