|
|
@@ -62,7 +62,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="6" v-if="id">
|
|
|
<el-form-item label="单据金额">
|
|
|
- <el-input type="text" :value="formData.createBy" disabled></el-input>
|
|
|
+ <el-input type="text" :value="formData.totalAmount" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6" v-if="id">
|
|
|
@@ -177,7 +177,7 @@
|
|
|
<el-table-column prop="goods.price" align="center" label="销售价格"></el-table-column>
|
|
|
<el-table-column prop="" align="center" label="销售金额" >
|
|
|
<template slot-scope="scope" v-if="scope.row.salesQty && scope.row.goods.price">
|
|
|
- {{scope.row.goods.price * scope.row.salesQty}}
|
|
|
+ {{(scope.row.goods.price * 100) * scope.row.salesQty / 100}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="goods.qty" align="center" label="库存数量"></el-table-column>
|
|
|
@@ -247,7 +247,8 @@
|
|
|
phone: '',
|
|
|
source: '',
|
|
|
payType: '',
|
|
|
- remark: ''
|
|
|
+ remark: '',
|
|
|
+ totalAmount: ''
|
|
|
},
|
|
|
isEdit: 0,
|
|
|
is_submit: true,
|
|
|
@@ -299,6 +300,7 @@
|
|
|
this.getWorker()
|
|
|
this.formData.salesId = res.data.salesId
|
|
|
this.formData.createBy = res.data.createBy
|
|
|
+ this.formData.totalAmount = res.data.totalAmount
|
|
|
this.formData.createTime = res.data.createTime
|
|
|
this.formData.confirmBy = res.data.confirmBy
|
|
|
this.formData.confirmTime = res.data.confirmTime
|
|
|
@@ -315,8 +317,8 @@
|
|
|
item.parentCategory = {categoryId: item.parentCategoryId,categoryName: item.parentCategoryName,items: [{categoryId: item.goodsCategoryId,categoryName: item.goodsCategoryName}]}
|
|
|
item.goodsCategory = {categoryId: item.goodsCategoryId,categoryName: item.goodsCategoryName}
|
|
|
that.getGoods(item.goodsCategoryId,item.goodsName,1).then(ress => {
|
|
|
- item.goods = {...ress.data,oldPrice:ress.data.price}
|
|
|
- item.goodsList = [{...ress.data,oldPrice:ress.data.price}]
|
|
|
+ item.goods = ress.data
|
|
|
+ item.goodsList = [ress.data]
|
|
|
})
|
|
|
})
|
|
|
setTimeout(()=>{
|
pengyh