Skip to content

H
haoban-4
Commit 9a4a6123 by 无尘
Options

fix: 更新loading

parent 954bdb90
Showing with 41 additions and 38 deletions
src/components/app/add-market-dialog.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-10-16 14:22:10
* @LastEditors: 无尘
* @LastEditTime: 2020-12-08 16:18:36
* @LastEditTime: 2020-12-22 11:21:09
-->
<!--
使用帮助
......@@ -13,7 +13,7 @@
-->
<template>
<el-dialog title="绑定服务市场账号" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
<div class="">
<div class="" v-loading="loadBtn">
<el-form ref="ruleForm" :model="marketForm" :rules="rules" label-width="80px">
<el-form-item label="手机号" prop="phoneNumber">
<country-mobile :nation-code.sync="marketForm.nationCode" :input-width="400" :limit-class="'limit-color'" v-model="marketForm.phoneNumber" :holder="'请输入手机号'" @checkPhoneNum="checkPhoneNum"></country-mobile>
......@@ -22,10 +22,11 @@
<el-input v-model="marketForm.password" placeholder="请输入密码" style="width:400px" maxlength="16"></el-input>
</el-form-item>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="handleClose">取消</el-button>
<el-button type="primary" :loading="loadBtn" @click="submitForm('ruleForm')">确认</el-button>
<div slot="footer" class="dialog-footer">
<el-button @click="handleClose">取消</el-button>
<el-button type="primary" @click="submitForm('ruleForm')">确认</el-button>
</div>
</div>
</el-dialog>
</template>
......
src/components/app/my-customer/customer-assign.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-04-14 09:50:16
* @LastEditors: 无尘
* @LastEditTime: 2020-09-21 10:28:33
* @LastEditTime: 2020-12-22 10:54:16
-->
<!--
<customer-assign v-if="assignShow" :store-brand-id="storeBrandId" :brand-id="brandId" :customer-assign-total="customerAssignTotal" :clerk-id="clerkId" :search-params="searchInput" :choose-all="selectRadio" :depart-obj="departObj" :multiple-data="multipleSelection" @closeText="closeText" @submitText="submitText"></customer-assign>
......@@ -12,38 +12,40 @@
-->
<template>
<el-dialog title="批量分配会员" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
<div class="assign-table">
<div class="check-all border-box flex flex-space-between">
<div class="font-14 color-606266"><el-checkbox :disabled="clerkOptions.length > assignPeople || unbindFlag" :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox></div>
<div class="font-14 color-606266">
<el-checkbox v-model="checked" @change="changeHand">手动分配</el-checkbox> <span class="span-line"></span>
<span>可分配会员 <span class="color-303133">{{ assignPeople }}</span> 人</span>
</div>
</div>
<div>
<ul class="clerk-list-ul">
<el-checkbox-group v-model="checkedClerks" @change="handleCheckedChange">
<template v-for="(item, index) in clerkOptions">
<li class="clerk-cell font-14 color-606266" :key="index + 'clerk'">
<el-checkbox :disabled="item.disabled" :label="item.clerkId" @change="changeCell($event, item)">{{ item.clerkName }}</el-checkbox><span v-if="!item.bindStaffFlag" class="font-14 color-f56c6c p-l-20">未关联企微用户</span>
<span v-if="!checked && checkedClerks.includes(item.clerkId)" class="p-l-20">
分配会员 <span class="color-303133">{{ item.memberCount }}</span> 人</span>
<span v-if="checked && checkedClerks.includes(item.clerkId)" class="p-l-20 p-r-10">分配会员 </span><el-input-number v-if="checked && checkedClerks.includes(item.clerkId)" class="w-100" v-model="item.memberCount" controls-position="right" @blur="blurNum($event, item)" @change="handleChange" :step="1" step-strictly :min="1" :max="999999999"></el-input-number><span v-if="checked && checkedClerks.includes(item.clerkId)" class="p-l-10"> 人</span>
</li>
</template>
</el-checkbox-group>
</ul>
<div class="flex flex-space-between m-t-20">
<div class="font-14 color-909399">最多分配会员 5000 人</div>
<div v-loading="loadBtn">
<div class="assign-table">
<div class="check-all border-box flex flex-space-between">
<div class="font-14 color-606266"><el-checkbox :disabled="clerkOptions.length > assignPeople || unbindFlag" :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox></div>
<div class="font-14 color-606266">
分配总数 <span :class="[totalPeople != 0 && totalPeople != assignPeople ? 'color-f5222d' : 'color-2f54eb']">{{ totalPeople }}</span> 人
<el-checkbox v-model="checked" @change="changeHand">手动分配</el-checkbox> <span class="span-line"></span>
<span>可分配会员 <span class="color-303133">{{ assignPeople }}</span> 人</span>
</div>
</div>
<div>
<ul class="clerk-list-ul">
<el-checkbox-group v-model="checkedClerks" @change="handleCheckedChange">
<template v-for="(item, index) in clerkOptions">
<li class="clerk-cell font-14 color-606266" :key="index + 'clerk'">
<el-checkbox :disabled="item.disabled" :label="item.clerkId" @change="changeCell($event, item)">{{ item.clerkName }}</el-checkbox><span v-if="!item.bindStaffFlag" class="font-14 color-f56c6c p-l-20">未关联企微用户</span>
<span v-if="!checked && checkedClerks.includes(item.clerkId)" class="p-l-20">
分配会员 <span class="color-303133">{{ item.memberCount }}</span> 人</span>
<span v-if="checked && checkedClerks.includes(item.clerkId)" class="p-l-20 p-r-10">分配会员 </span><el-input-number v-if="checked && checkedClerks.includes(item.clerkId)" class="w-100" v-model="item.memberCount" controls-position="right" @blur="blurNum($event, item)" @change="handleChange" :step="1" step-strictly :min="1" :max="999999999"></el-input-number><span v-if="checked && checkedClerks.includes(item.clerkId)" class="p-l-10"> 人</span>
</li>
</template>
</el-checkbox-group>
</ul>
<div class="flex flex-space-between m-t-20">
<div class="font-14 color-909399">最多分配会员 5000 人</div>
<div class="font-14 color-606266">
分配总数 <span :class="[totalPeople != 0 && totalPeople != assignPeople ? 'color-f5222d' : 'color-2f54eb']">{{ totalPeople }}</span> 人
</div>
</div>
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="toCancel">取消</el-button>
<el-button :disabled="totalPeople != assignPeople" :loading="loadBtn" type="primary" @click="submitForm('ruleForm')">确定</el-button>
<div slot="footer" class="dialog-footer">
<el-button @click="toCancel">取消</el-button>
<el-button :disabled="totalPeople != assignPeople" type="primary" @click="submitForm('ruleForm')">确定</el-button>
</div>
</div>
</el-dialog>
</template>
......
src/components/app/my-customer/edit-tag-dialog.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-09-01 17:16:25
* @LastEditors: 无尘
* @LastEditTime: 2020-12-08 16:18:49
* @LastEditTime: 2020-12-22 11:17:45
-->
<!--
......@@ -14,7 +14,7 @@
<template>
<el-dialog :title="form.tagId ? '编辑标签' : '新建标签'" width="600px" :visible.sync="editVisible" :before-close="handleClose" append-to-body>
<common-alert-tip :width="'476px'" :tip-content="tipContent"></common-alert-tip>
<el-form class="m-t-20" :model="form" :rules="rules" ref="tagForm" label-width="110px">
<el-form v-loading="loadingBtn" class="m-t-20" :model="form" :rules="rules" ref="tagForm" label-width="110px">
<el-form-item label="标签名称" prop="tagName">
<limit-input
:input-width="440"
......@@ -59,7 +59,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取消</el-button>
<el-button type="primary" :loading="loadingBtn" @click="submit('tagForm')">{{form.tagId ? '保存' : '新建'}}</el-button>
<el-button type="primary" @click="submit('tagForm')">{{form.tagId ? '保存' : '新建'}}</el-button>
</div>
</el-dialog>
</template>
......
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