Skip to content

M
memberTag-web
Commit 543ea2c7 by 无尘
Options

fix: 修改上传 status

parent 5039803c
Showing with 18 additions and 13 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/app.cca2b15ef875d805ead0d7eac7e0a6c2.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.4edcc50b6e147aa58d78.js></script><script type=text/javascript src=./static/js/vendor.4ac54fd03099c45beefc.js></script><script type=text/javascript src=./static/js/app.f4e83ed7afb9aa3975b5.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/app.ea5282cb4837034ac760d13c31146f17.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.bcb3771914e9e813ab39.js></script><script type=text/javascript src=./static/js/vendor.4ac54fd03099c45beefc.js></script><script type=text/javascript src=./static/js/app.f4e83ed7afb9aa3975b5.js></script></body></html>
\ No newline at end of file
dist/static/css/app.cca2b15ef875d805ead0d7eac7e0a6c2.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/app.ea5282cb4837034ac760d13c31146f17.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/5.31d9e22f4e71ccf98dbe.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.31d9e22f4e71ccf98dbe.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.5bafd0db2a3c4af6c8f1.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.5bafd0db2a3c4af6c8f1.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.241bd0d9253a4c75bbe4.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.2b5e394c21e7d9d79b92.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/7.08019632972271275609.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/7.674749ef3352df03005f.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.a5abcef25b21e8b47fbe.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/8.a8c2da0b6b72909e8ce8.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.4edcc50b6e147aa58d78.js → dist/static/js/manifest.bcb3771914e9e813ab39.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],c[d]&&u.push(c[d][0]),c[d]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);u.length;)u.shift()();if(a)for(i=0;i<a.length;i++)b=t(t.s=a[i]);return b};var r={},c={26:0};function t(n){if(r[n])return r[n].exports;var c=r[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,t),c.l=!0,c.exports}t.e=function(e){var n=c[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=c[e]=[r,t]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,t.nc&&a.setAttribute("nonce",t.nc),a.src=t.p+"static/js/"+e+"."+{0:"83085074e03874029d44",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"31d9e22f4e71ccf98dbe",6:"2b5e394c21e7d9d79b92",7:"08019632972271275609",8:"a5abcef25b21e8b47fbe",9:"be9610a42eda7bb18bc4",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"6bce72ffa3001288e97c",13:"5200748d114383e3286c",14:"e3674474da8a18925ba8",15:"ea13cc5370a4d770d711",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"129d150ebd1fce6ee6e0",19:"4f681127cc3b6c7e3765",20:"1be4e028c4beac6e198c",21:"e0df757bb0bc77451792",22:"e91d8f3111c8c501ab9d",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var n=c[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return a.onerror=a.onload=d,o.appendChild(a),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.4edcc50b6e147aa58d78.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],c[d]&&u.push(c[d][0]),c[d]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);u.length;)u.shift()();if(a)for(i=0;i<a.length;i++)b=t(t.s=a[i]);return b};var r={},c={26:0};function t(n){if(r[n])return r[n].exports;var c=r[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,t),c.l=!0,c.exports}t.e=function(e){var n=c[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=c[e]=[r,t]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,t.nc&&a.setAttribute("nonce",t.nc),a.src=t.p+"static/js/"+e+"."+{0:"83085074e03874029d44",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"5bafd0db2a3c4af6c8f1",6:"241bd0d9253a4c75bbe4",7:"674749ef3352df03005f",8:"a8c2da0b6b72909e8ce8",9:"be9610a42eda7bb18bc4",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"6bce72ffa3001288e97c",13:"5200748d114383e3286c",14:"e3674474da8a18925ba8",15:"ea13cc5370a4d770d711",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"129d150ebd1fce6ee6e0",19:"4f681127cc3b6c7e3765",20:"1be4e028c4beac6e198c",21:"e0df757bb0bc77451792",22:"e91d8f3111c8c501ab9d",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var n=c[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return a.onerror=a.onload=d,o.appendChild(a),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.bcb3771914e9e813ab39.js.map
\ No newline at end of file
src/components/tagShortDetail.vue
......@@ -1262,7 +1262,7 @@
if (ele.fixedRecentRadio == 1) {
tagValue.time[0].type = 'between';
tagValue.time[0].value = ele.fixedRecentRangeValue.join(',')
that.postTemplateData.selectedVal.push(ele.fixedRecentRangeValue);
that.postTemplateData.selectedVal.push([ele.fixedRecentRangeValue[0]+'至'+ele.fixedRecentRangeValue[1]]);
}
// tagValue.val[0].data.compute = ele.postCompute;
if (ele.fixedRecentRadio == 2) {
......
src/components/uploadExcel/index.vue
......@@ -2,7 +2,7 @@
<div>
<input id="excel-upload-input" :ref="'excel-upload-input'+currentIndex" type="file" accept=".xlsx, .xls, .csv" class="c-hide excel-upload-input" @change="handkeFileChange">
<div id="drop">
<el-button style="margin-left:16px;" size="mini" type="text" ><span class="p-r-8" @click="handleUpload">点击导入会员</span><span class="p-l-8 border-l-dcdfe6 color-e55858" v-if="tagItemStatus == 3" @click.stop="handleDownload">下载失败会员清单</span></el-button>
<el-button style="margin-left:16px;" size="mini" type="text" ><span class="p-r-8" @click="handleUpload">点击导入会员</span><span class="p-l-8 border-l-dcdfe6 color-e55858" v-if="tagItemStatus == 8" @click.stop="handleDownload">下载失败会员清单</span></el-button>
<div class="excel-upload__tip">只能上传一个excle文件（2003版本以上），且数据不超过5000条</div>
</div>
</div>
......@@ -11,6 +11,11 @@
<script>
import XLSX from 'xlsx'
import strLength from '@/common/js/strlen';
import showMsg from '@/common/js/showmsg';
import errMsg from '@/common/js/error';
import { _debounce } from "@/common/js/public";
import { getRequest, postRequest, postJson, postForm } from '@/api/api';
export default {
props:{
currentIndex: {
......@@ -164,7 +169,7 @@ export default {
tagItemId: that.tagItemId,
}
getRequest('/memberTag/saveHandMemberTag',para)
getRequest('/memberTag/queryImportErrorData',para)
.then((res) => {
// console.log(res,res.data,res.data.errorCode)
var resData = res.data
......
src/view/myTag/myTagDetail.vue
......@@ -885,7 +885,7 @@ import qs from 'qs';
if (code === 'tag003' && that.templateData.length ===1) {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
tagValue.val[0].data.value = that.templateData[0].numRange.join(',')
that.postTemplateData.selectedVal = that.templateData[0].numRange;
that.postTemplateData.selectedVal = [that.templateData[0].numRange[0]+'<='+ that.tagData.tagName +'<='+ that.templateData[0].numRange[1]];
}
/* 输入添加值 */
......@@ -950,7 +950,7 @@ import qs from 'qs';
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',')
that.postTemplateData.selectedVal = that.templateData[0].dateRangeValue
that.postTemplateData.selectedVal = [that.templateData[0].dateRangeValue[0]+'至'+that.templateData[0].dateRangeValue[1]]
}
if ((code === 'tag014' || code === 'tag017') && that.templateData.length === 1 && that.templateData[0].radio == 2){
// 天
......@@ -1080,7 +1080,7 @@ import qs from 'qs';
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].monthDayRange.join(',')
that.postTemplateData.selectedVal = that.templateData[0].monthDayRange
that.postTemplateData.selectedVal = [that.templateData[0].monthDayRange[0]+'至'+that.templateData[0].monthDayRange[1]]
}
if (code === 'tag015' && that.templateData.length === 1 && that.templateData[0].radio == 2){
// 天
......@@ -1192,7 +1192,7 @@ import qs from 'qs';
}
tagValue.val[0].data.compute = ele.postCompute;
tagValue.val[0].data.value = ele.numRange.join(',')
that.postTemplateData.selectedVal.push(ele.numRange);
that.postTemplateData.selectedVal.push([ele.numRange[0]+'<='+ that.tagData.tagName +'<='+ ele.numRange[1]]);
}
// 固定/最近
if (ele.templateCode === 'tag004') {
......@@ -1201,7 +1201,7 @@ import qs from 'qs';
if (ele.fixedRecentRadio == 1) {
tagValue.time[0].type = 'between';
tagValue.time[0].value = ele.fixedRecentRangeValue.join(',')
that.postTemplateData.selectedVal.push(ele.fixedRecentRangeValue);
that.postTemplateData.selectedVal.push([ele.fixedRecentRangeValue[0]+'至'+ele.fixedRecentRangeValue[1]]);
}
// tagValue.val[0].data.compute = ele.postCompute;
if (ele.fixedRecentRadio == 2) {
......
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