From 082613d446e29e4ec1c16bfaa52345106a498b23 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:03:49 +0800
Subject: [PATCH] 农事操作隐藏后四个，地图模式2d改为3d
---
src/views/traceability/addTraceability.vue | 92 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 25 deletions(-)
diff --git a/src/views/traceability/addTraceability.vue b/src/views/traceability/addTraceability.vue
index 797def5..ce39dd9 100644
--- a/src/views/traceability/addTraceability.vue
+++ b/src/views/traceability/addTraceability.vue
@@ -119,7 +119,7 @@
ref="formLabelAlign"
>
<el-form-item label="农产品名称" prop="productName">
- <el-input v-model="formLabelAlign.productName"></el-input>
+ <el-input maxlength="40" v-model="formLabelAlign.productName"></el-input>
</el-form-item>
<el-form-item label="开具日期" prop="createTime">
<el-date-picker
@@ -130,16 +130,16 @@
></el-date-picker>
</el-form-item>
<el-form-item label="重量/数量" prop="weight">
- <el-input v-model="formLabelAlign.weight"></el-input>
+ <el-input maxlength="9" v-model="formLabelAlign.weight"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="phone">
- <el-input v-model="formLabelAlign.phone"></el-input>
+ <el-input maxlength="14" v-model="formLabelAlign.phone"></el-input>
</el-form-item>
<el-form-item label="产地" prop="space">
- <el-input v-model="formLabelAlign.space"></el-input>
+ <el-input maxlength="50" v-model="formLabelAlign.space"></el-input>
</el-form-item>
<el-form-item label="合格证编号" prop="certificationCode">
- <el-input v-model="formLabelAlign.certificationCode"></el-input>
+ <el-input maxlength="45" v-model="formLabelAlign.certificationCode"></el-input>
</el-form-item>
<el-form-item label="承诺依据" prop="according">
<el-checkbox-group
@@ -169,7 +169,7 @@
</el-checkbox-group>
</el-form-item>
<el-form-item label="是否绑定溯源" prop="bind">
- <el-switch v-model="isBind" active-text="是" inactive-text="否">
+ <el-switch v-model="isBind" active-text="是" inactive-text="否" @change="OnAutoStart">
</el-switch>
</el-form-item>
</el-form>
@@ -197,8 +197,8 @@
<el-button type="primary" @click="next" v-if="isBind">{{
tip
}}</el-button>
- <el-button type="primary" @click="submit" v-if="isBtn">提 交</el-button>
- <el-button type="primary" @click="submits" v-if="!isBtn">提 交</el-button>
+ <!-- <el-button type="primary" @click="submit" v-if="isBtn">提 交</el-button> -->
+ <el-button type="primary" @click="submit0" v-if="!isBind">提 交</el-button>
</div>
</el-dialog>
</template>
@@ -208,7 +208,7 @@
import { save } from "@/api/traceability/traceability";
import { getList } from "@/api/farmplant/recovery";
import { getStrainList } from "@/api/farmplant/strain";
-import { getLandList } from "@/api/land/land";
+import { getLandList,selectRecoveryLandList } from "@/api/land/land";
export default {
data() {
return {
@@ -216,7 +216,7 @@
tip: "下一步",
isShow: false,
isBind: false,
- isBtn: true,
+ isBtn: 1,
wtjc: false,
zwjc: true,
nbjc: false,
@@ -224,6 +224,7 @@
radio: "1",
title: "创建溯源码",
form: {},
+ farm:{},
formLabelAlign: {
productName: "",
createTime: "",
@@ -237,7 +238,7 @@
visible: false,
rules: {
productName: [
- { required: true, message: "请输入产品名称", trigger: "blur" },
+ { required: true, message: "请输入产品名称", trigger: ["blur","change"] },
],
createTime: [
{
@@ -249,7 +250,7 @@
weight: [
{
required: true,
- message: "请输入联系重置/数量",
+ message: "请输入数量",
trigger: "change",
},
],
@@ -268,9 +269,9 @@
trigger: "change",
},
],
- space: [{ required: true, message: "请输入产地", trigger: "change" }],
+ space: [{ required: true, message: "请输入产地", trigger: ["blur","change"], }],
certificationCode: [
- { required: true, message: "请输入合格证编号", trigger: "blur" },
+ { required: true, message: "请输入合格证编号", trigger:["blur","change"], },
],
},
page: {
@@ -294,11 +295,16 @@
column: [
{
label: "采收品种",
+ prop: "strainName",
+ },
+ {
+ label: "采收品种",
prop: "strainId",
search: true,
searchSpan: 4,
span: 12,
type: "tree",
+ hide:true,
dicData: [],
props: {
label: "strainName",
@@ -309,7 +315,7 @@
{
required: true,
message: "请输入采收品种",
- trigger: "blur",
+ trigger: ["blur","change"],
},
],
disabled: true,
@@ -374,10 +380,15 @@
],
},
{
+ label:"操作人",
+ prop:"realName"
+ },
+ {
label: "操作人",
prop: "operator",
type: "tree",
dicData: [],
+ hide:true,
props: {
label: "realName",
value: "id",
@@ -400,6 +411,7 @@
computed: {
...mapState({
userInfo: (state) => state.user.userInfo,
+ $farmId: state => state.user.$farmId,
}),
},
methods: {
@@ -419,15 +431,24 @@
cnChange(data) {
this.zwcn = data;
},
- //创建溯源码
- submit() {
- var that = this;
+ submit0(){
if (this.isBind) {
this.formLabelAlign["bind"] = "0";
} else {
this.formLabelAlign["bind"] = "1";
}
-
+ if(this.isBtn==1){
+ this.submit();
+ }
+ if(this.isBtn==3){
+ this.submits();
+ }
+ },
+ //创建溯源码
+ submit() {
+ var that = this;
+ that.formLabelAlign['tenantId'] = this.userInfo.tenant_id;
+ that.formLabelAlign['deptId'] = this.$farmId;
this.$refs["formLabelAlign"].validate((valid) => {
if (valid) {
that.formLabelAlign.createTime =
@@ -453,9 +474,10 @@
save(that.formLabelAlign).then(
() => {
that.$emit("refreshOnLoad");
- that.$refs.formLabelAlign.resetFields();
that.close();
that.visible = false;
+ that.isBtn = 1;
+ that.$refs.formLabelAlign.resetFields();
this.$message({
type: "success",
message: "操作成功!",
@@ -471,6 +493,14 @@
}
});
},
+ //是否绑定溯源码绑定事件
+ OnAutoStart(e){
+ if(e){
+ this.isBtn = 2;
+ }else{
+ this.isBtn = 1;
+ }
+ },
//创建溯源码
submits() {
var that = this;
@@ -479,13 +509,17 @@
return;
}
if (this.selectionList.length ==1) {
- that.formLabelAlign['code'] = this.selectionList[0].code;
+ that.formLabelAlign['recoveryId'] = this.selectionList[0].id;
+ that.formLabelAlign['bind'] = '0';
}
+ that.formLabelAlign['tenantId'] = this.userInfo.tenant_id;
+ that.formLabelAlign['deptId'] = this.$farmId;
//新增
save(that.formLabelAlign).then(
() => {
that.$emit("refreshOnLoad");
that.visible = false;
+ that.isBtn = 1;
that.close();
this.$message({
type: "success",
@@ -502,7 +536,7 @@
//清除数据，状态回归
this.isShow = false;
this.isBind = false;
- this.isBtn = true;
+ this.isBtn = 1;
this.wtjc = false;
this.zwjc = true;
this.nbjc = false;
@@ -547,7 +581,7 @@
//修改按钮状态
this.isShow = true;
this.isBind = false;
- this.isBtn = false;
+ this.isBtn = 3;
//initFormData
that.initFormData();
} else {
@@ -559,8 +593,16 @@
//初始化表格数据
initFormData(){
var that = this;
+ // //获取农地数据
+ // getLandList(this.userInfo.user_id).then((res)=>{
+ // if(res.data.code==200){
+ // var landIdcolumn = that.findObject(that.option.column,"landId");
+ // that.landList = res.data.data;
+ // landIdcolumn.dicData = res.data.data;
+ // }
+ // })
//获取农地数据
- getLandList(this.userInfo.user_id).then((res)=>{
+ selectRecoveryLandList(this.$farmId).then((res)=>{
if(res.data.code==200){
var landIdcolumn = that.findObject(that.option.column,"landId");
that.landList = res.data.data;
@@ -610,7 +652,6 @@
},
selectionChange(list) {
this.selectionList = list;
- console.log(this.selectionList, 123456789);
},
selectionClear() {
this.selectionList = [];
@@ -627,6 +668,7 @@
},
onLoad(page, params = {}) {
this.loading = true;
+ params["farmId"] = this.$farmId
getList(
page.currentPage,
page.pageSize,
--
Gitblit v1.9.3