Skip to content

H
haoban-4
Commit b06b669b by 无尘
Options

fix: 更新loading

parent e81863c2
Showing with 59 additions and 53 deletions
src/components/app/my-customer/edit-visiable.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-28 11:07:46
* @LastEditors: 无尘
* @LastEditTime: 2020-11-26 11:28:11
* @LastEditTime: 2020-12-22 10:33:24
-->
<!--
<edit-visiable :brand-id="brandId" :set-item-id="setItemId" :set-type="setType" :select-mode="selectMode" :range-data="rangeData" @refreshData="refreshData"></edit-visiable>
......@@ -12,7 +12,7 @@
-->
<template>
<el-dialog width="554px" title="编辑可见范围" :visible.sync="setVisible" append-to-body :before-close="handleClose">
<div class="bind-store-body">
<div class="bind-store-body" v-loading="loadingBtn">
<div class="edit-visiable-tip m-b-20">
<common-alert-tip :width="'100%'" :tip-content="tipContent"></common-alert-tip>
</div>
......@@ -29,10 +29,11 @@
<customer-store v-if="formData.sendRange == '2'" :brand-id="brandId" :select-store="selectStoreData" @checkStoreIds="checkStoreIds"></customer-store>
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click.stop="cancel">取消</el-button>
<el-button type="primary" :loading="loadingBtn" @click.stop="submitForm">保存</el-button>
<div slot="footer" class="dialog-footer">
<el-button @click.stop="cancel">取消</el-button>
<el-button type="primary" @click.stop="submitForm">保存</el-button>
</div>
</div>
</el-dialog>
</template>
......
src/components/app/my-customer/sync-crowd-dialog.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-28 10:31:09
* @LastEditors: 无尘
* @LastEditTime: 2020-09-21 10:31:24
* @LastEditTime: 2020-12-22 10:36:16
-->
<!--
<sync-crowd-dialog :brand-id="brandId" :select-ids="selectIds" :total-num="totalNum" @refreshData="refreshData"></sync-crowd-dialog>
......@@ -15,43 +15,45 @@
<div class="sync-tip m-b-20">
<common-alert-tip :width="'400px'" :tip-content="tipContent"></common-alert-tip>
</div>
<div class="sync-search">
<div class="flex flex-space-between">
<div>
<el-input placeholder="请输入人群名称" maxlength="50" v-model="searchVal" style="width: 292px;" prefix-icon="el-icon-search" @keyup.native="value => toInput(value)" clearable @clear="clearInput"></el-input><el-select class="w-165 m-l-10" v-model="classifyId" placeholder="所有分类" @change="changeCondition">
<el-option label="所有分类" value=""></el-option>
<el-option v-for="item in classifyList" :key="item.sceneCrowdCategoryId" :label="item.sceneCrowdCategoryName" :value="item.sceneCrowdCategoryId"> </el-option>
</el-select>
<div v-loading="loadingBtn">
<div class="sync-search">
<div class="flex flex-space-between">
<div>
<el-input placeholder="请输入人群名称" maxlength="50" v-model="searchVal" style="width: 292px;" prefix-icon="el-icon-search" @keyup.native="value => toInput(value)" clearable @clear="clearInput"></el-input><el-select class="w-165 m-l-10" v-model="classifyId" placeholder="所有分类" @change="changeCondition">
<el-option label="所有分类" value=""></el-option>
<el-option v-for="item in classifyList" :key="item.sceneCrowdCategoryId" :label="item.sceneCrowdCategoryName" :value="item.sceneCrowdCategoryId"> </el-option>
</el-select>
</div>
</div>
</div>
</div>
<div class="m-t-20">
<el-table class="select-table" v-loading="loadingPage" ref="multipleTable" height="400" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }" @selection-change="handleSelectionChange">
<el-table-column type="selection" :selectable="selectable" width="55"> </el-table-column>
<el-table-column prop="" label="人群名称" show-overflow-tooltip>
<template slot-scope="scope">
<div :class="[selectIds.includes(scope.row.sceneCrowdId) ? 'color-909399': 'color-606266']">{{selectIds.includes(scope.row.sceneCrowdId) ? '（已选择）':''}}{{ scope.row.sceneCrowdName || '--' }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="所属分类" show-overflow-tooltip>
<template slot-scope="scope">
<div :class="[selectIds.includes(scope.row.sceneCrowdId) ? 'color-909399': 'color-606266']">{{ scope.row.sceneCrowdCategoryName || '--' }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="到期时间">
<template slot-scope="scope">
<div :class="['line-18', selectIds.includes(scope.row.sceneCrowdId) ? 'color-909399': 'color-606266']">{{ scope.row.sceneCrowdExpireTime | timeStampToYmd }} {{ !scope.row.sceneCrowdExpireTime? '--':'' }}</div>
<div :class="['line-18', selectIds.includes(scope.row.sceneCrowdId) ? 'color-909399': 'color-606266']">{{ scope.row.sceneCrowdExpireTime | timeStampToHms }} {{ !scope.row.sceneCrowdExpireTime? '--':'' }}</div>
</template>
</el-table-column>
</el-table>
<div v-if="tableData.length" class="block common-wrap__page text-right m-t-24">
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize" layout="prev, pager, next" :total="total"> </dm-pagination>
<div class="m-t-20">
<el-table class="select-table" v-loading="loadingPage" ref="multipleTable" height="400" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }" @selection-change="handleSelectionChange">
<el-table-column type="selection" :selectable="selectable" width="55"> </el-table-column>
<el-table-column prop="" label="人群名称" show-overflow-tooltip>
<template slot-scope="scope">
<div :class="[selectIds.includes(scope.row.sceneCrowdId) ? 'color-909399': 'color-606266']">{{selectIds.includes(scope.row.sceneCrowdId) ? '（已选择）':''}}{{ scope.row.sceneCrowdName || '--' }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="所属分类" show-overflow-tooltip>
<template slot-scope="scope">
<div :class="[selectIds.includes(scope.row.sceneCrowdId) ? 'color-909399': 'color-606266']">{{ scope.row.sceneCrowdCategoryName || '--' }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="到期时间">
<template slot-scope="scope">
<div :class="['line-18', selectIds.includes(scope.row.sceneCrowdId) ? 'color-909399': 'color-606266']">{{ scope.row.sceneCrowdExpireTime | timeStampToYmd }} {{ !scope.row.sceneCrowdExpireTime? '--':'' }}</div>
<div :class="['line-18', selectIds.includes(scope.row.sceneCrowdId) ? 'color-909399': 'color-606266']">{{ scope.row.sceneCrowdExpireTime | timeStampToHms }} {{ !scope.row.sceneCrowdExpireTime? '--':'' }}</div>
</template>
</el-table-column>
</el-table>
<div v-if="tableData.length" class="block common-wrap__page text-right m-t-24">
<dm-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize" layout="prev, pager, next" :total="total"> </dm-pagination>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="submitForm">立即同步（{{multipleSelection.length}}/{{20 - totalNum}}）</el-button>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取消</el-button>
<el-button type="primary" :loading="loadingBtn" @click="submitForm">立即同步（{{multipleSelection.length}}/{{20 - totalNum}}）</el-button>
</div>
</el-dialog>
</template>
......
src/components/app/my-customer/tag-classify-list.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-09-01 11:09:16
* @LastEditors: 无尘
* @LastEditTime: 2020-09-21 10:31:46
* @LastEditTime: 2020-12-22 10:31:46
-->
<!--
<tag-classify-list :tag-list="tagList" :current-classify-id="currentClassifyId" :brand-id="brandId" @refreshClassify="refreshClassify" @resetCurrentId="resetCurrentId" @changeClass="changeClass"></tag-classify-list>
......@@ -106,10 +106,11 @@ export default {
toDelClassify(index, row) {
const that = this;
that
.$confirm('删除该分类后，该分类内的所有标签将会被删除！', '提示', {
.$confirm('删除该分类后，该分类内的所有标签将会被删除！', '', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
type: 'warning',
showClose: false
})
.then(() => {
that.delTagData(row.categoryId);
......
src/views/apps/customer-app/clerk-tag.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-28 16:51:22
* @LastEditors: 无尘
* @LastEditTime: 2020-12-02 13:56:18
* @LastEditTime: 2020-12-22 10:30:38
-->
<template>
......@@ -336,10 +336,11 @@ export default {
toDelTag(index, row) {
const that = this;
that
.$confirm('是否要删除选中的标签?', '提示', {
.$confirm('是否要删除选中的标签?', '', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
type: 'warning',
showClose: false
})
.then(() => {
that.delTagData(row.tagId, row.linkId);
......
src/views/apps/customer-app/crowd-scene.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-27 10:16:37
* @LastEditors: 无尘
* @LastEditTime: 2020-12-16 11:03:10
* @LastEditTime: 2020-12-22 10:29:35
-->
<template>
......@@ -129,10 +129,11 @@ export default {
toDel(index, row) {
const that = this;
that
.$confirm('是否要删除该场景人群?', '提示', {
.$confirm('是否要删除该场景人群?', '', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
type: 'warning',
showClose: false
})
.then(() => {
that.delData(row.sceneCrowdId);
......
src/views/apps/customer-app/customer-data-set.vue
......@@ -4,11 +4,11 @@
* @Author: 无尘
* @Date: 2020-08-27 10:16:37
* @LastEditors: 无尘
* @LastEditTime: 2020-12-01 18:09:33
* @LastEditTime: 2020-12-22 10:36:57
-->
<template>
<div class="common-app-right">
<div class="customer-data-body">
<div class="customer-data-body" v-loading="loading" >
<div class="m-b-10">
<el-checkbox class="w-195" v-model="customerShowData.showAllOrderFlag">展示所有门店的订单</el-checkbox>
<div class="font-12 color-909399 set-tip-item">注：保存勾选项后，门店导购和店长可查看顾客在本店以外的消费订单</div>
......@@ -28,7 +28,7 @@
<el-checkbox v-model="customerShowData.clerkContactSmsFlag">短信</el-checkbox>
</div>
<div class="m-t-46 p-l-20">
<el-button type="primary" :loading="loading" @click="submit">保存</el-button>
<el-button type="primary" @click="submit">保存</el-button>
</div>
</div>
</div>
......
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