From 0a57d8138a02d9cf92b40a282ec41f6daa7f923b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 09 Sep 2022 10:26:24 +0800
Subject: [PATCH] 数据统计农资没有数据不显示，加工列表名字变更，农产品地块选择面积保留两位小数
---
src/views/farmplant/farmproductstock.vue | 2 +-
src/views/traceability/addTraceability.vue | 1 -
src/views/farmplant/processlist.vue | 4 ++--
src/views/statistics/stock.vue | 7 +++----
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/views/farmplant/farmproductstock.vue b/src/views/farmplant/farmproductstock.vue
index 046a01f..96cc65b 100644
--- a/src/views/farmplant/farmproductstock.vue
+++ b/src/views/farmplant/farmproductstock.vue
@@ -1170,7 +1170,7 @@
selectByStrainId(strainId,this.$farmId).then((res)=>{
var data = res.data.data
data.forEach((e)=>{
- e.detail = e.landName+"("+e.landArea+"亩)"+" 库存量"+e.weight+"公斤"
+ e.detail = e.landName+"("+(e.landArea-0).toFixed(2)+"亩)"+" 库存量"+e.weight+"公斤"
})
if(index == 0){//销售
const column = this.findObject(this.option.column, "id")
diff --git a/src/views/farmplant/processlist.vue b/src/views/farmplant/processlist.vue
index 095e90b..f23adf6 100644
--- a/src/views/farmplant/processlist.vue
+++ b/src/views/farmplant/processlist.vue
@@ -82,11 +82,11 @@
prop:"saleNum"
},
{
- label: "产品",
+ label: "加工产品",
prop: "processName",
},
{
- label: "产品数量",
+ label: "加工产品数量",
prop: "processNum"
},
{
diff --git a/src/views/statistics/stock.vue b/src/views/statistics/stock.vue
index 7b9c706..ab2555a 100644
--- a/src/views/statistics/stock.vue
+++ b/src/views/statistics/stock.vue
@@ -394,7 +394,6 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- console.log(params)
params.deptId= this.farm.id;
this.loading = true;
const {releaseTimeRange} = this.query;
@@ -416,9 +415,9 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- // this.data = this.data.filter((e)=>{
- // return !(e.bfcknum == e.cgnum == e.dbcknum == e.dbrknum == e.lycknum == e.rknum == 0)
- // })
+ this.data = this.data.filter((e)=>{
+ return (e.bfcknum == e.cgnum == e.dbcknum == e.dbrknum == e.lycknum == e.rknum == 0)
+ })
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/traceability/addTraceability.vue b/src/views/traceability/addTraceability.vue
index c9be7e9..3568455 100644
--- a/src/views/traceability/addTraceability.vue
+++ b/src/views/traceability/addTraceability.vue
@@ -674,7 +674,6 @@
page.pageSize,
Object.assign(params, this.query)
).then((res) => {
- console.log(res)
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
--
Gitblit v1.9.3