fix

zhiquanquan/app/base/controller/impl/trademark/uploadinfoCtl.js

@@ -28,8 +28,13 @@ class UploadinfoCtl extends trademarkCtl {
             "actionType": "tmInfo",
             "actionType": "tmInfo",
             "actionBody": {}
             "actionBody": {}
         };
         };
+        p.search.trademark_id ={$and:[{$not:null},{$not:""}]};
         let list = await  this.service.findAndCountAll(p);
         let list = await  this.service.findAndCountAll(p);
-        query.actionBody.tmList = list.results.rows.map(d=>d.trademark_id);
+        query.actionBody.tmList = list.results.rows.map(d => {
+            if (d.trademark_id) {
+                return d.trademark_id
+            }
+        });
         let rtn = await this.execClient.execPost(query, tmurl);
         let rtn = await this.execClient.execPost(query, tmurl);
         let data = JSON.parse(rtn.stdout);
         let data = JSON.parse(rtn.stdout);
         return system.getResultList(data.totalCount, data.data || [])
         return system.getResultList(data.totalCount, data.data || [])

zhiquanquan/app/front/entry/public/css/chunk-3e62f437.431eb760.css

-.brand_content[data-v-5c70d564]{width:100%}.brand_content .brand_header[data-v-5c70d564]{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-5c70d564]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-5c70d564]: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-5c70d564]{padding:16px;width:100%;background:#fff}.brand_content .brand_content_upload p[data-v-5c70d564]{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-5c70d564]{color:#1890ff}
\ No newline at end of file

zhiquanquan/app/front/entry/public/css/chunk-0934e898.2e92d182.css → zhiquanquan/app/front/entry/public/css/chunk-6ab78853.938207ad.css

-.brand_indentlist[data-v-564d3815]{width:100%}.brand_indentlist .brand_header[data-v-564d3815]{margin-bottom:10px}.brand_indentlist .brand_header button[data-v-564d3815]{margin-right:10px}.brand_indentlist[data-v-564d3815] .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-564d3815] .ivu-table-body .ivu-btn-primary{color:#2d8cf0!important;background-color:transparent;border-color:transparent}.ivu-checkbox-group{display:-webkit-box;display:-ms-flexbox;display:flex;width:226px;-ms-flex-wrap:wrap;flex-wrap:wrap}.ivu-table-filter-list-item .ivu-checkbox-wrapper+.ivu-checkbox-wrapper{margin-right:10px}
+.brand_indentlist[data-v-0637793a]{width:100%}.brand_indentlist .brand_header[data-v-0637793a]{margin-bottom:10px}.brand_indentlist .brand_header button[data-v-0637793a]{margin-right:10px}.brand_indentlist[data-v-0637793a] .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-0637793a] .ivu-table-body .ivu-btn-primary{color:#2d8cf0!important;background-color:transparent;border-color:transparent}.ivu-checkbox-group{display:-webkit-box;display:-ms-flexbox;display:flex;width:226px;-ms-flex-wrap:wrap;flex-wrap:wrap}.ivu-table-filter-list-item .ivu-checkbox-wrapper+.ivu-checkbox-wrapper{margin-right:10px}
\ No newline at end of file

zhiquanquan/app/front/entry/public/css/chunk-798e4acd.de406bdd.css

+.brand_content[data-v-46d67303]{width:100%}.brand_content .brand_header[data-v-46d67303]{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-46d67303]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-46d67303]: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-46d67303]{padding:16px;width:100%;background:#fff}.brand_content .brand_content_upload p[data-v-46d67303]{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-46d67303]{color:#1890ff}
\ No newline at end of file

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-07f00314.0d945c10.css rel=prefetch><link href=/css/chunk-0934e898.2e92d182.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-21501362.8b792df9.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-3e62f437.431eb760.css rel=prefetch><link href=/css/chunk-5924d288.a19eb0f9.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-79118d60.bc27e55d.css rel=prefetch><link href=/js/chunk-07f00314.c19c4456.js rel=prefetch><link href=/js/chunk-0934e898.2d0e5d21.js rel=prefetch><link href=/js/chunk-14b9857b.f18b7406.js rel=prefetch><link href=/js/chunk-21501362.76019f53.js rel=prefetch><link href=/js/chunk-2c359864.94ddcff1.js rel=prefetch><link href=/js/chunk-3385141a.01186988.js rel=prefetch><link href=/js/chunk-3e62f437.d5bef51f.js rel=prefetch><link href=/js/chunk-4fe8dd4f.a89b5545.js rel=prefetch><link href=/js/chunk-5924d288.444d2a75.js rel=prefetch><link href=/js/chunk-786333e2.eb817cf0.js rel=prefetch><link href=/js/chunk-79118d60.24fcb99a.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.527dde59.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.527dde59.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-07f00314.0d945c10.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-21501362.8b792df9.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-5924d288.a19eb0f9.css rel=prefetch><link href=/css/chunk-6ab78853.938207ad.css rel=prefetch><link href=/css/chunk-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-79118d60.bc27e55d.css rel=prefetch><link href=/css/chunk-798e4acd.de406bdd.css rel=prefetch><link href=/js/chunk-07f00314.c19c4456.js rel=prefetch><link href=/js/chunk-14b9857b.f18b7406.js rel=prefetch><link href=/js/chunk-21501362.76019f53.js rel=prefetch><link href=/js/chunk-2c359864.94ddcff1.js rel=prefetch><link href=/js/chunk-3385141a.01186988.js rel=prefetch><link href=/js/chunk-4fe8dd4f.a89b5545.js rel=prefetch><link href=/js/chunk-5924d288.444d2a75.js rel=prefetch><link href=/js/chunk-6ab78853.8b7595ca.js rel=prefetch><link href=/js/chunk-786333e2.eb817cf0.js rel=prefetch><link href=/js/chunk-79118d60.24fcb99a.js rel=prefetch><link href=/js/chunk-798e4acd.f94b142e.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.e3ac6c4b.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.e3ac6c4b.js></script></body></html>
\ No newline at end of file

zhiquanquan/app/front/entry/public/js/chunk-0934e898.2d0e5d21.js

-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0934e898"],{"0139":function(e,t,a){e.exports=a.p+"img/placeholder.756a7125.svg"},"0a79":function(e,t,a){"use strict";var n=a("f4e9"),i=a.n(n);i.a},"18bc":function(e,t,a){"use strict";var n=a("6038"),i=a.n(n);i.a},"391e":function(e,t,a){"use strict";var n=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)},i=[],o=a("6db5"),r=o["a"],c=a("2877"),s=Object(c["a"])(r,n,i,!1,null,null,null);t["a"]=s.exports},6038:function(e,t,a){},"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"),n=a.get()[0],i=window.innerHeight-n.offsetTop-t.advalue;t.frameHeight=i,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},9859: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("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var n=t.adjustHeight;return[a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"uploadinfo",metaName:"uploaddetail_info",packageName:"trademark",tblheight:n-120,isMulti:""},on:{onexec:e.onexec}})]}}])})],1)},i=[],o=(a("7f7f"),a("06d3")),r=a("391e"),c=a("8770"),s=a("c1df"),u=a.n(s),f=(a("7e1e"),a("0139")),l=a.n(f),d={components:{BizTable:o["a"],DateTime:c["a"],PageSpace:r["a"]},data:function(){return{placeholder:l.a}},mounted:function(){this.$route.params.upload_id&&this.$refs.bt.fetchData({upload_id:this.$route.params.upload_id})},methods:{onexec:function(e,t){},formatCol:function(e,t,a){var n=e[t];if("created_at"===t)n=u()(n).format("YYYY-MM-DD");else{if("pic_url"===t)return'<img style="width: 50px;height: 50px" src="'.concat(e[t]||l.a,'"/>');"deadline"===t?n=u()(e["tm_start_day"]||0).format("YYYY-MM-DD")+"至"+u()(e["tm_end_day"]||0).format("YYYY-MM-DD"):"publishinfo"===t?n=(e["contacts"]||"")+"\n"+(e["mobile"]||""):"name"===t&&(n=e["name"]||e["excelName"])}return n}}},m=d,h=(a("18bc"),a("0a79"),a("2877")),p=Object(h["a"])(m,n,i,!1,null,"564d3815",null);t["default"]=p.exports},f4e9:function(e,t,a){}}]);
\ No newline at end of file

