mirror of
https://gitee.com/java110/MicroCommunityWeb.git
synced 2026-06-12 10:00:56 +08:00
v1.9 优化采购查询物品总价bug
This commit is contained in:
parent
0d65871cd9
commit
a1e72e5292
@ -13,9 +13,9 @@
|
|||||||
<el-table-column prop="stock" :label="$t('resourceStoreTimes.stock')" align="center" />
|
<el-table-column prop="stock" :label="$t('resourceStoreTimes.stock')" align="center" />
|
||||||
<el-table-column prop="totalPrice" :label="$t('resourceStoreTimes.totalPrice')" align="center" />
|
<el-table-column prop="totalPrice" :label="$t('resourceStoreTimes.totalPrice')" align="center" />
|
||||||
</el-table>
|
</el-table>
|
||||||
<div style="text-align: right; margin-top: 20px;">
|
<!-- <div style="text-align: right; margin-top: 20px;">
|
||||||
<span>{{ $t('resourceStoreTimes.totalPrice') }}: {{ resourceStoreTimesInfo.totalPrice }}</span>
|
<span>{{ $t('resourceStoreTimes.totalPrice') }}: {{ resourceStoreTimesInfo.totalPrice }}</span>
|
||||||
</div>
|
</div> -->
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -49,17 +49,15 @@ export default {
|
|||||||
},
|
},
|
||||||
async _loadAllResourceStoreTimes(page, rows, resCode, shId) {
|
async _loadAllResourceStoreTimes(page, rows, resCode, shId) {
|
||||||
try {
|
try {
|
||||||
const params = {
|
|
||||||
params: {
|
const { data, totalPrice } = await listResourceStoreTimes({
|
||||||
page: page,
|
page: page,
|
||||||
row: rows,
|
row: rows,
|
||||||
resCode: resCode,
|
resCode: resCode,
|
||||||
shId: shId
|
shId: shId
|
||||||
}
|
})
|
||||||
}
|
|
||||||
const { data, totalPrice } = await listResourceStoreTimes(params)
|
|
||||||
this.resourceStoreTimesInfo.timeses = data
|
this.resourceStoreTimesInfo.timeses = data
|
||||||
this.resourceStoreTimesInfo.totalPrice = totalPrice.toFixed(2)
|
this.resourceStoreTimesInfo.totalPrice = totalPrice
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.$message.error(this.$t('common.fetchError'))
|
this.$message.error(this.$t('common.fetchError'))
|
||||||
}
|
}
|
||||||
|
|||||||
@ -118,6 +118,14 @@ export const messages = {
|
|||||||
fetchTotalPriceError: 'Failed to get total price details',
|
fetchTotalPriceError: 'Failed to get total price details',
|
||||||
storehouse: 'Storehouse',
|
storehouse: 'Storehouse',
|
||||||
selectType: 'Please select resource type'
|
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: {
|
zh: {
|
||||||
@ -239,6 +247,14 @@ export const messages = {
|
|||||||
fetchTotalPriceError: '获取物品总价详情失败',
|
fetchTotalPriceError: '获取物品总价详情失败',
|
||||||
storehouse: '仓库',
|
storehouse: '仓库',
|
||||||
selectType: '请选择物品类型'
|
selectType: '请选择物品类型'
|
||||||
|
},
|
||||||
|
resourceStoreTimes:{
|
||||||
|
title: '物品总价详情',
|
||||||
|
itemCode: '物品编码',
|
||||||
|
inboundTime: '入库时间',
|
||||||
|
unitPrice: '单价',
|
||||||
|
stock: '库存',
|
||||||
|
totalPrice: '总价',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -27,8 +27,8 @@
|
|||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-select v-model="resourceStoreManageInfo.conditions.shId" style="width:100%">
|
<el-select v-model="resourceStoreManageInfo.conditions.shId" style="width:100%">
|
||||||
<el-option :label="$t('resourceStoreManage.selectStorehouse')" value=""></el-option>
|
<el-option :label="$t('resourceStoreManage.selectStorehouse')" value=""></el-option>
|
||||||
<el-option v-for="(item, index) in resourceStoreManageInfo.storehouses" :key="index" :label="item.shName"
|
<el-option v-for="(item, index) in resourceStoreManageInfo.storehouses" :key="index"
|
||||||
:value="item.shId"></el-option>
|
:label="item.shName" :value="item.shId"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
@ -100,13 +100,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<el-table :data="resourceStoreManageInfo.resourceStores" border style="width:100%">
|
<el-table :data="resourceStoreManageInfo.resourceStores" border style="width:100%">
|
||||||
<el-table-column prop="resId" :label="$t('resourceStoreManage.resourceId')" align="center"></el-table-column>
|
<el-table-column prop="resId" :label="$t('resourceStoreManage.resourceId')"
|
||||||
|
align="center"></el-table-column>
|
||||||
<el-table-column :label="$t('resourceStoreManage.resourceNameCode')" align="center">
|
<el-table-column :label="$t('resourceStoreManage.resourceNameCode')" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.resName }}({{ scope.row.resCode }})
|
{{ scope.row.resName }}({{ scope.row.resCode }})
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="shName" :label="$t('resourceStoreManage.storeName')" align="center"></el-table-column>
|
<el-table-column prop="shName" :label="$t('resourceStoreManage.storeName')"
|
||||||
|
align="center"></el-table-column>
|
||||||
<el-table-column :label="$t('resourceStoreManage.resourceType')" align="center">
|
<el-table-column :label="$t('resourceStoreManage.resourceType')" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.parentRstName }}
|
{{ scope.row.parentRstName }}
|
||||||
|
|||||||
@ -44,8 +44,8 @@ export default {
|
|||||||
logo: '',
|
logo: '',
|
||||||
companyName:'',
|
companyName:'',
|
||||||
loginForm: {
|
loginForm: {
|
||||||
username: 'wuxw',
|
username: '',
|
||||||
passwd: 'admin',
|
passwd: '',
|
||||||
validateCode: ''
|
validateCode: ''
|
||||||
},
|
},
|
||||||
captchaUrl: '',
|
captchaUrl: '',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user