|
|
@@ -548,8 +548,8 @@ export default {
|
|
|
getDeliverList({ correspondId: this.mainForm.warehouse }).then(res => {
|
|
|
this.deliverList = res.data
|
|
|
this.deliverList.forEach(k => {
|
|
|
- if (this.mainForm.pickupWay == 2 && this.logisticsNumber === '001' && this.isFront!==null) {
|
|
|
this.$set(k, 'warehouseFlag', null)
|
|
|
+ if (this.mainForm.pickupWay == 2 && this.logisticsNumber === '001' ) {
|
|
|
if (k.refLinkman || k.refPhone || k.refInstallAddress) {
|
|
|
this.$set(k, 'warehouseFlag', 1)
|
|
|
}else{
|
|
|
@@ -582,7 +582,7 @@ export default {
|
|
|
if (this.tableSelection.length < 1) {
|
|
|
return this.$errorMsg('请选择发货申请单')
|
|
|
}
|
|
|
- if (this.mainForm.pickupWay == 2 && this.logisticsNumber === '001' && this.isFront!==null) {
|
|
|
+ if (this.mainForm.pickupWay == 2 && this.logisticsNumber === '001') {
|
|
|
for (let i = 0; i < this.tableSelection.length; i++) {
|
|
|
if (this.tableSelection[i].warehouseFlag == null) {
|
|
|
this.$errorMsg('仓库必选')
|
zhouhao