From e5e4de95332fc18ae9286c4efd5dc2a4a02cb107 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 22 Aug 2022 15:30:41 +0800
Subject: [PATCH] 修复数据存储时id存取错误问题

---
 src/views/task/task.vue |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/views/task/task.vue b/src/views/task/task.vue
index 9bdf61e..e49951b 100644
--- a/src/views/task/task.vue
+++ b/src/views/task/task.vue
@@ -68,6 +68,7 @@
 import {getList, getDetail, add, update, remove, updatechuli} from "@/api/task/task";
 import {mapGetters} from "vuex";
 import {getLandList} from "@/api/land/land";
+import {selectStockFa} from "@/api/stockfactory/stockfactory";
 
 export default {
   data() {
@@ -159,10 +160,11 @@
             prop: "stockId",
             hide: true,
             type: "tree",
-            dicUrl: `/api/soldr/soldr/selectSol`,
+            dicData:[],
+            // dicUrl: `/api/soldr/soldr/selectSol`,
             props: {
               label: "spn",
-              value: "id"
+              value: "stockId1"
             },
             change: function (value) {
               console.log(value.value)
@@ -553,7 +555,7 @@
     this.initData();
   },
   computed: {
-    ...mapGetters(["permission", "userInfo"]),
+    ...mapGetters(["permission", "userInfo","$farmId"]),
     permissionList() {
       return {
         addBtn: this.vaildData(this.permission.task_add, false),
@@ -573,7 +575,6 @@
   watch: {
     "form.stockId": {
       handler(val) {
-        console.log(val)
         var stockIdcolumn = this.findObject(this.option.column, "stockNum");
         if (val != "") {
           stockIdcolumn.display = true;
@@ -583,6 +584,14 @@
       },
       immediate: true,
     },
+    '$farmId':{
+      handler (newName, oldName) {
+          this.getLandList()
+          this.getSoldrList()
+          this.query={}
+          this.onLoad(this.page)
+      }
+    }
   },
   methods: {
     //入库
@@ -628,15 +637,29 @@
       this.gradeBoxVisiblechuli = true;
     },
     initData() {
+      this.getLandList()
+      this.getSoldrList()
+    },
+    getLandList(){
       var that = this;
       //获取农地数据
-      getLandList(this.userInfo.dept_id).then((res) => {
+      getLandList(this.$farmId).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;
         }
       })
+    },
+    getSoldrList(){
+      var that = this;
+      //获取农资
+      selectStockFa(this.$farmId).then((res) => {
+        if (res.data.code == 200) {
+          var stockIdcolumn = that.findObject(that.option.column, "stockId");
+          stockIdcolumn.dicData = res.data.data;
+        }
+      });
     },
     rowSave(row, done, loading) {
       if(row.tp.length<=0){
@@ -707,6 +730,9 @@
         });
     },
     beforeOpen(done, type) {
+      if(["add"].includes(type)){
+        this.option.disabled=false
+      }
       if (["edit", "view"].includes(type)) {
         getDetail(this.form.id).then(res => {
           this.form = res.data.data;
@@ -745,6 +771,7 @@
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      params["farmId"] = this.$farmId
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;

--
Gitblit v1.9.3