From e8e1df25ea803b1704ef77ba17074ffba5c2a0ae Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Wed, 31 Aug 2022 11:33:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhny_web

---
 src/views/wel/plant.vue      |    2 +-
 src/views/stock/stockout.vue |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/views/stock/stockout.vue b/src/views/stock/stockout.vue
index b784236..3786985 100644
--- a/src/views/stock/stockout.vue
+++ b/src/views/stock/stockout.vue
@@ -129,6 +129,7 @@
         viewBtn: true,
         selection: true,
         dialogClickModal: false,
+        emptyBtn:false,
         column: [
           {
             label: "农资库存id",
diff --git a/src/views/wel/plant.vue b/src/views/wel/plant.vue
index 2722cdc..cae0dd6 100644
--- a/src/views/wel/plant.vue
+++ b/src/views/wel/plant.vue
@@ -171,7 +171,7 @@
             ],
           },
           {
-            label: "秧苗来源农场",
+            label: "秧苗来源基地",
             prop: "farmId",
             type: "tree",
             display:true,

--
Gitblit v1.9.3