Skip to content

C
clique-web
Commit 36fd8afb by zhu_yu_dan
Options

fix:结算归属配置

parent cd990799
Showing with 32 additions and 20 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.06a042df7f7f7c139b49e28cc5e47799.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.e553fc633298373f77e0.js></script><script type=text/javascript src=./static/js/vendor.f7bef4ba6a35eee53566.js></script><script type=text/javascript src=./static/js/main.844b2d1bd87ffe13f75f.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.58f0a90d0098eaaf25b1a08782b62cb8.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.c198b9958e3110ff387d.js></script><script type=text/javascript src=./static/js/vendor.4d58b3015cdc1aa33f08.js></script><script type=text/javascript src=./static/js/main.bf2e1950c67e8c9c19d9.js></script></body></html>
\ No newline at end of file
dist/static/css/main.06a042df7f7f7c139b49e28cc5e47799.css.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.58f0a90d0098eaaf25b1a08782b62cb8.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/10.a18b60a758017ebf7df7.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/11.27528729efd798ace10f.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/15.73bcf663df1958d2a260.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/15.c599eedc650ae5cd62f0.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/25.2474fdfddf038ce06b3c.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/26.2287c68846145a8c5604.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/31.c07206648adb3cb7c265.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/4.4f0de59739044928188a.js → dist/static/js/4.9e7ef90c13a32196615a.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.5fa7b1a2b6aadb271627.js → dist/static/js/5.ae32efa6a124e74a06b9.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.79eb605d5e7d9a4ce484.js → dist/static/js/6.043d5be7e8ae7af315a9.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.64efdae52ec787eeaadd.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.94867d8e5d5e51ec19ce.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.f0246ee3c6d3a8d3bcd3.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/9.27e071d5f504605b2294.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.c198b9958e3110ff387d.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={36:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"6a7b63b6a9447c78e969",1:"73ceba26c1aaf431359d",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"9e7ef90c13a32196615a",5:"ae32efa6a124e74a06b9",6:"043d5be7e8ae7af315a9",7:"64efdae52ec787eeaadd",8:"94867d8e5d5e51ec19ce",9:"4dc79dcdb1a8f85a45f0",10:"a18b60a758017ebf7df7",11:"eedc6a657f9ef4732d0d",12:"4a8f728956ddba7c1f2c",13:"0d2bbc6b7ebbb4ebe6d4",14:"62798791cc0fde824239",15:"c599eedc650ae5cd62f0",16:"cf182235fc1722d0511a",17:"a3deedb0c47a9667af8a",18:"4c19992b12c95c722a3f",19:"0a8caf0d2927860781a6",20:"a2c73cf02c1ae068f605",21:"9478fd3dea2b7426acd8",22:"d381b38bb8d9151b6761",23:"a22230160f3c91f545a3",24:"c8cc8aa49bbcbba1b2ec",25:"2474fdfddf038ce06b3c",26:"2287c68846145a8c5604",27:"a05cabc5df423117a9b3",28:"6d6a15d813b2e0cffbaf",29:"8c6ed3dc5f7e3bc522fc",30:"29fc655ef81ad3f4b9fe",31:"c07206648adb3cb7c265",32:"bdd2934b6978a2c2e6ca",33:"375ce23a24c8c2797719"}[e]+".js";var d=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(d);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,t.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.c198b9958e3110ff387d.js.map
\ No newline at end of file
dist/static/js/manifest.e553fc633298373f77e0.js deleted 100644 → 0
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var o,b,d,i=0,u=[];i<c.length;i++)b=c[i],f[b]&&u.push(f[b][0]),f[b]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};var c={},f={36:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"6a7b63b6a9447c78e969",1:"73ceba26c1aaf431359d",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"4f0de59739044928188a",5:"5fa7b1a2b6aadb271627",6:"79eb605d5e7d9a4ce484",7:"67e0d59f5b459bfcbfd2",8:"f0246ee3c6d3a8d3bcd3",9:"27e071d5f504605b2294",10:"070886211500aff418db",11:"27528729efd798ace10f",12:"f6f4f844a29a984c95c9",13:"607b3bd383de5f25be89",14:"c89afb729f0b984e2aec",15:"73bcf663df1958d2a260",16:"ebedc1a6f35956bae127",17:"8ac5df3bb605abb26362",18:"f6a642098fc87d04cdb0",19:"d73b112213b640ea53ab",20:"597f656075a65474a2af",21:"08563ca144f8e589db45",22:"797f1991b3f9154cd166",23:"94a5e15f16f9d950bb43",24:"654464d75a7b8e0b8024",25:"2474fdfddf038ce06b3c",26:"2287c68846145a8c5604",27:"74d9077a4f611524df44",28:"53708fc57369376e0bc6",29:"f4afc64cbc7bcfb76260",30:"29fc655ef81ad3f4b9fe",31:"c07206648adb3cb7c265",32:"bdd2934b6978a2c2e6ca",33:"375ce23a24c8c2797719"}[e]+".js";var o=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.e553fc633298373f77e0.js.map
\ No newline at end of file
src/view/companyGroup/integral/cliqueCard.vue
......@@ -37,7 +37,7 @@
</p>
</div>
<div class="group-info">
<p>code: {{ card.groupCode ? card.groupCode : '--' }}</p>
<p class="group-code">code: {{ card.groupCode ? card.groupCode : '--' }}</p>
<p>门店：{{ card.storeCount }}家</p>
</div>
</li>
......@@ -288,7 +288,9 @@ export default {
},
// 获取导入时间
getImportTime() {
let para = {};
let para = {
enterpriseId: this.enterpriseId
};
postRequest('/api-admin/clique-last-import-time', para).then(res => {
let data = res.data;
if (data.errorCode == 0) {
......@@ -318,8 +320,10 @@ export default {
this.getImportTime();
} else {
this.dialogErrVisible = true;
this.importErrName = data.result.storeName;
this.importErrCode = data.result.storeCode;
if (data.result) {
this.importErrName = data.result.storeName;
this.importErrCode = data.result.storeCode;
}
}
});
return isCSV || true;
......@@ -377,6 +381,11 @@ export default {
box-shadow: 0px 1px 5px 0px rgba(220, 223, 230, 0.5);
}
.group-info {
.group-code {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
p {
color: #909399;
font-size: 14px;
......
src/view/companyGroup/integral/cliqueList.vue
......@@ -17,7 +17,7 @@
<template slot-scope="scope">
<div class="store-name-wrap">
<p class="first-item">{{ scope.row.storeName ? scope.row.storeName : '--' }}</p>
<p class="second-item">code：{{ scope.row.storeName ? scope.row.storeName : '--' }}</p>
<p class="second-item">code：{{ scope.row.storeCode ? scope.row.storeCode : '--' }}</p>
</div>
</template>
</el-table-column>
......@@ -288,12 +288,7 @@ export default {
},
// 搜索 选择结算归属
searchSelectBelong() {
if (this.value.indexOf('0') > -1) {
// 所有
this.groupIds = '';
} else {
this.groupIds = this.value.join(',');
}
this.groupIds = this.value.join(',');
this.getCliquePage();
}
}
......@@ -329,6 +324,9 @@ export default {
.second-item {
font-size: 14px;
color: #909399;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
.belong-wrap ul {
margin-top: 10px;
......
src/view/companyGroup/integral/settlementConfig.vue
......@@ -5,11 +5,12 @@
<div class="right-box">
<div class="nav-list-wrap">
<div class="nav-list">
<el-carousel trigger="click" height="60px" arrow="always" :autoplay="false" indicator-position="none" :loop="false">
<el-carousel trigger="click" height="60px" arrow="always" :autoplay="false" indicator-position="none" :loop="false" :interval="5000">
<el-carousel-item v-for="(newItem, idx) in newApplyList" :key="idx">
<ul class="clearfix">
<li @click="selectEnterprise(item, index)" class="fl nav-item" v-for="(item, index) in newItem" :key="index">
<i :class="{ on: curIndex == index }">{{ item.enterpriseName }}<span v-show="!item.isEdit" class="item-edit">*</span></i
<i :class="{ on: curIndex == index }"
>{{ item.enterpriseName }}<el-popover placement="top" width="160" trigger="hover" content="此商户下有未归属的门店"> <i v-show="!item.isEdit" slot="reference" class="iconfont tooltip-icon icon-xinxixianshi"></i> </el-popover></i
><span v-show="index < newItem.length - 1">|</span>
</li>
</ul>
......@@ -82,9 +83,9 @@ export default {
let data = res.data;
if (data.errorCode == 0) {
this.applyList = data.result ? data.result : [];
for (let i = 0, len = this.applyList.length; i < len; i += 4) {
for (let i = 0, len = this.applyList.length; i < len; i += 10) {
// 每4个一组
this.newApplyList.push(this.applyList.slice(i, i + 4));
this.newApplyList.push(this.applyList.slice(i, i + 10));
}
this.enterpriseId = this.applyList[0].enterpriseId;
// this.getCliquePage();
......@@ -136,6 +137,10 @@ export default {
padding: 0 15px;
color: #909399;
}
.tooltip-icon {
padding: 0 5px;
font-size: 13px;
}
span {
font-size: 13px;
color: #909399;
......
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