zhiquanquan/app/front/entry/public/js/chunk-3e62f437.d5bef51f.js

-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-3e62f437"],{"391e":function(e,t,a){"use strict";var n=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)},o=[],r=a("6db5"),s=r["a"],i=a("2877"),c=Object(i["a"])(s,n,o,!1,null,null,null);t["a"]=c.exports},"5a53":function(e,t,a){"use strict";var n=a("c610"),o=a.n(n);o.a},"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"),n=a.get()[0],o=window.innerHeight-n.offsetTop-t.advalue;t.frameHeight=o,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},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_content_upload"},[e._m(0),a("div",[a("Upload",{ref:"upload",attrs:{data:e.d,action:e.action,accept:".xls, .xlsx","on-success":e.handleSuccess,"before-upload":e.handleBeforeUpload}},[a("Button",{attrs:{icon:"ios-cloud-upload-outline"}},[e._v("上传文件")])],1),a("Button",{attrs:{type:"primary"},on:{click:e.check}},[e._v("发布")])],1)]),a("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var n=t.adjustHeight;return[a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"upload",metaName:"upload_info",packageName:"trademark",tblheight:n-120},on:{onexec:e.onexec}})]}}])}),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)},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.xlsx",download:"商标上传模版.xlsx"}},[e._v("商标上传模板")]),e._v(" ，并严格按模板提供内容填入商标信息。 ")])}],r=(a("7f7f"),a("a481"),a("c1df")),s=a.n(r),i=a("0086"),c=a("60b7"),l=a("391e"),u=a("06d3"),d=a("7e1e"),f=(a("c276"),{components:{BizTable:u["a"],Forms:i["a"],PageSpace:l["a"]},data:function(){return{fileurl:"",modal1:!1,action:"",d:{},formItem:{name:""},ruleValidate:{name:[{required:!1,message:"",trigger:"blur"}]}}},methods:{goBack:function(){this.$router.go(-1)},handleSuccess:function(e,t,a){var n=this.loadXML(e),o=n.documentElement.getElementsByTagName("Location")[0].textContent;this.fileurl=o},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"],n=0;n<a.length;n++)try{t=new ActiveXObject(a[n]),t.async=!1,t.loadXML(e);break}catch(r){}else{if(!(window.DOMParser&&document.implementation&&document.implementation.createDocument))return null;try{var o=new DOMParser;t=o.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/process",{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){"info"===e&&this.$router.push({name:"upload_info",params:{upload_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(){var e=this,t="/web/common/uploadCtl/getOssConfig";Object(c["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:{}}),m=f,h=(a("5a53"),a("2877")),p=Object(h["a"])(m,n,o,!1,null,"5c70d564",null);t["default"]=p.exports},c610:function(e,t,a){}}]);
\ No newline at end of file

zhiquanquan/app/front/entry/public/js/chunk-6ab78853.8b7595ca.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6ab78853"],{"0139":function(e,t,a){e.exports=a.p+"img/placeholder.756a7125.svg"},"0a79":function(e,t,a){"use strict";var n=a("f4e9"),i=a.n(n);i.a},"391e":function(e,t,a){"use strict";var n=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)},i=[],o=a("6db5"),r=o["a"],c=a("2877"),s=Object(c["a"])(r,n,i,!1,null,null,null);t["a"]=s.exports},"5b62":function(e,t,a){},"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"),n=a.get()[0],i=window.innerHeight-n.offsetTop-t.advalue;t.frameHeight=i,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},8986:function(e,t,a){"use strict";var n=a("5b62"),i=a.n(n);i.a},9859: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("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var n=t.adjustHeight;return[a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"uploadinfo",metaName:"uploaddetail_info",packageName:"trademark",tblheight:n-120,isLazy:""},on:{onexec:e.onexec}})]}}])})],1)},i=[],o=(a("7f7f"),a("06d3")),r=a("391e"),c=a("8770"),s=a("c1df"),u=a.n(s),f=(a("7e1e"),a("0139")),l=a.n(f),d={components:{BizTable:o["a"],DateTime:c["a"],PageSpace:r["a"]},data:function(){return{placeholder:l.a}},mounted:function(){this.$route.params.upload_id&&this.$refs.bt.fetchData({upload_id:this.$route.params.upload_id})},methods:{onexec:function(e,t){},formatCol:function(e,t,a){var n=e[t];if("created_at"===t)n=u()(n).format("YYYY-MM-DD");else{if("pic_url"===t)return'<img style="width: 50px;height: 50px" src="'.concat(e[t]||l.a,'"/>');"deadline"===t?n=u()(e["tm_start_day"]||0).format("YYYY-MM-DD")+"至"+u()(e["tm_end_day"]||0).format("YYYY-MM-DD"):"publishinfo"===t?n=(e["contacts"]||"")+"\n"+(e["mobile"]||""):"name"===t&&(n=e["name"]||e["excelName"])}return n}}},m=d,h=(a("8986"),a("0a79"),a("2877")),p=Object(h["a"])(m,n,i,!1,null,"0637793a",null);t["default"]=p.exports},f4e9:function(e,t,a){}}]);
\ No newline at end of file

