From 1708ea1131844f175796741be023010832b3adaf Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Aug 2022 10:34:03 +0800
Subject: [PATCH] 销售和损耗添加产品类型type参数，修改地块选择时的描述
---
src/views/farmplant/process.vue | 2 ++
src/views/farmplant/farmproductstock.vue | 13 +++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/views/farmplant/farmproductstock.vue b/src/views/farmplant/farmproductstock.vue
index ebc5c03..bd9f3ae 100644
--- a/src/views/farmplant/farmproductstock.vue
+++ b/src/views/farmplant/farmproductstock.vue
@@ -371,6 +371,7 @@
salePrice: "",
createUser: "",
saleBrand: "",
+ type:"0",
},
//出库字段
formCK: {
@@ -396,6 +397,7 @@
remarks: "",
reason: "",
lossTime: "",
+ type:"0",
},
//加工字段
formJG: {
@@ -445,7 +447,7 @@
span:24,
type: "select",
props: {
- label: "landName",
+ label: "detail",
value: "id"
},
dicData:[],
@@ -555,7 +557,7 @@
span:24,
type: "select",
props: {
- label: "landName",
+ label: "detail",
value: "id"
},
dicData:[],
@@ -666,7 +668,7 @@
span:24,
type: "select",
props: {
- label: "landName",
+ label: "detail",
value: "id"
},
dicData:[],
@@ -791,7 +793,7 @@
span:24,
type: "select",
props: {
- label: "landName",
+ label: "detail",
value: "id"
},
dicData:[],
@@ -1146,6 +1148,9 @@
selectLand(strainId,index){
selectByStrainId(strainId,this.$farmId).then((res)=>{
var data = res.data.data
+ data.forEach((e)=>{
+ e.detail = e.landName+"("+e.landArea+"亩)"+" 库存量"+e.weight+"公斤"
+ })
if(index == 0){//销售
const column = this.findObject(this.option.column, "id")
column.dicData = []
diff --git a/src/views/farmplant/process.vue b/src/views/farmplant/process.vue
index 2835fe6..10a53ba 100644
--- a/src/views/farmplant/process.vue
+++ b/src/views/farmplant/process.vue
@@ -291,6 +291,7 @@
processName:"",
weight:"",
+ type:"1",
},
//出库字段
formCK: {
@@ -319,6 +320,7 @@
lossTime: "",
processName:"",
+ type:"1",
},
//加工字段
formJG: {
--
Gitblit v1.9.3