From a1e72e5292891286990b8965ddb102c226b689a6 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 20 Aug 2025 15:08:47 +0800
Subject: [PATCH] =?UTF-8?q?v1.9=20=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=89=A9=E5=93=81=E6=80=BB=E4=BB=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resource/resourceStoreTimes.vue | 14 +++++-----
src/views/resource/resourceStoreManageLang.js | 16 ++++++++++++
.../resource/resourceStoreManageList.vue | 26 ++++++++++---------
src/views/user/login/Login.vue | 4 +--
4 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/src/components/resource/resourceStoreTimes.vue b/src/components/resource/resourceStoreTimes.vue
index f134d476c..0d962ce79 100644
--- a/src/components/resource/resourceStoreTimes.vue
+++ b/src/components/resource/resourceStoreTimes.vue
@@ -13,9 +13,9 @@
-
+
@@ -49,17 +49,15 @@ export default {
},
async _loadAllResourceStoreTimes(page, rows, resCode, shId) {
try {
- const params = {
- params: {
+
+ const { data, totalPrice } = await listResourceStoreTimes({
page: page,
row: rows,
resCode: resCode,
shId: shId
- }
- }
- const { data, totalPrice } = await listResourceStoreTimes(params)
+ })
this.resourceStoreTimesInfo.timeses = data
- this.resourceStoreTimesInfo.totalPrice = totalPrice.toFixed(2)
+ this.resourceStoreTimesInfo.totalPrice = totalPrice
} catch (error) {
this.$message.error(this.$t('common.fetchError'))
}
diff --git a/src/views/resource/resourceStoreManageLang.js b/src/views/resource/resourceStoreManageLang.js
index c778f118a..5e974b9f6 100644
--- a/src/views/resource/resourceStoreManageLang.js
+++ b/src/views/resource/resourceStoreManageLang.js
@@ -118,6 +118,14 @@ export const messages = {
fetchTotalPriceError: 'Failed to get total price details',
storehouse: 'Storehouse',
selectType: 'Please select resource type'
+ },
+ resourceStoreTimes:{
+ title: 'Total Price Details',
+ itemCode: 'Item Code',
+ inboundTime: 'Inbound Time',
+ unitPrice: 'Unit Price',
+ stock: 'Stock',
+ totalPrice: 'Total Price',
}
},
zh: {
@@ -239,6 +247,14 @@ export const messages = {
fetchTotalPriceError: '获取物品总价详情失败',
storehouse: '仓库',
selectType: '请选择物品类型'
+ },
+ resourceStoreTimes:{
+ title: '物品总价详情',
+ itemCode: '物品编码',
+ inboundTime: '入库时间',
+ unitPrice: '单价',
+ stock: '库存',
+ totalPrice: '总价',
}
}
}
\ No newline at end of file
diff --git a/src/views/resource/resourceStoreManageList.vue b/src/views/resource/resourceStoreManageList.vue
index 0f275d259..a47cf2352 100644
--- a/src/views/resource/resourceStoreManageList.vue
+++ b/src/views/resource/resourceStoreManageList.vue
@@ -27,8 +27,8 @@
-
+
@@ -46,7 +46,7 @@
:label="item.specName" :value="item.rssId">
-
+
-
+
{{ scope.row.resName }}({{ scope.row.resCode }})
-
+
{{ scope.row.parentRstName }}
@@ -401,14 +403,14 @@ export default {
this.resourceStoreManageInfo.curType = {}
this.$refs.addResourceStoreType.open('')
return;
- }
- if(!_curType || !_curType.rstId){
+ }
+ if (!_curType || !_curType.rstId) {
this.$message.error(this.$t('resourceStoreManage.selectType'))
return;
}
- this.$refs.addResourceStoreType.open(_curType.rstId)
-
-
+ this.$refs.addResourceStoreType.open(_curType.rstId)
+
+
},
openDeleteResourceStoreTypeModel() {
@@ -467,9 +469,9 @@ export default {
async exportExcel() {
try {
this.resourceStoreManageInfo.conditions.pagePath = 'resourceStoreManage'
- const res = await exportData(this.resourceStoreManageInfo.conditions)
+ const res = await exportData(this.resourceStoreManageInfo.conditions)
this.$message.success(this.$t('resourceStoreManage.exportSuccess'))
- if(res && res.code === 0){
+ if (res && res.code === 0) {
window.open('/#/pages/property/downloadTempFile?tab=下载中心')
}
} catch (error) {
diff --git a/src/views/user/login/Login.vue b/src/views/user/login/Login.vue
index 1bd17b013..7020dc5e7 100644
--- a/src/views/user/login/Login.vue
+++ b/src/views/user/login/Login.vue
@@ -44,8 +44,8 @@ export default {
logo: '',
companyName:'',
loginForm: {
- username: 'wuxw',
- passwd: 'admin',
+ username: '',
+ passwd: '',
validateCode: ''
},
captchaUrl: '',