From 2fe40d58754767f84dca10ded4391b72c53409fd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 17:32:23 +0800
Subject: [PATCH] 修改损耗、销售显示，修改种养表单样式
---
src/views/farmplant/inventorylist.vue | 2
src/views/farmplant/salelist.vue | 2
src/views/wel/plant.vue | 103 ++++++++++++++++++++++++++-------------------------
src/views/wel/over.vue | 3 +
4 files changed, 56 insertions(+), 54 deletions(-)
diff --git a/src/views/farmplant/inventorylist.vue b/src/views/farmplant/inventorylist.vue
index 4547ed5..1808e3b 100644
--- a/src/views/farmplant/inventorylist.vue
+++ b/src/views/farmplant/inventorylist.vue
@@ -73,7 +73,7 @@
},
{
label: "品种",
- prop: "strainName"
+ prop: "proName"
},
{
label: "损耗数量",
diff --git a/src/views/farmplant/salelist.vue b/src/views/farmplant/salelist.vue
index 1baf36a..90f808b 100644
--- a/src/views/farmplant/salelist.vue
+++ b/src/views/farmplant/salelist.vue
@@ -73,7 +73,7 @@
},
{
label: "品种",
- prop: "strainName"
+ prop: "proName"
},
{
label: "销售数量",
diff --git a/src/views/wel/over.vue b/src/views/wel/over.vue
index 2f028ef..ff5e917 100644
--- a/src/views/wel/over.vue
+++ b/src/views/wel/over.vue
@@ -4,6 +4,7 @@
title="确认结束种养"
:visible.sync="visible"
width="80%"
+ top="50px"
:modal-append-to-body="false"
:append-to-body="true"
:close-on-click-modal="false"
@@ -114,7 +115,7 @@
landId: 0,
option: {
tip: false,
- height: 520,
+ height: 350,
editBtn: false,
delBtn: false,
viewBtn: false,
diff --git a/src/views/wel/plant.vue b/src/views/wel/plant.vue
index 439fc09..0c07615 100644
--- a/src/views/wel/plant.vue
+++ b/src/views/wel/plant.vue
@@ -30,7 +30,7 @@
gutter: 30,
column: [
{
- label: "种养品",
+ label: "品种",
prop: "strainId",
labelWidth:110,
type:"tree",
@@ -48,19 +48,19 @@
],
},
{
- label: "品种",
+ label: "品种描述",
prop: "varieties",
labelWidth:110,
- rules: [
- {
- required: true,
- message: "请输入种养品名称",
- trigger: "blur",
- },
- ],
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入种养品名称",
+ // trigger: "blur",
+ // },
+ // ],
},
{
- label: "种养品图片",
+ label: "品种图片",
prop: "url",
type: "upload",
listType: "picture-img",
@@ -147,47 +147,6 @@
],
},
{
- label: "所属移栽农场",
- prop: "farmId",
- type: "tree",
- display:true,
- dicData: [],
- props: {
- label: "farmName",
- value: "id",
- },
- cascader: ["otherLandId"],
- labelWidth: 110,
- rules: [
- {
- required: true,
- message: "请选择所属农场",
- trigger: "blur",
- },
- ],
- },
- {
- label: "所属移栽地块",
- prop: "otherLandId",
- // span: 7,
- type: "tree",
- display:true,
- dicData: [],
- props: {
- label: "landName",
- value: "id",
- },
- dicUrl: `/api/land/land/getLandList?farmId={{key}}`,
- labelWidth: 110,
- rules: [
- {
- required: true,
- message: "请选择农产品",
- trigger: "blur",
- },
- ],
- },
- {
label: "作业方式",
prop: "jobWay",
labelWidth:110,
@@ -210,6 +169,47 @@
trigger: "blur",
},
],
+ },
+ {
+ label: "秧苗来源农场",
+ prop: "farmId",
+ type: "tree",
+ display:true,
+ dicData: [],
+ props: {
+ label: "farmName",
+ value: "id",
+ },
+ cascader: ["otherLandId"],
+ labelWidth: 110,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择所属农场",
+ // trigger: "blur",
+ // },
+ // ],
+ },
+ {
+ label: "秧苗来源地块",
+ prop: "otherLandId",
+ // span: 7,
+ type: "tree",
+ display:true,
+ dicData: [],
+ props: {
+ label: "landName",
+ value: "id",
+ },
+ dicUrl: `/api/land/land/getLandList?farmId={{key}}`,
+ labelWidth: 110,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择农产品",
+ // trigger: "blur",
+ // },
+ // ],
},
{
label: "种植时间",
@@ -305,6 +305,7 @@
farmColumn.display = false
landColumn.display = false
}else{
+ this.form.farmId = this.$farmId
farmColumn.display = true
landColumn.display = true
}
--
Gitblit v1.9.3