Skip to content

H
haoban-3
Commit eb6e2535 by 陈羽
Options

Merge branch 'featrue/销售线索' of http://git.gicdev.com/office/haoban-3 into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.c7dc44ad0bd96a53559aa9174c77db8f.css
#	dist/static/js/10.cfaf571df2c94290bb47.js
#	dist/static/js/10.f5de7923d151c2822410.js
#	dist/static/js/12.3b7df6b6bd5670353622.js
#	dist/static/js/manifest.5dc0ca8990f1b8c9c589.js
parents 125f8ef9 b374f158
Showing with 29 additions and 25 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.58.3.css><link href=./static/css/app.daf70986b53b553fec95ce99620c882e.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><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/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.57bf5ce3755967f41e9b.js></script><script type=text/javascript src=./static/js/vendor.6feec9d14bcc5dc1839b.js></script><script type=text/javascript src=./static/js/app.fd92e0d647da9405fea0.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>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.58.3.css><link href=./static/css/app.daf70986b53b553fec95ce99620c882e.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><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/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.57bf5ce3755967f41e9b.js></script><script type=text/javascript src=./static/js/vendor.6feec9d14bcc5dc1839b.js></script><script type=text/javascript src=./static/js/app.fd92e0d647da9405fea0.js></script></body></html>
dist/static/css/app.c7dc44ad0bd96a53559aa9174c77db8f.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/10.f5de7923d151c2822410.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.5dc0ca8990f1b8c9c589.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(d,b,n){for(var r,t,o,i=0,u=[];i<d.length;i++)t=d[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(d,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=a(a.s=n[i]);return o};var d={},f={101:0};function a(c){if(d[c])return d[c].exports;var f=d[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,a),f.l=!0,f.exports}a.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var d=new Promise(function(d,a){c=f[e]=[d,a]});c[2]=d;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,a.nc&&n.setAttribute("nonce",a.nc),n.src=a.p+"static/js/"+e+"."+{0:"34a339b38f0c1b216986",1:"80ec7107adf684998411",2:"2a6c0b9410ad48851f04",3:"71289dfc436f4e6b0672",4:"b8702b2c9b9d57e756ab",5:"7a62062ecd7095619dee",6:"649d63c7e2d6bf6e55fb",7:"dfad203bbec9bffcabbb",8:"50451230dba3ad2810f6",9:"af884ac4a314b4b3bc6b",10:"f5de7923d151c2822410",11:"603f74f1ea9f73bf61bd",12:"991898aabe93f6616b69",13:"49086d57174ef20d5bfc",14:"fe6d93f877adae3d42f0",15:"f7b8b867c1ca117585af",16:"c0b43a0cd4f3c52556c1",17:"b2385906980e5a57eb88",18:"d71b848f78013e7c6635",19:"1a1791d44b00938e0f09",20:"63234464baa425bb995e",21:"d0d07b348a58560cb8e0",22:"91d57db343aeed8d02a5",23:"5bd084681d476ed3c22d",24:"044c612168ec98077ec2",25:"280b353158f1617d9c6b",26:"98090da394d2fcd7acbd",27:"64b9a28f9cfe11783107",28:"72c691a47ab4c8804ed0",29:"263c95946d091adc2ead",30:"ce8accc35c07dbdd704f",31:"33f44b661656b1d12c95",32:"e510e855c43eae846f3b",33:"c7b5aa22dff1a42c251a",34:"5ec202078d1a2d356535",35:"5c1b9708baa993686c46",36:"deb49e9f768aed9d6da8",37:"803f53b66c4fb091e086",38:"47244e611bf46cbde220",39:"beb323af4c775906238d",40:"f0af54d2bd4734f497c2",41:"622ea41858dfd53f60bd",42:"15e0cf401c8b60c8bc5e",43:"2f86da0212a04f75f854",44:"6735568b83cc45c16117",45:"ff2159fa68f3bc7f537b",46:"046091a81c65f31cca07",47:"fd1a33a0a70a4cd06db1",48:"4760ddceb57af73e0a91",49:"4c2735d786976cdc34e1",50:"14f45c9d88e1c733d539",51:"51bad676a11cc6df4d7e",52:"7e2460e6eb686c63f790",53:"8993da6d7ff709439761",54:"9a0211ec43cd2892b0c2",55:"090f82f55f87df498994",56:"c3d0e60f1b32e4b17442",57:"ebe7791c87e83f0b2cee",58:"584983b6273c34a1fd1d",59:"82ced062becfdc5b9091",60:"3bef8c13761ebdface08",61:"53f113f29db81561850e",62:"e0acd353801c964887f4",63:"5afc768d50bb8f5f4b36",64:"73a434a6c4f7ea697f1a",65:"de7844a4f4245d5de8f7",66:"302ac9dea1d90c5ec905",67:"73fd8dddff260b575b1e",68:"a8ecabb226cd18c8e612",69:"927cc6261b733e4642b2",70:"eda7a2dffc900d51d864",71:"b9dda9056e82e4187e86",72:"6ecaafb4bcdf06ac310d",73:"995c35b64d50c823cfbb",74:"fe2e6061141a5314f0e6",75:"dc41dfc28339540f7617",76:"7542cedc5c106bd8047b",77:"26495e107533cebc818a",78:"1b13025b5c4a6a2e9033",79:"d4de77e6ab25b662bf76",80:"9ed3f939a873dc1c0a69",81:"d35a1a35efa32ee8b132",82:"216cf362684baf01006f",83:"196451da75cd883494c3",84:"e2ee8aa0777337944de3",85:"dc42e7b3a4afea89ec20",86:"26924b4a675763780a27",87:"f05750f4be735d794fa5",88:"9068dd36ffb4e9606749",89:"191c546f3945558e3105",90:"8328de831fe7a4d46b88",91:"2785ede41f249908d3e9",92:"25ed17c5be90edf4f562",93:"9f48fdc114738a0adbf2",94:"0960252e833bce31acf3",95:"140ccb51d9ae97b298c6",96:"6c6eb5ef6172208c1d1b",97:"5363440da82f7efcf921",98:"8fe75f8bede44bc4968c"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),d},a.m=e,a.c=d,a.d=function(e,c,d){a.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:d})},a.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(c,"a",c),c},a.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},a.p="./",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/business/authMerchant.vue
......@@ -29,7 +29,8 @@
</div>
</div>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
<el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData"
tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
<el-table-column prop="" label="商户列表" show-overflow-tooltip min-width="200">
<template slot-scope="scope">
<div class="ul-li-cell flex">
......@@ -38,8 +39,8 @@
</div>
<div class="cell-info">
<div class="cell-info-name flex font-14 color-303133">
<span class="gic-name color-606266">{{ scope.row.enterpriseName || '--' }}</span
><span class="gic-version color-606266">{{ scope.row.version || '3.0' }}</span>
<span class="gic-name color-606266">{{ scope.row.enterpriseName || '--' }}</span><span
class="gic-version color-606266">{{ scope.row.version || '3.0' }}</span>
</div>
<div class="cell-info-name flex font-14 color-606266">
<span class="gic-name">{{ scope.row.brandName || '--' }}</span>
......@@ -49,24 +50,23 @@
</template>
</el-table-column>
<el-table-column prop="" label="企业类型" show-overflow-tooltip>
<template slot-scope="scope"
><span class="color-606266">{{ scope.row.wxEnterpriseType | wxEnterpriseTypeFilter }}</span></template
>
<template slot-scope="scope"><span
class="color-606266">{{ scope.row.wxEnterpriseType | wxEnterpriseTypeFilter }}</span></template>
</el-table-column>
<el-table-column prop="" label="开平类型" show-overflow-tooltip>
<template slot-scope="scope"
><span class="color-606266">{{ scope.row.memberOpenCardFlag ? '不同开平' : '同一开平' }}</span></template
>
<template slot-scope="scope"><span
class="color-606266">{{ scope.row.memberOpenCardFlag ? '不同开平' : '同一开平' }}</span></template>
</el-table-column>
<el-table-column prop="" label="导购编辑" show-overflow-tooltip>
<template slot-scope="scope">
<el-switch v-model="scope.row.clerkEditFlag" :active-value="1" :inactive-value="0" @change="clerkEditFlagChange(scope.row, scope.$index)"></el-switch>
<el-switch v-model="scope.row.clerkEditFlag" :active-value="1" :inactive-value="0"
:disabled="scope.row.wxEnterpriseType===1" @change="clerkEditFlagChange(scope.row, scope.$index)">
</el-switch>
</template>
</el-table-column>
<el-table-column prop="" label="提交人" show-overflow-tooltip>
<template slot-scope="scope"
><span class="color-606266">{{ scope.row.staffName || '--' }}</span></template
>
<template slot-scope="scope"><span
class="color-606266">{{ scope.row.staffName || '--' }}</span></template>
</el-table-column>
<el-table-column prop="" label="完成时间" show-overflow-tooltip>
<template slot-scope="scope">
......@@ -78,12 +78,15 @@
<template slot-scope="scope">
<el-button type="text" @click="AddAuthMerchant(scope.row)">编辑授权设置</el-button>
<el-button type="text" @click="toStoreList(scope.row)">绑定门店列表</el-button>
<el-button slot="reference" type="text" size="small" @click="refreshStoreBind(scope.row)">刷新门店</el-button>
<el-button slot="reference" type="text" size="small" @click="refreshStoreBind(scope.row)">刷新门店
</el-button>
</template>
</el-table-column>
</el-table>
<div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0">
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="8"> </dm-pagination>
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper" :total="8"> </dm-pagination>
</div>
</div>
</div>
......@@ -201,7 +204,7 @@ export default {
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
.catch(function (error) {
that.loading = false;
that.$message.error({
duration: 1000,
......@@ -233,7 +236,7 @@ export default {
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
.catch(function (error) {
that.loading = false;
that.$message.error({
duration: 1000,
......@@ -241,7 +244,7 @@ export default {
});
});
})
.catch(() => {});
.catch(() => { });
},
clerkEditFlagChange(item, index) {
const that = this;
......@@ -253,7 +256,7 @@ export default {
})
.then(() => {
that.loading = true;
let para = { wxEnterprieseRelatedId: item.wxEnterpriseRelatedId, clerkEditFlag: that.tableData[index].clerkEditFlag ? 1 : 0 };
let para = { wxEnterprieseRelatedId: item.wxEnterpriseRelatedId, clerkEditFlag: that.tableData[ index ].clerkEditFlag ? 1 : 0 };
getRequest('/haoban-manage3-web/set-clerk-edit', para)
.then(res => {
that.loading = false;
......@@ -269,7 +272,7 @@ export default {
this.getTableList();
errMsg.errorMsg(resData);
})
.catch(function(error) {
.catch(function (error) {
that.loading = false;
that.$message.error({
duration: 1000,
......@@ -279,16 +282,16 @@ export default {
});
})
.catch(() => {
that.tableData[index].clerkEditFlag = that.tableData[index].clerkEditFlag ? 0 : 1;
that.tableData[ index ].clerkEditFlag = that.tableData[ index ].clerkEditFlag ? 0 : 1;
});
}
},
watch: {
activeBrand: function(newData, oldData) {
activeBrand: function (newData, oldData) {
const that = this;
that.activeBrand = newData;
},
activeGroup: function(newData, oldData) {
activeGroup: function (newData, oldData) {
const that = this;
that.activeGroup = newData;
}
......
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