zhiquanquan/app/front/entry/public/js/chunk-798e4acd.f94b142e.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-798e4acd"],{"391e":function(e,t,a){"use strict";var n=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)},o=[],r=a("6db5"),s=r["a"],i=a("2877"),c=Object(i["a"])(s,n,o,!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"),n=a.get()[0],o=window.innerHeight-n.offsetTop-t.advalue;t.frameHeight=o,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},8438:function(e,t,a){"use strict";var n=a("a183"),o=a.n(n);o.a},a183: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_content_upload"},[e._m(0),a("div",[a("Upload",{ref:"upload",attrs:{data:e.d,action:e.action,accept:".xls, .xlsx","on-success":e.handleSuccess,"before-upload":e.handleBeforeUpload}},[a("Button",{attrs:{icon:"ios-cloud-upload-outline"}},[e._v("上传文件")])],1),a("Button",{attrs:{type:"primary"},on:{click:e.check}},[e._v("发布")])],1)]),a("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var n=t.adjustHeight;return[a("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"upload",metaName:"upload_info",packageName:"trademark",tblheight:n-120},on:{onexec:e.onexec}})]}}])}),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)},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.xlsx",download:"商标上传模版.xlsx"}},[e._v("商标上传模板")]),e._v(" ，并严格按模板提供内容填入商标信息。 ")])}],r=(a("7f7f"),a("a481"),a("c1df")),s=a.n(r),i=a("0086"),c=a("60b7"),l=a("391e"),u=a("06d3"),d=a("7e1e"),f=(a("c276"),{components:{BizTable:u["a"],Forms:i["a"],PageSpace:l["a"]},data:function(){return{fileurl:"",modal1:!1,action:"",d:{},formItem:{name:""},ruleValidate:{name:[{required:!1,message:"",trigger:"blur"}]}}},methods:{goBack:function(){this.$router.go(-1)},handleSuccess:function(e,t,a){var n=this.loadXML(e),o=n.documentElement.getElementsByTagName("Location")[0].textContent;this.fileurl=o},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"],n=0;n<a.length;n++)try{t=new ActiveXObject(a[n]),t.async=!1,t.loadXML(e);break}catch(r){}else{if(!(window.DOMParser&&document.implementation&&document.implementation.createDocument))return null;try{var o=new DOMParser;t=o.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,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){"info"===e&&this.$router.push({name:"upload_info",params:{upload_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(){var e=this,t="/web/common/uploadCtl/getOssConfig";Object(c["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:{}}),m=f,h=(a("8438"),a("2877")),p=Object(h["a"])(m,n,o,!1,null,"46d67303",null);t["default"]=p.exports}}]);
\ No newline at end of file