|
@@ -74,7 +74,7 @@
|
|
</view> -->
|
|
</view> -->
|
|
<view class="cart-footer-right-button">
|
|
<view class="cart-footer-right-button">
|
|
<button class="btns" :loading="loading" v-if="!editFlag" type="warn" size="mini" @click="settlement">去结算({{totalNum}})</button>
|
|
<button class="btns" :loading="loading" v-if="!editFlag" type="warn" size="mini" @click="settlement">去结算({{totalNum}})</button>
|
|
- <button v-else class="btns" type="warn" plain size="mini" @click="batchRemove">删除</button>
|
|
|
|
|
|
+ <button v-else class="btns" type="warn" plain size="mini" @click="batchRemove">删除({{totalNum}})</button>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -253,7 +253,7 @@
|
|
if(this.editFlag){
|
|
if(this.editFlag){
|
|
this.allChecked = this.list.every(key => key.every(item => item.checked))
|
|
this.allChecked = this.list.every(key => key.every(item => item.checked))
|
|
}else{
|
|
}else{
|
|
- this.allChecked = this.list.every(key => key.every(item => item.checked && (item.status==1||item.dealerScopeFlag==1)))
|
|
|
|
|
|
+ this.allChecked = this.list.every(key => key.filter(item => item.status==1&&item.dealerScopeFlag==1 ).every(item => item.checked))
|
|
}
|
|
}
|
|
},
|
|
},
|
|
// 编辑
|
|
// 编辑
|
|
@@ -297,11 +297,17 @@
|
|
}
|
|
}
|
|
this.allChecked = !this.allChecked
|
|
this.allChecked = !this.allChecked
|
|
this.list.forEach(key => {
|
|
this.list.forEach(key => {
|
|
- key.forEach(item => {
|
|
|
|
- if(item.status == 1 || item.dealerScopeFlag == 1){
|
|
|
|
|
|
+ // 编辑模式
|
|
|
|
+ if(!this.editFlag){
|
|
|
|
+ key.filter(item=>item.status == 1 && item.dealerScopeFlag == 1).forEach(item => {
|
|
item.checked = this.allChecked
|
|
item.checked = this.allChecked
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+ })
|
|
|
|
+ }else{
|
|
|
|
+ // 非编辑模式
|
|
|
|
+ key.forEach(item => {
|
|
|
|
+ item.checked = this.allChecked
|
|
|
|
+ })
|
|
|
|
+ }
|
|
})
|
|
})
|
|
// 合计
|
|
// 合计
|
|
this.getChooseHeji()
|
|
this.getChooseHeji()
|
|
@@ -367,14 +373,9 @@
|
|
})
|
|
})
|
|
// 合计,批量操作
|
|
// 合计,批量操作
|
|
if(isBatch){
|
|
if(isBatch){
|
|
- // 如果全选
|
|
|
|
- if(_this.allChecked){
|
|
|
|
- _this.list = []
|
|
|
|
- _this.allChecked = false
|
|
|
|
- }
|
|
|
|
_this.getChooseHeji()
|
|
_this.getChooseHeji()
|
|
// 判断是否全选
|
|
// 判断是否全选
|
|
- this.isAllChecked()
|
|
|
|
|
|
+ _this.isAllChecked()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
uni.hideLoading()
|
|
uni.hideLoading()
|
|
@@ -438,7 +439,7 @@
|
|
this.submitForm(detailList,cartSn)
|
|
this.submitForm(detailList,cartSn)
|
|
},
|
|
},
|
|
// 确认提交
|
|
// 确认提交
|
|
- submitForm(){
|
|
|
|
|
|
+ submitForm(detailList,cartSn){
|
|
uni.showLoading({
|
|
uni.showLoading({
|
|
title: '提交中...',
|
|
title: '提交中...',
|
|
mask: true
|
|
mask: true
|