From 0d16601bfa7be98486715d8e1fbcb1a56f9335ee Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 May 2022 17:44:44 +0800
Subject: [PATCH] 农资入库修改，首页新增采收记录跳转
---
src/views/wel/index.vue | 12 +++++++++++-
src/views/stock/stockmanage.vue | 34 +++++++++++++++++++---------------
2 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/views/stock/stockmanage.vue b/src/views/stock/stockmanage.vue
index 876882a..7772db3 100644
--- a/src/views/stock/stockmanage.vue
+++ b/src/views/stock/stockmanage.vue
@@ -1,25 +1,22 @@
<template>
<div class="body">
<div class="search">
- <el-form
- :inline="true"
- :model="formInline"
- class="demo-form-inline"
- size="small"
- >
- <el-form-item label="">
+ <div style="float: left">
+ <div style="float: left">
<el-select
v-model="formInline.stype"
placeholder="全部分类"
+ size="small"
@change="stypeChange"
>
<el-option label="全部分类" value="0"></el-option>
- <el-option label="区域二" value="beijing"></el-option>
+ <el-option label="" value="1"></el-option>
</el-select>
- </el-form-item>
- <el-form-item label="">
+ </div>
+ <div style="float: left; margin-left: 15px">
<el-select
v-model="formInline.state"
+ size="small"
placeholder="有库存"
@change="stateChange"
>
@@ -27,15 +24,18 @@
<el-option label="有库存" value="0"></el-option>
<el-option label="无库存" value="1"></el-option>
</el-select>
- </el-form-item>
- <el-form-item label="">
+ </div>
+ <div style="float: left; margin-left: 15px">
<el-input
v-model="formInline.keyword"
+ size="small"
placeholder="请输入名称"
@input="keywordChange"
clearable
></el-input>
- </el-form-item>
+ </div>
+ </div>
+ <div>
<el-button size="small"
><span style="color: #5abf78">已出库待使用的农资</span></el-button
>
@@ -43,7 +43,7 @@
><span style="color: #5abf78">出入库记录</span></el-button
>
<el-button type="success" size="small">农资入库</el-button>
- </el-form>
+ </div>
</div>
<div class="table">
<div class="content">
@@ -754,7 +754,11 @@
.search {
padding-top: 40px;
- margin-left: 30px;
+ width: 98%;
+ margin: 0 auto;
+ display: flex;
+ flex-flow: row nowrap;
+ justify-content: space-between;
}
.content {
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index f730ad4..96d977e 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -57,7 +57,7 @@
<div class="title">当前种养品种</div>
<div class="content">
<div class="farm" v-for="(item, index) in farmPlanList" :key="index">
- <div class="farm-img"><img :src="item.url" class="img" /></div>
+ <div class="farm-img" @click="recoveryDetail(item)"><img :src="item.url" class="img" /></div>
<div class="cai">{{ item.strainName }}</div>
<div class="area">种植面积：<span>{{ item.area }}</span>亩</div>
<div class="btn">
@@ -325,6 +325,16 @@
query: data,
});
},
+ //采收记录
+ recoveryDetail() {
+ const data = {
+ activeName: "tab1",
+ };
+ this.$router.push({
+ path: `/farmDetail`,
+ query: data,
+ });
+ },
},
};
</script>
--
Gitblit v1.9.3