Skip to content

M
memberTag-web
Commit 3904665f by 无尘
Options

fix: 修改城标签详情

parent bf94000d
Showing with 125 additions and 22 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.ad330fbd186388ad6b0b6ad4c86b235f.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.830c3b31831c181b2d95.js></script><script type=text/javascript src=./static/js/vendor.0af28a078a21b203fb55.js></script><script type=text/javascript src=./static/js/app.b579951ad1a9445a29b3.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.c01f2468cac364ad631f2bcb63044820.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.1411e47eb0e0c0539979.js></script><script type=text/javascript src=./static/js/vendor.55375a1ae8ac238a889b.js></script><script type=text/javascript src=./static/js/app.247769845a047a4f99e4.js></script></body></html>
\ No newline at end of file
dist/static/js/6.19b95302654bdff342a0.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.56f21c24f51fc8167f89.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.5601269a1cc58bb2a017.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.d9fd690a180f2aa2d760.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.62457e830d89f13c9ca6.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.f91a6b3459f25a1aac5b.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/app.247769845a047a4f99e4.js 0 → 100644
webpackJsonp([25],{"4qCZ":function(e,t){},"5reh":function(e,t,a){"use strict";a.d(t,"a",function(){return n}),a.d(t,"b",function(){return o}),a.d(t,"d",function(){return r}),a.d(t,"c",function(){return u});var n="login",o="logout",r="title",u="show"},"5tgt":function(e,t,a){e.exports=function(e,t){return function(n){a("Vna/")("./"+e+"/"+t+".vue").then(function(e){n(e)})}}},NHnr:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=a("//Fk"),o=a.n(n),r=a("7+uW"),u={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{attrs:{id:"app"}},[t("transition",{attrs:{name:"fade",mode:"out-in"}},[t("router-view")],1)],1)},staticRenderFns:[]};var i=a("VU/8")({name:"App",data:function(){return{}}},u,!1,function(e){a("gx7t")},null,null).exports,m=a("/ocq"),l=a("5tgt"),s=a.n(l);r.default.use(m.a);var p,c=function(e){a.e(1).then(a.bind(null,"EE2z")).then(function(t){e(t)})},f=[{path:"/",name:"index",redirect:"platformTagLib",component:s()("index","index"),children:[{path:"/platformTagLib",name:"平台标签库",component:s()("platformTag","platformTagLib"),meta:{title:"会员标签-平台标签库"}},{path:"/platformTagList",component:s()("platformTag","platformTagList"),name:"平台标签列表",meta:{title:"会员标签-平台标签列表"}},{path:"/platformTagDetail",component:s()("platformTag","platformTagDetail"),name:"平台标签详情",meta:{title:"会员标签-平台标签详情"}},{path:"/manualTagLib",component:s()("manualTag","manualTagLib"),name:"手工标签库",meta:{title:"会员标签-手工标签库"}},{path:"/manualTagList",component:s()("manualTag","manualTagList"),name:"手工标签列表",meta:{title:"会员标签-手工标签列表"}},{path:"/manualTagEdit",component:s()("manualTag","manualTagEdit"),name:"编辑手工标签",meta:{title:"会员标签-编辑手工标签"}},{path:"/myTagLib",component:s()("myTag","myTagLib"),name:"我的标签库",meta:{title:"会员标签-我的标签库"}},{path:"/myTagList",component:s()("myTag","myTagList"),name:"我的标签库列表",meta:{title:"会员标签-我的标签库列表"}},{path:"/myTagDetail",component:s()("myTag","myTagDetail"),name:"标签详情",meta:{title:"会员标签-标签详情"}}]},{path:"/memberGroupList",name:"memberGroupListIndex",redirect:"memberGroupList",component:s()("memberGroup","index"),children:[{path:"/memberGroupList",component:s()("memberGroup","memberGroupList"),name:"会员分组",meta:{title:"会员标签-会员分组"}},{path:"/memberGroupDetail",component:s()("memberGroup","memberGroupDetail"),name:"分组详情",meta:{title:"会员标签-分组详情"}},{path:"/memberGroupEdit",component:s()("memberGroup","memberGroupEdit"),name:"编辑分组",meta:{title:"会员标签-编辑分组"}}]},{path:"/403",name:"无权访问",component:c},{path:"/404",name:"error404",component:c},{path:"/500",name:"error500",component:c},{path:"*",redirect:"/404",hidden:!0}],d=new m.a({routes:f,scrollBehavior:function(){return{y:0}}}),g=a("zL8q"),T=a.n(g),b=a("Rf8U"),v=a.n(b),h=a("mtWM"),L=a.n(h),G=a("bOdI"),y=a.n(G),x=a("NYxO"),k=a("5reh");r.default.use(x.a);var w=new x.a.Store({state:{user:{},token:null,title:"",show:!1},mutations:(p={},y()(p,k.a,function(e,t){sessionStorage.token=t,e.token=t}),y()(p,k.b,function(e){sessionStorage.removeItem("token"),e.token=null}),y()(p,k.d,function(e,t){e.title=t}),y()(p,k.c,function(e,t){e.show=t}),p)}),E=(a("Xcu2"),a("4qCZ"),a("uKUT"),a("kIPI")),P=a.n(E),q=a("Yw2C"),D=a.n(q),j=a("dq+2"),C=a.n(j),N=a("SE7k"),H=a.n(N),I=a("XsK6"),K=a.n(I),O=a("+adj"),S=a.n(O),V=a("GqmT"),z=a.n(V);r.default.use(z.a),r.default.use(S.a),r.default.use(K.a),r.default.use(H.a),r.default.use(C.a),r.default.use(D.a),r.default.use(P.a),r.default.config.productionTip=!1,r.default.use(T.a,{size:"large"}),r.default.use(v.a,L.a),r.default.axios.defaults.withCredentials=!0,r.default.axios.interceptors.request.use(function(e){return e},function(e){return console.log("requesterr"+e),o.a.reject(e)}),r.default.axios.interceptors.response.use(function(e){return 200==e.status&&e.data.errorCode,e},function(e){if(console.log(e),e.response)switch(e.response.status){case 401:window.location.href=window.location.origin+"/gic-web/#/";case 500:g.Message.error("服务器500")}return o.a.reject(e.response.data)}),new r.default({el:"#app",router:d,store:w,components:{App:i},template:"<App/>"})},"Vna/":function(e,t,a){var n={"./errorPage/401.vue":["4KSJ",10],"./errorPage/403.vue":["aM+6",2],"./errorPage/404.vue":["PRsh",3],"./errorPage/500.vue":["/HCr",4],"./errorPage/index.vue":["EE2z",1],"./index/index.vue":["YPWR",23],"./linktools/linktools.vue":["Lc2x",0,14],"./linktools/linktoolsold.vue":["/8lq",0,17],"./linktools/linktoolspage.vue":["HLON",0,11],"./login/login.vue":["6Qob",0,16],"./manualTag/manualTagEdit.vue":["308P",0,5],"./manualTag/manualTagLib.vue":["q490",0,21],"./manualTag/manualTagList.vue":["f0o3",0,19],"./memberGroup/index.vue":["Gy5W",20],"./memberGroup/memberGroupDetail.vue":["+/ey",0,9],"./memberGroup/memberGroupEdit.vue":["q0vu",0,6],"./memberGroup/memberGroupList.vue":["oVck",0,12],"./myTag/myTagDetail.vue":["ijla",0,8],"./myTag/myTagLib.vue":["twLH",0,13],"./myTag/myTagList.vue":["NJTp",0,7],"./platformTag/platformTagDetail.vue":["KN59",0,18],"./platformTag/platformTagLib.vue":["puJc",0,22],"./platformTag/platformTagList.vue":["G/on",0,15]};function o(e){var t=n[e];return t?Promise.all(t.slice(1).map(a.e)).then(function(){return a(t[0])}):Promise.reject(new Error("Cannot find module '"+e+"'."))}o.keys=function(){return Object.keys(n)},o.id="Vna/",e.exports=o},Xcu2:function(e,t){},gx7t:function(e,t){},uKUT:function(e,t){}},["NHnr"]);
//# sourceMappingURL=app.247769845a047a4f99e4.js.map
\ No newline at end of file
dist/static/js/app.b579951ad1a9445a29b3.js deleted 100644 → 0
webpackJsonp([25],{"4qCZ":function(e,t){},"5reh":function(e,t,a){"use strict";a.d(t,"a",function(){return n}),a.d(t,"b",function(){return o}),a.d(t,"d",function(){return r}),a.d(t,"c",function(){return u});var n="login",o="logout",r="title",u="show"},"5tgt":function(e,t,a){e.exports=function(e,t){return function(n){a("Vna/")("./"+e+"/"+t+".vue").then(function(e){n(e)})}}},NHnr:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=a("//Fk"),o=a.n(n),r=a("7+uW"),u={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{attrs:{id:"app"}},[t("transition",{attrs:{name:"fade",mode:"out-in"}},[t("router-view")],1)],1)},staticRenderFns:[]};var i=a("VU/8")({name:"App",data:function(){return{}}},u,!1,function(e){a("gx7t")},null,null).exports,m=a("/ocq"),l=a("5tgt"),s=a.n(l);r.default.use(m.a);var p,c=function(e){a.e(1).then(a.bind(null,"EE2z")).then(function(t){e(t)})},f=[{path:"/",name:"index",redirect:"platformTagLib",component:s()("index","index"),children:[{path:"/platformTagLib",name:"平台标签库",component:s()("platformTag","platformTagLib"),meta:{title:"会员标签-平台标签库"}},{path:"/platformTagList",component:s()("platformTag","platformTagList"),name:"平台标签列表",meta:{title:"会员标签-平台标签列表"}},{path:"/platformTagDetail",component:s()("platformTag","platformTagDetail"),name:"平台标签详情",meta:{title:"会员标签-平台标签详情"}},{path:"/manualTagLib",component:s()("manualTag","manualTagLib"),name:"手工标签库",meta:{title:"会员标签-手工标签库"}},{path:"/manualTagList",component:s()("manualTag","manualTagList"),name:"手工标签列表",meta:{title:"会员标签-手工标签列表"}},{path:"/manualTagEdit",component:s()("manualTag","manualTagEdit"),name:"编辑手工标签",meta:{title:"会员标签-编辑手工标签"}},{path:"/myTagLib",component:s()("myTag","myTagLib"),name:"我的标签库",meta:{title:"会员标签-我的标签库"}},{path:"/myTagList",component:s()("myTag","myTagList"),name:"我的标签库列表",meta:{title:"会员标签-我的标签库列表"}},{path:"/myTagDetail",component:s()("myTag","myTagDetail"),name:"标签详情",meta:{title:"会员标签-标签详情"}}]},{path:"/memberGroupList",name:"index",redirect:"memberGroupList",component:s()("memberGroup","index"),children:[{path:"/memberGroupList",component:s()("memberGroup","memberGroupList"),name:"会员分组",meta:{title:"会员标签-会员分组"}},{path:"/memberGroupDetail",component:s()("memberGroup","memberGroupDetail"),name:"分组详情",meta:{title:"会员标签-分组详情"}},{path:"/memberGroupEdit",component:s()("memberGroup","memberGroupEdit"),name:"编辑分组",meta:{title:"会员标签-编辑分组"}}]},{path:"/403",name:"无权访问",component:c},{path:"/404",name:"error404",component:c},{path:"/500",name:"error500",component:c},{path:"*",redirect:"/404",hidden:!0}],d=new m.a({routes:f,scrollBehavior:function(){return{y:0}}}),g=a("zL8q"),T=a.n(g),b=a("Rf8U"),v=a.n(b),h=a("mtWM"),L=a.n(h),G=a("bOdI"),y=a.n(G),x=a("NYxO"),k=a("5reh");r.default.use(x.a);var w=new x.a.Store({state:{user:{},token:null,title:"",show:!1},mutations:(p={},y()(p,k.a,function(e,t){sessionStorage.token=t,e.token=t}),y()(p,k.b,function(e){sessionStorage.removeItem("token"),e.token=null}),y()(p,k.d,function(e,t){e.title=t}),y()(p,k.c,function(e,t){e.show=t}),p)}),E=(a("Xcu2"),a("4qCZ"),a("uKUT"),a("kIPI")),P=a.n(E),q=a("Yw2C"),D=a.n(q),j=a("dq+2"),C=a.n(j),N=a("SE7k"),H=a.n(N),K=a("XsK6"),O=a.n(K),S=a("+adj"),V=a.n(S),z=a("GqmT"),I=a.n(z);r.default.use(I.a),r.default.use(V.a),r.default.use(O.a),r.default.use(H.a),r.default.use(C.a),r.default.use(D.a),r.default.use(P.a),r.default.config.productionTip=!1,r.default.use(T.a,{size:"large"}),r.default.use(v.a,L.a),r.default.axios.defaults.withCredentials=!0,r.default.axios.interceptors.request.use(function(e){return e},function(e){return console.log("requesterr"+e),o.a.reject(e)}),r.default.axios.interceptors.response.use(function(e){return 200==e.status&&e.data.errorCode,e},function(e){if(console.log(e),e.response)switch(e.response.status){case 401:window.location.href=window.location.origin+"/gic-web/#/";case 500:g.Message.error("服务器500")}return o.a.reject(e.response.data)}),new r.default({el:"#app",router:d,store:w,components:{App:i},template:"<App/>"})},"Vna/":function(e,t,a){var n={"./errorPage/401.vue":["4KSJ",10],"./errorPage/403.vue":["aM+6",2],"./errorPage/404.vue":["PRsh",3],"./errorPage/500.vue":["/HCr",4],"./errorPage/index.vue":["EE2z",1],"./index/index.vue":["YPWR",23],"./linktools/linktools.vue":["Lc2x",0,14],"./linktools/linktoolsold.vue":["/8lq",0,17],"./linktools/linktoolspage.vue":["HLON",0,11],"./login/login.vue":["6Qob",0,16],"./manualTag/manualTagEdit.vue":["308P",0,5],"./manualTag/manualTagLib.vue":["q490",0,21],"./manualTag/manualTagList.vue":["f0o3",0,19],"./memberGroup/index.vue":["Gy5W",20],"./memberGroup/memberGroupDetail.vue":["+/ey",0,9],"./memberGroup/memberGroupEdit.vue":["q0vu",0,6],"./memberGroup/memberGroupList.vue":["oVck",0,12],"./myTag/myTagDetail.vue":["ijla",0,8],"./myTag/myTagLib.vue":["twLH",0,13],"./myTag/myTagList.vue":["NJTp",0,7],"./platformTag/platformTagDetail.vue":["KN59",0,18],"./platformTag/platformTagLib.vue":["puJc",0,22],"./platformTag/platformTagList.vue":["G/on",0,15]};function o(e){var t=n[e];return t?Promise.all(t.slice(1).map(a.e)).then(function(){return a(t[0])}):Promise.reject(new Error("Cannot find module '"+e+"'."))}o.keys=function(){return Object.keys(n)},o.id="Vna/",e.exports=o},Xcu2:function(e,t){},gx7t:function(e,t){},uKUT:function(e,t){}},["NHnr"]);
//# sourceMappingURL=app.b579951ad1a9445a29b3.js.map
\ No newline at end of file
dist/static/js/manifest.830c3b31831c181b2d95.js → dist/static/js/manifest.1411e47eb0e0c0539979.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,f,o){for(var a,b,i,u=0,d=[];u<r.length;u++)b=r[u],t[b]&&d.push(t[b][0]),t[b]=0;for(a in f)Object.prototype.hasOwnProperty.call(f,a)&&(e[a]=f[a]);for(n&&n(r,f,o);d.length;)d.shift()();if(o)for(u=0;u<o.length;u++)i=c(c.s=o[u]);return i};var r={},t={27: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 f=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:"8895abfb40621c3b6b09",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"4b37957ccfef76b92e1a",6:"56f21c24f51fc8167f89",7:"d9fd690a180f2aa2d760",8:"f91a6b3459f25a1aac5b",9:"f861be85fc538267e274",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"f6e9faa54422908ebc04",13:"e758be86411be4766b96",14:"e3674474da8a18925ba8",15:"7d1ff03b792f26290716",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"6ed416399616407ccde9",19:"0f7d81100d0f8ccb8074",20:"0bef46bf128efff99a1a",21:"409e1f4c416739f1cb0c",22:"04f2c04e10c125c291b0",23:"5275761a271b27e0ec1e",26:"52359959d210204efba3"}[e]+".js";var a=setTimeout(b,12e4);function b(){o.onerror=o.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=b,f.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.830c3b31831c181b2d95.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,f){for(var a,b,i,u=0,d=[];u<r.length;u++)b=r[u],t[b]&&d.push(t[b][0]),t[b]=0;for(a in o)Object.prototype.hasOwnProperty.call(o,a)&&(e[a]=o[a]);for(n&&n(r,o,f);d.length;)d.shift()();if(f)for(u=0;u<f.length;u++)i=c(c.s=f[u]);return i};var r={},t={27: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],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,c.nc&&f.setAttribute("nonce",c.nc),f.src=c.p+"static/js/"+e+"."+{0:"8895abfb40621c3b6b09",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"4b37957ccfef76b92e1a",6:"19b95302654bdff342a0",7:"5601269a1cc58bb2a017",8:"62457e830d89f13c9ca6",9:"f861be85fc538267e274",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"f6e9faa54422908ebc04",13:"e758be86411be4766b96",14:"e3674474da8a18925ba8",15:"7d1ff03b792f26290716",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"6ed416399616407ccde9",19:"0f7d81100d0f8ccb8074",20:"0bef46bf128efff99a1a",21:"409e1f4c416739f1cb0c",22:"04f2c04e10c125c291b0",23:"5275761a271b27e0ec1e",26:"52359959d210204efba3"}[e]+".js";var a=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=b,o.appendChild(f),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.1411e47eb0e0c0539979.js.map
\ No newline at end of file
dist/static/js/vendor.0af28a078a21b203fb55.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/vendor.55375a1ae8ac238a889b.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
package-lock.json
......@@ -157,9 +157,9 @@
}
},
"@gic-test/vue-gic-store-new": {
"version": "1.1.6",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-store-new/download/@gic-test/vue-gic-store-new-1.1.6.tgz",
"integrity": "sha1-COA/HcbsAOrLFB3WSEibwlmWtMw=",
"version": "1.1.8",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-store-new/download/@gic-test/vue-gic-store-new-1.1.8.tgz",
"integrity": "sha1-rv3fI4rDUPXsibGNKRqGlIQv8Dw=",
"requires": {
"axios": "^0.18.0",
"qs": "^6.5.2",
......
src/components/tagShortDetail.vue
......@@ -261,7 +261,7 @@
<el-option label="存在其一" value="in"></el-option>
</el-select><label
class="inline-block middle label-unit m-l-8"
>{{parent.selectLabel}}</label><el-select
>{{tagData.tagName}}</label><el-select
v-model="parent.selectTwo"
placeholder="请选择"
class="w-98 m-l-8">
......@@ -459,6 +459,22 @@
><!-- :picker-options="pickerOptions" -->
</el-date-picker>
</template>
<!-- 19.时间属性(年月日时分秒-年月日时分秒) -->
<template v-if="parent.templateCode == 'tag019'">
<el-date-picker
v-model="parent.dateRangeValue"
type="daterange"
:editable="false"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
value-format="yyyyMMddHHmmss"
:default-time="['000000', '235959']"
><!-- :picker-options="pickerOptions" -->
</el-date-picker>
</template>
<!-- 17.时间属性(年月日-年月日 + 最近) -->
<template v-if="parent.templateCode == 'tag017'">
<el-radio v-model="parent.radio" label="1">固定时段</el-radio>
......@@ -769,7 +785,7 @@
timeSelect: '1', // 最近/之后
timeInput: '',
},
// 时间属性- 年月日-年月日
// 时间属性- 年月日时分秒-年月日时分秒
tag016: {
dateRangeValue: []
},
......@@ -784,6 +800,10 @@
timeSelect: '1', // 最近
timeInput: '',
},
// 时间属性- 年月日-年月日
tag019: {
dateRangeValue: []
},
// 标签详情数据
tagData: {
......@@ -910,7 +930,7 @@
"val":[{//选择的值 跟人群筛选器一样
"type": "data",//类型
"data": {
"key": that.currentKey || that.tagData.tagId,//es字段 如果是nested 变为title.t
"key": that.currentKey,// || that.tagData.tagId,//es字段 如果是nested 变为title.t
"compute": "",//计算属性
"value": "",//值,
"dealKey":""//属性是需要处理的类型 比如门店 下的门店类型都需要转门店id 需要后台转换 storeWidget
......@@ -998,6 +1018,36 @@
})
}
/* 年月日-年月日*/
if (code === 'tag016' && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择时间'})
return false;
}
if (code === 'tag016' && that.templateData.length ===1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',')
that.postTemplateData.selectedVal.push(`${that.templateData[0].dateRangeValue[0]} 至 ${that.templateData[0].dateRangeValue[1]}`)
}
/* 年月日时分秒-年月日时分秒*/
if (code === 'tag019' && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择时间'})
return false;
}
if (code === 'tag019' && that.templateData.length ===1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',')
that.postTemplateData.selectedVal.push(`${that.templateData[0].dateRangeValue[0]} 至 ${that.templateData[0].dateRangeValue[1]}`)
}
/* 固定/相对 年月日+最近+之后 年月日+最近*/
if ((code === 'tag014' || code === 'tag017') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择值'})
......@@ -2151,13 +2201,13 @@
getAsyncList(url,data) {
const that = this;
const para = {
key: that.currentKey || that.tagData.tagId,
key: that.tagData.tagType == 1?that.tagData.tagId : that.currentKey ,
requestProject: 'member-tag'
};
that.axios.post(that.baseUrl + url, qs.stringify(para)).then(res => {
let resData = res.data;
if (!!that.currentKey) {
if (that.tagData.tagType != 1 && that.currentKey != 'tag' ) {
if (resData.errorCode == 0) {
data.options = resData.result;
that.templateData.push(data)
......@@ -2326,6 +2376,8 @@
that.tagData.tagName = resData.result.tagName;
that.tagData.tagDescribe = resData.result.tagDescribe;
that.tagData.isActive = resData.result.isActive;
that.tagData.tagType = resData.result.tagType;
// 获取 columnKey
// if (!!resData.result.columnKey) {
that.currentKey = resData.result.columnKey;
......
src/router/index.js
......@@ -117,7 +117,7 @@ export const constantRouterMap = [
// 会员分组
{
path: '/memberGroupList',
name: 'index',
name: 'memberGroupListIndex',
redirect: 'memberGroupList',
component: _import('memberGroup','index'),
children: [
......
src/view/myTag/myTagDetail.vue
......@@ -198,7 +198,7 @@
<el-option label="存在其一" value="in"></el-option>
</el-select><label
class="inline-block middle label-unit m-l-8"
>{{parent.selectLabel}}</label><el-select
>{{tagData.tagName}}</label><el-select
v-model="parent.selectTwo"
placeholder="请选择"
class="w-98 m-l-8">
......@@ -396,6 +396,22 @@
><!-- :picker-options="pickerOptions" -->
</el-date-picker>
</template>
<!-- 19.时间属性(年月日时分秒-年月日时分秒) -->
<template v-if="parent.templateCode == 'tag019'">
<el-date-picker
v-model="parent.dateRangeValue"
type="daterange"
:editable="false"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
value-format="yyyyMMddHHmmss"
:default-time="['000000', '235959']"
><!-- :picker-options="pickerOptions" -->
</el-date-picker>
</template>
<!-- 17.时间属性(年月日-年月日 + 最近) -->
<template v-if="parent.templateCode == 'tag017'">
<el-radio v-model="parent.radio" label="1">固定时段</el-radio>
......@@ -719,6 +735,11 @@ import qs from 'qs';
timeInput: '',
},
// 时间属性- 年月日-年月日
tag019: {
dateRangeValue: []
},
// 标签详情数据
tagData: {
tagId: '',
......@@ -875,7 +896,7 @@ import qs from 'qs';
"val":[{//选择的值 跟人群筛选器一样
"type": "data",//类型
"data": {
"key": that.currentKey || that.tagData.tagId,//es字段 如果是nested 变为title.t
"key": that.currentKey,// || that.tagData.tagId,//es字段 如果是nested 变为title.t
"compute": "",//计算属性
"value": "",//值,
"dealKey":""//属性是需要处理的类型 比如门店 下的门店类型都需要转门店id 需要后台转换 storeWidget
......@@ -959,6 +980,36 @@ import qs from 'qs';
})
}
/* 年月日-年月日*/
if (code === 'tag016' && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择时间'})
return false;
}
if (code === 'tag016' && that.templateData.length ===1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',')
that.postTemplateData.selectedVal.push(`${that.templateData[0].dateRangeValue[0]} 至 ${that.templateData[0].dateRangeValue[1]}`)
}
/* 年月日时分秒-年月日时分秒*/
if (code === 'tag019' && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择时间'})
return false;
}
if (code === 'tag019' && that.templateData.length ===1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',')
that.postTemplateData.selectedVal.push(`${that.templateData[0].dateRangeValue[0]} 至 ${that.templateData[0].dateRangeValue[1]}`)
}
/* 固定/相对 年月日+最近+之后 年月日+最近*/
if ((code === 'tag014' || code === 'tag017') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择值'})
......@@ -2082,13 +2133,13 @@ import qs from 'qs';
getAsyncList(url,data) {
const that = this;
const para = {
key: that.currentKey || that.tagData.tagId,
key: that.tagData.tagType == 1?that.tagData.tagId : that.currentKey ,
requestProject: 'member-tag'
};
that.axios.post(that.baseUrl + url, qs.stringify(para)).then(res => {
let resData = res.data;
if (!!that.currentKey) {
if (that.tagData.tagType != 1 && that.currentKey != 'tag' ) {
if (resData.errorCode == 0) {
data.options = resData.result;
that.templateData.push(data)
......
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