From 7ae4b4b6679ba419cfd92d2a60ed603c2c8a446d Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 11 Aug 2022 16:59:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/land/landAdd.vue | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/views/land/landAdd.vue b/src/views/land/landAdd.vue
index d31d187..e6afca1 100644
--- a/src/views/land/landAdd.vue
+++ b/src/views/land/landAdd.vue
@@ -51,11 +51,13 @@
label: "所属农场",
prop: "farmId",
type: "tree",
+ value:"",
dicData: [],
props: {
label: "farmName",
value: "id"
},
+ disabled:true,
slot: true,
rules: [{
required: true,
@@ -106,41 +108,36 @@
}
},
computed: {
- ...mapGetters(["userInfo", "permission", "polygons"]),
+ ...mapGetters(["userInfo", "permission", "polygons","$farmId"]),
},
mounted () {
this.initData(this.userInfo.tenant_id)
},
methods: {
initData (tenantId) {
- // getDeptTree(tenantId).then(res => { console.log(res)
-
- // const column = this.findObject(this.option.column, "deptId");
- // column.dicData = res.data.data;
- // });
- const data = {
- deptId: this.userInfo.dept_id
- }
- getFarmList(data).then(res => {
+ getFarmList().then(res => {
const column = this.findObject(this.option.column, "farmId")
column.dicData = res.data.data
})
},
//初始化
init () {
+ console.log(22222222222222)
//清空面的数据
this.$store.commit('clear_polygon')
//计算当前时间
this.visible = true
+ this.form.farmId = this.$farmId
},
// 表单提交
submit (row, loading) {
row['deptId'] = this.userInfo.dept_id
+ // row.farmId = this.farm.id
var that = this
if (this.polygons.length == 0) {
//没有面的数据
- this.$refs.getMapData.isCheck = true
- loading()
+ // this.$refs.getMapData.isCheck = true
+ // loading()
} else {
//如果有值，空间坐标转换
let pol = this.polygons
--
Gitblit v1.9.3