|
|
@@ -51,9 +51,10 @@
|
|
|
row.sendNum }}</span>
|
|
|
</template>
|
|
|
<template slot="sendNumFinancing" slot-scope="{row}">
|
|
|
- <el-input-number v-if="!mingxibaocun && whetherFinancing == 1" v-model="row.sendNumFinancing"
|
|
|
+ <el-input-number v-if="!mingxibaocun && whetherFinancing == 1 && !financingInventory" v-model="row.sendNumFinancing"
|
|
|
size="small" :controls="false" :precision="0" style="width: 100%"
|
|
|
@change="calculator(row)" />
|
|
|
+ <span v-else-if="financingInventory">{{row.sendNumFinancing = row.inventoryFinancing}}</span>
|
|
|
<span v-else>{{ row.sendNumFinancing }}</span>
|
|
|
</template>
|
|
|
<template slot="sendNumHave" slot-scope="{row}">
|
|
|
@@ -947,14 +948,14 @@ export default {
|
|
|
this.$set(row, 'profitLossAmount', Number(row.subTotalMoney) - Number(row.price))
|
|
|
},
|
|
|
calculator(row) {
|
|
|
- if (row.sendNumFinancing > row.inventoryFinancing) {
|
|
|
- this.$set(row, 'sendNumFinancing', null)
|
|
|
- this.$message.error("融资数量不能大于参考库存融资");
|
|
|
- }
|
|
|
- if (row.sendNumHave > row.inventoryHave) {
|
|
|
- this.$set(row, 'sendNumHave', null)
|
|
|
- this.$message.error("自由数量不能大于参考库存自有");
|
|
|
- }
|
|
|
+ /* if (row.sendNumFinancing > row.inventoryFinancing) {
|
|
|
+ this.$set(row, 'sendNumFinancing', null)
|
|
|
+ this.$message.error("融资数量不能大于参考库存融资");
|
|
|
+ }
|
|
|
+ if (row.sendNumHave > row.inventoryHave) {
|
|
|
+ this.$set(row, 'sendNumHave', null)
|
|
|
+ this.$message.error("自有数量不能大于参考库存自有");
|
|
|
+ }*/
|
|
|
row.sendNum = Number(Number(row.sendNumFinancing) + Number(row.sendNumHave))
|
|
|
row.subTotalMoney = row.sendNum * row.costprie
|
|
|
row.profitLossNum = Number(row.sendNum) - Number(row.inventory)
|
|
|
@@ -971,7 +972,7 @@ export default {
|
|
|
this.$message.error('请先保存')
|
|
|
return
|
|
|
}
|
|
|
- if (this.financingInventory) {
|
|
|
+/* if (this.financingInventory) {
|
|
|
// 不允许盘点融资货 sendNumFinancing
|
|
|
let financing = this.form.orderItemsList.find(item => item.inventoryFinancing > 0)
|
|
|
console.info('financing----', financing)
|
|
|
@@ -979,7 +980,7 @@ export default {
|
|
|
this.$message.error('当前不允许盘点融资货货物');
|
|
|
return false
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
this.$confirm("提交结果之后不可修改? 确认是否继续", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
@@ -1012,7 +1013,7 @@ export default {
|
|
|
// }
|
|
|
// }
|
|
|
console.info('this.financingInventory----', this.financingInventory)
|
|
|
- if (this.financingInventory) {
|
|
|
+/* if (this.financingInventory) {
|
|
|
// 不允许盘点融资货 sendNumFinancing
|
|
|
let financing = this.form.orderItemsList.find(item => item.inventoryFinancing > 0)
|
|
|
console.info('financing----', financing)
|
|
|
@@ -1020,7 +1021,7 @@ export default {
|
|
|
this.$message.error('当前不允许盘点融资货货物');
|
|
|
return false
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
console.log(this.form, 857)
|
|
|
// return
|
|
|
const loading = this.$loading({
|
