From be0dc2fe73c79995305d45264f423e582ed23810 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 15 Jul 2025 13:24:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E9=A1=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=8C=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue                 | 14 ++++++++++++++
 src/views/statistics/stock_statistics.vue | 14 +++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e9fd89ce..d4d78cb3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -62,6 +62,8 @@
 					<el-button type="default" @click="faceLogin">刷脸登录</el-button>
 				</div> -->
 				<!-- <div class="copyright">Copyright © 2024 {{ baseConfig.base_right }}</div> -->
+				<div class="version version_web">WEB版本：{{ config_index.APP_VER }}</div>
+				<div class="version ">SERVER版本：{{ baseConfig.sys_version }}</div>
 			</div>
 		</div>
 	</div>
@@ -94,6 +96,7 @@
 </template>
 
 <script>
+import config_index from "@/config"
 import { Monitor } from '@element-plus/icons-vue'
 import passwordForm from './components/passwordForm'
 import phoneForm from './components/phoneForm'
@@ -107,6 +110,7 @@ export default {
 	},
 	data() {
 		return {
+			config_index,
 			config: {
 				lang: this.$TOOL.data.get('APP_LANG') || this.$CONFIG.LANG,
 				dark: this.$TOOL.data.get('APP_DARK') || false
@@ -401,6 +405,16 @@ export default {
 	top: 20px;
 	right: 20px;
 }
+.version {
+	position: absolute;
+	bottom: 15px;
+	right: 30px;
+	font-size: 14px;
+	color: rgb(36, 93, 116);
+}
+.version_web{
+	bottom: 40px;
+}
 .copyright {
 	position: absolute;
 	bottom: 30px;
diff --git a/src/views/statistics/stock_statistics.vue b/src/views/statistics/stock_statistics.vue
index 92d425d9..e0860226 100644
--- a/src/views/statistics/stock_statistics.vue
+++ b/src/views/statistics/stock_statistics.vue
@@ -317,7 +317,7 @@ export default {
 							if(specsList.indexOf(ite.material_specification)>-1){}else{
 								specsList.push(ite.material_specification);
 								let obj3 = {};
-								obj3.text = ite.material_specificationv;
+								obj3.text = ite.material_specification;
 								obj3.value = ite.material_specification;
 								that.specsFilters1.push(obj3);
 							}
@@ -523,25 +523,25 @@ export default {
 		},
 
 		filterName1(value, row) {
-            return row.物料名 == value;
+            return row.material_name == value;
         },
 		filterSpecs1(value, row) {
-            return row.规格 == value;
+            return row.material_specification == value;
         },
         filterModel1(value, row) {
-             return row.型号 == value;
+             return row.material_model == value;
         },
 		filterDept1(value, row) {
              return row.完成车间 == value;
         },
 		filterName11(value, row) {
-            return row.物料名 == value;
+            return row.name == value;
         },
 		filterSpecs11(value, row) {
-            return row.规格 == value;
+            return row.specification == value;
         },
         filterModel11(value, row) {
-             return row.型号 == value;
+             return row.model == value;
         },
 		filterName2(value, row) {
             return row.物料名 == value;