From cd36d33be90d6aee3bc48ade9dc828f625ecebdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 26 Jul 2024 11:07:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.dev | 6 +++---
src/views/cost/accounting.vue | 6 +++++-
src/views/warehouse/index.vue | 8 ++++++--
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/.env.dev b/.env.dev
index 70bd184..ee2bc1e 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
###
# @Author: zhp
# @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-07-25 15:43:42
+ # @LastEditTime: 2024-07-26 10:50:10
# @LastEditors: zhp
# @Description:
###
@@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
# 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.1.70:30307'
-# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
+VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
# 闫阳
# VUE_APP_BASE_API = 'http://192.168.1.81:48080'
# 徐
@@ -21,7 +21,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
# 郭
# VUE_APP_BASE_API = 'http://192.168.1.61:48080'
# sara
-VUE_APP_BASE_API = 'http://192.168.1.63:8080'
+# VUE_APP_BASE_API = 'http://192.168.1.63:8080'
# 张一丁
# VUE_APP_BASE_API = 'http://192.168.4.139:48080'
# 蔡
diff --git a/src/views/cost/accounting.vue b/src/views/cost/accounting.vue
index 63fd305..9c57e00 100644
--- a/src/views/cost/accounting.vue
+++ b/src/views/cost/accounting.vue
@@ -1,7 +1,7 @@
@@ -394,6 +394,10 @@ export default {
this.listQuery.yearPhaseEnd = this.listQuery.end ? this.listQuery.end.slice(0, 6) : undefined
if (this.listQuery.end && this.listQuery.start) {
if (this.listQuery.end.slice(0, 4) - this.listQuery.start.slice(0, 4) > 10) {
+ this.listQuery.end = undefined
+ this.listQuery.start = undefined
+ this.listQuery.yearPhaseStart = undefined
+ this.listQuery.yearPhaseEnd = undefined
return this.$message({
message: '起止年份不能超过十年',
type: 'warning'
diff --git a/src/views/warehouse/index.vue b/src/views/warehouse/index.vue
index 69aecef..f6e8bf4 100644
--- a/src/views/warehouse/index.vue
+++ b/src/views/warehouse/index.vue
@@ -1,7 +1,7 @@
@@ -10,7 +10,7 @@
-
+
@@ -283,6 +283,10 @@ export default {
// this.changeTime()
},
methods: {
+ handleChange() {
+ this.listQuery.materialCode = undefined
+ this.listQuery.materialName = undefined
+ },
async getDataList() {
await getStockRealTimePage(this.listQuery).then(res => {
if (res.code === 0) {
From 4d8300d2136fa598545d3fd71ddcbd1d1ad3eac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 26 Jul 2024 11:16:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E7=A0=81?=
=?UTF-8?q?=E9=A1=B5=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/cost/accounting.vue | 18 +++++++++---------
src/views/warehouse/index.vue | 16 +++++++---------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/views/cost/accounting.vue b/src/views/cost/accounting.vue
index 9c57e00..6c1ee62 100644
--- a/src/views/cost/accounting.vue
+++ b/src/views/cost/accounting.vue
@@ -1,7 +1,7 @@
@@ -30,12 +30,12 @@
-
-
@@ -101,8 +101,8 @@ export default {
// selectedValues: [],
options,
listQuery: {
- // size: 10,
- // current: 1,
+ pageSize: 20,
+ pageNo: 1,
total: 0,
center: undefined,
start: undefined,
@@ -509,8 +509,8 @@ export default {
this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
switch (val.btnName) {
case 'search':
- this.listQuery.current = 1;
- this.listQuery.size = 10;
+ this.listQuery.pageNo = 1;
+ this.listQuery.pageSize = 10;
this.getDataList();
break;
case 'export':
@@ -523,8 +523,8 @@ export default {
/** 导出按钮操作 */
handleExport() {
const queryParams = this.listQuery;
- queryParams.current = 1
- queryParams.size = 999
+ // queryParams.current = 1
+ // queryParams.size = 999
// if (this.facType === 0) {
this.$modal.confirm('是否确认导出所有数据项?').then(() => {
this.exportLoading = true;
diff --git a/src/views/warehouse/index.vue b/src/views/warehouse/index.vue
index f6e8bf4..bae2be3 100644
--- a/src/views/warehouse/index.vue
+++ b/src/views/warehouse/index.vue
@@ -1,7 +1,7 @@
@@ -54,12 +54,12 @@
-
-
@@ -100,8 +100,8 @@ export default {
start: undefined,
end: undefined,
listQuery: {
- size: 10,
- current: 1,
+ pageSize: 20,
+ pageNo: 1,
total: 0,
mDType:0,
wDType: 0,
@@ -299,8 +299,8 @@ export default {
this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
switch (val.btnName) {
case 'search':
- this.listQuery.current = 1;
- this.listQuery.size = 10;
+ this.listQuery.pageNo = 1;
+ this.listQuery.pageSize = 10;
this.getDataList();
break;
case 'export':
@@ -313,8 +313,6 @@ export default {
/** 导出按钮操作 */
handleExport() {
const queryParams = this.listQuery;
- queryParams.current = 1
- queryParams.size = 999
// if (this.facType === 0) {
this.$modal.confirm('是否确认导出所有数据项?').then(() => {
this.exportLoading = true;