|
@@ -24,8 +24,8 @@
|
|
</div>
|
|
</div>
|
|
本次入库数量合计:<strong>{{ item && (item.totalRealPutQty || item.totalRealPutQty==0) ? item.totalRealPutQty : '--' }}</strong>
|
|
本次入库数量合计:<strong>{{ item && (item.totalRealPutQty || item.totalRealPutQty==0) ? item.totalRealPutQty : '--' }}</strong>
|
|
<div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">,
|
|
<div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">,
|
|
- 本次入库金额合计:<strong>{{ item && (item.totalRealPutAmount || item.totalRealPutAmount==0) ? toThousands(item.totalRealPutAmount, 2) : '--' }}</strong>
|
|
|
|
- </div>
|
|
|
|
|
|
+ 本次入库金额合计:<strong>{{ item && (item.totalRealPutAmount || item.totalRealPutAmount==0) ? toThousands(item.totalRealPutAmount, 2) : '--' }}</strong>
|
|
|
|
+ </div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</a-alert>
|
|
</a-alert>
|
|
@@ -92,7 +92,7 @@
|
|
<script>
|
|
<script>
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
-import { purchaseWriteStockIn, receivingQuery, receivingDetail } from '@/api/purchase'
|
|
|
|
|
|
+import { purchaseWriteStockIn, receivingFindBySn, receivingDetail } from '@/api/purchase'
|
|
import { updateRealPutQty } from '@/api/receiving'
|
|
import { updateRealPutQty } from '@/api/receiving'
|
|
import { purchaseUpdateWarehouse } from '@/api/purchaseDetail'
|
|
import { purchaseUpdateWarehouse } from '@/api/purchaseDetail'
|
|
import ProductType from '../../common/productType.js'
|
|
import ProductType from '../../common/productType.js'
|
|
@@ -128,7 +128,9 @@ export default {
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].no = no + i + 1
|
|
|
|
+ data.list[i].realPutQty = data.list[i].realPutQty == undefined ? data.list[i].putQty : data.list[i].realPutQty
|
|
data.list[i].shippedQty = data.list[i].realPutQty
|
|
data.list[i].shippedQty = data.list[i].realPutQty
|
|
|
|
+ data.list[i].realPutAmount = data.list[i].realPutAmount == undefined ? data.list[i].discountedAmount : data.list[i].realPutAmount
|
|
const warehouseSn = data.list[i].warehouseSn || undefined
|
|
const warehouseSn = data.list[i].warehouseSn || undefined
|
|
const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
|
|
const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
|
|
if (warehouseSn || warehouseLocationSn) {
|
|
if (warehouseSn || warehouseLocationSn) {
|
|
@@ -228,9 +230,9 @@ export default {
|
|
// 详情
|
|
// 详情
|
|
getDetail () {
|
|
getDetail () {
|
|
this.spinning = true
|
|
this.spinning = true
|
|
- receivingQuery({ receivingBillSn: this.$route.params.sn }).then(res => {
|
|
|
|
|
|
+ receivingFindBySn({ receivingBillSn: this.$route.params.sn }).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
- this.detail = res.data
|
|
|
|
|
|
+ this.detail = [res.data]
|
|
} else {
|
|
} else {
|
|
this.detail = null
|
|
this.detail = null
|
|
}
|
|
}
|
|
@@ -274,17 +276,17 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 修改入库数量
|
|
// 修改入库数量
|
|
- changePutQty(record, bindex){
|
|
|
|
- if(record.realPutQty == record.shippedQty){
|
|
|
|
|
|
+ changePutQty (record, bindex) {
|
|
|
|
+ if (record.realPutQty == record.shippedQty) {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
this.spinning = true
|
|
this.spinning = true
|
|
- updateRealPutQty({id:record.id,realPutQty:record.realPutQty}).then(res => {
|
|
|
|
- if(res.status == 200){
|
|
|
|
|
|
+ updateRealPutQty({ id: record.id, realPutQty: record.realPutQty }).then(res => {
|
|
|
|
+ if (res.status == 200) {
|
|
this.$message.success(res.message)
|
|
this.$message.success(res.message)
|
|
this.getDetail()
|
|
this.getDetail()
|
|
this.$refs['table-' + bindex][0].refresh()
|
|
this.$refs['table-' + bindex][0].refresh()
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
record.realPutQty = record.shippedQty
|
|
record.realPutQty = record.shippedQty
|
|
}
|
|
}
|
|
this.spinning = false
|
|
this.spinning = false
|