From b29ac7d0c2b7e5d13dca3d781d584c3f95d48e58 Mon Sep 17 00:00:00 2001
From: 陈翱 <1121324153@qq.com>
Date: Fri, 19 Aug 2022 10:55:32 +0800
Subject: [PATCH] 完善缺料和领料信息
---
src/views/material/MaterialCollection.vue | 15 +++++++++++++--
src/views/material/MissingMaterialsPlease.vue | 45 ++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/src/views/material/MaterialCollection.vue b/src/views/material/MaterialCollection.vue
index 3bf3075..65dcc12 100644
--- a/src/views/material/MaterialCollection.vue
+++ b/src/views/material/MaterialCollection.vue
@@ -139,6 +139,15 @@
<j-popup
v-show="showRentPrise"
+ ref="getPurchaseList"
+ code="getPurchaseList"
+ :param="purchaseParam"
+ org-fields="username"
+ dest-fields="popup"
+ field="popup"/>
+
+ <j-popup
+ v-show="showRentPrise"
ref="shipment_details"
code="find_shipment_detail"
:param="shipmentParam"
@@ -175,6 +184,7 @@ export default {
materialParam:{code:''},
shipmentParam:{code:'',moCode:''},
processParam:{no:'',workno:''},
+ purchaseParam:{no:'',workno:''},
inventoryParam:{code:''},
param1:{field0054:'',field0057:''},
description: '菜单管理页面',
@@ -326,9 +336,10 @@ export default {
this.processParam['workno'] ="''"+data.workno+"''";
this.$refs.getPlanProcess.openModal();
}else{
-
+ this.purchaseParam['no'] = "'"+data.cno+"'";
+ this.purchaseParam['workno'] ="''"+data.workno+"''";
+ this.$refs.getPurchaseList.openModal();
}
-
},
inventoryClick(data){
diff --git a/src/views/material/MissingMaterialsPlease.vue b/src/views/material/MissingMaterialsPlease.vue
index 5de431a..142ee0e 100644
--- a/src/views/material/MissingMaterialsPlease.vue
+++ b/src/views/material/MissingMaterialsPlease.vue
@@ -88,6 +88,11 @@
<span slot="receive" slot-scope="text, record">
<a @click="receiveClick(record)">{{ numFormat(record.llqty) }}</a>
</span>
+
+ <span slot="openPlan" slot-scope="text, record">
+ <a @click="openPlan(record)">{{ record.plan }}</a>
+ </span>
+
<span slot="inStock" slot-scope="text, record">
<a @click="inventoryClick(record)">{{ numFormat(record.qty) }}</a>
</span>
@@ -118,6 +123,25 @@
org-fields="username"
dest-fields="popup"
field="popup"/>
+
+ <j-popup
+ v-show="showRentPrise"
+ ref="getPlanProcess"
+ code="getPlanProcess"
+ :param="processParam"
+ org-fields="username"
+ dest-fields="popup"
+ field="popup"/>
+
+ <j-popup
+ v-show="showRentPrise"
+ ref="getPurchaseList"
+ code="getPurchaseList"
+ :param="purchaseParam"
+ org-fields="username"
+ dest-fields="popup"
+ field="popup"/>
+
<j-popup
v-show="showRentPrise"
ref="inventory_details"
@@ -147,6 +171,8 @@ export default {
shipmentParam:{code:'',moCode:''},
inventoryParam:{code:''},
param1:{field0054:'',field0057:''},
+ processParam:{no:'',workno:''},
+ purchaseParam:{no:'',workno:''},
description: '菜单管理页面',
field0056:'',
field0054:'',
@@ -207,7 +233,10 @@ export default {
{
title: '计划',
align: 'center',
- dataIndex: 'plan'
+ dataIndex: 'plan',
+ scopedSlots:{
+ customRender:'openPlan'
+ }
},
{
title: '领料',
@@ -284,6 +313,20 @@ export default {
this.shipmentParam['moCode'] = "'"+data.workno+"'";
this.$refs.shipment_details.openModal();
},
+
+ openPlan(data){
+ if(data.f04=='自制'){
+ this.processParam['no'] = "'"+data.cno+"'";
+ this.processParam['workno'] ="''"+data.workno+"''";
+ this.$refs.getPlanProcess.openModal();
+ }else{
+ this.purchaseParam['no'] = "'"+data.cno+"'";
+ this.purchaseParam['workno'] ="''"+data.workno+"''";
+ this.$refs.getPurchaseList.openModal();
+ }
+ },
+
+
inventoryClick(data){
this.inventoryParam['code'] = "'"+data.cno+"'";
this.$refs.inventory_details.openModal();
--
libgit2 0.22.2