Commit f792e9b8 by huaying

fix: ui

parent 3e6113f6
<template> <template>
<section> <div style="width:100%;">
<el-form inline> <el-form inline>
<el-form-item> <el-form-item>
<el-input placeholder="请输入活码ID/名称、创建人" style="width: 260px" @change="searchList" v-model="inFields.hmSelect" clearable> <el-input placeholder="请输入活码ID/名称、创建人" style="width: 260px" @change="searchList" v-model="inFields.hmSelect" clearable>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
</div> </div>
</el-dialog> </el-dialog>
<links :src="wxQrcode" :show.sync="show" :imageName="imageName" :sourceType="false" /> <links :src="wxQrcode" :show.sync="show" :imageName="imageName" :sourceType="false" />
</section> </div>
</template> </template>
<script> <script>
...@@ -282,9 +282,25 @@ export default { ...@@ -282,9 +282,25 @@ export default {
limitCode: this.$buttonCode.downActCode limitCode: this.$buttonCode.downActCode
}, },
handler: row => { handler: row => {
this.wxQrcode = row.wxQrcode; // this.wxQrcode = row.wxQrcode;
this.imageName = `${row.hmId}_${row.hmName}`; // this.imageName = `${row.hmId}_${row.hmName}`;
this.show = true; // this.show = true;
const downloadFile = (fileName, content) => {
const url = content;
const x = new XMLHttpRequest();
x.open('GET', url, true);
x.responseType = 'blob';
x.onload = function(e) {
const blob = new Blob([x.response]);
let url = window.URL.createObjectURL(blob);
let a = document.createElement('a');
a.href = url;
a.download = fileName + '.png';
a.click();
};
x.send();
};
downloadFile(row.hmCode + '_' + row.hmName, row.wxQrcode);
} }
}, },
{ {
......
...@@ -111,6 +111,8 @@ export default { ...@@ -111,6 +111,8 @@ export default {
} }
.tips { .tips {
color: #303133; color: #303133;
margin-top: 12px;
font-size: 14px;
span { span {
color: #909399; color: #909399;
} }
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
</el-form-item> </el-form-item>
</template> </template>
</setActCode> </setActCode>
<div v-if="showMark" class="mark"></div>
</div> </div>
</template> </template>
<script> <script>
...@@ -32,6 +33,7 @@ export default { ...@@ -32,6 +33,7 @@ export default {
components: { setActCode, SelectClerk }, components: { setActCode, SelectClerk },
data() { data() {
return { return {
showMark: false,
loading: false, loading: false,
form: { form: {
hmType: 1, hmType: 1,
...@@ -113,8 +115,8 @@ export default { ...@@ -113,8 +115,8 @@ export default {
if (res.data.code == 0) { if (res.data.code == 0) {
setTimeout(() => { setTimeout(() => {
this.$router.go(-1); this.$router.go(-1);
this.$refs.setActCodePage.btnLoading = false; this.$refs.setActCodePage.btnLoading = false;
this.showMark = false;
this.form = { this.form = {
hmType: 1, hmType: 1,
name: '', name: '',
...@@ -124,6 +126,7 @@ export default { ...@@ -124,6 +126,7 @@ export default {
}, 1000); }, 1000);
} else { } else {
this.$refs.setActCodePage.btnLoading = false; this.$refs.setActCodePage.btnLoading = false;
this.showMark = false;
return this.$message.error(res.data.message); return this.$message.error(res.data.message);
} }
}); });
...@@ -133,6 +136,7 @@ export default { ...@@ -133,6 +136,7 @@ export default {
if (res.data.code == 0) { if (res.data.code == 0) {
setTimeout(() => { setTimeout(() => {
this.$route.meta.refresh = true; this.$route.meta.refresh = true;
this.showMark = false;
this.$refs.setActCodePage.btnLoading = false; this.$refs.setActCodePage.btnLoading = false;
this.$router.go(-1); this.$router.go(-1);
this.form = { this.form = {
...@@ -143,6 +147,7 @@ export default { ...@@ -143,6 +147,7 @@ export default {
}; };
}, 1000); }, 1000);
} else { } else {
this.showMark = false;
this.$refs.setActCodePage.btnLoading = false; this.$refs.setActCodePage.btnLoading = false;
return this.$message.error(res.data.message); return this.$message.error(res.data.message);
} }
...@@ -164,4 +169,10 @@ export default { ...@@ -164,4 +169,10 @@ export default {
font-size: 12px; font-size: 12px;
color: #909399; color: #909399;
} }
.mark {
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0);
z-index: 99;
}
</style> </style>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<slot name="typeCode"></slot> <slot name="typeCode"></slot>
<slot name="codeName"></slot> <slot name="codeName"></slot>
<el-form-item label="活码分组" prop="hmGroupId"> <el-form-item label="活码分组" prop="hmGroupId">
<el-select class="w340" v-model="form.hmGroupId" v-loadmore="onLoadmore" clearable remote filterable :remote-method="remoteMethod"> <el-select class="w340" v-model="form.hmGroupId" v-loadmore="onLoadmore" clearable filterable :filter-method="remoteMethod">
<el-option v-for="item in groupList" :key="item.groupId" :label="item.groupName" :value="item.groupId"></el-option> <el-option v-for="item in groupList" :key="item.groupId" :label="item.groupName" :value="item.groupId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -144,6 +144,9 @@ export default { ...@@ -144,6 +144,9 @@ export default {
}, },
// 保存按钮 // 保存按钮
save() { save() {
if (!this.$refs.welcomeItem.submit()) {
return;
}
if (this.form.memberLabelStatus == 0) { if (this.form.memberLabelStatus == 0) {
this.$confirm('关联的标签在GIC中已被删除,无法统计和查看添加好友客户数据,为确保后续客户数据统计,请重新关联标签', '关联的标签已被删除,请重新关联标签', { this.$confirm('关联的标签在GIC中已被删除,无法统计和查看添加好友客户数据,为确保后续客户数据统计,请重新关联标签', '关联的标签已被删除,请重新关联标签', {
confirmButtonText: '选择标签', confirmButtonText: '选择标签',
...@@ -168,6 +171,7 @@ export default { ...@@ -168,6 +171,7 @@ export default {
this.$refs.form.validate(async valid => { this.$refs.form.validate(async valid => {
if (valid) { if (valid) {
// this.form.passFlag = this.form.passFlag ? 1 : 0; // this.form.passFlag = this.form.passFlag ? 1 : 0;
this.$parent.showMark = true;
this.btnLoading = true; this.btnLoading = true;
this.$emit('sumbit', this.form); this.$emit('sumbit', this.form);
} }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<ul class="tabs" v-if="welcomeType == 2"> <ul class="tabs" v-if="welcomeType == 2">
<li> <li>
通过此<span>{{ welcomeName == 'code' ? '活码' : '链接' }}</span 通过此<span>{{ welcomeName == 'code' ? '活码' : '链接' }}</span
>添加好友后,系统不推送欢迎语,及时在【设置-欢迎语设置】中为该成员配置了欢迎语。 >添加好友后,系统不推送欢迎语,即使在【设置-欢迎语设置】中为该成员配置了欢迎语。
</li> </li>
<li>(根据企业微信规则,若所添加的该成员在企业微信后台已经配置了欢迎语,那么企微后台的欢迎语会照常推送)</li> <li>(根据企业微信规则,若所添加的该成员在企业微信后台已经配置了欢迎语,那么企微后台的欢迎语会照常推送)</li>
</ul> </ul>
...@@ -251,13 +251,17 @@ export default { ...@@ -251,13 +251,17 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 12px; margin-bottom: 12px;
.blueBtn {
font-size: 14px;
height: 32px;
}
} }
.paginationBox { .paginationBox {
position: absolute; position: absolute;
right: 7px; right: 7px;
bottom: 0; bottom: 0;
margin-top: 46px; margin-top: 46px;
margin-right: -4px; margin-right: 6px;
} }
} }
.wrapText { .wrapText {
......
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