From fa12796a50ff655105b98c472df7eef69fc66204 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期二, 21 十一月 2023 16:58:31 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/GoodManage/MixingManage.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/web/src/views/GoodManage/MixingManage.vue b/web/src/views/GoodManage/MixingManage.vue
index 595c8c7..da0e332 100644
--- a/web/src/views/GoodManage/MixingManage.vue
+++ b/web/src/views/GoodManage/MixingManage.vue
@@ -14,8 +14,11 @@
<el-tab-pane label="校正记录" name="four">
<mixing-check ref="checkm"></mixing-check>
</el-tab-pane>
- <el-tab-pane label="原料实际放量" name="five">
+ <!-- <el-tab-pane label="原料实际放量" name="five">
<real-raw ref="realRaws"></real-raw>
+ </el-tab-pane> -->
+ <el-tab-pane label="搅拌站消耗" name="six">
+ <mixing-expend ref="expendm"></mixing-expend>
</el-tab-pane>
</el-tabs>
</div>
@@ -26,14 +29,16 @@
import MixingIncome from './components/MixingIncome.vue'//入库记录
import MixingCost from './components/MixingCost.vue'//消耗记录
import MixingCheck from './components/MixingCheck.vue'//校正记录
-import RealRaw from './components/RealRaw.vue'//原料实际放量
+// import RealRaw from './components/RealRaw.vue'//原料实际放量
+import MixingExpend from './components/MixingExpend.vue'//搅拌站消耗
export default {
components:{
MixingInvent,
MixingIncome,
MixingCost,
MixingCheck,
- RealRaw
+ // RealRaw,
+ MixingExpend
},
data(){
return{
@@ -66,6 +71,9 @@
this.$refs.realRaws.getLists();
this.$refs.realRaws.getMaterialNames();
break;
+ case 'six':
+ this.$refs.expendm.searchButtonInfo(true);
+ break;
default:
this.$refs.inventm.searchButtonInfo(true);
}
--
Gitblit v1.9.3