Skip to content

C
clique-web
Commit 21b7cd17 by zhu_yu_dan
Options

bug:积分结算报表的下载改为最原始的下载

parent e3f6a863
Showing with 103 additions and 58 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.5bd82012ce0acf56482ac840a2b0e27a.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.3fabd88fccd61ea18123.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.9e40dd9943fd3666bb2a5862dc5cd169.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.8ead373a6b62d6f650a3.js></script><script type=text/javascript src=./static/js/vendor.1e64e812438b0a3af88f.js></script><script type=text/javascript src=./static/js/main.a8e5d1aeaaac669e42cb.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/main.5bd82012ce0acf56482ac840a2b0e27a.css 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.5bd82012ce0acf56482ac840a2b0e27a.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.9e40dd9943fd3666bb2a5862dc5cd169.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.9e40dd9943fd3666bb2a5862dc5cd169.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.780304d27afe459ee3f4.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/11.a6800fdb0c0b1c69c00c.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.668c99115fcb37fe30a1.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/13.e1d7ef34a8918c5e4c91.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/13.f33b586c30e59c45c7cc.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/14.9d7866da23eae6beb141.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/15.b2c8d912367a079fd91e.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/17.1a8636077b786a984423.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/18.28ef221553603ed7ddcf.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/19.0f382a583054f3167b3c.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/20.6caf4733f6235b86c902.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/21.1e46fdf5628c2ea199ac.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/22.4dcc7f42a2940d2cfaaa.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/24.2007b52ae4ed232d464a.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/35.b9f00764b65c553a53f8.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/4.6f32962990c4f47b6b8a.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.299374ef57c52933e3fe.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.299374ef57c52933e3fe.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/5.2c06fcacc29f613256e7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.2c06fcacc29f613256e7.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/6.757d0534ee41575596f2.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.955b966d611ad2222aac.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.b475bf47ec953d03b58c.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/9.871513f8c9bc4e125cff.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.3fabd88fccd61ea18123.js deleted 100644 → 0
!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:"757d0534ee41575596f2",7:"955b966d611ad2222aac",8:"b475bf47ec953d03b58c",9:"871513f8c9bc4e125cff",10:"780304d27afe459ee3f4",11:"a6800fdb0c0b1c69c00c",12:"668c99115fcb37fe30a1",13:"f33b586c30e59c45c7cc",14:"9d7866da23eae6beb141",15:"b2c8d912367a079fd91e",16:"c07857a2765d09cef9bb",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:"b8088f86fd677aea9cdd",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.3fabd88fccd61ea18123.js.map
\ No newline at end of file
dist/static/js/manifest.8ead373a6b62d6f650a3.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={40:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;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:"2c06fcacc29f613256e7",6:"757d0534ee41575596f2",7:"955b966d611ad2222aac",8:"b475bf47ec953d03b58c",9:"871513f8c9bc4e125cff",10:"780304d27afe459ee3f4",11:"a6800fdb0c0b1c69c00c",12:"668c99115fcb37fe30a1",13:"e1d7ef34a8918c5e4c91",14:"9d7866da23eae6beb141",15:"b2c8d912367a079fd91e",16:"13c83c0f37ba0f4c7e66",17:"1a8636077b786a984423",18:"28ef221553603ed7ddcf",19:"0f382a583054f3167b3c",20:"6caf4733f6235b86c902",21:"1e46fdf5628c2ea199ac",22:"4dcc7f42a2940d2cfaaa",23:"9b9915c61ee9b5dc37ec",24:"2007b52ae4ed232d464a",25:"2757e7d76d8f6fef6fd2",26:"d6bb3bbef604053e99d6",27:"014d35c0326c5f60a81d",28:"de4ef5b52cb3f53c7a46",29:"14d44e8ef7adb5ea6b5b",30:"64b768adfe7489389803",31:"71a747d50d1aa85a2fe7",32:"462c722f695f2b87f5d9",33:"b8088f86fd677aea9cdd",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=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},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.8ead373a6b62d6f650a3.js.map
\ No newline at end of file
src/common/js/excel_config.js 0 → 100644
// var protocol = window.location.protocol; // 获取协议
// var host = window.location.host;
// var config = protocol + '//' + host; // 获取域名
var config = window.location.origin; // 获取域名和协议
// eslint-disable-next-line
module.exports = {
// config: 'http://gicdev.demogic.com',
config
};
src/view/companyGroup/integral/cardExcel.vue
...@@ -22,8 +22,16 @@ ...@@ -22,8 +22,16 @@
<p class="table-second-item">{{ scope.row.exchangeTime | dateFormatNew('hh:mm:ss') }}</p> <p class="table-second-item">{{ scope.row.exchangeTime | dateFormatNew('hh:mm:ss') }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="coupName" label="卡券名称"> </el-table-column> <el-table-column prop="coupName" label="卡券名称">
<el-table-column prop="coupDenomination" label="卡券面额"> </el-table-column> <template slot-scope="scope">
{{ scope.row.coupName ? scope.row.coupName : '--' }}
</template>
</el-table-column>
<el-table-column prop="coupDenomination" label="卡券面额">
<template slot-scope="scope">
{{ scope.row.coupDenomination ? scope.row.coupDenomination : '--' }}
</template>
</el-table-column>
<el-table-column prop="checkStoreName" label="核销门店" sortable="custom"> <el-table-column prop="checkStoreName" label="核销门店" sortable="custom">
<template slot-scope="scope"> <template slot-scope="scope">
<p class="table-first-item">{{ scope.row.checkStoreName ? scope.row.checkStoreName : '--' }}</p> <p class="table-first-item">{{ scope.row.checkStoreName ? scope.row.checkStoreName : '--' }}</p>
...@@ -44,8 +52,6 @@ ...@@ -44,8 +52,6 @@
<div class="pagination" v-show="totalCount > 0"> <div class="pagination" v-show="totalCount > 0">
<el-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" :total="totalCount"> </el-pagination> <el-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" :total="totalCount"> </el-pagination>
</div> </div>
<!-- 导出数据 -->
<vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</div> </div>
</template> </template>
...@@ -54,6 +60,7 @@ import { dateFormat } from '../../../common/js/filter'; ...@@ -54,6 +60,7 @@ import { dateFormat } from '../../../common/js/filter';
import { postRequest, getRequest } from '@/api/api'; import { postRequest, getRequest } from '@/api/api';
// import { log } from '@/utils/index.js'; // import { log } from '@/utils/index.js';
import defaultImg from '../../../../static/img/head_default.jpg'; import defaultImg from '../../../../static/img/head_default.jpg';
import excelConfig from '@/common/js/excel_config.js';
export default { export default {
name: 'cardExcel', name: 'cardExcel',
data() { data() {
...@@ -71,10 +78,6 @@ export default { ...@@ -71,10 +78,6 @@ export default {
totalCount: 0, totalCount: 0,
defaultImg: defaultImg, defaultImg: defaultImg,
loading: false, loading: false,
// 导出数据
dialogVisible: false,
excelUrl: '/api-report/report-clique-integral-coup-exchange',
params: {},
// 排序 // 排序
curSortType: '' curSortType: ''
}; };
...@@ -194,14 +197,22 @@ export default { ...@@ -194,14 +197,22 @@ export default {
}, },
// 导出数据 // 导出数据
downloadExcel() { downloadExcel() {
this.dialogVisible = true; let para = {
this.params = {
requestProject: this.projectName, requestProject: this.projectName,
paramTime: this.month, paramTime: this.month,
enterpriseId: this.enterpriseId, enterpriseId: this.enterpriseId,
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: this.pageSize pageSize: this.pageSize
}; };
postRequest('/api-report/report-clique-integral-coup-exchange', para).then(res => {
var data = res.data;
if (data.errorCode) {
// 如果报错，会有返回信息，如果成功，直接下载文件，没有返回信息
this.$message.error(data.message);
} else {
window.location.href = excelConfig.config + '/api-report/report-clique-integral-coup-exchange?requestProject=' + this.projectName + '&paramTime=' + this.month + '&enterpriseId=' + this.enterpriseId + '&currentPage=' + this.currentPage + '&pageSize=' + this.pageSize;
}
});
} }
} }
}; };
......
src/view/companyGroup/integral/closeAllExcel.vue
...@@ -26,14 +26,12 @@ ...@@ -26,14 +26,12 @@
<div class="pagination" v-show="totalCount > 0"> <div class="pagination" v-show="totalCount > 0">
<el-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" :total="totalCount"> </el-pagination> <el-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" :total="totalCount"> </el-pagination>
</div> </div>
<!-- 导出数据 -->
<vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisible" :type="1" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
<vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisible2" :type="2" :excelUrl="excelUrl2" :params="params2" :projectName="projectName"></vue-gic-export-excel>
</div> </div>
</template> </template>
<script> <script>
import { postRequest, getRequest } from '@/api/api'; import { postRequest, getRequest } from '@/api/api';
import excelConfig from '@/common/js/excel_config.js';
// import { log } from '@/utils/index.js'; // import { log } from '@/utils/index.js';
export default { export default {
name: 'integralCloseAll', name: 'integralCloseAll',
...@@ -51,13 +49,6 @@ export default { ...@@ -51,13 +49,6 @@ export default {
pageSize: 20, pageSize: 20,
totalCount: 0, totalCount: 0,
loading: false, loading: false,
// 导出数据
dialogVisible: false,
excelUrl: '/api-report/report-clique-integral-report',
params: {},
dialogVisible2: false,
excelUrl2: '/api-report/report-clique-integral-detail',
params2: {},
// 排序 // 排序
curSortType: '' curSortType: ''
}; };
...@@ -223,25 +214,41 @@ export default { ...@@ -223,25 +214,41 @@ export default {
}, },
// 导出明细数据 // 导出明细数据
downloadExcelDtl() { downloadExcelDtl() {
this.dialogVisible2 = true; let para = {
this.params2 = {
requestProject: this.projectName, requestProject: this.projectName,
paramTime: this.month, paramTime: this.month,
enterpriseId: this.enterpriseId, enterpriseId: this.enterpriseId,
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: this.pageSize pageSize: this.pageSize
}; };
postRequest('/api-report/report-clique-integral-detail', para).then(res => {
var data = res.data;
if (data.errorCode) {
// 如果报错，会有返回信息，如果成功，直接下载文件，没有返回信息
this.$message.error(data.message);
} else {
window.location.href = excelConfig.config + '/api-report/report-clique-integral-detail?requestProject=' + this.projectName + '&paramTime=' + this.month + '&enterpriseId=' + this.enterpriseId + '&currentPage=' + this.currentPage + '&pageSize=' + this.pageSize;
}
});
}, },
// 导出汇总数据 // 导出汇总数据
downloadExcelAll() { downloadExcelAll() {
this.dialogVisible = true; let para = {
this.params = {
requestProject: this.projectName, requestProject: this.projectName,
paramTime: this.month, paramTime: this.month,
enterpriseId: this.enterpriseId, enterpriseId: this.enterpriseId,
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: this.pageSize pageSize: this.pageSize
}; };
postRequest('/api-report/report-clique-integral-report', para).then(res => {
var data = res.data;
if (data.errorCode) {
// 如果报错，会有返回信息，如果成功，直接下载文件，没有返回信息
this.$message.error(data.message);
} else {
window.location.href = excelConfig.config + '/api-report/report-clique-integral-report?requestProject=' + this.projectName + '&paramTime=' + this.month + '&enterpriseId=' + this.enterpriseId + '&currentPage=' + this.currentPage + '&pageSize=' + this.pageSize;
}
});
} }
} }
}; };
......
src/view/companyGroup/integral/integralExcel.vue
...@@ -50,8 +50,6 @@ ...@@ -50,8 +50,6 @@
<div class="pagination" v-show="totalCount > 0"> <div class="pagination" v-show="totalCount > 0">
<el-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" :total="totalCount"> </el-pagination> <el-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" :total="totalCount"> </el-pagination>
</div> </div>
<!-- 导出数据 -->
<vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</div> </div>
</template> </template>
...@@ -59,6 +57,7 @@ ...@@ -59,6 +57,7 @@
import { postRequest, getRequest } from '@/api/api'; import { postRequest, getRequest } from '@/api/api';
// import { log } from '@/utils/index.js'; // import { log } from '@/utils/index.js';
import defaultImg from '../../../../static/img/head_default.jpg'; import defaultImg from '../../../../static/img/head_default.jpg';
import excelConfig from '@/common/js/excel_config.js';
export default { export default {
name: 'integralExcel', name: 'integralExcel',
data() { data() {
...@@ -76,10 +75,6 @@ export default { ...@@ -76,10 +75,6 @@ export default {
totalCount: 0, totalCount: 0,
defaultImg: defaultImg, defaultImg: defaultImg,
loading: false, loading: false,
// 导出数据
dialogVisible: false,
excelUrl: '/api-report/report-clique-integral-order',
params: {},
// 排序 // 排序
curSortType: '' curSortType: ''
}; };
...@@ -194,14 +189,22 @@ export default { ...@@ -194,14 +189,22 @@ export default {
}, },
// 导出数据 // 导出数据
downloadExcel() { downloadExcel() {
this.dialogVisible = true; let para = {
this.params = {
requestProject: this.projectName, requestProject: this.projectName,
paramTime: this.month, paramTime: this.month,
enterpriseId: this.enterpriseId, enterpriseId: this.enterpriseId,
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: this.pageSize pageSize: this.pageSize
}; };
postRequest('/api-report/report-clique-integral-order', para).then(res => {
var data = res.data;
if (data.errorCode) {
// 如果报错，会有返回信息，如果成功，直接下载文件，没有返回信息
this.$message.error(data.message);
} else {
window.location.href = excelConfig.config + '/api-report/report-clique-integral-order?requestProject=' + this.projectName + '&paramTime=' + this.month + '&enterpriseId=' + this.enterpriseId + '&currentPage=' + this.currentPage + '&pageSize=' + this.pageSize;
}
});
} }
} }
}; };
......
src/view/companyGroup/membershipSystem/memberInfoTemplate.vue
...@@ -296,8 +296,7 @@ ...@@ -296,8 +296,7 @@
<!-- 商户列表 --> <!-- 商户列表 -->
<template v-for="(merchantItem, idx) in merchantOptions"> <template v-for="(merchantItem, idx) in merchantOptions">
<div class="checkbox-cell" :key="idx"> <div class="checkbox-cell" :key="idx">
<el-checkbox :label="merchantItem.enterpriseId" :key="merchantItem.id">{{}}</el-checkbox> <el-checkbox :label="merchantItem.enterpriseId" :key="merchantItem.id"> <el-input class="w-316" v-model="merchantItem.name" placeholder="" disabled></el-input></el-checkbox>
<el-input class="w-316" v-model="merchantItem.name" placeholder="" disabled></el-input>
</div> </div>
</template> </template>
</el-checkbox-group> </el-checkbox-group>
...@@ -372,7 +371,7 @@ ...@@ -372,7 +371,7 @@
</div> </div>
</template> </template>
<!-- 生日 结婚纪念日--> <!-- 生日103 结婚纪念日204-->
<template v-if="currentIndex == index && (item.systemFieldId == 'k103' || item.systemFieldId == 'k204')"> <template v-if="currentIndex == index && (item.systemFieldId == 'k103' || item.systemFieldId == 'k204')">
<div class="edit-item " :key="index"> <div class="edit-item " :key="index">
<div class="edit-item-title">数字</div> <div class="edit-item-title">数字</div>
...@@ -387,6 +386,19 @@ ...@@ -387,6 +386,19 @@
<el-input v-model="item.limitCountMax" placeholder="" disabled class="w-120"></el-input> <el-input v-model="item.limitCountMax" placeholder="" disabled class="w-120"></el-input>
<label class="label-txt">位字符</label> <label class="label-txt">位字符</label>
</div> </div>
<div class="edit-item " v-show="item.systemFieldId == 'k103'" :key="index">
<div class="edit-item-title">
设置农历生日<el-popover width="200" trigger="hover" content="开启后用户可手动选择填写农历或阳历生日，不开启则默认用户填写生日为阳历生日" placement="top"> <i slot="reference" class="el-icon-question"></i></el-popover>
</div>
<el-switch v-model="item.fieldContent.birthType"></el-switch>
<div class="edit-item-title">
年龄范围<el-popover width="215" trigger="hover" content="例：若用户填写年龄范围为0-10岁，则小程序端用户填写的生日年份只能为当前年份往前推10年内" placement="top"> <i slot="reference" class="el-icon-question"></i></el-popover>
</div>
<el-input-number class="w-120 my-input-number" :controls="false" v-model="item.fieldContent.sectionMin" min="0" max="99"></el-input-number>
<label class="label-txt">至</label>
<el-input-number class="w-120 my-input-number" type="number" :controls="false" v-model="item.fieldContent.sectionMax" :min="item.fieldContent.sectionMin" max="99"></el-input-number>
<label class="label-txt">岁</label>
</div>
</template> </template>
<!-- 文化程度 婚姻状况 是否有房 是否有车--> <!-- 文化程度 婚姻状况 是否有房 是否有车-->
...@@ -559,8 +571,7 @@ ...@@ -559,8 +571,7 @@
<!-- 商户列表 --> <!-- 商户列表 -->
<template v-for="(merchantItem, idx) in merchantOptions"> <template v-for="(merchantItem, idx) in merchantOptions">
<div class="checkbox-cell" :key="idx"> <div class="checkbox-cell" :key="idx">
<el-checkbox :label="merchantItem.enterpriseId" :key="merchantItem.id">{{}}</el-checkbox> <el-checkbox :label="merchantItem.enterpriseId" :key="merchantItem.id"> <el-input class="w-316" v-model="merchantItem.name" placeholder="" disabled></el-input></el-checkbox>
<el-input class="w-316" v-model="merchantItem.name" placeholder="" disabled></el-input>
</div> </div>
</template> </template>
</el-checkbox-group> </el-checkbox-group>
...@@ -1185,15 +1196,12 @@ export default { ...@@ -1185,15 +1196,12 @@ export default {
inputFocus(tag, obj) { inputFocus(tag, obj) {
let that = this; let that = this;
log(tag, obj);
that.tempTag = tag; that.tempTag = tag;
that.tempObj = obj; that.tempObj = obj;
}, },
formatInput(e) { formatInput(e) {
let that = this; let that = this;
log(e, e.target.value);
that.tempObj[that.tempTag] = String(e.target.value).replace(/[^\d]/g, ''); that.tempObj[that.tempTag] = String(e.target.value).replace(/[^\d]/g, '');
// 判断最大值和最小值 // 判断最大值和最小值
if (that.tempObj['limitCountMin'] >= that.tempObj['limitCountMax']) { if (that.tempObj['limitCountMin'] >= that.tempObj['limitCountMax']) {
...@@ -1225,13 +1233,11 @@ export default { ...@@ -1225,13 +1233,11 @@ export default {
// move child // move child
onChildMove(evt) { onChildMove(evt) {
let tag = true; let tag = true;
log('onChildMove:', evt, evt.to.className);
if (evt.dragged.className.indexOf('block-class') != -1) { if (evt.dragged.className.indexOf('block-class') != -1) {
if (evt.to.className.indexOf('block-wrap') != -1) { if (evt.to.className.indexOf('block-wrap') != -1) {
tag = false; tag = false;
} }
} }
log(tag);
return tag; return tag;
}, },
...@@ -1239,7 +1245,6 @@ export default { ...@@ -1239,7 +1245,6 @@ export default {
itemMoveEnd(evt) { itemMoveEnd(evt) {
let that = this; let that = this;
that.isDragging = false; that.isDragging = false;
log(' move end:', evt, evt.clone.dataset.type);
that.selectKey = ''; that.selectKey = '';
that.selectKey = evt.clone.dataset.type; that.selectKey = evt.clone.dataset.type;
// 判断中间是否已经添加 // 判断中间是否已经添加
...@@ -1250,14 +1255,12 @@ export default { ...@@ -1250,14 +1255,12 @@ export default {
}); });
function setKey() { function setKey() {
// log("settttt:")
if (that.selectKey.indexOf('k10') != -1) { if (that.selectKey.indexOf('k10') != -1) {
that.baseInfo.forEach(function(ele, index) { that.baseInfo.forEach(function(ele, index) {
if (ele.systemFieldId == that.selectKey) { if (ele.systemFieldId == that.selectKey) {
ele.fixed = true; ele.fixed = true;
} }
}); });
// log("settttt:",that.selectKey)
return; return;
} }
if (that.selectKey.indexOf('k20') != -1) { if (that.selectKey.indexOf('k20') != -1) {
...@@ -1296,8 +1299,6 @@ export default { ...@@ -1296,8 +1299,6 @@ export default {
} }
that.selectKey = ''; that.selectKey = '';
log('move end:', that.baseInfo, that.tempaletDataList);
that.tempaletDataList = JSON.parse(JSON.stringify(that.tempaletDataList)); that.tempaletDataList = JSON.parse(JSON.stringify(that.tempaletDataList));
}, },
...@@ -1309,7 +1310,6 @@ export default { ...@@ -1309,7 +1310,6 @@ export default {
// 选择 item // 选择 item
selectItem(key, index) { selectItem(key, index) {
let that = this; let that = this;
log(key, index);
that.currentKey = key; that.currentKey = key;
that.currentIndex = index; that.currentIndex = index;
that.currentChildIndex = null; that.currentChildIndex = null;
...@@ -1712,6 +1712,14 @@ export default { ...@@ -1712,6 +1712,14 @@ export default {
ele.enterpriseIds = [...new Set(newIdsArray)].join(',') || []; ele.enterpriseIds = [...new Set(newIdsArray)].join(',') || [];
log('>>>>>>>>>>>:', ele.enterpriseIds); log('>>>>>>>>>>>:', ele.enterpriseIds);
} }
// 生日 农历 新增
if (ele.systemFieldId == 'k103') {
ele.fieldContent = JSON.parse(ele.fieldContent);
ele.fieldContent.birthType = ele.fieldContent.birthType ? 0 : 1;
ele.fieldContent.sectionMin = ele.fieldContent.sectionMin > -1 ? Number(ele.fieldContent.sectionMin) : -1;
ele.fieldContent.sectionMax = ele.fieldContent.sectionMax > -1 ? Number(ele.fieldContent.sectionMax) : -1;
ele.fieldContent.timeFlag = ele.fieldContent.sectionMin == -1 && ele.fieldContent.sectionMax == -1 ? 1 : 2;
}
}); });
// 判断重复字段 // 判断重复字段
...@@ -2042,16 +2050,17 @@ export default { ...@@ -2042,16 +2050,17 @@ export default {
if (!!el.enterpriseIds && !!el.enterpriseIds.length && el.enterpriseIds.length < that.merchantOptions.length) { if (!!el.enterpriseIds && !!el.enterpriseIds.length && el.enterpriseIds.length < that.merchantOptions.length) {
el.isIndeterminate = true; el.isIndeterminate = true;
} }
// 生日 农历
if (ele.systemFieldId == 'k103') {
ele.fieldContent.birthType = ele.fieldContent.birthType == 0 ? true : false;
ele.fieldContent.sectionMin = ele.fieldContent.sectionMin == -1 ? undefined : ele.fieldContent.sectionMin;
ele.fieldContent.sectionMax = ele.fieldContent.sectionMax == -1 ? undefined : ele.fieldContent.sectionMax;
}
}); });
} }
} }
}); });
//
log(data);
that.tempaletDataList = data; that.tempaletDataList = data;
// 获取模板所有字段 // 获取模板所有字段
that.getTempInfo(); that.getTempInfo();
// showMsg.showmsg('设置成功','success') // showMsg.showmsg('设置成功','success')
...@@ -2694,4 +2703,9 @@ export default { ...@@ -2694,4 +2703,9 @@ export default {
} }
} }
} }
.my-input-number /deep/ .el-input__inner {
background: rgba(255, 255, 255, 0.1);
text-align: left;
color: #fff;
}
</style> </style>
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