From b318a8bb90e3333bd93a6aadf3be7eaa4b7d38a6 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Fri, 29 Jul 2022 11:34:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhny_web
---
src/views/stock/stockmanage.vue | 4 ++--
src/views/stock/stockout.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/stock/stockmanage.vue b/src/views/stock/stockmanage.vue
index 8bf0543..ee90144 100644
--- a/src/views/stock/stockmanage.vue
+++ b/src/views/stock/stockmanage.vue
@@ -637,7 +637,7 @@
],
},
{
- label: "入库时间",
+ label: "出库时间",
prop: "time1",
type: "date",
format: "yyyy-MM-dd",
@@ -646,7 +646,7 @@
rules: [
{
required: true,
- message: "请输入入库时间",
+ message: "请输入出库时间",
trigger: "blur",
},
],
diff --git a/src/views/stock/stockout.vue b/src/views/stock/stockout.vue
index fb4b348..1cd8985 100644
--- a/src/views/stock/stockout.vue
+++ b/src/views/stock/stockout.vue
@@ -128,7 +128,7 @@
dialogClickModal: false,
column: [
{
- label: "农资id",
+ label: "农资库存id",
span: 20,
display: true,
prop: "sid",
--
Gitblit v1.9.3