Skip to content

H
haoban-4
Commit 5487cf71 by 无尘
Options

fix: 修改分配

parent 8749265b
Showing with 47 additions and 42 deletions
src/components/app/my-customer/customer-assign.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-04-14 09:50:16
* @LastEditors: 无尘
* @LastEditTime: 2020-09-17 09:31:41
* @LastEditTime: 2020-09-17 10:03:55
-->
<!--
<customer-assign v-if="assignShow" :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>
......@@ -373,12 +373,12 @@ export default {
const data = {
wxEnterpriseId: that.wxEnterpriseId,
enterpriseId: that.brandId,
chooseAll: that.chooseAll,
chooseFlag: that.chooseAll,
storeInfoId: that.departObj.storeInfoId,
clerkId: that.clerkId,
keyword: that.searchParams,
memberIds: that.chooseAll == 1 ? '' : Object.keys(that.editRow).length ? that.editRow.memberId : that.multipleData.map(ele => ele.memberId).join(','),
clerkIds: JSON.stringify(clerkIds),
search: that.searchParams,
mcuIds: that.chooseAll == 1 ? '' : Object.keys(that.editRow).length ? [ that.editRow ] : that.multipleData,
clerkIds: clerkIds,
staffName: that.staffName
};
saveAssign(data)
......
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-11 14:54:39
* @LastEditTime: 2020-09-17 10:09:12
-->
<!--
<tag-classify-list :tag-list="tagList" :current-classify-id="currentClassifyId" :brand-id="brandId" @refreshClassify="refreshClassify" @resetCurrentId="resetCurrentId" @changeClass="changeClass"></tag-classify-list>
......@@ -16,7 +16,7 @@
<li :class="['tag-classify-item', { active: currentClassifyId == item.categoryId }]" v-for="(item, index) in tagList" :key="item.categoryId+index" @click="changeClassify(index, item)">
<span class="tag-classify-name">{{ item.categoryName || '--' }}</span>
<el-dropdown v-if="item.state != 0" class="tag-classify-drop" placement="bottom-start">
<i class="iconfont icongengduo edit-icon"></i>
<i class="iconfont icongengduo1 edit-icon"></i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item style="padding: 0 30px;" @click.native="toEditClassify(index, item)">编辑</el-dropdown-item>
<el-dropdown-item style="padding: 0 30px;" @click.native="toDelClassify(index, item)">删除</el-dropdown-item>
......@@ -173,14 +173,19 @@ export default {
background-color: rgba(47,84,235,0.05);;
.edit-icon {
opacity: 1;
color: @blue;
background-color: rgba(47,84,235,0.09);
color: #909399;
background-color: none;
}
}
.edit-icon {
padding: 4px;
opacity: 0;
font-size: 12px;
&:hover {
opacity: 1;
color: @blue;
background-color: rgba(47,84,235,0.09);
}
}
.tag-classify-name {
display: block;
......
src/styles/font/demo_index.html
......@@ -31,6 +31,12 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe61a;</span>
<div class="name">资料 copy</div>
<div class="code-name">&amp;#xe61a;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe61b;</span>
<div class="name">排序</div>
<div class="code-name">&amp;#xe61b;</div>
......@@ -79,12 +85,6 @@
</li>
<li class="dib">
<span class="icon iconfont">&#xe616;</span>
<div class="name">资料 copy</div>
<div class="code-name">&amp;#xe616;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe84e;</span>
<div class="name">展示优先</div>
<div class="code-name">&amp;#xe84e;</div>
......@@ -267,6 +267,15 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont iconziliaocopy"></span>
<div class="name">
资料 copy
</div>
<div class="code-name">.iconziliaocopy
</div>
</li>
<li class="dib">
<span class="icon iconfont iconpaixu"></span>
<div class="name">
排序
......@@ -339,15 +348,6 @@
</li>
<li class="dib">
<span class="icon iconfont iconziliaocopy"></span>
<div class="name">
资料 copy
</div>
<div class="code-name">.iconziliaocopy
</div>
</li>
<li class="dib">
<span class="icon iconfont iconzhanshiyouxian"></span>
<div class="name">
展示优先
......@@ -576,6 +576,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconziliaocopy"></use>
</svg>
<div class="name">资料 copy</div>
<div class="code-name">#iconziliaocopy</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconpaixu"></use>
</svg>
<div class="name">排序</div>
......@@ -640,14 +648,6 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconziliaocopy"></use>
</svg>
<div class="name">资料 copy</div>
<div class="code-name">#iconziliaocopy</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconzhanshiyouxian"></use>
</svg>
<div class="name">展示优先</div>
......
src/styles/font/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/styles/font/iconfont.json
......@@ -6,6 +6,13 @@
"description": "",
"glyphs": [
{
"icon_id": "17228540",
"name": "资料 copy",
"font_class": "ziliaocopy",
"unicode": "e61a",
"unicode_decimal": 58906
},
{
"icon_id": "16330569",
"name": "排序",
"font_class": "paixu",
......@@ -62,13 +69,6 @@
"unicode_decimal": 58890
},
{
"icon_id": "14847887",
"name": "资料 copy",
"font_class": "ziliaocopy",
"unicode": "e616",
"unicode_decimal": 58902
},
{
"icon_id": "15947107",
"name": "展示优先",
"font_class": "zhanshiyouxian",
......
src/styles/font/iconfont.svg
......@@ -20,6 +20,9 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="ziliaocopy" unicode="&#58906;" d="M952.832 474.624h-223.232l-4.096 14.336c-1.536 2.56-1.536 6.656-1.536 9.216 0 6.656 1.536 12.8 4.096 17.92l5.12 10.24H947.2l5.12-10.24c2.56-5.12 4.096-11.776 4.096-17.92 0-4.096 0-6.656-1.536-9.216l-2.048-14.336zM750.592 474.624c-14.336 0-26.112 11.776-26.112 26.112s11.776 26.112 26.112 26.112 26.112-11.776 26.112-26.112-11.776-26.112-26.112-26.112z m0 38.912c-7.68 0-12.8-5.12-12.8-12.8s5.12-12.8 12.8-12.8 12.8 5.12 12.8 12.8-5.12 12.8-12.8 12.8z m194.56-38.912c-14.336 0-26.112 11.776-26.112 26.112s11.776 26.112 26.112 26.112 26.112-11.776 26.112-26.112-11.776-26.112-26.112-26.112z m0 38.912c-7.68 0-12.8-5.12-12.8-12.8s5.12-12.8 12.8-12.8 12.8 5.12 12.8 12.8-5.12 12.8-12.8 12.8z m-68.608-272.384h-146.432l-4.096 14.336c0 2.56-1.536 5.12-1.536 9.216 0 6.656 1.536 11.776 4.096 16.896l5.12 11.776h125.952v1.536h6.656l1.536-1.536h5.12l5.12-11.776c2.56-5.12 4.096-10.24 4.096-16.896 0-2.56 0-6.656-1.536-9.216l-4.096-14.336zM750.592 241.152c-14.336 0-26.112 11.776-26.112 26.112s11.776 26.112 26.112 26.112 26.112-11.776 26.112-26.112-11.776-26.112-26.112-26.112z m0 38.912c-7.68 0-12.8-5.12-12.8-12.8s5.12-12.8 12.8-12.8 12.8 5.12 12.8 12.8-5.12 12.8-12.8 12.8z m116.736-38.912c-4.096 0-9.216 1.536-12.8 4.096-7.68 5.12-12.8 12.8-12.8 22.016 0 14.336 11.776 26.112 26.112 26.112s26.112-11.776 26.112-26.112c0-9.216-5.12-17.92-12.8-22.016-4.608-2.56-9.728-4.096-13.824-4.096z m0 38.912c-2.56 0-5.12 0-6.656-1.536-4.096-2.56-6.656-6.656-6.656-11.776 0-7.68 5.12-12.8 12.8-12.8s12.8 5.12 12.8 12.8c0 5.12-2.56 9.216-6.656 11.776-1.536 1.536-3.072 1.536-5.632 1.536zM928.256-31.232H287.744c-71.168 0-134.656 38.912-160.768 98.304-7.68 17.92-11.776 36.352-11.776 55.808V646.144l10.24-1.536-10.24 1.536v10.24C122.88 736.768 198.144 799.232 287.744 799.232h640.512c89.6 0 165.888-62.464 172.544-142.848v-532.992c0-85.504-77.824-154.624-172.544-154.624zM300.544 20.992H896c53.248 0 95.744 12.8 120.832 36.352 20.992 19.456 29.696 51.712 29.696 98.304V612.352c0 46.592-10.24 79.36-29.696 98.304-23.552 24.576-65.024 36.352-119.296 36.352h-578.56c-55.808 0-99.84-12.8-123.392-37.376-17.92-19.456-27.136-49.152-27.136-95.744v-457.728c0-46.592 10.24-79.36 29.696-98.304 6.656-6.656 14.336-11.776 23.552-16.896l4.096-1.536c4.096-1.536 6.656-2.56 10.24-5.12 1.536-1.536 4.096-1.536 6.656-2.56l5.12-1.536c2.56-1.536 2.56-1.536 4.096-1.536 4.096-1.536 7.68-1.536 11.776-2.56l5.12-1.536c4.096-1.536 9.216-1.536 12.8-2.56h4.096c5.12 0 9.216-1.536 14.336-1.536l0.512 0.512zM652.288 176.64c-6.656 0-11.776 2.56-15.36 6.656-6.656 6.656-6.656 12.8-6.656 15.36 0 56.832-28.672 110.08-75.264 141.312-26.112-22.016-60.928-33.792-95.744-33.792-34.816 0-70.144 11.776-95.744 33.792-46.592-31.232-75.264-84.48-75.264-141.312 0-2.56 0-9.216-6.656-15.36-4.096-4.096-9.216-6.656-15.36-6.656-6.656 0-11.776 1.536-15.36 6.656-4.096 4.096-6.656 9.216-6.656 15.36 0 68.608 33.792 133.632 89.6 173.568-17.408 23.552-26.624 52.224-26.624 82.944C309.76 538.112 374.784 604.16 458.752 604.16S609.28 538.112 609.28 455.168c0-27.136-9.216-56.832-26.112-82.944 55.808-40.448 89.6-104.96 89.6-173.568 0-2.56 0-9.216-6.656-15.36-5.12-6.656-11.264-6.656-13.824-6.656z m-386.56 38.912l1.536-19.456v19.456h-1.536z m385.024 0l1.536-19.456v19.456h-1.536zM458.752 561.664c-59.904 0-107.52-46.592-107.52-106.496s46.592-107.52 107.52-107.52c59.904 0 106.496 46.592 106.496 107.52 1.024 59.904-46.592 106.496-106.496 106.496z" horiz-adv-x="1216" />
<glyph glyph-name="paixu" unicode="&#58907;" d="M711.10656 458.01472c0-6.71744-2.4576-12.61568-7.3728-17.53088-4.9152-4.9152-10.81344-7.3728-17.53088-7.3728h-348.9792c-6.71744 0-12.61568 2.4576-17.53088 7.3728-4.9152 4.9152-7.3728 10.73152-7.3728 17.53088 0 6.71744 2.4576 12.61568 7.3728 17.53088l174.4896 174.4896c4.9152 4.9152 10.73152 7.3728 17.53088 7.3728 6.71744 0 12.61568-2.4576 17.53088-7.3728l174.4896-174.4896c4.9152-4.9152 7.3728-10.73152 7.3728-17.53088zM703.73376 326.0416c4.9152-4.9152 7.3728-10.81344 7.3728-17.53088 0-6.71744-2.4576-12.61568-7.3728-17.53088l-174.4896-174.4896c-4.9152-4.9152-10.81344-7.3728-17.53088-7.3728-6.71744 0-12.61568 2.4576-17.53088 7.3728l-174.4896 174.4896c-4.9152 4.9152-7.3728 10.73152-7.3728 17.53088 0 6.71744 2.4576 12.61568 7.3728 17.53088 4.9152 4.9152 10.73152 7.3728 17.53088 7.3728h348.9792c6.79936 0 12.61568-2.4576 17.53088-7.3728z m0 0" horiz-adv-x="1024" />
......@@ -44,9 +47,6 @@ Created by iconfont
<glyph glyph-name="biaoqian" unicode="&#58890;" d="M612.3 10.899999999999977s14.4-76.3 58.1-74.8l280.8 102.2c8 2.9 14.4 8.8 18.1 16.6 3.7 7.8 4.1 16.5 1.1 24.5L765.6 615.1 727.3 711c8.1-1.1 90.5-82.9 90.5-82.9L1013.1 95c7.1-19.4 6.2-40.5-2.6-59.3-8.8-18.8-24.3-33.1-43.7-40.1L686-106.60000000000002c-8.6-3.1-17.6-4.7-26.4-4.7-11.2 0-22.4 2.4-32.8 7.3-18.8 8.8-34.9 38.6-34.9 38.6l20.4 76.3zM77.5-26.299999999999955c-50.2 13.5-80.3 65.4-66.8 115.7l163.7 610.8C202.1 803.6 355.6 927.6 515.1 880.4c159-47.1 206.9-207.3 177-318.9L528.4-49.299999999999955c-13.5-50.3-65.4-80.3-115.7-66.8L77.5-26.299999999999955z m15.9 59.4l335.2-89.8c17.4-4.7 35.6 5.9 40.3 23.3l163.7 610.8c6.1 22.8 5.6 73.6-7.2 116.8C606.8 756.4 566.5 801 497.6 821.4c-68.9 20.4-131.5 3.5-186.8-41.2-38.8-31.4-72.2-77.9-77-95.9L70.1 73.39999999999998c-4.6-17.4 5.9-35.6 23.3-40.3zM330.058 52.059999999999945l118.116 440.837 59.403-15.917L389.46 36.144000000000005z m-156.35 41.941L291.85 534.935l59.403-15.917L233.11 78.08500000000004zM359.4 648.8a76.9 76.9 0 1 1 153.8 0 76.9 76.9 0 1 1-153.8 0z" horiz-adv-x="1024" />
<glyph glyph-name="ziliaocopy" unicode="&#58902;" d="M1033.6 496H758.4l-4.8 17.6c-1.6 3.2-1.6 8-1.6 11.2 0 8 1.6 16 4.8 22.4l6.4 12.8h264l6.4-12.8c3.2-6.4 4.8-14.4 4.8-22.4 0-4.8 0-8-1.6-11.2l-3.2-17.6z m-19.2 24zM784 496c-17.6 0-32 14.4-32 32s14.4 32 32 32 32-14.4 32-32-14.4-32-32-32z m0 48c-9.6 0-16-6.4-16-16s6.4-16 16-16 16 6.4 16 16-6.4 16-16 16zM1024 496c-17.6 0-32 14.4-32 32s14.4 32 32 32 32-14.4 32-32-14.4-32-32-32z m0 48c-9.6 0-16-6.4-16-16s6.4-16 16-16 16 6.4 16 16-6.4 16-16 16zM939.2 208H758.4l-4.8 17.6c0 3.2-1.6 6.4-1.6 11.2 0 8 1.6 14.4 4.8 20.8l6.4 14.4h155.2v1.6h8l1.6-1.6h6.4l6.4-14.4c3.2-6.4 4.8-12.8 4.8-20.8 0-3.2 0-8-1.6-11.2l-4.8-17.6z m-20.8 24zM784 208c-17.6 0-32 14.4-32 32s14.4 32 32 32 32-14.4 32-32-14.4-32-32-32z m0 48c-9.6 0-16-6.4-16-16s6.4-16 16-16 16 6.4 16 16-6.4 16-16 16zM928 208c-4.8 0-11.2 1.6-16 4.8-9.6 6.4-16 16-16 27.2 0 17.6 14.4 32 32 32s32-14.4 32-32c0-11.2-6.4-22.4-16-27.2-4.8-3.2-11.2-4.8-16-4.8z m0 48c-3.2 0-6.4 0-8-1.6-4.8-3.2-8-8-8-14.4 0-9.6 6.4-16 16-16s16 6.4 16 16c0 6.4-3.2 11.2-8 14.4-3.2 1.6-4.8 1.6-8 1.6zM1003.2-128H212.8C124.8-128 46.4-80 14.4-6.4 4.8 16 0 38.4 0 62.4V707.2l12.8-1.6-12.8 1.6V720C9.6 819.2 102.4 896 212.8 896h790.4C1113.6 896 1208 819.2 1216 720v-657.6C1216-43.2 1120-128 1003.2-128z m-774.4 64h734.4c65.6 0 118.4 16 148.8 44.8 25.6 24 36.8 64 36.8 121.6V665.6c0 57.6-12.8 97.6-36.8 121.6-28.8 30.4-80 44.8-147.2 44.8H251.2C182.4 832 128 816 99.2 785.6c-22.4-24-33.6-60.8-33.6-118.4v-564.8c0-57.6 12.8-97.6 36.8-121.6 8-8 17.6-14.4 28.8-20.8l4.8-1.6c4.8-1.6 8-3.2 12.8-6.4 1.6-1.6 4.8-1.6 8-3.2l6.4-1.6c3.2-1.6 3.2-1.6 4.8-1.6 4.8-1.6 9.6-1.6 14.4-3.2l6.4-1.6c4.8-1.6 11.2-1.6 16-3.2h4.8c6.4 0 11.2-1.6 17.6-1.6h1.6zM662.4 128c-8 0-14.4 3.2-19.2 8-8 8-8 16-8 19.2 0 70.4-35.2 136-92.8 174.4-32-27.2-75.2-41.6-118.4-41.6s-86.4 14.4-118.4 41.6c-57.6-38.4-92.8-104-92.8-174.4 0-3.2 0-11.2-8-19.2-4.8-4.8-11.2-8-19.2-8s-14.4 1.6-19.2 8c-4.8 4.8-8 11.2-8 19.2 0 84.8 41.6 164.8 110.4 214.4-20.8 28.8-32 64-32 102.4C240 574.4 320 656 424 656s185.6-81.6 185.6-184c0-33.6-11.2-70.4-32-102.4C646.4 320 688 240 688 155.2c0-3.2 0-11.2-8-19.2-6.4-8-14.4-8-17.6-8z m-476.8 48l1.6-24V176h-1.6z m475.2 0l1.6-24V176h-1.6zM424 603.2c-73.6 0-132.8-57.6-132.8-131.2s57.6-132.8 132.8-132.8c73.6 0 131.2 57.6 131.2 132.8 1.6 73.6-57.6 131.2-131.2 131.2z" horiz-adv-x="1216" />
<glyph glyph-name="zhanshiyouxian" unicode="&#59470;" d="M910.222222 156.444444H113.777778V782.222222h796.444444v-625.777778zM170.666667 213.333333h682.666666V725.333333H170.666667v-512zM56.888889 42.666667h910.222222v-56.888889H56.888889zM364.088889 366.933333l-45.511111 34.133334 125.155555 164.977777 91.022223-91.022222 125.155555 153.6 45.511111-34.133333-164.977778-204.8-91.022222 91.022222z" horiz-adv-x="1024" />
......
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