fix(addRechargeCard): bug-54 修复充值提货卡功能无法选择商品的bug
This commit is contained in:
parent
9abbdd07d2
commit
f208f8fdb2
|
|
@ -129,21 +129,21 @@
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td colspan="2" style="border-right: 1px solid #fff">
|
<td colspan="2" style="border-right: 1px solid #fff">
|
||||||
<el-input :disabled="deled" v-model="ctem.baseQuantity" />
|
<el-input v-model="ctem.baseQuantity" :disabled="deled" />
|
||||||
</td>
|
</td>
|
||||||
<!-- 可提数量 -->
|
<!-- 可提数量 -->
|
||||||
<td colspan="2" style="border-right: 1px solid #fff">
|
<td colspan="2" style="border-right: 1px solid #fff">
|
||||||
<el-input disabled v-model="ctem.usableQuantity" />
|
<el-input v-model="ctem.usableQuantity" disabled />
|
||||||
</td>
|
</td>
|
||||||
<!-- 增加数量 -->
|
<!-- 增加数量 -->
|
||||||
<td colspan="2" style="border-right: 1px solid #fff">
|
<td colspan="2" style="border-right: 1px solid #fff">
|
||||||
<el-input :disabled="deled" v-model="ctem.quantity" />
|
<el-input v-model="ctem.quantity" :disabled="deled" />
|
||||||
</td>
|
</td>
|
||||||
<td colspan="2" style="border-right: 1px solid #fff">
|
<td colspan="2" style="border-right: 1px solid #fff">
|
||||||
<!-- <el-input v-model="ctem.orderAchieve"></el-input>-->
|
<!-- <el-input v-model="ctem.orderAchieve"></el-input>-->
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
:disabled="deled"
|
|
||||||
v-model="ctem.receiveTime"
|
v-model="ctem.receiveTime"
|
||||||
|
:disabled="deled"
|
||||||
type="date"
|
type="date"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
format="yyyy-MM-dd"
|
format="yyyy-MM-dd"
|
||||||
|
|
@ -233,16 +233,20 @@
|
||||||
>
|
>
|
||||||
<div class="cpHeight">
|
<div class="cpHeight">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="22"> <el-input v-model="select.queryInfo"
|
<el-col :span="22"> <el-input
|
||||||
|
v-model="select.queryInfo"
|
||||||
clearable
|
clearable
|
||||||
:placeholder="'请输入'"
|
:placeholder="'请输入'"
|
||||||
|
prefix-icon="el-icon-search"
|
||||||
@keyup.enter.native="getDataList"
|
@keyup.enter.native="getDataList"
|
||||||
prefix-icon="el-icon-search"></el-input>
|
/>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="2">
|
<el-col :span="2">
|
||||||
<el-button type="primary"
|
<el-button
|
||||||
|
type="primary"
|
||||||
size="small"
|
size="small"
|
||||||
@click="getDataList"> {{ '搜索' }}</el-button>
|
@click="getDataList"
|
||||||
|
> {{ '搜索' }}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<div style="height:10px" />
|
<div style="height:10px" />
|
||||||
|
|
@ -264,10 +268,11 @@
|
||||||
prop="productName"
|
prop="productName"
|
||||||
:label="'产品名称'"
|
:label="'产品名称'"
|
||||||
/>
|
/>
|
||||||
<el-table-column align="center"
|
<el-table-column
|
||||||
|
align="center"
|
||||||
prop="productCode"
|
prop="productCode"
|
||||||
:label="'产品编号'">
|
:label="'产品编号'"
|
||||||
</el-table-column>
|
/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center"
|
align="center"
|
||||||
prop="productName"
|
prop="productName"
|
||||||
|
|
@ -424,7 +429,7 @@ export default {
|
||||||
plcz: {},
|
plcz: {},
|
||||||
select: {}, // 产品筛选
|
select: {}, // 产品筛选
|
||||||
dialogList: [], // 产品数组
|
dialogList: [], // 产品数组
|
||||||
selectData: [], // 选中
|
selectData: undefined, // 选中
|
||||||
skuList: [], // 规格数组
|
skuList: [], // 规格数组
|
||||||
selSkuList: '',
|
selSkuList: '',
|
||||||
selSkuNameList: '',
|
selSkuNameList: '',
|
||||||
|
|
@ -519,7 +524,6 @@ export default {
|
||||||
}
|
}
|
||||||
] }], 'orderType': 1 }]
|
] }], 'orderType': 1 }]
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
},
|
},
|
||||||
|
|
@ -558,7 +562,7 @@ export default {
|
||||||
'receiveTime': res.receiveTime,
|
'receiveTime': res.receiveTime,
|
||||||
'specsName': res.waresGiftConfigList[0].specsName, 'specsNameId': res.waresGiftConfigList[0].specsNameId,
|
'specsName': res.waresGiftConfigList[0].specsName, 'specsNameId': res.waresGiftConfigList[0].specsNameId,
|
||||||
'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage,
|
'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage,
|
||||||
"pkId":res.pkId?res.pkId:''
|
'pkId': res.pkId ? res.pkId : ''
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
@ -627,7 +631,7 @@ export default {
|
||||||
path: 'rechargeQc',
|
path: 'rechargeQc',
|
||||||
query: {
|
query: {
|
||||||
data: JSON.stringify(dataList),
|
data: JSON.stringify(dataList),
|
||||||
approvalBusiness: 700,
|
approvalBusiness: 700
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -641,7 +645,7 @@ export default {
|
||||||
'receiveTime': res.receiveTime,
|
'receiveTime': res.receiveTime,
|
||||||
'specsName': res.waresGiftConfigList[0].specsName, 'specsNameId': res.waresGiftConfigList[0].specsNameId,
|
'specsName': res.waresGiftConfigList[0].specsName, 'specsNameId': res.waresGiftConfigList[0].specsNameId,
|
||||||
'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage,
|
'baseQuantity': res.baseQuantity, 'quantity': res.quantity, 'isFreeMail': res.isFreeMail, 'pkPostage': res.pkPostage,
|
||||||
"pkId":res.pkId?res.pkId:''
|
'pkId': res.pkId ? res.pkId : ''
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
@ -690,13 +694,19 @@ export default {
|
||||||
this.ggVisible = false
|
this.ggVisible = false
|
||||||
},
|
},
|
||||||
sureProduct() {
|
sureProduct() {
|
||||||
if (this.selectData.length == 0) {
|
if (!this.selectData) {
|
||||||
this.$message({
|
this.$message({
|
||||||
message: '请选择产品',
|
message: '请选择产品',
|
||||||
type: 'warning'
|
type: 'warning'
|
||||||
})
|
})
|
||||||
return false
|
|
||||||
} else {
|
} else {
|
||||||
|
if (!this.selectData.selSkuNameList || this.selectData.selSkuNameList.length === 0) {
|
||||||
|
this.$message({
|
||||||
|
message: '请选择产品规格',
|
||||||
|
type: 'warning'
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
this.allData.forEach((item) => {
|
this.allData.forEach((item) => {
|
||||||
if (this.isArea == item.orderType) {
|
if (this.isArea == item.orderType) {
|
||||||
item.consumeRuleConfigList[this.showCndex].waresGiftConfigList[
|
item.consumeRuleConfigList[this.showCndex].waresGiftConfigList[
|
||||||
|
|
@ -758,7 +768,7 @@ export default {
|
||||||
this.isArea = val
|
this.isArea = val
|
||||||
},
|
},
|
||||||
handleClose() {
|
handleClose() {
|
||||||
this.selectData = []
|
this.selectData = undefined
|
||||||
this.dialogVisible = false
|
this.dialogVisible = false
|
||||||
},
|
},
|
||||||
handleCloseGg() {
|
handleCloseGg() {
|
||||||
|
|
@ -872,18 +882,23 @@ export default {
|
||||||
},
|
},
|
||||||
selected(selection, row) {
|
selected(selection, row) {
|
||||||
// 清除 所有勾选项
|
// 清除 所有勾选项
|
||||||
this.$refs.multipleTable.clearSelection()
|
if (selection.length === 0) {
|
||||||
// 当表格数据都没有被勾选的时候 就返回
|
this.selectData = undefined
|
||||||
// 主要用于将当前勾选的表格状态清除
|
} else {
|
||||||
if (selection.length == 0) return
|
|
||||||
this.$refs.multipleTable.toggleRowSelection(row, true)
|
|
||||||
this.selectData = row
|
this.selectData = row
|
||||||
|
}
|
||||||
|
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
this.$refs.multipleTable.toggleRowSelection(row, true)
|
||||||
|
// // 当表格数据都没有被勾选的时候 就返回
|
||||||
|
// // 主要用于将当前勾选的表格状态清除
|
||||||
|
// this.$nextTick(() => {
|
||||||
|
// if (selection.length == 0) return
|
||||||
|
// this.$refs.multipleTable.toggleRowSelection(row, true)
|
||||||
|
// this.selectData = row
|
||||||
|
// })
|
||||||
},
|
},
|
||||||
// 表格的选中 可以获得当前选中的数据
|
|
||||||
selectionChange(val) {
|
|
||||||
// 将选中的数据存储起来
|
|
||||||
this.selectData = val
|
|
||||||
},
|
|
||||||
tableRowClassName({ row, rowIndex }) {
|
tableRowClassName({ row, rowIndex }) {
|
||||||
if (rowIndex % 2 == 1) {
|
if (rowIndex % 2 == 1) {
|
||||||
return 'warning-row'
|
return 'warning-row'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue