From 81e2e31406a7ca549e4d48c7ebfcbcbbe0f304fa Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 29 Jul 2022 14:26:55 +0800
Subject: [PATCH] "修复出入库时参数未填报错"
---
public/traceablityInfos.html | 284 ++++++++--------
src/views/stock/stockmanage.vue | 10
src/views/farm/farmReport.vue | 8
src/views/farmplant/detection.vue | 308 +++++++++++++++++++
src/views/farmplant/farmplant.vue | 55 ++-
public/traceablityInfo.html | 281 ++++++++--------
6 files changed, 633 insertions(+), 313 deletions(-)
diff --git a/public/traceablityInfo.html b/public/traceablityInfo.html
index 5abd461..0cf54d3 100644
--- a/public/traceablityInfo.html
+++ b/public/traceablityInfo.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html lang="en">
-
+
<head>
<meta charset="UTF-8">
<meta name="divport" content="width=device-width, initial-scale=1.0">
@@ -8,7 +8,7 @@
.top-log {
position: relative;
}
-
+
.top-log .btn-grounp {
position: absolute;
left: 0;
@@ -20,14 +20,14 @@
justify-content: space-around;
background: transparent;
}
-
+
.main-content {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
-
+
.main-content .logo {
position: relative;
margin-top: 56px;
@@ -36,7 +36,7 @@
border-radius: 50%;
overflow: hidden;
}
-
+
.main-content .logo .btn {
position: absolute;
bottom: 0;
@@ -48,14 +48,14 @@
font-size: 24px;
color: #fff;
}
-
+
.main-content .title {
margin-top: 30px;
font-size: 48px;
font-weight: bold;
color: #333333;
}
-
+
.main-content .type {
display: flex;
margin-top: 10px;
@@ -67,14 +67,14 @@
border-radius: 8px;
overflow: hidden;
}
-
+
.main-content .type .sub {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
}
-
+
.main-content .type .icon {
width: 36px;
display: flex;
@@ -82,7 +82,7 @@
justify-content: center;
background: #6AC077;
}
-
+
.main-content .date {
display: flex;
align-items: center;
@@ -95,38 +95,38 @@
font-size: 34px;
color: #5ABF78;
}
-
+
.model-box {
margin-top: 60px;
padding: 0 30px;
}
-
+
.model-box .model-title {
display: flex;
align-items: center;
height: 50px;
}
-
+
.model-box .model-title .l {
width: 5px;
height: 36px;
background: #5ABF78;
}
-
+
.model-box .model-title .title {
margin-left: 20px;
font-size: 36px;
font-weight: bold;
color: #333333;
}
-
+
.model-box .model-title .border {
flex: 1;
margin: 13px;
border-top: 1px dashed #D4DBE8;
border-bottom: 1px dashed #D4DBE8;
}
-
+
.model-box .model-title .status {
display: flex;
align-items: center;
@@ -134,73 +134,72 @@
font-size: 24px;
color: #5ABF78;
}
-
+
.model-box .model-title .statu.no {
color: #EC9144;
}
-
+
.model-box .model-title .status view {
display: flex;
align-items: center;
justify-content: center;
}
-
+
.model-box.qw .model-content {
display: flex;
flex-direction: column;
margin-top: 30px;
- height: 642px;
background: #fff;
border-radius: 30px;
}
-
+
.model-box.qw .model-content .box:first-child {
border: 2px solid #EEEEEE;
}
-
+
.model-box.qw .model-content .box {
flex: 1;
display: flex;
padding: 30px;
}
-
+
.model-box.qw .model-content .box>.r {
margin-left: 26px;
flex: 1;
font-size: 24px;
}
-
+
.model-box.qw .model-content .box>.r .title {
font-size: 32px;
font-weight: bold;
color: #333333;
}
-
+
.model-box.qw .model-content .box>.r .line-box {
margin-top: 16px;
display: flex;
}
-
+
.model-box.qw .model-content .box>.r .line-box .sub {
width: 120px;
color: #333333;
line-height: 36px;
}
-
+
.model-box.qw .model-content .box>.r .line-box .content {
flex: 1;
color: #666666;
line-height: 36px;
}
/* 容器 */
-
+
.model-box.cd .model-content {
margin-top: 30px;
background: #fff;
border-radius: 30px;
}
/* 头部 */
-
+
.model-box.cd .model-content .content-header {
display: flex;
align-items: center;
@@ -209,33 +208,33 @@
font-size: 30px;
color: #5ABF78;
}
-
+
.model-box.cd .model-content.jk .content-header {
color: #A255B5;
border-bottom: 2px solid #ECECEC;
}
/* 中间 */
-
+
.model-box.cd .model-content.dk .content-body {
height: 450px;
background: greenyellow;
}
-
+
.model-box.cd .model-content.jksp .content-body {
height: 385px;
background: #A255B5;
}
-
+
.model-box.cd .model-content.jk .content-body {
border-bottom: 1px solid transparent;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box {
margin: 26px 22px;
border-radius: 28px;
border: 2px solid #E3E3E3;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-title {
padding: 0 22px;
margin-top: 10px;
@@ -247,7 +246,7 @@
font-weight: bold;
color: #333333;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-date {
display: flex;
align-items: center;
@@ -256,7 +255,7 @@
height: 2px;
background: #ECECEC;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-date .site-date-text {
padding: 0 18px;
height: 36px;
@@ -265,14 +264,14 @@
font-size: 24px;
color: #929292;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content {
padding: 24px 22px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content>view {
display: flex;
align-items: center;
@@ -284,45 +283,45 @@
border-radius: 8px;
box-sizing: border-box;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(1),
.model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(2) {
margin-top: 0;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content>view .type {
font-size: 28px;
color: #333333;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content>view .unit {
margin-top: 4px;
font-size: 24px;
color: #84898F;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content>view .r {
font-size: 38px;
color: #5ABF78;
}
/* 底部 */
-
+
.model-box.cd .model-content .content-footer {
display: flex;
align-items: center;
height: 120px;
font-size: 24px;
}
-
+
.model-box.cd .model-content.dk .content-footer {
padding: 0 26px;
}
-
+
.model-box.cd .model-content.dk .content-footer .l {
width: 480px;
color: #666666;
}
-
+
.model-box.cd .model-content.dk .content-footer .r {
flex: 1;
display: flex;
@@ -330,11 +329,11 @@
justify-content: center;
color: #5ABF78;
}
-
+
.model-box.cd .model-content.jksp .content-footer {
padding: 0 30px;
}
-
+
.model-box.cd .model-content.jksp .content-footer .equi-btn {
display: flex;
align-items: center;
@@ -348,28 +347,28 @@
font-size: 24px;
color: #697580;
}
-
+
.model-box.cd .model-content.jksp .content-footer .equi-btn:first-child {
margin-left: 0;
}
-
+
.model-box.cd .model-content.jksp .content-footer .equi-btn.on {
background: linear-gradient(90deg, #5ABB82 0%, #7BDA8F 100%);
border: none;
color: #fff;
}
/* 种植环节 */
-
+
.model-box.zz .model-content {
margin-top: 30px;
}
-
+
.model-box.zz .model-content .msg {
display: flex;
align-items: center;
height: 126px;
}
-
+
.model-box.zz .model-content .msg .r {
margin-left: 30px;
padding: 10px 26px;
@@ -380,17 +379,17 @@
color: #999999;
border-radius: 16px;
}
-
+
.model-box.zz .model-content .msg .r text {
font-weight: bold;
color: #EC9144;
}
-
+
.model-box.zz .model-content .msg .r .r-b-msg {
margin-top: 10px;
color: #333333;
}
-
+
.model-box.zz .model-content .msg .r .point-to {
position: absolute;
top: 0;
@@ -405,12 +404,12 @@
border-bottom: 14px solid transparent;
z-index: -1;
}
-
+
.model-box.zz .model-content .record-box {
display: flex;
align-items: center;
}
-
+
.model-box.zz .model-content .record-box .l {
margin-left: 40px;
display: flex;
@@ -418,56 +417,56 @@
align-items: center;
justify-content: center;
}
-
+
.model-box.zz .model-content .record-box .l .point {
width: 20px;
height: 20px;
background: #5ABF78;
border-radius: 50%;
}
-
+
.model-box.zz .model-content .record-box .l .line {
width: 2px;
height: 150px;
background: #DEE3E7;
}
-
+
.model-box.zz .model-content .record-box .l .line.one {
width: 2px;
height: 100px;
background: #DEE3E7;
}
-
+
.model-box.zz .model-content .record-box .l .line.two {
width: 2px;
height: 100px;
background: #DEE3E7;
}
-
+
.model-box.zz .model-content .record-box .r {
margin-left: 64px;
flex: 1;
}
-
+
.model-box.zz .model-content .record-box .r .record-item {
margin-top: 30px;
padding: 32px 30px 42px;
background: #FFFFFF;
border-radius: 30px;
}
-
+
.model-box.zz .model-content .record-box .r .record-item .type {
font-size: 32px;
font-weight: bold;
color: #333333;
}
-
+
.model-box.zz .model-content .record-box .r .record-item .date-pel {
margin-top: 10px;
display: flex;
justify-content: space-between;
}
-
+
.model-box.zz .model-content .record-box .r .record-item .date-pel .date {
padding: 2px 20px;
font-size: 24px;
@@ -475,20 +474,20 @@
background: linear-gradient(89deg, #60BA84 0%, #73DB90 100%);
border-radius: 10px;
}
-
+
.model-box.zz .model-content .record-box .r .record-item .date-pel .pel {
font-size: 28px;
color: #666666;
}
/* 生产企业 */
-
+
.model-box.sc .model-content {
margin-top: 30px;
/* padding-bottom: 30px; */
background: #fff;
border-radius: 30px;
}
-
+
.model-box.sc .model-content .content-header {
display: flex;
align-items: center;
@@ -498,26 +497,26 @@
font-weight: bold;
color: #000000;
}
-
+
.model-box.sc .model-content .content-body {
height: 390px;
}
-
+
.model-box.sc .model-content .content-body .swiper {
height: 100%;
width: 100%;
}
-
+
.model-box.sc .model-content .content-body .swiper-image {
height: 100%;
width: 100%;
}
-
+
.model-box.sc .model-content .content-body .slide-image {
height: 100%;
width: 100%;
}
-
+
.model-box.sc .model-content .text-intro {
margin: 0 25px;
padding: 20px 0 34px;
@@ -526,26 +525,26 @@
color: #818592;
border-bottom: 2px solid #EAEEF4;
}
-
+
.model-box.sc .model-content .content-footer {
margin-top: 24px;
display: flex;
align-items: flex-start;
justify-content: space-around;
}
-
+
.model-box.sc .model-content .content-footer>view {
display: flex;
flex-direction: column;
align-items: center;
}
-
+
.model-box.sc .model-content .content-footer>view .type {
margin-top: 6px;
font-size: 24px;
color: #697580;
}
-
+
.model-box.sc .model-content .content-footer>view .msg {
margin-top: 2px;
padding: 2px 6px;
@@ -554,14 +553,14 @@
font-size: 20px;
color: #697580;
}
-
+
.btn-grounp {
margin-top: 84px;
display: flex;
height: 148px;
background: #FFFFFF;
}
-
+
.btn-grounp .l {
margin-right: 76px;
width: 194px;
@@ -570,19 +569,19 @@
align-items: center;
justify-content: center;
}
-
+
.btn-grounp .l .plan {
font-size: 34px;
font-weight: bold;
color: #D55B26;
}
-
+
.btn-grounp .l .text {
margin-top: 2px;
font-size: 20px;
color: #A5AEB5;
}
-
+
.btn-grounp .r {
flex: 1;
display: flex;
@@ -592,15 +591,15 @@
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script src="https://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
</head>
-
-
+
+
<body>
<div class="page-main-container" style="background: #F1F9F8;width:100%;height: 100%;">
-
+
<!-- <scroll-div scroll-top="{{scrollTop}}" refresher-enabled="{{true}}" bindrefresherrefresh="refresh" refresher-triggered="{{triggered}}" style="height: {{clientHeight}}" scroll-y bindscrolltolower="upcroll"> -->
-
+
<!-- </scroll-div> -->
-
+
</div>
<script>
var getData = function(name) {
@@ -610,13 +609,13 @@
return null;
};
var code = getData("code");
-
+
// var code = "22070000001";
-
-
+
+
axios.get('https://dev.jxpskj.com:8023/api/traceability/getTraceabilityDetailInfos?code=' + code).then(function(res) {
// axios.get('http://192.168.0.114:89/traceability/getTraceabilityDetailInfo?code=' + code).then(function(res) {
-
+
var data = res.data.data;
var farm = data.farm;
var land = data.landVO;
@@ -624,7 +623,7 @@
var paperList = data.paperVOList;
var recordVOList = data.recordVOList;
var recovery = data.recoveryVO;
-
+
var str0 = `<div class="top-log">
<img width="100%" height="405px" src="http://182.106.212.58:8014/assets/images/sym/2.png" />
<div class="btn-grounp">
@@ -634,30 +633,30 @@
<img bindtap="scrollTo" data-class=".sc" width="176px" height="80px" src="http://182.106.212.58:8014/assets/images/sy/1414.png" />
</div>
</div>
-
+
<div class="main-content">
-
+
<div class="logo">
<img width="100%" height="100%" src="${recovery.url}" />
<!-- <div class="btn">更换图片</div> -->
</div>
-
+
<div class="title">${recovery.strainName}</div>
-
+
<div class="type">
<div class="sub">${recovery.lx}</div>
<!-- <div class="icon">
<van-icon name="play" />
</div> -->
</div>
-
+
<div class="date">
采收时间：${recovery.time.replaceAll("-",".")}
</div>
-
+
</div>
<div class="qw model-box">
-
+
<div class="model-title">
<div class="l"></div>
<div class="title">权威检测</div>
@@ -669,7 +668,7 @@
可追溯
</div>
</div>
-
+
<div class="model-content">`
var str1 = '';
if (paperList.length > 0) {
@@ -701,12 +700,12 @@
} else {
str1 = str1 + `<div class="box"></div>`
}
-
-
- var str2 = `
+
+
+ var str2 = `
</div>
</div>
-
+
<div class="cd model-box">
<div class="model-title">
<div class="l"></div>
@@ -719,7 +718,7 @@
可追溯
</div>
</div>
-
+
<div class="dk model-content">
<div class="content-header">
<van-icon style="margin-right: 12px;" name="http://182.106.212.58:8014/assets/images/sy/1267.png" /> 种植地块
@@ -737,7 +736,7 @@
</div> -->
</div>
</div>
-
+
<div class="jksp model-content">
<div class="content-header">
<van-icon style="margin-right: 12px;" name="http://182.106.212.58:8014/assets/images/sy/1272.png" /> 良心生产，不怕监督，24小时视频监控
@@ -747,13 +746,13 @@
<div class="equi-btn on">
3号摄像头
</div>
-
+
<div class="equi-btn">
3号摄像头
</div>
</div>
</div>
-
+
<div class="jk model-content">
<div class="content-header">
物联网监控保证产地养分充足，且不被污染
@@ -772,7 +771,7 @@
<div class="site-date-text">6分钟前更新</div>
</div>
<div class="site-content">
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -784,7 +783,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -796,7 +795,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -808,7 +807,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -820,7 +819,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -832,7 +831,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -844,7 +843,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -856,7 +855,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -868,7 +867,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -880,7 +879,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -892,7 +891,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -904,13 +903,13 @@
33.92
</div>
</div>
-
+
</div>
</div>
</div>
</div>
</div>
-
+
<div class="zz model-box">
<div class="model-title">
<div class="l"></div>
@@ -923,9 +922,9 @@
</div> -->
</div>
</div>
-
+
<div class="model-content">
-
+
<div class="msg">
<div class="l">
<img width="126px" height="126px" src="http://182.106.212.58:8014/assets/images/sy/zz-log.png" />
@@ -938,25 +937,25 @@
<div class="r-b-msg">
以下农事操作，是在我的监督下完成
</div>
-
+
<div class="point-to"></div>
</div>
</div>`
-
+
var str3 = '';
recordVOList.forEach((item, index) => {
str3 = str3 + `<div class="record-box">
<div class="l">
-
+
<div class="one line" style="${ index == 0 ? 'background: transparent !important;' : '' }">
</div>
-
+
<div class="point">
</div>
-
+
<div class="two line" style="${ index == recordVOList.length - 1 ? 'background: transparent !important;' : '' }">
</div>
-
+
</div>
<div class="r">
<div class="record-item">
@@ -966,14 +965,14 @@
<div class="pel">操作人：${item.realName}</div>
</div>
</div>
-
+
</div>
</div>`
});
-
+
var str4 = `</div>
</div>
-
+
<div class="sc model-box">
<div class="model-title">
<div class="l"></div>
@@ -986,7 +985,7 @@
</div> -->
</div>
</div>
-
+
<div class="model-content">
<div class="content-header">
${farm.farmName}
@@ -1004,7 +1003,7 @@
})
}
var str6 = `</block></swiper>
-
+
</div>
<div class="text-intro">
${farm.introduce}
@@ -1013,7 +1012,7 @@
</div>
</div>
</div>`
-
+
// <div class="btn-grounp">
// <div class="l">
// <div class="plan">
@@ -1025,16 +1024,16 @@
// </div>
// <div class="r">
// <van-button bind:click="editTracability" round custom-style="margin-right: 40px; width: 200px; height: 72px; border: 2px solid #5ABF78; background: #fff; color: #5ABF78; font-size: 30px;">编辑溯源</van-button>
-
+
// <van-button bind:click="submit" round custom-style="width: 200px; height: 72px; border: none; background: #5ABF78; color: #fff; font-size: 30px;">分享</van-button>
// </div>
// </div>
-
+
var dom = $('.page-main-container');
dom.empty();
dom.append(str0 + str1 + str2 + str3 + str4 + str5 + str6);
});
</script>
</body>
-
+
</html>
\ No newline at end of file
diff --git a/public/traceablityInfos.html b/public/traceablityInfos.html
index 1cd96b4..3711c27 100644
--- a/public/traceablityInfos.html
+++ b/public/traceablityInfos.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html lang="en">
-
+
<head>
<meta charset="UTF-8">
<meta name="divport" content="width=device-width, initial-scale=1.0">
@@ -8,7 +8,7 @@
.top-log {
position: relative;
}
-
+
.top-log .btn-grounp {
position: absolute;
left: 0;
@@ -20,14 +20,14 @@
justify-content: space-around;
background: transparent;
}
-
+
.main-content {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
-
+
.main-content .logo {
position: relative;
margin-top: 56px;
@@ -36,7 +36,7 @@
border-radius: 50%;
overflow: hidden;
}
-
+
.main-content .logo .btn {
position: absolute;
bottom: 0;
@@ -48,14 +48,14 @@
font-size: 24px;
color: #fff;
}
-
+
.main-content .title {
margin-top: 30px;
font-size: 48px;
font-weight: bold;
color: #333333;
}
-
+
.main-content .type {
display: flex;
margin-top: 10px;
@@ -67,14 +67,14 @@
border-radius: 8px;
overflow: hidden;
}
-
+
.main-content .type .sub {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
}
-
+
.main-content .type .icon {
width: 36px;
display: flex;
@@ -82,7 +82,7 @@
justify-content: center;
background: #6AC077;
}
-
+
.main-content .date {
display: flex;
align-items: center;
@@ -95,38 +95,38 @@
font-size: 34px;
color: #5ABF78;
}
-
+
.model-box {
margin-top: 60px;
padding: 0 30px;
}
-
+
.model-box .model-title {
display: flex;
align-items: center;
height: 50px;
}
-
+
.model-box .model-title .l {
width: 5px;
height: 36px;
background: #5ABF78;
}
-
+
.model-box .model-title .title {
margin-left: 20px;
font-size: 36px;
font-weight: bold;
color: #333333;
}
-
+
.model-box .model-title .border {
flex: 1;
margin: 13px;
border-top: 1px dashed #D4DBE8;
border-bottom: 1px dashed #D4DBE8;
}
-
+
.model-box .model-title .status {
display: flex;
align-items: center;
@@ -134,73 +134,73 @@
font-size: 24px;
color: #5ABF78;
}
-
+
.model-box .model-title .statu.no {
color: #EC9144;
}
-
+
.model-box .model-title .status view {
display: flex;
align-items: center;
justify-content: center;
}
-
+
.model-box.qw .model-content {
display: flex;
flex-direction: column;
margin-top: 30px;
- height: 642px;
+ /* height: 642px; */
background: #fff;
border-radius: 30px;
}
-
+
.model-box.qw .model-content .box:first-child {
border: 2px solid #EEEEEE;
}
-
+
.model-box.qw .model-content .box {
flex: 1;
display: flex;
padding: 30px;
}
-
+
.model-box.qw .model-content .box>.r {
margin-left: 26px;
flex: 1;
font-size: 24px;
}
-
+
.model-box.qw .model-content .box>.r .title {
font-size: 32px;
font-weight: bold;
color: #333333;
}
-
+
.model-box.qw .model-content .box>.r .line-box {
margin-top: 16px;
display: flex;
}
-
+
.model-box.qw .model-content .box>.r .line-box .sub {
width: 120px;
color: #333333;
line-height: 36px;
}
-
+
.model-box.qw .model-content .box>.r .line-box .content {
flex: 1;
color: #666666;
line-height: 36px;
}
/* 容器 */
-
+
.model-box.cd .model-content {
margin-top: 30px;
background: #fff;
border-radius: 30px;
}
/* 头部 */
-
+
.model-box.cd .model-content .content-header {
display: flex;
align-items: center;
@@ -209,33 +209,33 @@
font-size: 30px;
color: #5ABF78;
}
-
+
.model-box.cd .model-content.jk .content-header {
color: #A255B5;
border-bottom: 2px solid #ECECEC;
}
/* 中间 */
-
+
.model-box.cd .model-content.dk .content-body {
height: 450px;
background: greenyellow;
}
-
+
.model-box.cd .model-content.jksp .content-body {
height: 385px;
background: #A255B5;
}
-
+
.model-box.cd .model-content.jk .content-body {
border-bottom: 1px solid transparent;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box {
margin: 26px 22px;
border-radius: 28px;
border: 2px solid #E3E3E3;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-title {
padding: 0 22px;
margin-top: 10px;
@@ -247,7 +247,7 @@
font-weight: bold;
color: #333333;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-date {
display: flex;
align-items: center;
@@ -256,7 +256,7 @@
height: 2px;
background: #ECECEC;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-date .site-date-text {
padding: 0 18px;
height: 36px;
@@ -265,14 +265,14 @@
font-size: 24px;
color: #929292;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content {
padding: 24px 22px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content>view {
display: flex;
align-items: center;
@@ -284,45 +284,45 @@
border-radius: 8px;
box-sizing: border-box;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(1),
.model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(2) {
margin-top: 0;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content>view .type {
font-size: 28px;
color: #333333;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content>view .unit {
margin-top: 4px;
font-size: 24px;
color: #84898F;
}
-
+
.model-box.cd .model-content.jk .content-body .site-box .site-content>view .r {
font-size: 38px;
color: #5ABF78;
}
/* 底部 */
-
+
.model-box.cd .model-content .content-footer {
display: flex;
align-items: center;
height: 120px;
font-size: 24px;
}
-
+
.model-box.cd .model-content.dk .content-footer {
padding: 0 26px;
}
-
+
.model-box.cd .model-content.dk .content-footer .l {
width: 480px;
color: #666666;
}
-
+
.model-box.cd .model-content.dk .content-footer .r {
flex: 1;
display: flex;
@@ -330,11 +330,11 @@
justify-content: center;
color: #5ABF78;
}
-
+
.model-box.cd .model-content.jksp .content-footer {
padding: 0 30px;
}
-
+
.model-box.cd .model-content.jksp .content-footer .equi-btn {
display: flex;
align-items: center;
@@ -348,28 +348,28 @@
font-size: 24px;
color: #697580;
}
-
+
.model-box.cd .model-content.jksp .content-footer .equi-btn:first-child {
margin-left: 0;
}
-
+
.model-box.cd .model-content.jksp .content-footer .equi-btn.on {
background: linear-gradient(90deg, #5ABB82 0%, #7BDA8F 100%);
border: none;
color: #fff;
}
/* 种植环节 */
-
+
.model-box.zz .model-content {
margin-top: 30px;
}
-
+
.model-box.zz .model-content .msg {
display: flex;
align-items: center;
height: 126px;
}
-
+
.model-box.zz .model-content .msg .r {
margin-left: 30px;
padding: 10px 26px;
@@ -380,17 +380,17 @@
color: #999999;
border-radius: 16px;
}
-
+
.model-box.zz .model-content .msg .r text {
font-weight: bold;
color: #EC9144;
}
-
+
.model-box.zz .model-content .msg .r .r-b-msg {
margin-top: 10px;
color: #333333;
}
-
+
.model-box.zz .model-content .msg .r .point-to {
position: absolute;
top: 0;
@@ -405,12 +405,12 @@
border-bottom: 14px solid transparent;
z-index: -1;
}
-
+
.model-box.zz .model-content .record-box {
display: flex;
align-items: center;
}
-
+
.model-box.zz .model-content .record-box .l {
margin-left: 40px;
display: flex;
@@ -418,56 +418,56 @@
align-items: center;
justify-content: center;
}
-
+
.model-box.zz .model-content .record-box .l .point {
width: 20px;
height: 20px;
background: #5ABF78;
border-radius: 50%;
}
-
+
.model-box.zz .model-content .record-box .l .line {
width: 2px;
height: 150px;
background: #DEE3E7;
}
-
+
.model-box.zz .model-content .record-box .l .line.one {
width: 2px;
height: 100px;
background: #DEE3E7;
}
-
+
.model-box.zz .model-content .record-box .l .line.two {
width: 2px;
height: 100px;
background: #DEE3E7;
}
-
+
.model-box.zz .model-content .record-box .r {
margin-left: 64px;
flex: 1;
}
-
+
.model-box.zz .model-content .record-box .r .record-item {
margin-top: 30px;
padding: 32px 30px 42px;
background: #FFFFFF;
border-radius: 30px;
}
-
+
.model-box.zz .model-content .record-box .r .record-item .type {
font-size: 32px;
font-weight: bold;
color: #333333;
}
-
+
.model-box.zz .model-content .record-box .r .record-item .date-pel {
margin-top: 10px;
display: flex;
justify-content: space-between;
}
-
+
.model-box.zz .model-content .record-box .r .record-item .date-pel .date {
padding: 2px 20px;
font-size: 24px;
@@ -475,20 +475,20 @@
background: linear-gradient(89deg, #60BA84 0%, #73DB90 100%);
border-radius: 10px;
}
-
+
.model-box.zz .model-content .record-box .r .record-item .date-pel .pel {
font-size: 28px;
color: #666666;
}
/* 生产企业 */
-
+
.model-box.sc .model-content {
margin-top: 30px;
/* padding-bottom: 30px; */
background: #fff;
border-radius: 30px;
}
-
+
.model-box.sc .model-content .content-header {
display: flex;
align-items: center;
@@ -498,26 +498,26 @@
font-weight: bold;
color: #000000;
}
-
+
.model-box.sc .model-content .content-body {
height: 390px;
}
-
+
.model-box.sc .model-content .content-body .swiper {
height: 100%;
width: 100%;
}
-
+
.model-box.sc .model-content .content-body .swiper-image {
height: 100%;
width: 100%;
}
-
+
.model-box.sc .model-content .content-body .slide-image {
height: 100%;
width: 100%;
}
-
+
.model-box.sc .model-content .text-intro {
margin: 0 25px;
padding: 20px 0 34px;
@@ -526,26 +526,26 @@
color: #818592;
border-bottom: 2px solid #EAEEF4;
}
-
+
.model-box.sc .model-content .content-footer {
margin-top: 24px;
display: flex;
align-items: flex-start;
justify-content: space-around;
}
-
+
.model-box.sc .model-content .content-footer>view {
display: flex;
flex-direction: column;
align-items: center;
}
-
+
.model-box.sc .model-content .content-footer>view .type {
margin-top: 6px;
font-size: 24px;
color: #697580;
}
-
+
.model-box.sc .model-content .content-footer>view .msg {
margin-top: 2px;
padding: 2px 6px;
@@ -554,14 +554,14 @@
font-size: 20px;
color: #697580;
}
-
+
.btn-grounp {
margin-top: 84px;
display: flex;
height: 148px;
background: #FFFFFF;
}
-
+
.btn-grounp .l {
margin-right: 76px;
width: 194px;
@@ -570,19 +570,19 @@
align-items: center;
justify-content: center;
}
-
+
.btn-grounp .l .plan {
font-size: 34px;
font-weight: bold;
color: #D55B26;
}
-
+
.btn-grounp .l .text {
margin-top: 2px;
font-size: 20px;
color: #A5AEB5;
}
-
+
.btn-grounp .r {
flex: 1;
display: flex;
@@ -592,15 +592,15 @@
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script src="https://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
</head>
-
-
+
+
<body>
<div class="page-main-container" style="background: #F1F9F8;width:100%;height: 100%;">
-
+
<!-- <scroll-div scroll-top="{{scrollTop}}" refresher-enabled="{{true}}" bindrefresherrefresh="refresh" refresher-triggered="{{triggered}}" style="height: {{clientHeight}}" scroll-y bindscrolltolower="upcroll"> -->
-
+
<!-- </scroll-div> -->
-
+
</div>
<script>
var getData = function(name) {
@@ -610,13 +610,13 @@
return null;
};
var code = getData("code");
-
- // var code = "22060000002";
-
-
+
+ // var code = "22070000002";
+
+
axios.get('https://dev.jxpskj.com:8023/api/traceability/getTraceabilityDetailInfo?code=' + code).then(function(res) {
// axios.get('http://192.168.0.114:89/traceability/getTraceabilityDetailInfo?code==22060000002').then(function(res) {
-
+
var data = res.data.data;
var farm = data.farm;
var land = data.landVO;
@@ -624,7 +624,7 @@
var paperList = data.paperVOList;
var recordVOList = data.recordVOList;
var recovery = data.recoveryVO;
-
+
var str0 = `<div class="top-log">
<img width="100%" height="405px" src="http://182.106.212.58:8014/assets/images/sym/2.png" />
<div class="btn-grounp">
@@ -634,30 +634,30 @@
<img bindtap="scrollTo" data-class=".sc" width="176px" height="80px" src="http://182.106.212.58:8014/assets/images/sy/1414.png" />
</div>
</div>
-
+
<div class="main-content">
-
+
<div class="logo">
<img width="100%" height="100%" src="${recovery.url}" />
<!-- <div class="btn">更换图片</div> -->
</div>
-
+
<div class="title">${recovery.strainName}</div>
-
+
<div class="type">
<div class="sub">${recovery.lx}</div>
<!-- <div class="icon">
<van-icon name="play" />
</div> -->
</div>
-
+
<div class="date">
采收时间：${recovery.time.replaceAll("-",".")}
</div>
-
+
</div>
<div class="qw model-box">
-
+
<div class="model-title">
<div class="l"></div>
<div class="title">权威检测</div>
@@ -669,7 +669,7 @@
可追溯
</div>
</div>
-
+
<div class="model-content">`
var str1 = '';
if (paperList.length > 0) {
@@ -701,12 +701,12 @@
} else {
str1 = str1 + `<div class="box"></div>`
}
-
-
- var str2 = `
+
+
+ var str2 = `
</div>
</div>
-
+
<div class="cd model-box">
<div class="model-title">
<div class="l"></div>
@@ -719,7 +719,7 @@
可追溯
</div>
</div>
-
+
<div class="dk model-content">
<div class="content-header">
<van-icon style="margin-right: 12px;" name="http://182.106.212.58:8014/assets/images/sy/1267.png" /> 种植地块
@@ -737,7 +737,7 @@
</div> -->
</div>
</div>
-
+
<div class="jksp model-content">
<div class="content-header">
<van-icon style="margin-right: 12px;" name="http://182.106.212.58:8014/assets/images/sy/1272.png" /> 良心生产，不怕监督，24小时视频监控
@@ -747,13 +747,13 @@
<div class="equi-btn on">
3号摄像头
</div>
-
+
<div class="equi-btn">
3号摄像头
</div>
</div>
</div>
-
+
<div class="jk model-content">
<div class="content-header">
物联网监控保证产地养分充足，且不被污染
@@ -772,7 +772,7 @@
<div class="site-date-text">6分钟前更新</div>
</div>
<div class="site-content">
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -784,7 +784,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -796,7 +796,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -808,7 +808,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -820,7 +820,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -832,7 +832,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -844,7 +844,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -856,7 +856,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -868,7 +868,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -880,7 +880,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -892,7 +892,7 @@
33.92
</div>
</div>
-
+
<div>
<div class="l">
<div class="type">空气温度</div>
@@ -904,13 +904,13 @@
33.92
</div>
</div>
-
+
</div>
</div>
</div>
</div>
</div>
-
+
<div class="zz model-box">
<div class="model-title">
<div class="l"></div>
@@ -923,9 +923,9 @@
</div> -->
</div>
</div>
-
+
<div class="model-content">
-
+
<div class="msg">
<div class="l">
<img width="126px" height="126px" src="http://182.106.212.58:8014/assets/images/sy/zz-log.png" />
@@ -938,25 +938,25 @@
<div class="r-b-msg">
以下农事操作，是在我的监督下完成
</div>
-
+
<div class="point-to"></div>
</div>
</div>`
-
+
var str3 = '';
recordVOList.forEach((item, index) => {
str3 = str3 + `<div class="record-box">
<div class="l">
-
+
<div class="one line" style="${ index == 0 ? 'background: transparent !important;' : '' }">
</div>
-
+
<div class="point">
</div>
-
+
<div class="two line" style="${ index == recordVOList.length - 1 ? 'background: transparent !important;' : '' }">
</div>
-
+
</div>
<div class="r">
<div class="record-item">
@@ -966,14 +966,14 @@
<div class="pel">操作人：${item.realName}</div>
</div>
</div>
-
+
</div>
</div>`
});
-
+
var str4 = `</div>
</div>
-
+
<div class="sc model-box">
<div class="model-title">
<div class="l"></div>
@@ -986,7 +986,7 @@
</div> -->
</div>
</div>
-
+
<div class="model-content">
<div class="content-header">
${farm.farmName}
@@ -1004,7 +1004,7 @@
})
}
var str6 = `</block></swiper>
-
+
</div>
<div class="text-intro">
${farm.introduce}
@@ -1013,7 +1013,7 @@
</div>
</div>
</div>`
-
+
// <div class="btn-grounp">
// <div class="l">
// <div class="plan">
@@ -1025,16 +1025,16 @@
// </div>
// <div class="r">
// <van-button bind:click="editTracability" round custom-style="margin-right: 40px; width: 200px; height: 72px; border: 2px solid #5ABF78; background: #fff; color: #5ABF78; font-size: 30px;">编辑溯源</van-button>
-
+
// <van-button bind:click="submit" round custom-style="width: 200px; height: 72px; border: none; background: #5ABF78; color: #fff; font-size: 30px;">分享</van-button>
// </div>
// </div>
-
+
var dom = $('.page-main-container');
dom.empty();
dom.append(str0 + str1 + str2 + str3 + str4 + str5 + str6);
});
</script>
</body>
-
+
</html>
\ No newline at end of file
diff --git a/src/views/farm/farmReport.vue b/src/views/farm/farmReport.vue
index 5b48fbf..225556f 100644
--- a/src/views/farm/farmReport.vue
+++ b/src/views/farm/farmReport.vue
@@ -33,7 +33,7 @@
</avue-crud>
</basic-container>
</template>
-
+
<script>
import { getDetail, getList, update, remove, save } from "@/api/farm/farmPaper";
import { mapGetters } from "vuex";
@@ -155,7 +155,7 @@
methods: {
//新增
rowSave(row, done, loading) {
- row["deptId"] = this.farmId;
+ row["farmId"] = this.farmId;
row["type"] = 1;
save(row).then(
() => {
@@ -282,5 +282,5 @@
},
};
</script>
-
-<style></style>
+
+<style></style>
\ No newline at end of file
diff --git a/src/views/farmplant/detection.vue b/src/views/farmplant/detection.vue
new file mode 100644
index 0000000..ddfe89f
--- /dev/null
+++ b/src/views/farmplant/detection.vue
@@ -0,0 +1,308 @@
+<template>
+ <div>
+ <el-dialog
+ title="检测报告"
+ :modal-append-to-body="false"
+ :append-to-body="true"
+ :close-on-click-modal="false"
+ @close="close"
+ width="60%"
+ :visible.sync="visible"
+ center
+ >
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ >
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ </avue-crud>
+ </el-dialog>
+</div>
+</template>
+
+
+<script>
+import { getDetail, getList, update, remove, save } from "@/api/farm/farmPaper";
+import { mapGetters } from "vuex";
+export default {
+ props: ["farmId"],
+ data() {
+ return {
+ farmPlantId:null,
+ visible: true,
+ form: {},
+ query: {},
+ loading: true,
+ excelBox: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ selectionList: [],
+ option: {
+ tip: false,
+ searchSize: "mini",
+ searchMenuSpan: 8,
+ height: "400",
+ editBtn: true,
+ delBtn: true,
+ viewBtn: true,
+ menuWidth: 200,
+ menuAlign: "center",
+ align: "center",
+ selection: true,
+ column: [
+ {
+ label: "检测项目",
+ prop: "name",
+ rules: [
+ {
+ required: true,
+ message: "请输入检测项目",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "检测机构",
+ prop: "organName",
+ rules: [
+ {
+ required: true,
+ message: "请输入检测机构",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "报告编号",
+ prop: "code",
+ rules: [
+ {
+ required: true,
+ message: "请输入报告编号",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "颁发日期",
+ prop: "time",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [
+ {
+ required: true,
+ message: "请选择颁发日期",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "报告图片",
+ prop: "pictures",
+ type: "upload",
+ dataType: "string",
+ span: 24,
+ limit: 3,
+ listType: "picture-card",
+ tip: "只能上传jpg/png文件,最多上传3张",
+ propsHttp: {
+ res: "data",
+ url: "url"
+ },
+ action: "/api/blade-resource/oss/endpoint/put-files"
+ },
+ ],
+ },
+ data: [],
+ };
+ },
+ created() {
+
+ },
+ computed: {
+ ...mapGetters(["permission", "userInfo"]),
+ // permissionList() {
+ // return {
+ // addBtn: this.vaildData(this.permission.social_add, true),
+ // viewBtn: this.vaildData(this.permission.social_view, false),
+ // delBtn: this.vaildData(this.permission.social_delete, false),
+ // editBtn: this.vaildData(this.permission.social_edit, false),
+ // };
+ // },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ mounted() {
+ },
+ methods: {
+ init(id) {
+ this.visible = true;
+ this.farmPlantId = id;
+ this.onLoad(this.page);
+ },
+ //新增
+ rowSave(row, done, loading) {
+ row["farmId"] = this.farmPlantId;
+ //种养品
+ row["type"] = 3;
+ save(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ loading();
+ window.console.log(error);
+ }
+ );
+ },
+ //修改
+ rowUpdate(row, index, done, loading) {
+ update(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ loading();
+ console.log(error);
+ }
+ );
+ },
+ //删除
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetail(this.form.id).then((res) => {
+ this.form = res.data.data;
+ });
+ }
+ done();
+ },
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ params['type'] = 3;
+ params['farmId'] = this.farmPlantId;
+ getList(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/farmplant/farmplant.vue b/src/views/farmplant/farmplant.vue
index 984346b..2027a1c 100644
--- a/src/views/farmplant/farmplant.vue
+++ b/src/views/farmplant/farmplant.vue
@@ -30,21 +30,37 @@
>删 除
</el-button>
</template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ :type="type"
+ :size="size"
+ icon="el-icon-money"
+ @click="handleDetection(row)"
+ >检测报告
+ </el-button>
+ </template>
</avue-crud>
+ <!-- 检测报告 -->
+ <detection v-if="detectionVisible" ref="detection"></detection>
</basic-container>
</template>
-
+
<script>
import { getDetail, getList, update, remove, save } from "@/api/farmplant/farmplant";
import { getStrainList } from "@/api/farmplant/strain";
import { getLandList } from "@/api/land/land";
import { mapGetters } from "vuex";
+import detection from "./detection.vue";
export default {
+ components: {
+ detection
+ },
props:[
"type","activeName"
],
data() {
return {
+ detectionVisible:false,
visible: true,
form: {},
query: {},
@@ -63,7 +79,7 @@
editBtn: true,
delBtn: true,
viewBtn: true,
- menuWidth: 200,
+ menuWidth: 280,
menuAlign: "center",
align: "center",
selection: true,
@@ -259,7 +275,7 @@
required: true,
message: "请输入作业方式",
trigger: "blur",
- },
+ },
],
// display:false,
},
@@ -275,7 +291,7 @@
required: true,
message: "请选择移栽时间",
trigger: "blur",
- },
+ },
],
// display:false,
},
@@ -292,7 +308,7 @@
required: false,
message: "请选预计采收时间",
trigger: "blur",
- },
+ },
],
// display:false,
},
@@ -307,13 +323,13 @@
required: false,
message: "请输入预计亩产",
trigger: "blur",
- },
+ },
],
// display:false,
},
{
label: "株数",
- prop: "plantNumber",
+ prop: "plantNumber",
labelWidth:110,
type:"number",
hide:true,
@@ -322,7 +338,7 @@
required: false,
message: "请输入株数",
trigger: "blur",
- },
+ },
],
// display:false,
},
@@ -337,7 +353,7 @@
required: false,
message: "请输入株间距",
trigger: "blur",
- },
+ },
],
// display:false,
},
@@ -354,7 +370,7 @@
// required: true,
// message: "请选择投苗时间",
// trigger: "blur",
- // },
+ // },
// ],
// display:false,
// },
@@ -369,7 +385,7 @@
// required: true,
// message: "请输入养殖数量",
// trigger: "blur",
- // },
+ // },
// ],
// display:false,
// },
@@ -440,7 +456,7 @@
// required: false,
// message: "请输入预计亩产",
// trigger: "blur",
- // },
+ // },
// ],
// plantNumbercolumn.display = true;
// plantSpacingcolumn.display = true;
@@ -490,7 +506,7 @@
// required: true,
// message: "请输入养殖数量",
// trigger: "blur",
- // },
+ // },
// ],
// plantNumbercolumn.display = false;
// plantSpacingcolumn.display = false;
@@ -557,7 +573,7 @@
strainId.dicData = res.data.data;
}
})
-
+
},
//新增
rowSave(row, done, loading) {
@@ -685,9 +701,16 @@
this.selectionClear();
});
},
+ //检测报告
+ handleDetection(row){
+ this.detectionVisible = true;
+ this.$nextTick(() => {
+ this.$refs.detection.init(row.id);
+ });
+ },
},
};
</script>
-
+
<style>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/stock/stockmanage.vue b/src/views/stock/stockmanage.vue
index 8f6cbba..ee90144 100644
--- a/src/views/stock/stockmanage.vue
+++ b/src/views/stock/stockmanage.vue
@@ -446,11 +446,6 @@
type: "number",
span: 11,
prop: "amount1",
- rules: [{
- required: true,
- message: "请输入入库数量",
- trigger: "blur"
- }]
},
{
label: "入库类型",
@@ -618,11 +613,6 @@
type: "number",
span: 11,
prop: "amount1",
- rules: [{
- required: true,
- message: "请输入入库数量",
- trigger: "blur"
- }]
},
{
label: "出库类型",
--
Gitblit v1.9.3