|
@@ -398,7 +398,7 @@
|
|
|
(scope.row.price * scope.row.qty * 100 -
|
|
|
((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 -
|
|
|
((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) /
|
|
|
- 100
|
|
|
+ 100
|
|
|
}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -550,11 +550,8 @@
|
|
|
>
|
|
|
<el-table-column align="center" label="" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- @click="chooseItem(scope.row.recordNo, scope.row.userid)"
|
|
|
- >选择
|
|
|
+ <el-button type="primary" size="small" @click="chooseItem(scope.row.recordNo, scope.row.userid)"
|
|
|
+ >选择
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -588,24 +585,46 @@
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="proNum">
|
|
|
- <el-input v-model="goodsScreenForm.proNum" placeholder="请输入物料编码" />
|
|
|
+ <el-input
|
|
|
+ @keyup.enter.native="submitGoodsScreenForm"
|
|
|
+ v-model="goodsScreenForm.proNum"
|
|
|
+ placeholder="请输入物料编码"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="proName">
|
|
|
- <el-input v-model="goodsScreenForm.proName" placeholder="请输入产品名称" />
|
|
|
+ <el-input
|
|
|
+ @keyup.enter.native="submitGoodsScreenForm"
|
|
|
+ v-model="goodsScreenForm.proName"
|
|
|
+ placeholder="请输入产品名称"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="proModel">
|
|
|
- <el-input v-model="goodsScreenForm.proModel" placeholder="请输入产品型号" />
|
|
|
+ <el-input
|
|
|
+ @keyup.enter.native="submitGoodsScreenForm"
|
|
|
+ v-model="goodsScreenForm.proModel"
|
|
|
+ placeholder="请输入产品型号"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="price1" style="display: flex">
|
|
|
- <el-input v-model="goodsScreenForm.price1" placeholder="请输入价格" style="width: 46%" />
|
|
|
+ <el-input
|
|
|
+ @keyup.enter.native="submitGoodsScreenForm"
|
|
|
+ v-model="goodsScreenForm.price1"
|
|
|
+ placeholder="请输入价格"
|
|
|
+ style="width: 46%"
|
|
|
+ />
|
|
|
<span> - </span>
|
|
|
- <el-input v-model="goodsScreenForm.price2" placeholder="请输入价格" style="width: 46%" />
|
|
|
+ <el-input
|
|
|
+ @keyup.enter.native="submitGoodsScreenForm"
|
|
|
+ v-model="goodsScreenForm.price2"
|
|
|
+ placeholder="请输入价格"
|
|
|
+ style="width: 46%"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="24" :lg="24" class="tr">
|
|
@@ -698,24 +717,46 @@
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="proNum">
|
|
|
- <el-input v-model="goodsScreenForm.proNum" placeholder="请输入物料编码" />
|
|
|
+ <el-input
|
|
|
+ @keyup.enter.native="submitGoodsScreenForm"
|
|
|
+ v-model="goodsScreenForm.proNum"
|
|
|
+ placeholder="请输入物料编码"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="proName">
|
|
|
- <el-input v-model="goodsScreenForm.proName" placeholder="请输入产品名称" />
|
|
|
+ <el-input
|
|
|
+ @keyup.enter.native="submitGoodsScreenForm"
|
|
|
+ v-model="goodsScreenForm.proName"
|
|
|
+ placeholder="请输入产品名称"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="proModel">
|
|
|
- <el-input v-model="goodsScreenForm.proModel" placeholder="请输入产品型号" />
|
|
|
+ <el-input
|
|
|
+ @keyup.enter.native="submitGoodsScreenForm"
|
|
|
+ v-model="goodsScreenForm.proModel"
|
|
|
+ placeholder="请输入产品型号"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="price1" style="display: flex">
|
|
|
- <el-input v-model="goodsScreenForm.price1" placeholder="请输入价格" style="width: 46%" />
|
|
|
+ <el-input
|
|
|
+ @keyup.enter.native="submitGoodsScreenForm"
|
|
|
+ v-model="goodsScreenForm.price1"
|
|
|
+ placeholder="请输入价格"
|
|
|
+ style="width: 46%"
|
|
|
+ />
|
|
|
<span> - </span>
|
|
|
- <el-input v-model="goodsScreenForm.price2" placeholder="请输入价格" style="width: 46%" />
|
|
|
+ <el-input
|
|
|
+ @keyup.enter.native="submitGoodsScreenForm"
|
|
|
+ v-model="goodsScreenForm.price2"
|
|
|
+ placeholder="请输入价格"
|
|
|
+ style="width: 46%"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="24" :lg="24" class="tr">
|
|
@@ -984,7 +1025,7 @@ export default {
|
|
|
immediate: true,
|
|
|
deep: true
|
|
|
},
|
|
|
- 'mainForm.saleType': function(newValue, oldValue) {
|
|
|
+ 'mainForm.saleType': function (newValue, oldValue) {
|
|
|
this.oldSaleType = oldValue
|
|
|
}
|
|
|
},
|