Skip to content

C
clique-web
Commit 75317e71 by zhu_yu_dan
Options

ui:结算归属配置；bug:门店释放，商户状态未变化

parent f32873f5
Showing with 11 additions and 6 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.6f60e93b03a611c6b749b4a2062a0399.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.06.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 src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.ff2db9e6ace2984597aa.js></script><script type=text/javascript src=./static/js/vendor.1e64e812438b0a3af88f.js></script><script type=text/javascript src=./static/js/main.ebf48f57e93e8e9c7cb7.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.c95fdd7b846069ebb8f7176e76daf64e.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.06.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 src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.2c3ab56c5eec7d24f955.js></script><script type=text/javascript src=./static/js/vendor.1e64e812438b0a3af88f.js></script><script type=text/javascript src=./static/js/main.ebf48f57e93e8e9c7cb7.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/main.6f60e93b03a611c6b749b4a2062a0399.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.c95fdd7b846069ebb8f7176e76daf64e.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/16.4725c1a813c6a0caf9bd.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/16.6c79f7d249acf64c6b35.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/manifest.ff2db9e6ace2984597aa.js → dist/static/js/manifest.2c3ab56c5eec7d24f955.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var o,d,b,i=0,u=[];i<f.length;i++)d=f[i],a[d]&&u.push(a[d][0]),a[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var f={},a={40:0};function n(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,n){c=a[e]=[f,n]});c[2]=f;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:"08fb0d5f0434f8bf1a3e",1:"7022ec098f28856d54d4",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"6f32962990c4f47b6b8a",5:"299374ef57c52933e3fe",6:"fa0b3cbce6811a485ff8",7:"4fec8739e76a3f34d874",8:"f253c806c0ae6effc39e",9:"5999e2286ab73a7f96a9",10:"169e4ad17e4ff631e4de",11:"a6800fdb0c0b1c69c00c",12:"668c99115fcb37fe30a1",13:"f33b586c30e59c45c7cc",14:"9d7866da23eae6beb141",15:"b2c8d912367a079fd91e",16:"4725c1a813c6a0caf9bd",17:"1a8636077b786a984423",18:"28ef221553603ed7ddcf",19:"0f382a583054f3167b3c",20:"6caf4733f6235b86c902",21:"1e46fdf5628c2ea199ac",22:"4dcc7f42a2940d2cfaaa",23:"9b9915c61ee9b5dc37ec",24:"2007b52ae4ed232d464a",25:"2757e7d76d8f6fef6fd2",26:"9f6788921b154bb28665",27:"05b1f553520b490c6be4",28:"9899b74c2257c5425799",29:"e6574cd5ad31292b8181",30:"29fc655ef81ad3f4b9fe",31:"ebc8c137e5b42e094d13",32:"d6f295c90effdc17795c",33:"d6b981f45e313fe7a0a8",34:"b78ea9446b213201043b",35:"b9f00764b65c553a53f8",36:"6c49aba9959f62a4a729",37:"a3f757e35216656052bd"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,c,f){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var o,d,b,i=0,u=[];i<f.length;i++)d=f[i],a[d]&&u.push(a[d][0]),a[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var f={},a={40:0};function n(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,n){c=a[e]=[f,n]});c[2]=f;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:"08fb0d5f0434f8bf1a3e",1:"7022ec098f28856d54d4",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"6f32962990c4f47b6b8a",5:"299374ef57c52933e3fe",6:"fa0b3cbce6811a485ff8",7:"4fec8739e76a3f34d874",8:"f253c806c0ae6effc39e",9:"5999e2286ab73a7f96a9",10:"169e4ad17e4ff631e4de",11:"a6800fdb0c0b1c69c00c",12:"668c99115fcb37fe30a1",13:"f33b586c30e59c45c7cc",14:"9d7866da23eae6beb141",15:"b2c8d912367a079fd91e",16:"6c79f7d249acf64c6b35",17:"1a8636077b786a984423",18:"28ef221553603ed7ddcf",19:"0f382a583054f3167b3c",20:"6caf4733f6235b86c902",21:"1e46fdf5628c2ea199ac",22:"4dcc7f42a2940d2cfaaa",23:"9b9915c61ee9b5dc37ec",24:"2007b52ae4ed232d464a",25:"2757e7d76d8f6fef6fd2",26:"9f6788921b154bb28665",27:"05b1f553520b490c6be4",28:"9899b74c2257c5425799",29:"e6574cd5ad31292b8181",30:"29fc655ef81ad3f4b9fe",31:"5b98389d3ccc9a0294b7",32:"d6f295c90effdc17795c",33:"07e7523fd7bd8d4db0d5",34:"b78ea9446b213201043b",35:"b9f00764b65c553a53f8",36:"6c49aba9959f62a4a729",37:"a3f757e35216656052bd"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,c,f){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.ff2db9e6ace2984597aa.js.map //# sourceMappingURL=manifest.2c3ab56c5eec7d24f955.js.map
\ No newline at end of file \ No newline at end of file
src/view/companyGroup/integral/cliqueCard.vue
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<el-dialog title="删除提示" :visible.sync="dialogVisible" width="500px"> <el-dialog title="删除提示" :visible.sync="dialogVisible" width="500px">
<div class="del-wrap"> <div class="del-wrap">
<h3>确认将结算归属【{{ cliqueGroupName }}（{{ cliqueGroupCode }}）】删除？</h3> <h3>确认将结算归属【{{ cliqueGroupName }}（{{ cliqueGroupCode }}）】删除？</h3>
<p>删除后该结算归属下的门店将变为无归属，请及时重新分配</p> <p v-show="cliqueGroupNum > 0">删除后该结算归属下的门店（{{ cliqueGroupNum }}家）将变为无归属，请及时重新分配</p>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
...@@ -159,6 +159,7 @@ export default { ...@@ -159,6 +159,7 @@ export default {
dialogVisible: false, dialogVisible: false,
cliqueGroupName: '', cliqueGroupName: '',
cliqueGroupCode: '', cliqueGroupCode: '',
cliqueGroupNum: null,
integralSettlementGroupId: '', integralSettlementGroupId: '',
cliqueGroupIndex: 0, cliqueGroupIndex: 0,
// 编辑 // 编辑
...@@ -235,6 +236,7 @@ export default { ...@@ -235,6 +236,7 @@ export default {
this.cliqueGroupIndex = index; this.cliqueGroupIndex = index;
this.cliqueGroupName = item.groupName; this.cliqueGroupName = item.groupName;
this.cliqueGroupCode = item.groupCode ? item.groupCode : '--'; this.cliqueGroupCode = item.groupCode ? item.groupCode : '--';
this.cliqueGroupNum = item.storeCount;
}, },
sureDelBtn() { sureDelBtn() {
let para = { let para = {
...@@ -479,6 +481,8 @@ export default { ...@@ -479,6 +481,8 @@ export default {
} }
.del-wrap { .del-wrap {
font-size: 14px; font-size: 14px;
max-height: 300px;
overflow: auto;
h3 { h3 {
color: #303133; color: #303133;
line-height: 20px; line-height: 20px;
......
src/view/companyGroup/integral/cliqueList.vue
...@@ -331,6 +331,7 @@ export default { ...@@ -331,6 +331,7 @@ export default {
if (data.errorCode == 0) { if (data.errorCode == 0) {
this.dialogVisible2 = false; this.dialogVisible2 = false;
this.getCliquePage(); this.getCliquePage();
this.$emit('resetEnterpriseList', true);
this.$message.success('释放成功'); this.$message.success('释放成功');
} else { } else {
this.$message.error(data.message); this.$message.error(data.message);
......
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