fix

e9016f90 · 王悦 · 9595cfd8 · e9016f90 · e9016f90 · 9595cfd8
Commit e9016f90 authored Sep 09, 2020 by 王悦
10 changed files
--- a/zhiquanquan/app/front/entry/public/css/chunk-3f6a4221.70630be5.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-3f6a4221.70630be5.css
-.brand_indentlist[data-v-483b1af0]{width:100%}.brand_indentlist .brand_header[data-v-483b1af0]{margin-bottom:10px}.brand_indentlist .brand_header button[data-v-483b1af0]{margin-right:10px}.brand_indentlist[data-v-483b1af0] .ivu-btn>span{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+.brand_indentlist[data-v-7b2c6108]{width:100%}.brand_indentlist .brand_header[data-v-7b2c6108]{margin-bottom:10px}.brand_indentlist .brand_header button[data-v-7b2c6108]{margin-right:10px}.brand_indentlist[data-v-7b2c6108] .ivu-btn>span{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/css/chunk-953e9550.9e8d26ba.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-953e9550.9e8d26ba.css
+.brand_content[data-v-02fa91a4]{width:100%}.brand_content .brand_header[data-v-02fa91a4]{width:100%;height:50px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:#fff;-webkit-box-shadow:0 1px 0 0 #ddd;box-shadow:0 1px 0 0 #ddd;margin-bottom:10px}.brand_content .brand_header>span[data-v-02fa91a4]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-02fa91a4]:last-child{height:22px;font-size:16px;font-family:PingFangSC-Semibold,PingFang SC;font-weight:600;color:#000;line-height:22px;margin-left:10px}.brand_content .brand_content_upload[data-v-02fa91a4]{padding:16px;width:100%;background:#fff}.brand_content .brand_content_upload p[data-v-02fa91a4]{width:460px;height:21px;font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#333;line-height:21px;margin-bottom:20px}.brand_content .brand_content_upload p span[data-v-02fa91a4]{color:#1890ff}
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/css/chunk-e86e45c2.8da90c93.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-e86e45c2.8da90c93.css
-.brand_content[data-v-3307938e]{width:100%}.brand_content .brand_header[data-v-3307938e]{width:100%;height:50px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:#fff;-webkit-box-shadow:0 1px 0 0 #ddd;box-shadow:0 1px 0 0 #ddd;margin-bottom:10px}.brand_content .brand_header>span[data-v-3307938e]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-3307938e]:last-child{height:22px;font-size:16px;font-family:PingFangSC-Semibold,PingFang SC;font-weight:600;color:#000;line-height:22px;margin-left:10px}.brand_content .brand_content_upload[data-v-3307938e]{padding:16px;width:100%;background:#fff}.brand_content .brand_content_upload p[data-v-3307938e]{width:460px;height:21px;font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#333;line-height:21px;margin-bottom:20px}.brand_content .brand_content_upload p span[data-v-3307938e]{color:#1890ff}
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/index.html
+++ b/zhiquanquan/app/front/entry/public/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-3f6a4221.70630be5.css rel=prefetch><link href=/css/chunk-51d8db1f.84955839.css rel=prefetch><link href=/css/chunk-64606e9c.25bb1211.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-e86e45c2.8da90c93.css rel=prefetch><link href=/js/chunk-14b9857b.045d68b1.js rel=prefetch><link href=/js/chunk-2c359864.1901a494.js rel=prefetch><link href=/js/chunk-3385141a.361ae46e.js rel=prefetch><link href=/js/chunk-3f6a4221.3682e14c.js rel=prefetch><link href=/js/chunk-4fe8dd4f.c7f5a9a6.js rel=prefetch><link href=/js/chunk-51d8db1f.a77526ea.js rel=prefetch><link href=/js/chunk-64606e9c.3c2861b2.js rel=prefetch><link href=/js/chunk-786333e2.d81b11a4.js rel=prefetch><link href=/js/chunk-e86e45c2.bc0f38ae.js rel=prefetch><link href=/css/app.d144942e.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.e0b3eac6.js rel=preload as=script><link href=/js/chunk-vendors.0cce4d14.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.d144942e.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.0cce4d14.js></script><script src=/js/app.e0b3eac6.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-05048d1e.544a3e1d.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-51d8db1f.84955839.css rel=prefetch><link href=/css/chunk-64606e9c.25bb1211.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-953e9550.9e8d26ba.css rel=prefetch><link href=/js/chunk-05048d1e.53f424c5.js rel=prefetch><link href=/js/chunk-14b9857b.045d68b1.js rel=prefetch><link href=/js/chunk-2c359864.1901a494.js rel=prefetch><link href=/js/chunk-3385141a.361ae46e.js rel=prefetch><link href=/js/chunk-4fe8dd4f.c7f5a9a6.js rel=prefetch><link href=/js/chunk-51d8db1f.a77526ea.js rel=prefetch><link href=/js/chunk-64606e9c.16157db2.js rel=prefetch><link href=/js/chunk-786333e2.d81b11a4.js rel=prefetch><link href=/js/chunk-953e9550.0769a010.js rel=prefetch><link href=/css/app.d144942e.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.0389b214.js rel=preload as=script><link href=/js/chunk-vendors.0cce4d14.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.d144942e.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.0cce4d14.js></script><script src=/js/app.0389b214.js></script></body></html>
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/app.e0b3eac6.js
+++ b/zhiquanquan/app/front/entry/public/js/app.e0b3eac6.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-05048d1e.53f424c5.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-05048d1e.53f424c5.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-05048d1e"],{"309d":function(e,t,a){"use strict";var r=a("3306"),n=a.n(r);n.a},3306:function(e,t,a){},"48b4":function(e,t,a){"use strict";a.r(t);var r=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"brand_indentlist"},[a("div",{staticClass:"brand_header"},[a("Button",{attrs:{type:"primary"},on:{click:e.excelHandler}},[e._v("Excel批量上传")]),a("Button",{attrs:{type:"primary"},on:{click:e.searchHandler}},[e._v("检索上传")])],1),a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"trademark",metaName:"originmanage_info",packageName:"trademark",tblheight:e.adjustHeight-120,isMulti:"",isLazy:"true",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}})],1)},n=[],i=a("06d3"),o=a("8770"),s=a("c1df"),d=a.n(s),c=a("7e1e"),u={components:{BizTable:i["a"],DateTime:o["a"]},data:function(){return{}},mounted:function(){this.$route.query.ids?this.$refs.bt.fetchData({ids:this.$route.query.ids}):this.$refs.bt.fetchData()},methods:{excelHandler:function(){this.$router.push("/originmanage/originmanage_excelupload")},searchHandler:function(){this.$router.push("/originmanage/originmanage_brandsearch")},onexec:function(e,t){var a=this;"detail"===e?this.$router.push({name:"originmanage_detail",query:{id:t.id}}):"down"===e&&Object(c["f"])("/web/trademark/trademarkCtl/update",{id:t.id,publish_status:"lowershelf"}).then((function(e){a.$Message.success("发布成功"),a.$refs.bt.fetchData()})).catch((function(e){a.$Message.error("发布出错")}))},formatCol:function(e,t,a){var r=e[t];if("created_at"===t)r=d()(r).format("YYYY-MM-DD");else{if("pic_url"===t)return'<img style="width: 50px;height: 50px" src="'.concat(e[t],'"/>');"deadline"===t&&(r=d()(e["tm_start_day"]||0).format("YYYY-MM-DD")+"至"+d()(e["tm_end_day"]||0).format("YYYY-MM-DD"))}return r}}},l=u,f=(a("309d"),a("2877")),h=Object(f["a"])(l,r,n,!1,null,"7b2c6108",null);t["default"]=h.exports}}]);
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/chunk-3f6a4221.3682e14c.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-3f6a4221.3682e14c.js
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-3f6a4221"],{"43b1":function(e,t,a){"use strict";var n=a("5793"),r=a.n(n);r.a},"48b4":function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"brand_indentlist"},[a("div",{staticClass:"brand_header"},[a("Button",{attrs:{type:"primary"},on:{click:e.excelHandler}},[e._v("Excel批量上传")]),a("Button",{attrs:{type:"primary"},on:{click:e.searchHandler}},[e._v("检索上传")])],1),a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"trademark",metaName:"originmanage_info",packageName:"trademark",tblheight:e.adjustHeight-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}})],1)},r=[],i=a("06d3"),o=a("8770"),s=a("c1df"),d=a.n(s),c=a("7e1e"),l={components:{BizTable:i["a"],DateTime:o["a"]},data:function(){return{}},mounted:function(){},methods:{excelHandler:function(){this.$router.push("/originmanage/originmanage_excelupload")},searchHandler:function(){this.$router.push("/originmanage/originmanage_brandsearch")},onexec:function(e,t){var a=this;"detail"===e?this.$router.push({name:"originmanage_detail",query:{id:t.id}}):"down"===e&&Object(c["f"])("/web/trademark/trademarkCtl/update",{id:t.id,publish_status:"lowershelf"}).then((function(e){a.$Message.success("发布成功"),a.$refs.bt.fetchData()})).catch((function(e){a.$Message.error("发布出错")}))},formatCol:function(e,t,a){var n=e[t];if("created_at"===t)n=d()(n).format("YYYY-MM-DD");else{if("pic_url"===t)return'<img style="width: 50px;height: 50px" src="'.concat(e[t],'"/>');"deadline"===t&&(n=d()(e["tm_start_day"]||0).format("YYYY-MM-DD")+"至"+d()(e["tm_end_day"]||0).format("YYYY-MM-DD"))}return n}}},u=l,f=(a("43b1"),a("2877")),m=Object(f["a"])(u,n,r,!1,null,"483b1af0",null);t["default"]=m.exports},5793:function(e,t,a){}}]);
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/chunk-64606e9c.3c2861b2.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-64606e9c.3c2861b2.js
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-64606e9c"],{"203b":function(e,t,s){},"391e":function(e,t,s){"use strict";var r=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},a=[],i=s("6db5"),n=i["a"],o=s("2877"),c=Object(o["a"])(n,r,a,!1,null,null,null);t["a"]=c.exports},"40c2":function(e,t,s){"use strict";var r=s("203b"),a=s.n(r);a.a},"6db5":function(e,t,s){"use strict";(function(e){s("c5f6");t["a"]={name:"pagespace_page",prop:{tweak:Number},data:function(){return{frameHeight:0,advalue:this.tweak?this.tweak:0}},components:{},mounted:function(){var t=this;this.setHeight(),e(window).resize((function(){t.setHeight()}))},methods:{setHeight:function(){var t=this;this.$nextTick((function(){var s=e("#framediv"),r=s.get()[0],a=window.innerHeight-r.offsetTop-t.advalue;t.frameHeight=a,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,s("1157"))},b228:function(e,t,s){"use strict";s.r(t);var r=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("div",{staticClass:"brand_content"},[s("div",{staticClass:"brand_header"},[s("span",{on:{click:e.goBack}},[s("Icon",{attrs:{type:"md-arrow-back",size:"18",color:"#1890FF"}})],1),s("span",[e._v("检索上传")])]),s("PageSpace",[s("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"search",metaName:"search_info",packageName:"trademark",tblheight:e.adjustHeight-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}})],1),s("editForm",{ref:"ed",on:{onrefselect:e.refresh}})],1)},a=[],i=(s("c1df"),s("7e1e")),n=s("c276"),o=s("06d3"),c=s("391e"),f=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("div",[s("Modal",{attrs:{title:"","ok-text":"发布","cancel-text":"取消"},on:{"on-ok":e.okselects},model:{value:e.isshowref,callback:function(t){e.isshowref=t},expression:"isshowref"}},[s("Forms",{ref:"forminfo",staticStyle:{height:"100%"},attrs:{fminfo:e.forminfo,isSearchForm:!1}})],1)],1)},l=[],u=(s("7f7f"),s("0086")),d={name:"reftable_window",data:function(){return{item:{},isshowref:!1,forminfo:{name:"",main:[{title:"",cols:1,ctls:[{type:"input",label:"设置价格",prop:"business_quoted_price",style:"width:80%",rules:[{required:!0,message:"请设置价格",trigger:"blur"},{pattern:/^[1-9]\d$/,message:"格式不正确",trigger:"blur"}]},{type:"input",label:"联系人",prop:"contacts",style:"width:80%",rules:[{required:!0,message:"请填写联系人",trigger:"blur"}]},{type:"input",label:"联系电话",prop:"mobile",style:"width:80%",rules:[{required:!0,message:"请填写联系电话",trigger:"blur"},{pattern:/^1[3456789]\d{9}$/,message:"手机号码格式不正确",trigger:"blur"}]}]}]}}},props:[],components:{BizTable:o["a"],Forms:u["a"]},mounted:function(){},methods:{showrefwindow:function(e){this.item=e,this.isshowref=!0,this.$refs.forminfo.resetForm()},okselects:function(){var e=this;this.$refs.forminfo.validate((function(t){if(t){var s=e.item.map((function(t){return t.business_quoted_price=e.$refs.forminfo.formModel.business_quoted_price,t.contacts=e.$refs.forminfo.formModel.contacts,t.mobile=e.$refs.forminfo.formModel.mobile,t.channel_name=e.$store.state.user.userobj.company.name,t.channel_code=e.$store.state.user.userobj.company.id,t.execlName=t.sbmc,Object(n["b"])(t)}));Object(i["f"])("/web/trademark/trademarkCtl/publish",s).then((function(t){0==t.data.status?e.$Message.success(t.data.msg):e.$Message.error(t.data.msg)}))}else e.isshowref=!0})),this.$emit("onrefselect")}}},h=d,m=s("2877"),b=Object(m["a"])(h,f,l,!1,null,null,null),g=b.exports,p={components:{BizTable:o["a"],PageSpace:c["a"],editForm:g},data:function(){return{selectnumber:0,checked:!1}},methods:{goBack:function(){this.$router.go(-1)},onexec:function(e,t){var s=this;"bulkpublish"===e?0===this.$refs.bt.currentSels.length?this.$Message.warning("请选择要发布的商标"):this.$refs.ed.showrefwindow(this.$refs.bt.currentSels):"publish"===e&&this.$refs.bt.$refs.edform.validate((function(e){if(e){var r=[Object(n["b"])(t)];Object(i["f"])("/web/trademark/trademarkCtl/publish",r).then((function(e){0==e.data.status?(s.$refs.bt.fetchData(s.$refs.bt.searchModel),s.$Message.success(e.data.msg)):s.$Message.error(e.data.msg)}))}}))},formatCol:function(e,t,s){var r=e[t];return"logo"===t?'<img style="width: 50px;height: 50px" src="'.concat(e[t],'"/>'):r},refresh:function(){this.$refs.bt.fetchData(this.$refs.bt.searchModel)},checkchange:function(){this.checked=!this.checked,this.$refs.bt.handleSelectAll(this.checked)}},mounted:function(){},watch:{}},w=p,$=(s("40c2"),Object(m["a"])(w,r,a,!1,null,"66ad5b06",null));t["default"]=$.exports}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-64606e9c"],{"203b":function(e,t,s){},"391e":function(e,t,s){"use strict";var r=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},a=[],i=s("6db5"),n=i["a"],o=s("2877"),c=Object(o["a"])(n,r,a,!1,null,null,null);t["a"]=c.exports},"40c2":function(e,t,s){"use strict";var r=s("203b"),a=s.n(r);a.a},"6db5":function(e,t,s){"use strict";(function(e){s("c5f6");t["a"]={name:"pagespace_page",prop:{tweak:Number},data:function(){return{frameHeight:0,advalue:this.tweak?this.tweak:0}},components:{},mounted:function(){var t=this;this.setHeight(),e(window).resize((function(){t.setHeight()}))},methods:{setHeight:function(){var t=this;this.$nextTick((function(){var s=e("#framediv"),r=s.get()[0],a=window.innerHeight-r.offsetTop-t.advalue;t.frameHeight=a,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,s("1157"))},b228:function(e,t,s){"use strict";s.r(t);var r=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("div",{staticClass:"brand_content"},[s("div",{staticClass:"brand_header"},[s("span",{on:{click:e.goBack}},[s("Icon",{attrs:{type:"md-arrow-back",size:"18",color:"#1890FF"}})],1),s("span",[e._v("检索上传")])]),s("PageSpace",[s("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"search",metaName:"search_info",packageName:"trademark",tblheight:e.adjustHeight-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}})],1),s("editForm",{ref:"ed",on:{onrefselect:e.refresh}})],1)},a=[],i=(s("c1df"),s("7e1e")),n=s("c276"),o=s("06d3"),c=s("391e"),f=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("div",[s("Modal",{attrs:{title:"","ok-text":"发布","cancel-text":"取消"},on:{"on-ok":e.okselects},model:{value:e.isshowref,callback:function(t){e.isshowref=t},expression:"isshowref"}},[s("Forms",{ref:"forminfo",staticStyle:{height:"100%"},attrs:{fminfo:e.forminfo,isSearchForm:!1}})],1)],1)},l=[],u=(s("7f7f"),s("0086")),d={name:"reftable_window",data:function(){return{item:{},isshowref:!1,forminfo:{name:"",main:[{title:"",cols:1,ctls:[{type:"input",label:"设置价格",prop:"business_quoted_price",style:"width:80%",rules:[{required:!0,message:"请设置价格",trigger:"blur"},{pattern:/^[+]{0,1}(\d+)$/,message:"格式不正确",trigger:"blur"}]},{type:"input",label:"联系人",prop:"contacts",style:"width:80%",rules:[{required:!0,message:"请填写联系人",trigger:"blur"}]},{type:"input",label:"联系电话",prop:"mobile",style:"width:80%",rules:[{required:!0,message:"请填写联系电话",trigger:"blur"},{pattern:/^1[3456789]\d{9}$/,message:"手机号码格式不正确",trigger:"blur"}]}]}]}}},props:[],components:{BizTable:o["a"],Forms:u["a"]},mounted:function(){},methods:{showrefwindow:function(e){this.item=e,this.isshowref=!0,this.$refs.forminfo.resetForm()},okselects:function(){var e=this;this.$refs.forminfo.validate((function(t){if(t){var s=e.item.map((function(t){return t.business_quoted_price=e.$refs.forminfo.formModel.business_quoted_price,t.contacts=e.$refs.forminfo.formModel.contacts,t.mobile=e.$refs.forminfo.formModel.mobile,t.channel_name=e.$store.state.user.userobj.company.name,t.channel_code=e.$store.state.user.userobj.company.id,t.execlName=t.sbmc,Object(n["b"])(t)}));Object(i["f"])("/web/trademark/trademarkCtl/publish",s).then((function(t){0==t.data.status?e.$Message.success(t.data.msg):e.$Message.error(t.data.msg)}))}else e.isshowref=!0})),this.$emit("onrefselect")}}},h=d,m=s("2877"),b=Object(m["a"])(h,f,l,!1,null,null,null),g=b.exports,p={components:{BizTable:o["a"],PageSpace:c["a"],editForm:g},data:function(){return{selectnumber:0,checked:!1}},methods:{goBack:function(){this.$router.go(-1)},onexec:function(e,t){var s=this;"bulkpublish"===e?0===this.$refs.bt.currentSels.length?this.$Message.warning("请选择要发布的商标"):this.$refs.ed.showrefwindow(this.$refs.bt.currentSels):"publish"===e&&this.$refs.bt.$refs.edform.validate((function(e){if(e){var r=[Object(n["b"])(t)];Object(i["f"])("/web/trademark/trademarkCtl/publish",r).then((function(e){0==e.data.status?(s.$refs.bt.fetchData(s.$refs.bt.searchModel),s.$Message.success(e.data.msg)):s.$Message.error(e.data.msg)}))}}))},formatCol:function(e,t,s){var r=e[t];return"logo"===t?'<img style="width: 50px;height: 50px" src="'.concat(e[t],'"/>'):r},refresh:function(){this.$refs.bt.fetchData(this.$refs.bt.searchModel)},checkchange:function(){this.checked=!this.checked,this.$refs.bt.handleSelectAll(this.checked)}},mounted:function(){},watch:{}},w=p,$=(s("40c2"),Object(m["a"])(w,r,a,!1,null,"66ad5b06",null));t["default"]=$.exports}}]);
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/chunk-953e9550.0769a010.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-953e9550.0769a010.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-953e9550"],{"959f":function(e,t,a){"use strict";var n=a("fb4e"),o=a.n(n);o.a},be4f:function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"brand_content"},[a("div",{staticClass:"brand_header"},[a("span",{on:{click:e.goBack}},[a("Icon",{attrs:{type:"md-arrow-back",size:"18",color:"#1890FF"}})],1),a("span",[e._v("Excel批量上传商标")])]),a("div",{staticClass:"brand_content_upload"},[e._m(0),a("div",[a("Upload",{attrs:{action:"","before-upload":e.beforeUpload}},[a("Button",{attrs:{icon:"ios-cloud-upload-outline"}},[e._v("上传Csv文件")]),e._v(" "+e._s(e.note)+" ")],1),a("Button",{attrs:{type:"primary"},on:{click:e.check}},[e._v("发布")])],1)]),a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"upload",metaName:"upload_info",packageName:"trademark",tblheight:e.adjustHeight-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}}),a("Modal",{attrs:{title:"提示"},on:{"on-ok":e.ok,"on-cancel":e.cancel},model:{value:e.modal1,callback:function(t){e.modal1=t},expression:"modal1"}},[a("p",[e._v("是否发布所有商标？")])])],1)},o=[function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("p",[e._v(" 第一次上传请下载 "),a("a",{attrs:{href:"https://gsb-zc.oss-cn-beijing.aliyuncs.com/%E5%95%86%E6%A0%87%E6%A8%A1%E7%89%88.csv",download:"商标上传模版.csv"}},[e._v("商标上传模板")]),e._v(" ，并严格按模板提供内容填入商标信息。 ")])}],s=(a("7f7f"),a("ac6a"),a("c1df")),c=a.n(s),r=a("06d3"),i=a("7e1e"),l=a("c276"),d={components:{BizTable:r["a"]},data:function(){return{note:"点击上传Csv文件",publishdata:[],modal1:!1}},methods:{goBack:function(){this.$router.go(-1)},beforeUpload:function(e){var t=this;return Object(l["e"])(e).then((function(e){e.forEach((function(e){e.channel_name=t.$store.state.user.userobj.company.name,e.channel_code=t.$store.state.user.userobj.company.id,e.execlName=e.name})),t.publishdata=e,t.note="文件已上传"})).catch((function(e){t.$Notice.warning({title:"上传出错",desc:"请检查文件格式"})})),!1},check:function(){if(0===this.publishdata.length)return this.$Message.warning("先上传文件");this.modal1=!0},ok:function(){this.publish()},cancel:function(){},publish:function(){var e=this;Object(i["f"])("/web/trademark/trademarkCtl/publish",this.publishdata).then((function(t){-200!=t.data.status?(e.note="点击上传Csv文件",e.$Message.success("发布成功"),e.$refs.bt.fetchData()):(e.$Message.error("发布失败"),console.log("details err:",t))})).catch((function(t){e.$Message.error("发布失败"),console.log("details err:",t)}))},onexec:function(e,t){var a=this;"info"===e&&Object(i["f"])("/web/trademark/trademarkCtl/getidlist",{upload_id:t.id}).then((function(e){if(-200!=e.data.status){var t=e.data.data.map((function(e){return e.id}));a.$router.push({name:"originmanage_order",query:{ids:t}})}else console.log("details err:",e)})).catch((function(e){console.log("details err:",e)}))},formatCol:function(e,t,a){var n=e[t];return"created_at"===t?n=c()(n).format("YYYY-MM-DD"):"status"===t&&(n=0==n?"处理中":"处理完成"),n}},mounted:function(){},watch:{}},u=d,f=(a("959f"),a("2877")),h=Object(f["a"])(u,n,o,!1,null,"02fa91a4",null);t["default"]=h.exports},fb4e:function(e,t,a){}}]);
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/chunk-e86e45c2.bc0f38ae.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-e86e45c2.bc0f38ae.js
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-e86e45c2"],{7029:function(e,t,a){"use strict";var n=a("934e"),o=a.n(n);o.a},"934e":function(e,t,a){},be4f:function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"brand_content"},[a("div",{staticClass:"brand_header"},[a("span",{on:{click:e.goBack}},[a("Icon",{attrs:{type:"md-arrow-back",size:"18",color:"#1890FF"}})],1),a("span",[e._v("Excel批量上传商标")])]),a("div",{staticClass:"brand_content_upload"},[e._m(0),a("div",[a("Upload",{attrs:{action:"","before-upload":e.beforeUpload}},[a("Button",{attrs:{icon:"ios-cloud-upload-outline"}},[e._v("上传Csv文件")]),e._v(" "+e._s(e.note)+" ")],1),a("Button",{attrs:{type:"primary"},on:{click:e.check}},[e._v("发布")])],1)]),a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"upload",metaName:"upload_info",packageName:"trademark",tblheight:e.adjustHeight-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}}),a("Modal",{attrs:{title:"提示"},on:{"on-ok":e.ok,"on-cancel":e.cancel},model:{value:e.modal1,callback:function(t){e.modal1=t},expression:"modal1"}},[a("p",[e._v("是否发布所有商标？")])])],1)},o=[function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("p",[e._v(" 第一次上传请下载 "),a("a",{attrs:{href:"https://gsb-zc.oss-cn-beijing.aliyuncs.com/%E5%95%86%E6%A0%87%E6%A8%A1%E7%89%88.csv",download:"商标上传模版.csv"}},[e._v("商标上传模板")]),e._v(" ，并严格按模板提供内容填入商标信息。 ")])}],c=(a("7f7f"),a("ac6a"),a("c1df")),s=a.n(c),r=a("06d3"),i=a("7e1e"),l=a("c276"),u={components:{BizTable:r["a"]},data:function(){return{note:"点击上传Csv文件",publishdata:[],modal1:!1}},methods:{goBack:function(){this.$router.go(-1)},beforeUpload:function(e){var t=this;return Object(l["e"])(e).then((function(e){e.forEach((function(e){e.channel_name=t.$store.state.user.userobj.company.name,e.channel_code=t.$store.state.user.userobj.company.id,e.execlName=e.name})),t.publishdata=e,t.note="文件已上传"})).catch((function(e){t.$Notice.warning({title:"上传出错",desc:"请检查文件格式"})})),!1},check:function(){if(0===this.publishdata.length)return this.$Message.warning("先上传文件");this.modal1=!0},ok:function(){this.publish()},cancel:function(){},publish:function(){var e=this;Object(i["f"])("/web/trademark/trademarkCtl/publish",this.publishdata).then((function(t){-200!=t.data.status?(e.note="点击上传Csv文件",e.$Message.success("发布成功"),e.$refs.bt.fetchData()):(e.$Message.error("发布失败"),console.log("details err:",t))})).catch((function(t){e.$Message.error("发布失败"),console.log("details err:",t)}))},onexec:function(e,t){"info"===e&&this.$router.push({name:"originmanage_order",query:{id:t.id}})},formatCol:function(e,t,a){var n=e[t];return"created_at"===t?n=s()(n).format("YYYY-MM-DD"):"status"===t&&(n=0==n?"处理中":"处理完成"),n}},mounted:function(){},watch:{}},d=u,f=(a("7029"),a("2877")),h=Object(f["a"])(d,n,o,!1,null,"3307938e",null);t["default"]=h.exports}}]);
\ No newline at end of file