Commit fe91f926 authored by zhengke's avatar zhengke

1

parents 7b35ca17 e0b9430e
......@@ -124,7 +124,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="reasonDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="czsubmitForm('addMsg')">确 定</el-button>
<el-button size="small" type="primary" @click="czsubmitForm('addMsg')" :loading="tjloading">确 定</el-button>
</span>
</el-dialog>
</div>
......@@ -141,6 +141,7 @@
czType:1,
changeState:false,
loading:false,
tjloading:false,
checkAll: false,
checkedCities: [],
cities: [],
......@@ -233,17 +234,17 @@
this.$refs[formName].validate((valid) => {
if (valid) {
let cmd="/api/user/SetDistributorRemitAudit";
this.loading = true
this.tjloading = true
this.apipost(cmd,this.addMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
this.reasonDig=false;
this.loading = false
this.tjloading = false
} else {
this.Error(res.data.message);
this.loading = false
this.tjloading = false
}
},
null
......
......@@ -6,8 +6,18 @@
</el-input>
<el-table ref="multipleTable" :data="dataList" tooltip-effect="dark" height="450" style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="50px">
</el-table-column>
<template v-if="isSingle">
<el-table-column width="50px" label="">
<template slot-scope="scope">
<el-radio v-model="scope.row.IsChecked" @change.native="getTemplateRow(scope.$index,scope.row)">&nbsp;
</el-radio>
</template>
</el-table-column>
</template>
<template v-else>
<el-table-column type="selection" width="50px">
</el-table-column>
</template>
<el-table-column label="ID" width="80px">
<template slot-scope="scope">{{ scope.row.Id }}</template>
</el-table-column>
......@@ -34,7 +44,7 @@
</template>
<script>
export default {
props:['ckGoods'],
props: ['ckGoods', "isSingle", "IsGetSpec"],
data() {
return {
dataList: [],
......@@ -42,32 +52,50 @@
pageIndex: 1,
pageSize: 15,
Name: '',
GoodsStatus:1 //上架中
GoodsStatus: 1, //上架中
IsGetSpec: 0
},
total: 0,
selectRow: [],
};
},
created() {},
created() {
if (this.IsGetSpec) {
this.msg.IsGetSpec = this.IsGetSpec;
}
},
methods: {
//获取所有菜单
getList() {
this.apipost("/api/product/GetProductGoodsDialogList", this.msg, res => {
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
var tempArray = res.data.data.pageData;
if (tempArray && tempArray.length > 0) {
tempArray.forEach(item => {
item.IsChecked = false;
});
}
this.dataList = JSON.parse(JSON.stringify(tempArray));
} else {
this.Info(res.data.message);
}
})
},
handleSelectionChange(val) {
// if(val.length>this.ckGoods){
// this.Info('超过了');
// val=val.slice(0,this.ckGoods);
// }
this.selectRow = JSON.parse(JSON.stringify(val));
},
getTemplateRow(index, row) {
this.selectRow = [];
if (this.dataList && this.dataList.length > 0) {
this.dataList.forEach(item => {
if (item.Id != row.Id) {
item.IsChecked = false;
}
})
}
this.selectRow.push(JSON.parse(JSON.stringify(row)));
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......
This diff is collapsed.
......@@ -56,7 +56,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="Goods_stock" label="库存">
<el-table-column prop="Goods_Stock" label="库存">
</el-table-column>
<el-table-column label="活动时间">
<template slot-scope="scope">
......@@ -136,7 +136,6 @@
this.loading = true;
this.apipost("/api/GroupBuy/GetGroupbuyActivityPageList", this.msg, res => {
this.loading = false;
console.log("res", res);
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
let pageData = res.data.data.pageData;
......
......@@ -25,10 +25,12 @@
border: 1px solid #ebeef5;
padding: 10px;
}
.speciDig .tpl-box {
width: 300px;
height: 440px;
}
}
.speciDig .tpl-box .tpl-head {
padding: 0 20px;
font-size: 15px;
......@@ -36,11 +38,13 @@
margin-bottom: 10px;
line-height: 44px;
background: #f5f7fa;
}
.speciDig .tpl-scrollbar {
}
.speciDig .tpl-scrollbar {
height: calc(440px - 44px - 10px);
}
.speciDig .tpl-scrollbar .el-checkbox {
}
.speciDig .tpl-scrollbar .el-checkbox {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
......@@ -48,35 +52,39 @@
-ms-flex-align: center;
align-items: center;
padding: 10px 0;
}
.goodsSpecifica .app-attr-group .attr-list {
}
.goodsSpecifica .app-attr-group .attr-list {
display: inline-block;
margin-right: 10px;
margin-bottom: 10px;
position: relative;
}
.goodsSpecifica .app-attr-group .close {
}
.goodsSpecifica .app-attr-group .close {
position: absolute;
top: -4px;
right: -4px;
font-size: 16px;
cursor: pointer;
}
.goodsSpecifica .box-grow-0 {
}
.goodsSpecifica .box-grow-0 {
min-width: 0;
-webkit-box-flex: 0;
flex-grow: 0;
flex-shrink: 0;
}
.goodsSpecifica .app-attr-group .img-box {
}
.goodsSpecifica .app-attr-group .img-box {
position: relative;
height: 100px;
width: 100px;
margin-top: 8px;
border: 1px solid #ebeef5;
}
}
.goodsSpecifica .app-attr-group .attr-jt {
.goodsSpecifica .app-attr-group .attr-jt {
background: #ffffff;
width: 6px;
height: 6px;
......@@ -89,7 +97,8 @@
-ms-transform: rotate(-45deg);
position: absolute;
top: -5px;
}
}
</style>
<template>
<div>
......@@ -254,7 +263,8 @@
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
export default {
components:{
props: ['SpecList'],
components: {
ChooseImg
},
data() {
......@@ -278,14 +288,12 @@
speciList: [],
DropdownList: [],
huiyList: [],
SeparateDistributionType: 1, //待传递给父组件
EnjoyMember: 1, //待传父组件
SeparateDistributionType: 1, //待传递给父组件
EnjoyMember: 1, //待传父组件
};
},
created() {
console.log("SpecificationList",this.SpecificationList);
},
methods: {
// 添加规格模板
......@@ -665,12 +673,12 @@
});
},
CheckBox(val) {
console.log(val,'valll');
console.log(val, 'valll');
},
},
mounted() {
this.getSpeciList();
this.getSpeciList();
}
};
......
......@@ -542,9 +542,9 @@
</el-dialog>
<!-- 选择商品 -->
<el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog">
<choiceGood ref="choiceGood" :ckGoods="ckGoods"></choiceGood>
<choiceGood ref="choiceGood" ></choiceGood>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="quxiaoGoods()">取 消</el-button>
<el-button size="small" @click="isShowGoods=false">取 消</el-button>
<el-button size="small" type="danger" @click="getGoodsChoice()">确 定</el-button>
</span>
</el-dialog>
......
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