From e4b524d3150ee0f67cd60a07badf71e7bdc66e72 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 14 九月 2023 11:21:51 +0800
Subject: [PATCH] 小程序
---
platform_web/src/views/system/loginLog.vue | 2 ++
minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue | 6 ++----
platform_web/src/views/business/companyLoginLog.vue | 5 ++++-
platform_web/src/views/business/workbench.vue | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
index cf66e4c..06f7ac9 100644
--- a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
+++ b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
@@ -269,10 +269,9 @@
// 璺宠浆鍑哄簱鍏ュ簱
submit() {
if (this.data.status === 0) { // 鍑哄簱
- console.log('鍑哄簱')
// router.push({ name: 'issueOperation', query: { id: route.query.id, type: 7 } })
uni.navigateTo({
- url: `/pages/OutOperation/OutOperation?id=${this.id}&type=7`
+ url: `/pages_inspect/pages/OutOperation/OutOperation?id=${this.id}&type=7`
});
} else if (this.data.status === 1) { // 鍏ュ簱
if (this.data.type === 3) { // 澶囨枡纭
@@ -280,9 +279,8 @@
// router.push({ name: 'orderStock', query: { id: route.query.id, status: data.value.status, next: 1 } })
return
}
- console.log('鍏ュ簱')
uni.navigateTo({
- url: `/pages/InOperation/InOperation?id=${this.id}&type=7`
+ url: `/pages_inspect/pages/InOperation/InOperation?id=${this.id}&type=7`
});
// router.push({ name: 'warehousing', query: { id: route.query.id, type: 7 } })
}
diff --git a/platform_web/src/views/business/companyLoginLog.vue b/platform_web/src/views/business/companyLoginLog.vue
index 7ae40c8..5cebe24 100644
--- a/platform_web/src/views/business/companyLoginLog.vue
+++ b/platform_web/src/views/business/companyLoginLog.vue
@@ -99,7 +99,10 @@
return '缇氱緤骞冲彴'
}else if (value == 3) {
return 'EDGP骞冲彴'
- }else{
+ }else if (value == 4) {
+ return '寰俊灏忕▼搴�'
+ }
+ else{
return 'pc-骞冲彴';
}
}
diff --git a/platform_web/src/views/business/workbench.vue b/platform_web/src/views/business/workbench.vue
index 0171904..a4c84e3 100644
--- a/platform_web/src/views/business/workbench.vue
+++ b/platform_web/src/views/business/workbench.vue
@@ -130,7 +130,7 @@
yAxis: {},
series: [
{
- name: '閿�閲�',
+ name: '鐧诲綍娆℃暟',
type: 'line',
data: num
}
diff --git a/platform_web/src/views/system/loginLog.vue b/platform_web/src/views/system/loginLog.vue
index bd26f42..e4692e5 100644
--- a/platform_web/src/views/system/loginLog.vue
+++ b/platform_web/src/views/system/loginLog.vue
@@ -137,6 +137,8 @@
return '缇氱緤骞冲彴'
}else if (value == 3) {
return 'EDGP骞冲彴'
+ }else if (value == 4) {
+ return '寰俊灏忕▼搴�'
}else{
return 'pc-骞冲彴';
}
--
Gitblit v1.9.3