Skip to content

M
memberTag-web
Commit 09b2c636 by 无尘
Options

add: 增加返回后端数据判断

parent 6b93001c
Showing with 71 additions and 11 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.30f6625aa1c1b752bc29eb2e724410c7.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.ab91d1707b0347e94796.js></script><script type=text/javascript src=./static/js/vendor.b0d7f5b290518254f4f2.js></script><script type=text/javascript src=./static/js/app.ba337f1a8f88b0fa95e1.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.7cfc24d7efb2c302384fd5aec421ece3.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.a234695e705e5015b0a7.js></script><script type=text/javascript src=./static/js/vendor.b0d7f5b290518254f4f2.js></script><script type=text/javascript src=./static/js/app.ba337f1a8f88b0fa95e1.js></script></body></html>
\ No newline at end of file
dist/static/js/6.4ea1c32d4ff35e55c90c.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.6e20df2de316cd07487c.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.1e15be5aeabdbb794eb4.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/7.8503c3ebe9ccda503e48.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.ab91d1707b0347e94796.js → dist/static/js/manifest.a234695e705e5015b0a7.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var f,d,i,u=0,s=[];u<r.length;u++)d=r[u],t[d]&&s.push(t[d][0]),t[d]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);s.length;)s.shift()();if(a)for(u=0;u<a.length;u++)i=c(c.s=a[u]);return i};var r={},t={26:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});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,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"603e24b6249496bff8d6",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"0106258f51de87a40b57",6:"6e20df2de316cd07487c",7:"8503c3ebe9ccda503e48",8:"24eeef980ff8ffe24d42",9:"6284684f59ae2a7586a8",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"dece2fedb495aa36c9a6",13:"e29aa5893a93a16c34bc",14:"92199267df3426ee7901",15:"9f61f06d1572f1265cc0",16:"843a47923cc77fa59466",17:"83e469d672229c638715",18:"6ed416399616407ccde9",19:"bfcaf83a5268b922dc57",20:"747937511d9761d173a2",21:"3dba0a38816e1f1717fb",22:"22f63d81db79c0c78098",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=d,o.appendChild(a),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.ab91d1707b0347e94796.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var f,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,o);b.length;)b.shift()();if(o)for(u=0;u<o.length;u++)i=c(c.s=o[u]);return i};var r={},t={26:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+e+"."+{0:"603e24b6249496bff8d6",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"0106258f51de87a40b57",6:"4ea1c32d4ff35e55c90c",7:"1e15be5aeabdbb794eb4",8:"24eeef980ff8ffe24d42",9:"6284684f59ae2a7586a8",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"dece2fedb495aa36c9a6",13:"e29aa5893a93a16c34bc",14:"92199267df3426ee7901",15:"9f61f06d1572f1265cc0",16:"843a47923cc77fa59466",17:"83e469d672229c638715",18:"6ed416399616407ccde9",19:"bfcaf83a5268b922dc57",20:"747937511d9761d173a2",21:"3dba0a38816e1f1717fb",22:"22f63d81db79c0c78098",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.a234695e705e5015b0a7.js.map
\ No newline at end of file
src/components/tagShortDetail.vue
......@@ -466,6 +466,8 @@
postCompute: '', // 参数
currentKey: null, // 参数
currentComputeType: '',// 当前标签的计算 type
// 标签总数据
templateData: [
......@@ -488,7 +490,7 @@
compute: 'in'
},
// 属于/不属于
// 属于/不属于(计算控件)
tag002: {
computeRadio: '',
},
......@@ -508,13 +510,13 @@
// 最近 天
tag005: {
timeRecent: '',
compute: 'lastday'
timeType: 'lastday'
},
// 之后 天
tag006: {
timeAfter: '',
compute: 'afterday'
timeType: 'afterday'
},
// 添加输入值
......@@ -755,8 +757,6 @@
*/
confirmDialog(){
const that = this
console.log(that.templateData)
let tagParams = [];
let tagValue = {
......@@ -796,12 +796,24 @@
tagValue.val[0].data.value = that.templateData[0].numRange.join(',')
tagParams = that.templateData;
}
/* 输入添加值 */
if (code === 'tag007' && !that.templateData[0].addTags.length) {
that.$message.error({ message: '请添加值'})
return false;
}
if (code === 'tag007' && that.templateData.length ===1 ){
tagValue.val[0].data.compute = 'range';
tagValue.val[0].data.value = that.templateData[0].addTags.join(',')
tagParams = that.templateData;
}
/* 固定/相对 */
if (code === 'tag014' && that.templateData[0].radio == 1 && !that.templateData[0].daterangeValue.length) {
that.$message.error({ message: '请选择值'})
return false;
}
if (code === 'tag014' && that.templateData[0].radio == 2 && that.templateData[0].timeCheckedTwo && !timeInput) {
if (code === 'tag014' && that.templateData[0].radio == 2 && that.templateData[0].timeCheckedTwo && !that.templateData[0].timeInput) {
that.$message.error({ message: '请填写值'})
return false;
}
......@@ -815,6 +827,7 @@
tagValue.val[0].data.value = that.templateData[0];
tagParams = that.templateData;
}
/* 时间属性- 月日-月日 */
if (code === 'tag015' && !that.templateData[0].monthDayRange.length) {
that.$message.error({ message: '请选择值'})
......@@ -826,9 +839,54 @@
tagParams = that.templateData;
}
/* 属于/不属于+ 选项 */
let returnFlag = true;
if (that.templateData.length == 2) {
that.templateData.forEach(function(ele,index){
if (ele.templateCode === 'tag001') {
if (!ele.checkeditems.length) { returnFlag = false }
tagValue.val[0].data.value = ele.checkeditems.join(',')
}
// 属于/不属于
if (ele.templateCode === 'tag002') {
tagValue.val[0].data.compute = ele.computeRadio;
}
// 数字区间
if (ele.templateCode === 'tag003') {
if (ele.numRange[0] === '') { returnFlag = false }
tagValue.val[0].data.compute = ele.postCompute;
tagValue.val[0].data.value = ele.numRange.join(',')
}
if (ele.templateCode === 'tag005') {
if (ele.timeRecent === '') { returnFlag = false }
tagValue.time[0].type = ele.timeType;
tagValue.time[0].value = ele.timeRecent;
}
if (ele.templateCode === 'tag006') {
if (ele.timeAfter === '') { returnFlag = false }
tagValue.time[0].type = ele.timeType;
tagValue.time[0].value = ele.timeAfter;
}
if (ele.templateCode === 'tag013') {
if (!ele.checkeditems.length) { returnFlag = false }
tagValue.val[0].data.value = ele.checkeditems.join(',')
}
})
}
if (!returnFlag) {
that.$message.error({ message: '请完善标签值'})
return false;
}
/* 数字区间 + 之后 几天 */
tagParams = that.templateData;
that.addToTemp(tagValue,tagParams);
that.closeTagShortDialog()
},
......@@ -1449,6 +1507,8 @@
if (!!newTemp) {
let newTempVal = newTemp.val[0]
let newTime = newTemp.time
that.currentComputeType = parseInt(newTempVal.compute.computeType);
// 计算控件
if (parseInt(newTempVal.compute.computeType) === 0 && !!newTempVal.compute.computeWidgetId) {
that.getTemplateCodeById(newTempVal.compute.computeWidgetId)
......
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