update

b79b948d · 王悦 · 3f19308f · b79b948d · b79b948d · b79b948d
Commit b79b948d authored Sep 14, 2020 by 王悦
10 changed files
--- a/zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js
+++ b/zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js
@@ -146,12 +146,17 @@ class TrademarkCtl extends CtlBase {
        await upload.save();
        for (let i = 0; i < data.length; i += 200) {
            let item = data.slice(i, i + 200);
+            item.forEach(e=>{
+                e.channel_code = p.actionBody.company_id;
+                e.channel_name = p.actionBody.channel_name;
+            });
            let pushd = {
                data:item
            };
            pushd.opath = p.actionBody.opath;
            pushd.userid = p.actionBody.userid;
            pushd.company_id = p.actionBody.company_id;
+            pushd.channel_name = p.actionBody.channel_name;
            await this.publish(pushd, {upload_id: uploadid})
        }
        return system.getResult(1, "ok")
@@ -177,6 +182,7 @@ class TrademarkCtl extends CtlBase {
                file_url: p.file_url,
                opath: p.opath,
                userid: p.userid,
+                channel_name: p.channel_name,
                company_id: p.company_id
            }, pushmyurl);
            if (rtn.status == 1) {

--- a/zhiquanquan/app/front/entry/public/css/chunk-18078264.457252cc.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-18078264.457252cc.css
-.brand_from[data-v-12a67f14]{position:fixed;width:80.66%;bottom:0;z-index:9}.brand_from .brand_fix[data-v-12a67f14]{position:relative!important}.brand_from[data-v-12a67f14] .ivu-card{padding-bottom:0!important;border-top:1px solid #dcdee2!important}.brand_from[data-v-12a67f14] .ivu-btn{position:absolute;bottom:38px;right:20px}.brand_from[data-v-12a67f14] .ivu-card-head{display:none}.brand_from[data-v-12a67f14] .ivu-card-body{width:30%}.brand_from[data-v-12a67f14] .ivu-row-flex{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.brand_content[data-v-a503c5b0]{width:100%;height:100%;position:relative}.brand_content .brand_header[data-v-a503c5b0]{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-a503c5b0]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-a503c5b0]: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[data-v-a503c5b0] #framediv .ivu-card-body{margin-bottom:110px}
+.brand_from[data-v-12a67f14]{position:fixed;width:80.66%;bottom:0;z-index:9}.brand_from .brand_fix[data-v-12a67f14]{position:relative!important}.brand_from[data-v-12a67f14] .ivu-card{padding-bottom:0!important;border-top:1px solid #dcdee2!important}.brand_from[data-v-12a67f14] .ivu-btn{position:absolute;bottom:38px;right:20px}.brand_from[data-v-12a67f14] .ivu-card-head{display:none}.brand_from[data-v-12a67f14] .ivu-card-body{width:30%}.brand_from[data-v-12a67f14] .ivu-row-flex{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.brand_content[data-v-e2fde824]{width:100%;height:100%;position:relative}.brand_content .brand_header[data-v-e2fde824]{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-e2fde824]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-e2fde824]: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[data-v-e2fde824] #framediv .ivu-card-body{margin-bottom:110px}
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/css/chunk-2a4c423e.4bb592e7.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-2a4c423e.4bb592e7.css
+.brand_content[data-v-0b6e6fc4]{width:100%}.brand_content .brand_header[data-v-0b6e6fc4]{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-0b6e6fc4]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-0b6e6fc4]: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-0b6e6fc4]{padding:16px;width:100%;background:#fff}.brand_content .brand_content_upload p[data-v-0b6e6fc4]{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-0b6e6fc4]{color:#1890ff}
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/css/chunk-79c019e0.c1174227.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-79c019e0.c1174227.css
-.brand_content[data-v-0bd28cec]{width:100%}.brand_content .brand_header[data-v-0bd28cec]{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-0bd28cec]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-0bd28cec]: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-0bd28cec]{padding:16px;width:100%;background:#fff}.brand_content .brand_content_upload p[data-v-0bd28cec]{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-0bd28cec]{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-18078264.457252cc.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-48cdcf06.4f534ef6.css rel=prefetch><link href=/css/chunk-51d8db1f.84955839.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-79c019e0.c1174227.css rel=prefetch><link href=/css/chunk-f1119100.f86fd2b1.css rel=prefetch><link href=/js/chunk-14b9857b.045d68b1.js rel=prefetch><link href=/js/chunk-18078264.4a5d9025.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-48cdcf06.618a9866.js rel=prefetch><link href=/js/chunk-4fe8dd4f.0b4915be.js rel=prefetch><link href=/js/chunk-51d8db1f.d896f330.js rel=prefetch><link href=/js/chunk-786333e2.d81b11a4.js rel=prefetch><link href=/js/chunk-79c019e0.1f39054a.js rel=prefetch><link href=/js/chunk-f1119100.216cd9ab.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.01e93d69.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.01e93d69.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-0932aaee.a4dc5d43.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-2a4c423e.4bb592e7.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-48cdcf06.4f534ef6.css rel=prefetch><link href=/css/chunk-51d8db1f.84955839.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-f1119100.f86fd2b1.css rel=prefetch><link href=/js/chunk-0932aaee.987a0d9c.js rel=prefetch><link href=/js/chunk-14b9857b.045d68b1.js rel=prefetch><link href=/js/chunk-2a4c423e.f79c29cb.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-48cdcf06.618a9866.js rel=prefetch><link href=/js/chunk-4fe8dd4f.0b4915be.js rel=prefetch><link href=/js/chunk-51d8db1f.d896f330.js rel=prefetch><link href=/js/chunk-786333e2.d81b11a4.js rel=prefetch><link href=/js/chunk-f1119100.216cd9ab.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.0f2f1661.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.0f2f1661.js></script></body></html>
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/app.01e93d69.js
+++ b/zhiquanquan/app/front/entry/public/js/app.01e93d69.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-0932aaee.987a0d9c.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-0932aaee.987a0d9c.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0932aaee"],{"0139":function(e,t,a){e.exports=a.p+"img/placeholder.756a7125.svg"},"1a4e":function(e,t,a){},"203d":function(e,t,a){},"391e":function(e,t,a){"use strict";var s=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},r=[],n=a("6db5"),i=n["a"],o=a("2877"),c=Object(o["a"])(i,s,r,!1,null,null,null);t["a"]=c.exports},"6db5":function(e,t,a){"use strict";(function(e){a("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 a=e("#framediv"),s=a.get()[0],r=window.innerHeight-s.offsetTop-t.advalue;t.frameHeight=r,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},"835e":function(e,t,a){"use strict";var s=a("1a4e"),r=a.n(s);r.a},ad35:function(e,t,a){"use strict";var s=a("203d"),r=a.n(s);r.a},b228:function(e,t,a){"use strict";a.r(t);var s=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("检索上传")])]),a("PageSpace",[a("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,selectRow:e.selectRow,oninitbtn:e.oninitbtn}})],1),a("editForm",{ref:"ed",attrs:{data:e.selectdata},on:{onrefselect:e.refresh}})],1)},r=[],n=(a("7f7f"),a("c1df"),a("7e1e")),i=a("c276"),o=a("06d3"),c=a("391e"),f=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"brand_from"},[a("div",{staticClass:"brand_fix"},[a("Forms",{ref:"forminfo",staticStyle:{height:"100%"},attrs:{fminfo:e.forminfo,isSearchForm:!1},on:{"on-select":e.brandHandle}}),a("Button",{attrs:{type:"primary"},on:{click:e.okselects}},[e._v("确认发布")])],1)])},l=[],d=a("0086"),u={name:"reftable_window",data:function(){return{item:this.data,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:{data:{type:Array}},components:{BizTable:o["a"],Forms:d["a"]},mounted:function(){},watch:{data:function(e){this.item=e||[]}},methods:{brandHandle:function(e,t){console.log(e,t)},showrefwindow:function(e){this.item=e,this.isshowref=!0,this.$refs.forminfo.resetForm()},okselects:function(){var e=this;if(0==this.item.length)return this.$Message.warning("请选择要发布的商标");this.$refs.forminfo.validate((function(t){if(t){var a=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(i["b"])(t)}));Object(n["f"])("/web/trademark/trademarkCtl/publish",{data:a}).then((function(t){0==t.data.status?(e.$emit("onrefselect"),e.item=[],e.$Message.success(t.data.msg)):e.$Message.error(t.data.msg)}))}else e.isshowref=!0}))}}},h=u,m=(a("835e"),a("2877")),b=Object(m["a"])(h,f,l,!1,null,"12a67f14",null),g=b.exports,p=a("0139"),w=a.n(p),$={components:{BizTable:o["a"],PageSpace:c["a"],editForm:g},data:function(){return{selectnumber:0,checked:!1,placeholder:w.a,selectdata:[]}},methods:{goBack:function(){this.$router.go(-1)},selectRow:function(e){this.selectdata=e},onexec:function(e,t){var a=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){t.channel_name=a.$store.state.user.userobj.company.name,t.channel_code=a.$store.state.user.userobj.company.id;var s=[Object(i["b"])(t)];Object(n["f"])("/web/trademark/trademarkCtl/publish",{data:s}).then((function(e){0==e.data.status?(a.$refs.bt.fetchData(a.$refs.bt.searchModel),a.$Message.success(e.data.msg)):a.$Message.error(e.data.msg)}))}}))},formatCol:function(e,t,a){var s=e[t];return"logo"===t?'<img style="width: 100%;height: 100%" src="'.concat(e[t]||w.a,'"/>'):s},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:{}},v=$,k=(a("ad35"),Object(m["a"])(v,s,r,!1,null,"e2fde824",null));t["default"]=k.exports}}]);
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/chunk-18078264.4a5d9025.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-18078264.4a5d9025.js
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-18078264"],{"0139":function(e,t,a){e.exports=a.p+"img/placeholder.756a7125.svg"},"1a4e":function(e,t,a){},"391e":function(e,t,a){"use strict";var s=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},r=[],n=a("6db5"),i=n["a"],o=a("2877"),c=Object(o["a"])(i,s,r,!1,null,null,null);t["a"]=c.exports},"6db5":function(e,t,a){"use strict";(function(e){a("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 a=e("#framediv"),s=a.get()[0],r=window.innerHeight-s.offsetTop-t.advalue;t.frameHeight=r,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},"835e":function(e,t,a){"use strict";var s=a("1a4e"),r=a.n(s);r.a},"979e":function(e,t,a){"use strict";var s=a("9a9b"),r=a.n(s);r.a},"9a9b":function(e,t,a){},b228:function(e,t,a){"use strict";a.r(t);var s=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("检索上传")])]),a("PageSpace",[a("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,selectRow:e.selectRow,oninitbtn:e.oninitbtn}})],1),a("editForm",{ref:"ed",attrs:{data:e.selectdata},on:{onrefselect:e.refresh}})],1)},r=[],n=(a("c1df"),a("7e1e")),i=a("c276"),o=a("06d3"),c=a("391e"),f=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"brand_from"},[a("div",{staticClass:"brand_fix"},[a("Forms",{ref:"forminfo",staticStyle:{height:"100%"},attrs:{fminfo:e.forminfo,isSearchForm:!1},on:{"on-select":e.brandHandle}}),a("Button",{attrs:{type:"primary"},on:{click:e.okselects}},[e._v("确认发布")])],1)])},l=[],u=(a("7f7f"),a("0086")),d={name:"reftable_window",data:function(){return{item:this.data,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:{data:{type:Array}},components:{BizTable:o["a"],Forms:u["a"]},mounted:function(){},watch:{data:function(e){this.item=e||[]}},methods:{brandHandle:function(e,t){console.log(e,t)},showrefwindow:function(e){this.item=e,this.isshowref=!0,this.$refs.forminfo.resetForm()},okselects:function(){var e=this;if(0==this.item.length)return this.$Message.warning("请选择要发布的商标");this.$refs.forminfo.validate((function(t){if(t){var a=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(i["b"])(t)}));Object(n["f"])("/web/trademark/trademarkCtl/publish",{data:a}).then((function(t){0==t.data.status?(e.$emit("onrefselect"),e.item=[],e.$Message.success(t.data.msg)):e.$Message.error(t.data.msg)}))}else e.isshowref=!0}))}}},h=d,m=(a("835e"),a("2877")),b=Object(m["a"])(h,f,l,!1,null,"12a67f14",null),g=b.exports,p=a("0139"),w=a.n(p),v={components:{BizTable:o["a"],PageSpace:c["a"],editForm:g},data:function(){return{selectnumber:0,checked:!1,placeholder:w.a,selectdata:[]}},methods:{goBack:function(){this.$router.go(-1)},selectRow:function(e){this.selectdata=e},onexec:function(e,t){var a=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 s=[Object(i["b"])(t)];Object(n["f"])("/web/trademark/trademarkCtl/publish",{data:s}).then((function(e){0==e.data.status?(a.$refs.bt.fetchData(a.$refs.bt.searchModel),a.$Message.success(e.data.msg)):a.$Message.error(e.data.msg)}))}}))},formatCol:function(e,t,a){var s=e[t];return"logo"===t?'<img style="width: 100%;height: 100%" src="'.concat(e[t]||w.a,'"/>'):s},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:{}},$=v,k=(a("979e"),Object(m["a"])($,s,r,!1,null,"a503c5b0",null));t["default"]=k.exports}}]);
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/chunk-2a4c423e.f79c29cb.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-2a4c423e.f79c29cb.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2a4c423e"],{"094b":function(e,t,a){"use strict";var o=a("1c4f"),n=a.n(o);n.a},"1c4f":function(e,t,a){},be4f:function(e,t,a){"use strict";a.r(t);var o=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",{ref:"upload",attrs:{data:e.d,action:e.action,accept:".csv","on-success":e.handleSuccess,"before-upload":e.handleBeforeUpload}},[a("Button",{attrs:{icon:"ios-cloud-upload-outline"}},[e._v("上传Csv文件")])],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("Form",{ref:"forminfo",staticStyle:{height:"100%"},attrs:{model:e.formItem,"label-position":"left",rules:e.ruleValidate}},[a("FormItem",{attrs:{label:"批次名称",prop:"name"}},[a("Input",{attrs:{placeholder:""},model:{value:e.formItem.name,callback:function(t){e.$set(e.formItem,"name",t)},expression:"formItem.name"}})],1)],1),a("p",[e._v("发布后平台审核人员会在1个工作日内审核上架，请耐心等待")])],1)],1)},n=[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(" ，并严格按模板提供内容填入商标信息。 ")])}],r=(a("7f7f"),a("a481"),a("c1df")),c=a.n(r),s=a("0086"),i=a("60b7"),l=a("06d3"),u=a("7e1e"),d=(a("c276"),{components:{BizTable:l["a"],Forms:s["a"]},data:function(){return{fileurl:"",modal1:!1,action:"",d:{},formItem:{name:""},ruleValidate:{name:[{required:!0,message:"批次名称不能为空",trigger:"blur"}]}}},methods:{goBack:function(){this.$router.go(-1)},handleSuccess:function(e,t,a){var o=this.loadXML(e),n=o.documentElement.getElementsByTagName("Location")[0].textContent;this.fileurl=n},loadXML:function(e){var t=null;if(!window.DOMParser&&window.ActiveXObject)for(var a=["MSXML.2.DOMDocument.6.0","MSXML.2.DOMDocument.3.0","Microsoft.XMLDOM"],o=0;o<a.length;o++)try{t=new ActiveXObject(a[o]),t.async=!1,t.loadXML(e);break}catch(r){}else{if(!(window.DOMParser&&document.implementation&&document.implementation.createDocument))return null;try{var n=new DOMParser;t=n.parseFromString(e,"text/xml")}catch(r){console.log(r)}}return t},handleBeforeUpload:function(e){this.$refs.upload.clearFiles();var t=new Date;return this.d.key="zc_"+Math.round(500*Math.random())+t.getMonth()+t.getTime()+t.getFullYear()+t.getDate()+t.getHours()+t.getMinutes()+t.getSeconds()+t.getMilliseconds()+e.name.replace(" ",""),!0},check:function(){if(!this.fileurl)return this.$Message.warning("先上传文件");this.modal1=!0},ok:function(){var e=this;this.$refs.forminfo.validate((function(t){t?e.publish(e.formItem.name):e.modal1=!0}))},cancel:function(){},publish:function(e){var t=this;Object(u["f"])("/web/trademark/trademarkCtl/excelpublish",{file_url:this.fileurl,name:e,channel_name:this.$store.state.user.userobj.company.name}).then((function(e){-200!=e.data.status?(t.$Message.success("发布成功"),t.$refs.bt.fetchData(),t.$refs.upload.clearFiles(),t.fileurl=""):(t.$Message.error("发布失败"),console.log("details err:",e))})).catch((function(e){t.$Message.error("发布失败"),console.log("details err:",e)}))},onexec:function(e,t){var a=this;"info"===e&&Object(u["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.trademark_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 o=e[t];return"created_at"===t?o=c()(o).format("YYYY-MM-DD"):"status"===t&&(o=0==o?"处理中":"处理完成"),o}},mounted:function(){var e=this,t="/web/common/uploadCtl/getOssConfig";Object(i["a"])(t,null).then((function(t){if(200==t.status){var a=t.data;e.d["key"]="key",e.d["Bucket"]=a.Bucket,e.d["OSSAccessKeyId"]=a.OSSAccessKeyId,e.d["Signature"]=a.Signature,e.d["policy"]=a.policy,e.d["success_action_status"]=a.success_action_status,e.action=a.url}else console.log("cofig fetch failuer")}))},watch:{}}),f=d,m=(a("094b"),a("2877")),h=Object(m["a"])(f,o,n,!1,null,"0b6e6fc4",null);t["default"]=h.exports}}]);
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/chunk-79c019e0.1f39054a.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-79c019e0.1f39054a.js
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-79c019e0"],{1937:function(e,t,a){},5984:function(e,t,a){"use strict";var o=a("1937"),n=a.n(o);n.a},be4f:function(e,t,a){"use strict";a.r(t);var o=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",{ref:"upload",attrs:{data:e.d,action:e.action,accept:".csv","on-success":e.handleSuccess,"before-upload":e.handleBeforeUpload}},[a("Button",{attrs:{icon:"ios-cloud-upload-outline"}},[e._v("上传Csv文件")])],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("Form",{ref:"forminfo",staticStyle:{height:"100%"},attrs:{model:e.formItem,"label-position":"left",rules:e.ruleValidate}},[a("FormItem",{attrs:{label:"批次名称",prop:"name"}},[a("Input",{attrs:{placeholder:""},model:{value:e.formItem.name,callback:function(t){e.$set(e.formItem,"name",t)},expression:"formItem.name"}})],1)],1),a("p",[e._v("发布后平台审核人员会在1个工作日内审核上架，请耐心等待")])],1)],1)},n=[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(" ，并严格按模板提供内容填入商标信息。 ")])}],r=(a("7f7f"),a("a481"),a("c1df")),c=a.n(r),s=a("0086"),i=a("60b7"),l=a("06d3"),d=a("7e1e"),u=(a("c276"),{components:{BizTable:l["a"],Forms:s["a"]},data:function(){return{fileurl:"",modal1:!1,action:"",d:{},formItem:{name:""},ruleValidate:{name:[{required:!0,message:"批次名称不能为空",trigger:"blur"}]}}},methods:{goBack:function(){this.$router.go(-1)},handleSuccess:function(e,t,a){var o=this.loadXML(e),n=o.documentElement.getElementsByTagName("Location")[0].textContent;this.fileurl=n},loadXML:function(e){var t=null;if(!window.DOMParser&&window.ActiveXObject)for(var a=["MSXML.2.DOMDocument.6.0","MSXML.2.DOMDocument.3.0","Microsoft.XMLDOM"],o=0;o<a.length;o++)try{t=new ActiveXObject(a[o]),t.async=!1,t.loadXML(e);break}catch(r){}else{if(!(window.DOMParser&&document.implementation&&document.implementation.createDocument))return null;try{var n=new DOMParser;t=n.parseFromString(e,"text/xml")}catch(r){console.log(r)}}return t},handleBeforeUpload:function(e){this.$refs.upload.clearFiles();var t=new Date;return this.d.key="zc_"+Math.round(500*Math.random())+t.getMonth()+t.getTime()+t.getFullYear()+t.getDate()+t.getHours()+t.getMinutes()+t.getSeconds()+t.getMilliseconds()+e.name.replace(" ",""),!0},check:function(){if(!this.fileurl)return this.$Message.warning("先上传文件");this.modal1=!0},ok:function(){var e=this;this.$refs.forminfo.validate((function(t){t?e.publish(e.formItem.name):e.modal1=!0}))},cancel:function(){},publish:function(e){var t=this;Object(d["f"])("/web/trademark/trademarkCtl/excelpublish",{file_url:this.fileurl,name:e}).then((function(e){-200!=e.data.status?(t.$Message.success("发布成功"),t.$refs.bt.fetchData(),t.$refs.upload.clearFiles(),t.fileurl=""):(t.$Message.error("发布失败"),console.log("details err:",e))})).catch((function(e){t.$Message.error("发布失败"),console.log("details err:",e)}))},onexec:function(e,t){var a=this;"info"===e&&Object(d["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.trademark_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 o=e[t];return"created_at"===t?o=c()(o).format("YYYY-MM-DD"):"status"===t&&(o=0==o?"处理中":"处理完成"),o}},mounted:function(){var e=this,t="/web/common/uploadCtl/getOssConfig";Object(i["a"])(t,null).then((function(t){if(200==t.status){var a=t.data;e.d["key"]="key",e.d["Bucket"]=a.Bucket,e.d["OSSAccessKeyId"]=a.OSSAccessKeyId,e.d["Signature"]=a.Signature,e.d["policy"]=a.policy,e.d["success_action_status"]=a.success_action_status,e.action=a.url}else console.log("cofig fetch failuer")}))},watch:{}}),f=u,m=(a("5984"),a("2877")),h=Object(m["a"])(f,o,n,!1,null,"0bd28cec",null);t["default"]=h.exports}}]);
\ No newline at end of file