From 48929d592615d01c5fb34a3589c01c809c4c3a76 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 11:50:07 +0800
Subject: [PATCH] 操作人显示真名，任务管理存储农资id为已出库农资id

---
 src/views/farmplant/process.vue          |    8 ++++----
 src/views/farmplant/farmproductstock.vue |    8 ++++----
 src/views/task/task.vue                  |    6 ++++--
 src/views/stock/stockout.vue             |    3 +++
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/views/farmplant/farmproductstock.vue b/src/views/farmplant/farmproductstock.vue
index 96cc65b..9d635af 100644
--- a/src/views/farmplant/farmproductstock.vue
+++ b/src/views/farmplant/farmproductstock.vue
@@ -522,7 +522,7 @@
                     },
                     {
                         label: "操作人",
-                        prop: "name",
+                        prop: "realName",
                         span: 24,
                         rules: [
                             {
@@ -633,7 +633,7 @@
                     },
                     {
                         label: "操作人",
-                        prop: "name",
+                        prop: "realName",
                         span: 24,
                         rules: [
                             {
@@ -758,7 +758,7 @@
                     },
                     {
                         label: "操作人",
-                        prop: "name",
+                        prop: "realName",
                         span: 24,
                         rules: [
                             {
@@ -881,7 +881,7 @@
                     },
                     {
                         label: "操作人",
-                        prop: "name",
+                        prop: "realName",
                         span: 24,
                         rules: [
                             {
diff --git a/src/views/farmplant/process.vue b/src/views/farmplant/process.vue
index 3b9e261..73c0f91 100644
--- a/src/views/farmplant/process.vue
+++ b/src/views/farmplant/process.vue
@@ -419,7 +419,7 @@
                     },
                     {
                         label: "操作人",
-                        prop: "name",
+                        prop: "realName",
                         span: 24,
                         rules: [
                             {
@@ -504,7 +504,7 @@
                     },
                     {
                         label: "操作人",
-                        prop: "name",
+                        prop: "realName",
                         span: 24,
                         rules: [
                             {
@@ -601,7 +601,7 @@
                     },
                     {
                         label: "操作人",
-                        prop: "name",
+                        prop: "realName",
                         span: 24,
                         rules: [
                             {
@@ -679,7 +679,7 @@
                     },
                     {
                         label: "操作人",
-                        prop: "name",
+                        prop: "realName",
                         span: 24,
                         rules: [
                             {
diff --git a/src/views/stock/stockout.vue b/src/views/stock/stockout.vue
index cc870db..b7dd40a 100644
--- a/src/views/stock/stockout.vue
+++ b/src/views/stock/stockout.vue
@@ -443,6 +443,9 @@
           e.amount1 = fixed.fixedNum(e.amount1)
           e.cnum = fixed.fixedNum(e.cnum)
         })
+        this.data = data.records.filter((e)=>{
+            return e.amount1 !=0
+        })
         this.loading = false;
         // this.selectionClear();
       });
diff --git a/src/views/task/task.vue b/src/views/task/task.vue
index 8990d58..4799669 100644
--- a/src/views/task/task.vue
+++ b/src/views/task/task.vue
@@ -165,7 +165,7 @@
             // dicUrl: `/api/soldr/soldr/selectSol`,
             props: {
               label: "spn",
-              value: "stockId1"
+              value: "id"
             },
             change: function (value) {
               // console.log(value.value)
@@ -339,7 +339,7 @@
             dicUrl: `/api/soldr/soldr/selectSol`,
             props: {
               label: "spn",
-              value: "stockId1"
+              value: "id"
             },
             change: function (value) {
               // console.log(value.value)
@@ -656,8 +656,10 @@
       getLandList(this.$farmId).then((res) => {
         if (res.data.code == 200) {
           var landIdcolumn = that.findObject(that.option.column, "landId");
+          var landIdColumnChuli = that.findObject(that.optionchuli.column,"landId")
           that.landList = res.data.data;
           landIdcolumn.dicData = res.data.data;
+          landIdColumnChuli.dicData = res.data.data
         }
       })
     },

--
Gitblit v1.9.3