Commit 08fb1aa8 by 陈羽

update: dist

parent 9e764a92
......@@ -49,12 +49,12 @@
<a class="singelinfo-jlitem">卡券记录 ({{ memberInfo.couponCount }})</a>
</div>
</div>
<div slot="reference" style="width:200px;">
<div slot="reference" style="width:100%;">
<a :href="'/member/#/wechatmemberDetail?memberId=' + memberObj.memberId" target="_blank" class="link-content">
<!-- <img class="vertical-middle table__avatar" :src="filterAvatar(memberObj.memberImgUrl)" width="60" height="60" alt="" srcset="" /> -->
<div class="table-info">
<p class="table-name--ellipsis">{{ memberObj.memberName || '--' }}</p>
<a :href="'/member/#/wechatmemberDetail?memberId=' + memberObj.memberId" target="_blank">{{ memberObj.cardNum }}</a>
<a class="link--ellipsis" :href="'/member/#/wechatmemberDetail?memberId=' + memberObj.memberId" target="_blank">{{ memberObj.cardNum }}</a>
</div>
</a>
</div>
......@@ -115,7 +115,7 @@ export default {
align-items: center;
}
.table-info {
width: 200px;
width: 100%;
margin-left: 5px;
}
.table-name--ellipsis {
......@@ -171,4 +171,10 @@ export default {
text-align: center;
flex: 1;
}
.link--ellipsis {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
......@@ -38,7 +38,7 @@
<div v-loading="loading">
<el-table :data="tableData" style="width: 100%" @sort-change="sortChange">
<el-table-column label="活动名称" prop="activityName"></el-table-column>
<el-table-column label="活动时间" sortable="custom">
<el-table-column label="活动时间" sortable="custom" width="250px">
<template slot-scope="{ row }">
<div>{{ getTimeAll(row.beginTime) }}&nbsp;</div>
<div>{{ getTimeAll(row.endTime) }}</div>
......@@ -59,7 +59,7 @@
{{ row.memberSearchType === 1 ? '所有会员' : row.memberSearchType === 2 ? row.memberSearchParams.split(',').length + '个会员分组' : '部分会员' }}
</template>
</el-table-column>
<el-table-column label="创建时间">
<el-table-column label="创建时间" width="200px">
<template slot-scope="{ row }">{{ getTimeAll(row.createTime) }}</template>
</el-table-column>
<el-table-column label="操作">
......
......@@ -52,7 +52,7 @@
</div>
<div class="right" style="display: flex;justify-content: space-between;width:322px;padding-left:10px;box-sizing: border-box;">
<div class="search-content-item" style="width:214px;">
<el-select v-model="goodsType" placeholder="请选择批量操作" clearable @change="handleData">
<el-select v-model="goodsType" placeholder="请选择批量操作" clearable @change="handleData" style="width:214px;">
<el-option label="批量上架" :value="0"></el-option>
<el-option label="批量下架" :value="1"></el-option>
<el-option label="批量删除" :value="2"></el-option>
......
......@@ -226,8 +226,11 @@ export default {
}
},
selectCreator(v) {
this.creatorName = v.creatorName;
this.creatorId = v.creatorId;
this.creatorName = '';
this.$nextTick(() => {
this.creatorName = v.creatorName;
this.creatorId = v.creatorId;
});
this.handleInputSearch();
},
querySearch(v, cb) {
......
......@@ -111,7 +111,7 @@
</el-dropdown>
</template>
</el-table-column>
<el-table-column label="会员" min-width="170px">
<el-table-column label="会员" min-width="150px">
<template slot-scope="scope">
<memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></memberInfo>
<!-- <p>{{ scope.row.memberName }}</p>
......@@ -433,8 +433,11 @@ export default {
}
},
selectCreator(v) {
this.creatorName = v.creatorName;
this.creatorId = v.creatorId;
this.creatorName = '';
this.$nextTick(() => {
this.creatorName = v.creatorName;
this.creatorId = v.creatorId;
});
this.getListCurr();
},
querySearch(v, cb) {
......
......@@ -249,8 +249,11 @@ export default {
}
},
selectCreator(v) {
this.updaterName = v.creatorName;
this.updaterId = v.creatorId;
this.updaterName = '';
this.$nextTick(() => {
this.updaterName = v.creatorName;
this.updaterId = v.creatorId;
});
this.handleInputSearch();
},
querySearch(v, cb) {
......
......@@ -60,7 +60,7 @@
<el-table-column prop="storeCode" label="自提点code" min-width="100"> </el-table-column>
<el-table-column prop="pickUpPointAddress" label="自提点地址" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointPhone" label="联系电话"> </el-table-column>
<el-table-column prop="canChooseTime" label="自提时间可选">
<el-table-column prop="canChooseTime" label="自提时间可选" min-width="150px">
<template slot-scope="scope">
<span>{{ scope.row.canChooseTime === 1 ? '是' : '否' }}</span>
</template>
......@@ -70,7 +70,7 @@
<span>{{ scope.row.isValid === 1 ? '正常' : '失效' }}</span>
</template>
</el-table-column>
<el-table-column prop="creatorName" label="创建人"> </el-table-column>
<el-table-column prop="creatorName" label="创建人" min-width="150px"> </el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div>
......@@ -166,8 +166,11 @@ export default {
},
methods: {
selectCreator(v) {
this.creatorName = v.creatorName;
this.creatorId = v.creatorId;
this.creatorName = '';
this.$nextTick(() => {
this.creatorName = v.creatorName;
this.creatorId = v.creatorId;
});
this.getSearchList();
},
querySearch(v, cb) {
......
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