From dcd75a9a37d281f8aa5aabbeb76bd544dc08a4da Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 May 2022 19:04:34 +0800
Subject: [PATCH] 采收记录完善，结束完成，新增农产品种植，页面样式优化
---
src/views/wel/recovery.vue | 119 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 96 insertions(+), 23 deletions(-)
diff --git a/src/views/wel/recovery.vue b/src/views/wel/recovery.vue
index 81e742a..34994ea 100644
--- a/src/views/wel/recovery.vue
+++ b/src/views/wel/recovery.vue
@@ -17,6 +17,8 @@
import { mapState } from "vuex";
import { getLandList } from "@/api/land/land";
import { getUserList } from "@/api/system/user";
+import { getStrainList } from "@/api/farmplant/strain";
+import { save } from "@/api/farmplant/recovery";
export default {
data() {
return {
@@ -29,8 +31,14 @@
column: [
{
label: "采收品种",
- prop: "farmName",
+ prop: "strainId",
span: 12,
+ type: "tree",
+ dicData: [],
+ props: {
+ label: "strainName",
+ value: "id"
+ },
labelWidth: 145,
rules: [
{
@@ -39,6 +47,7 @@
trigger: "blur",
},
],
+ disabled:true,
},
{
label: "采收地块",
@@ -62,14 +71,17 @@
},
{
label: "采收重量",
- prop: "farmArea",
+ prop: "weight",
+ tip: '公斤',
span: 12,
labelWidth: 145,
width: 110,
+ controls:false,
+ type:'number',
rules: [
{
required: true,
- message: "请输入采收重量",
+ message: "请输入采收重量 公斤",
trigger: "click",
},
],
@@ -117,20 +129,20 @@
},
],
},
- {
- label: "采收产品",
- prop: "farmArea",
- span: 12,
- labelWidth: 145,
- width: 110,
- rules: [
- {
- required: true,
- message: "请输入采收产品",
- trigger: "click",
- },
- ],
- },
+ // {
+ // label: "采收产品",
+ // prop: "farmArea",
+ // span: 12,
+ // labelWidth: 145,
+ // width: 110,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入采收产品",
+ // trigger: "click",
+ // },
+ // ],
+ // },
{
label: "操作人",
prop: "operator",
@@ -153,7 +165,7 @@
},
{
label: "产品等级",
- prop: "leave",
+ prop: "leaves",
span: 12,
labelWidth: 145,
width: 110,
@@ -191,7 +203,7 @@
},
{
label: "备注",
- prop: "farmArea",
+ prop: "remark",
span: 24,
type:"textarea",
labelWidth: 145,
@@ -215,8 +227,47 @@
}),
},
methods: {
+ //计算当前时间
+ getNowTime(){
+ var date = new Date();
+ //年 getFullYear()：四位数字返回年份
+ var year = date.getFullYear(); //getFullYear()代替getYear()
+ //月 getMonth()：0 ~ 11
+ var month = date.getMonth() + 1;
+ //日 getDate()：(1 ~ 31)
+ var day = date.getDate();
+ //时 getHours()：(0 ~ 23)
+ var hour = date.getHours();
+ //分 getMinutes()： (0 ~ 59)
+ var minute = date.getMinutes();
+ //秒 getSeconds()：(0 ~ 59)
+ var second = date.getSeconds();
+ //赋值
+ this.form['time'] = year + '-'
+ + this.addZero(month) + '-'
+ + this.addZero(day) + ' '
+ + this.addZero(hour) + ':'
+ + this.addZero(minute);
+ },
+ //小于10的拼接上0字符串
+ addZero(s) {
+ return s < 10 ? ('0' + s) : s;
+ },
//初始化
init(data) {
+ this.form = {
+ farmPlantId:data.id,
+ strainId:data.strainId,
+ landId:data.landId,
+ weight:data.weight,
+ leaves:'0',
+ jobWay:data.jobWay,
+ operator:data.operator,
+ remark:''
+ };
+ this.form['operator'] = this.userInfo.user_id;
+ //计算当前时间
+ this.getNowTime();
this.visible = true;
var that = this;
//获取农地数据
@@ -227,6 +278,7 @@
landIdcolumn.dicData = res.data.data;
}
});
+
//获取操作人
const user = {
tenantId: this.userInfo.tenant_id,
@@ -237,12 +289,33 @@
operatorcolumn.dicData = res.data.data;
}
});
+ //获取农产品数据
+ getStrainList(0).then((res)=>{
+ if(res.data.code==200){
+ var strainId = that.findObject(that.option.column,"strainId");
+ strainId.dicData = res.data.data;
+ }
+ })
},
// 表单提交
- dataFormSubmit() {
- this.dataForm["userId"] = this.userInfo.id;
- this.$refs["dataForm"].validate((valid) => {
- });
+ submit(row,loading,done) {
+ var that = this;
+ row.time = row.time + ":00";
+ save(row).then(
+ () => {
+ this.$refs.form.resetFields();
+ that.visible = false;
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ done();
+ window.console.log(error);
+ }
+ );
},
},
};
--
Gitblit v1.9.3