diff --git a/src/views/CheckReport/components/DetailReport4.vue b/src/views/CheckReport/components/DetailReport4.vue
index 9633e1ec..d05b86c7 100644
--- a/src/views/CheckReport/components/DetailReport4.vue
+++ b/src/views/CheckReport/components/DetailReport4.vue
@@ -24,6 +24,11 @@
{{ scope.row.unit }}
+
+
+ {{ scope.row.color }}
+
+
{{ scope.row.quantity }}
diff --git a/src/views/OutFactory/OutFactoryList.vue b/src/views/OutFactory/OutFactoryList.vue
index feea8efa..84de0f89 100644
--- a/src/views/OutFactory/OutFactoryList.vue
+++ b/src/views/OutFactory/OutFactoryList.vue
@@ -49,15 +49,15 @@
width="55"
fixed="left"
align="center"/>
-
+
- {{ scope.row.factoryNumber }}
+ {{ scope.row.factoryName }}
+
-
-
+
- {{ scope.row.factoryName }}
+ {{ scope.row.factoryNumber }}
diff --git a/src/views/OutFactory/components/MyDetail.vue b/src/views/OutFactory/components/MyDetail.vue
index 334c91ac..45875406 100644
--- a/src/views/OutFactory/components/MyDetail.vue
+++ b/src/views/OutFactory/components/MyDetail.vue
@@ -207,7 +207,6 @@ export default {
}
},
created() {
- this.getlist()
},
beforeCreate() {
_that = this
@@ -215,13 +214,20 @@ export default {
methods: {
// 根据id选中
selectFromId(showList, selectList) {
- if (selectList) {
- for (const i in showList) {
- if (selectList.findIndex(item => item.productCode === showList[i].code) > -1) {
- this.$refs.multipleTable.toggleRowSelection(showList[i], true)
+ this.$refs.multipleTable.clearSelection()
+ this.$nextTick(() => {
+ if (selectList) {
+ console.log('showList和selectList', showList, selectList)
+ for (const i in showList) {
+ if (selectList.findIndex(item => item.productCode === showList[i].code) > -1) {
+ console.log('选中==================', i, showList[i])
+ this.$refs.multipleTable.toggleRowSelection(showList[i], true)
+ } else {
+ this.$refs.multipleTable.toggleRowSelection(showList[i], false)
+ }
}
}
- }
+ })
return showList
},
getlist() {
@@ -254,15 +260,7 @@ export default {
// 搜索
handleFilter() {
this.getemplist.pagenum = 1
- productlist(this.getemplist).then(res => {
- if (res.data.ret === 200) {
- this.list = res.data.data.content.list
- this.total = res.data.data.content.totalCount
- // this.restFilter()
- } else {
- // this.restFilter()
- }
- })
+ this.getlist()
},
// 批量操作
handleSelectionChange(rows) {
diff --git a/src/views/OutFactory/components/MyDialog.vue b/src/views/OutFactory/components/MyDialog.vue
index ddf7572f..1ec6d4b3 100644
--- a/src/views/OutFactory/components/MyDialog.vue
+++ b/src/views/OutFactory/components/MyDialog.vue
@@ -1,5 +1,5 @@
-
+
@@ -464,28 +464,22 @@ export default {
return result
},
productdetail(val) {
- console.log(val)
- // const nowlistdata = this.$refs.editable.getRecords()
const nowlistdata = this.$refs.editable.getRecords()
const alldata = [...val, ...nowlistdata]
const filterdata = this.uniqueArray(alldata, 'productCode')
-
+ console.log('filterdata=========', filterdata)
for (let i = 0; i < filterdata.length; i++) {
console.log(filterdata[i].price)
let m = 1
for (let j = 0; j < nowlistdata.length; j++) {
if (filterdata[i].productCode === nowlistdata[j].productCode) {
m = 2
- // this.$notify.error({
- // title: 'wrong',
- // message: this.$t('prompt.wpytj'),
- // offset: 100
- // })
- // return false
}
}
- filterdata[i].discountRate = 0
- filterdata[i].price = filterdata[i].purchasePrice
+ if (filterdata[i].price === undefined) {
+ filterdata[i].price = 0
+ }
+ // filterdata[i].price = filterdata[i].purchasePrice
if (m === 1) {
this.$refs.editable.insert(filterdata[i])
}
diff --git a/src/views/OutSourceOut/AddOutSourceOut.vue b/src/views/OutSourceOut/AddOutSourceOut.vue
index 5f821e51..bd8bbfcc 100644
--- a/src/views/OutSourceOut/AddOutSourceOut.vue
+++ b/src/views/OutSourceOut/AddOutSourceOut.vue
@@ -671,27 +671,27 @@ export default {
handlesave() {
const EnterDetail = this.deepClone(this.$refs.editable.getRecords())
// 保存时同样商品不能有同一个批次
- let i = 0
- EnterDetail.map(function(elem) {
- return elem
- }).forEach(function(elem) {
- EnterDetail.map(function(elem2) {
- return elem2
- }).forEach(function(elem2) {
- if (elem2.productCode === elem.productCode && elem2.batch === elem.batch) {
- i++
- }
- })
- })
- console.log(i)
- if (i > EnterDetail.length) {
- this.$notify.error({
- title: 'wrong',
- message: '同样商品不能有同一个批次',
- offset: 100
- })
- return false
- }
+ // let i = 0
+ // EnterDetail.map(function(elem) {
+ // return elem
+ // }).forEach(function(elem) {
+ // EnterDetail.map(function(elem2) {
+ // return elem2
+ // }).forEach(function(elem2) {
+ // if (elem2.productCode === elem.productCode && elem2.batch === elem.batch) {
+ // i++
+ // }
+ // })
+ // })
+ // console.log(i)
+ // if (i > EnterDetail.length) {
+ // this.$notify.error({
+ // title: 'wrong',
+ // message: '同样商品不能有同一个批次',
+ // offset: 100
+ // })
+ // return false
+ // }
// 批次货位不能为空
let j = 1
EnterDetail.map(function(elem) {
diff --git a/src/views/StockInvoice/AddStockInvoice.vue b/src/views/StockInvoice/AddStockInvoice.vue
index fa893fd2..f22c6e6f 100644
--- a/src/views/StockInvoice/AddStockInvoice.vue
+++ b/src/views/StockInvoice/AddStockInvoice.vue
@@ -215,7 +215,7 @@
+ @input="getdiscountRate(scope.row, scope)"/>
@@ -636,12 +636,32 @@ export default {
}
},
// 通过折扣计算折扣额
- getdiscountRate(row) {
+ getdiscountRate(row, scope) {
+ console.log('执行了')
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
row.discountMoney = (row.includeTaxPrice * row.quantity * (row.discountRate / 100)).toFixed(2)
}
+ if (row !== '' && row !== null && row !== undefined && scope.$index === 0) {
+ if (row.discountRate !== '' && row.discountRate !== null && row.discountRate !== undefined) {
+ for (let i = 0; i < this.list2.length; i++) {
+ this.list2[i].temp = i
+ }
+ for (let i = row.temp; i < this.list2.length; i++) {
+ console.log('this.list2[i].discountRate', this.list2[i].discountRate)
+ if (this.list2[i].discountRate !== null && this.list2[i].discountRate !== 0 && this.list2[i].discountRate !== '' && this.list2[i].discountRate !== undefined) {
+ // this.list2[i].requireDate = row.requireDate
+ // this.list2[i].requireQuantity = row.requireQuantity
+ } else {
+ console.log(222)
+ // this.list2[i].requireDate = row.requireDate
+ this.list2[i].discountRate = row.discountRate
+ }
+ }
+ console.log(row)
+ }
+ }
},
// 通过税率计算含税价
gettaxRate(row) {
diff --git a/src/views/Stockenter/components/MyArrival.vue b/src/views/Stockenter/components/MyArrival.vue
index 66b31ef7..dcaf65a7 100644
--- a/src/views/Stockenter/components/MyArrival.vue
+++ b/src/views/Stockenter/components/MyArrival.vue
@@ -379,7 +379,7 @@ export default {
color: item.color,
basicQuantity: (Number(item.arrivalQuantity) - Number(item.hadStorageQuantity)).toFixed(2),
actualEnterQuantity: (Number(item.arrivalQuantity) - Number(item.hadStorageQuantity)).toFixed(2),
- enterPrice: (item.includeTaxPrice).toFixed(2),
+ enterPrice: item.includeTaxPrice,
taxRate: (item.taxRate).toFixed(2),
enterMoney: '0.00',
remarks: '',
@@ -391,7 +391,7 @@ export default {
hadStorageQuantity: item.hadStorageQuantity
}
})
- console.log(arrivalDetail)
+ console.log('arrivalDetail', arrivalDetail)
this.$emit('arrival', arrivalDetail)
this.$emit('allarrivalinfo', this.choosedata)
}