Commit 7ea287f2 authored by mengwenhao's avatar mengwenhao

fix:商品-字遮挡,无法驳回

parent 2486e431
...@@ -48,3 +48,10 @@ ...@@ -48,3 +48,10 @@
background-color: #199ffb; background-color: #199ffb;
} }
} }
.el-input__inner {
padding-right: 15%;
}
.el-textarea__inner {
padding-bottom: 10%;
}
...@@ -241,7 +241,9 @@ ...@@ -241,7 +241,9 @@
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
> </el-table-column> :selectable="canChooseShop"
>
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="shop_name" prop="shop_name"
...@@ -574,11 +576,11 @@ ...@@ -574,11 +576,11 @@
<section style="display:flex;justify-content:center;"> <section style="display:flex;justify-content:center;">
<el-button <el-button
type="danger" type="danger"
@click="onDefault" @click.stop="onDefault"
>驳回</el-button> >驳回</el-button>
<el-button <el-button
type="primary" type="primary"
@click="rejectVisible = false" @click.stop="rejectVisible = false"
>取消 >取消
</el-button> </el-button>
</section> </section>
...@@ -863,20 +865,28 @@ export default { ...@@ -863,20 +865,28 @@ export default {
}; };
const res = await getShopsList(query); const res = await getShopsList(query);
if (res.code !== 0) return this.$message.error(res.reason); if (res.code !== 0) return this.$message.error(res.reason);
console.log(res);
this.shopsList = res.result; this.shopsList = res.result;
this.shopsCount = res.count; this.shopsCount = res.count;
}, },
// 门店列表更改时操作 // 门店列表更改时操作
handleShopsChange (value) { handleShopsChange (value) {
console.log(value); this.goodsObj.sub_shop = value;
this.goodsObj.sub_shop = this.goodsObj.sub_shop.concat(value);
const shopList = value.map(item => { const shopList = value.map(item => {
return item.sub_shop_id; return item.sub_shop_id;
}); });
this.shopIds = ""; this.shopIds = "";
this.shopIds = shopList.join(","); this.shopIds = shopList.join(",");
}, },
// 是否可选门店
canChooseShop () {
if (this.goodsObj.sub_shop.length === 1) {
return false;
} else {
return true;
}
},
// 添加新门店 // 添加新门店
async addShop () { async addShop () {
...@@ -992,7 +1002,7 @@ export default { ...@@ -992,7 +1002,7 @@ export default {
if (!this.inventoryAdd) { if (!this.inventoryAdd) {
this.$nextTick(() => { this.$nextTick(() => {
this.inventoryAdd = 0; this.inventoryAdd = 0;
}) });
} }
if (this.inventoryAdd + this.goodsObj.inventory_rest < 0) { if (this.inventoryAdd + this.goodsObj.inventory_rest < 0) {
this.$nextTick(() => { this.$nextTick(() => {
...@@ -1117,7 +1127,8 @@ export default { ...@@ -1117,7 +1127,8 @@ export default {
// 审核拒绝 // 审核拒绝
async onDefault () { async onDefault () {
if (this.rejectReason.reason != "0" || this.rejectReason.reason === "") { console.log(this.rejectReason.reason);
if (this.rejectReason.reason == "") {
return this.$message.error("审核驳回时,驳回原因不能为空"); return this.$message.error("审核驳回时,驳回原因不能为空");
} }
const query = { const query = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment