|
@@ -292,7 +292,7 @@
|
|
searchKeyWord: '',
|
|
searchKeyWord: '',
|
|
warehouseName: sessionStorage.getItem('ck'),
|
|
warehouseName: sessionStorage.getItem('ck'),
|
|
managementType: 1,
|
|
managementType: 1,
|
|
- viewFlag:'1'
|
|
|
|
|
|
+ // viewFlag:'1'
|
|
})
|
|
})
|
|
.toPromise()
|
|
.toPromise()
|
|
.then((response) => {
|
|
.then((response) => {
|
|
@@ -323,9 +323,12 @@
|
|
console.log(this.common.commonWeighingList, 'commonWeighingList')
|
|
console.log(this.common.commonWeighingList, 'commonWeighingList')
|
|
let _list = this.common.commonWeighingList
|
|
let _list = this.common.commonWeighingList
|
|
for (let i = 0; i < _list.length; i++) {
|
|
for (let i = 0; i < _list.length; i++) {
|
|
- if (_list[i].allow == 2) {
|
|
|
|
- continue
|
|
|
|
- }
|
|
|
|
|
|
+ if (_list[i].paymentManagement) {
|
|
|
|
+ if (_list[i].paymentManagement.status != '待结算' || _list[i].paymentManagement
|
|
|
|
+ .approveStatus) {
|
|
|
|
+ continue
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if (_list[i].status == '已质检' || _list[i].status == '已称毛重') {
|
|
if (_list[i].status == '已质检' || _list[i].status == '已称毛重') {
|
|
this.mList.push(_list[i])
|
|
this.mList.push(_list[i])
|
|
}
|
|
}
|