shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2024-09-20 23:16:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

4.18 修改

Browse source
This commit is contained in:
tczjx58520 2020-04-18 17:56:55 +08:00
parent 894c80026d
commit 4924032cb1
3 changed files with 51 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/views/SaleOut/AddSaleOut.vue
View file

@ -247,6 +247,7 @@
</div>
<div class="container">
<el-editable
v-loading="listLoading"
ref="editable"
:data.sync="list2"
:edit-config="{ showIcon: true, showStatus: true}"
@ -261,6 +262,7 @@
<el-editable-column :fixed="isfixed" :label="$t('Hmodule.xh')" min-width="55" align="center" type="index"/>
<el-editable-column :fixed="isfixed" :label="$t('Hmodule.wpbh')" prop="productCode" align="center" min-width="150"/>
<el-editable-column :fixed="isfixed" :label="$t('Hmodule.wpmc')" prop="productName" align="center" min-width="150"/>
<el-editable-column :label="$t('updates.kcsl')" :fixed="isfixed" prop="countNumber" align="center" min-width="150"/>
<el-editable-column :label="$t('Hmodule.hw')" prop="location" align="center" min-width="150">
<template slot-scope="scope">
<p>{{ getLocationData(scope.row) }}</p>
@ -653,6 +655,7 @@ export default {
}
}
return {
listLoading: false,
pickerOptions1: {
disabledDate: (time) => {
return time.getTime() < new Date().getTime() - 8.64e7
@ -1564,7 +1567,10 @@ export default {
}
}
})
console.log(`调用次数${this.flag}`, this.flag)
// 查询库存数量
countlist(this.personalForm.saleRepositoryId, this.$store.getters.regionIds, row.productCode).then(res => {
row.countNumber = res.data.data.content.list[0].existStock
})
return row.location
}
row.flag = false

32
src/views/SaleOut/NewAccessoriesOut.vue
View file

@ -131,6 +131,7 @@
</div>
<div class="container">
<el-editable
v-loading="listLoading"
ref="editable"
:data.sync="list2"
:edit-config="{ showIcon: true, showStatus: true}"
@ -145,6 +146,7 @@
<el-editable-column :fixed="isfixed" :label="$t('Hmodule.xh')" min-width="55" align="center" type="index"/>
<el-editable-column :fixed="isfixed" :label="$t('Hmodule.wpbh')" prop="productCode" align="center" min-width="150"/>
<el-editable-column :fixed="isfixed" :label="$t('Hmodule.wpmc')" prop="productName" align="center" min-width="150"/>
<el-editable-column :label="$t('updates.kcsl')" :fixed="isfixed" prop="countNumber" align="center" min-width="150"/>
<el-editable-column :label="$t('Hmodule.hw')" prop="location" align="center" min-width="150">
<template slot-scope="scope">
<p>{{ getLocationData(scope.row) }}</p>
@ -166,8 +168,8 @@
<el-editable-column :label="$t('updates.jbdw')" prop="unit" align="center" min-width="150"/>
<el-editable-column :label="$t('updates.ggxh')" prop="typeId" align="center" min-width="150"/>
<el-editable-column :label="$t('updates.ys')" prop="color" align="center" min-width="150"/>
<el-editable-column :label="$t('updates.jxf')" prop="kpiGrade" align="center" min-width="150"/>
<el-editable-column :label="$t('updates.spjf')" prop="point" align="center" min-width="150"/>
<!-- <el-editable-column :label="$t('updates.jxf')" prop="kpiGrade" align="center" min-width="150"/> -->
<!-- <el-editable-column :label="$t('updates.spjf')" prop="point" align="center" min-width="150"/> -->
<el-editable-column :label="$t('updates.ydsl')" prop="allQuantity" align="center" min-width="150"/>
<el-editable-column :label="$t('updates.wcksl')" prop="allQuantity" align="center" min-width="150"/>
<el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('updates.cksli')" prop="quantity" align="center" min-width="150" >
@ -523,6 +525,7 @@ export default {
}
}
return {
listLoading: false,
pickerOptions1: {
disabledDate: (time) => {
return time.getTime() < new Date().getTime() - 8.64e7
@ -733,19 +736,6 @@ export default {
num += this.list2[i].quantity
num2 += Number(this.list2[i].discountMoney)
num1 += this.list2[i].includeTaxCostMoney
productlist(this.list2[i].productCode).then(res => {
if (res.data.ret === 200) {
if (res.data.data.content.list[0].isBatch === 2) {
this.list2[i].batch = '不使用'
}
} else {
this.$notify.error({
title: 'wrong',
message: res.data.msg,
offset: 100
})
}
})
}
this.heji1 = num
this.heji3 = num1
@ -1473,7 +1463,13 @@ export default {
}
},
getLocationData(row) {
if (row.flag === undefined) {
row.flag = true
} else {
return row.location
}
// 默认批次
if (row.flag) {
if (row.batch === null || row.batch === '' || row.batch === undefined) {
const parms3 = row.productCode
batchlist(this.personalForm.saleRepositoryId, parms3).then(res => {
@ -1503,7 +1499,13 @@ export default {
}
}
})
// 查询库存数量
countlist(this.personalForm.saleRepositoryId, this.$store.getters.regionIds, row.productCode).then(res => {
row.countNumber = res.data.data.content.list[0].existStock
})
return row.location
}
row.flag = false
},
chooseSourceType(val) {
this.receivableMoney = ''

1
src/views/SaleOut/components/MyMaterials.vue
View file

@ -294,6 +294,7 @@ export default {
const detialproduct = [].concat.apply([], yuan)
const finalproduct = detialproduct.map(item => {
return {
countNumber: 0,
categoryName: item.productCategory,
category: item.categoryId,
type: item.typeId,