|
@@ -617,7 +617,7 @@ export default {
|
|
|
saveLoading: false,
|
|
|
disabled: false,
|
|
|
form: {},
|
|
|
- billType:"销售", //账单类型
|
|
|
+ billType:"收费", //账单类型
|
|
|
billData:{}, //账单需要数据
|
|
|
applySettlementDialog:false,//生成账单组件
|
|
|
configuration: {
|
|
@@ -1118,7 +1118,7 @@ export default {
|
|
|
]
|
|
|
}, {
|
|
|
label: '销售订单号',
|
|
|
- prop: 'orgOrderNo',
|
|
|
+ prop: 'orderNo',
|
|
|
disabled: true,
|
|
|
rules: [
|
|
|
{
|
|
@@ -1478,6 +1478,20 @@ export default {
|
|
|
this.pageLoading = false
|
|
|
let goodsData = []
|
|
|
res.data.forEach(item => {
|
|
|
+ getMarketPrice({code: item.code}).then(res => {
|
|
|
+ if (res.data.data.length > 0) {
|
|
|
+ this.$set(item, 'price', res.data.data[0].salesPrice)
|
|
|
+ } else {
|
|
|
+ this.$set(item, 'price', '0')
|
|
|
+ }
|
|
|
+ })
|
|
|
+ getPurchasePrice({code: item.code}).then(res => {
|
|
|
+ if (res.data.data.length > 0) {
|
|
|
+ this.$set(item, 'purchaseAmount', res.data.data[0].purchasePrice)
|
|
|
+ } else {
|
|
|
+ this.$set(item, 'purchaseAmount', '0')
|
|
|
+ }
|
|
|
+ })
|
|
|
this.$set(item, 'priceType', '一般')
|
|
|
this.$set(item, 'actualQuantity', '0')
|
|
|
this.$set(item, 'purchaseAmount', '0')
|
|
@@ -1742,7 +1756,20 @@ export default {
|
|
|
this.$set(this.tableData[item], 'orderQuantity', 0)
|
|
|
this.$set(this.tableData[item], 'actualQuantity', 0)
|
|
|
this.$set(this.tableData[item], 'purchaseAmount', '0')
|
|
|
- this.tableData[item].price = '0'
|
|
|
+ getMarketPrice({code: this.tableData[item].code}).then(res => {
|
|
|
+ if (res.data.data.length > 0) {
|
|
|
+ this.$set(this.tableData[item], 'price', res.data.data[0].salesPrice)
|
|
|
+ } else {
|
|
|
+ this.$set(this.tableData[item], 'price', '0')
|
|
|
+ }
|
|
|
+ })
|
|
|
+ getPurchasePrice({code: this.tableData[item].code}).then(res => {
|
|
|
+ if (res.data.data.length > 0) {
|
|
|
+ this.$set(this.tableData[item], 'purchaseAmount', res.data.data[0].purchasePrice)
|
|
|
+ } else {
|
|
|
+ this.$set(this.tableData[item], 'purchaseAmount', '0')
|
|
|
+ }
|
|
|
+ })
|
|
|
this.tableData[item].amount = 0
|
|
|
this.tableData[item].sort = this.maxGoodsNum + 1
|
|
|
delete this.tableData[item].id
|