Skip to content

Z
zhichan
Commit 43ca0b00 by 王悦
Options

fix

parent 74c8e20a
Showing with 27 additions and 9 deletions
zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js
......@@ -121,7 +121,7 @@ class TrademarkCtl extends CtlBase {
return system.getResultFail(-2, e)
}
}
//接受队列消息，解析excel
async process(p, q, req) {
let fileurl = p.actionBody.file_url;
let uploadid = p.actionBody.upload_id;
......@@ -156,7 +156,16 @@ class TrademarkCtl extends CtlBase {
}
return system.getResult(1, "ok")
}
/**
* @api {post} /web/trademark/trademarkCtl/getidlist 上传excel
* @apiGroup 标源管理
* @apiParamExample {json} 请求参数
* {"file_url": "","name":""}
* @apiSuccessExample {json} 成功示例:
* {"success": ""}
* @apiErrorExample {json} 失败示例:
* {"error": ""}
*/
async excelpublish(p, q, req) {
try {
let upload = await this.uploadSve.create({
......@@ -251,7 +260,16 @@ class TrademarkCtl extends CtlBase {
});
return system.getResult(1,"ok")
}
/**
* @api {post} /web/trademark/trademarkCtl/getidlist 获取上传excel中所有商标
* @apiGroup 标源管理
* @apiParamExample {json} 请求参数
* {"upload_id": "1"}
* @apiSuccessExample {json} 成功示例:
* {"success": ""}
* @apiErrorExample {json} 失败示例:
* {"error": ""}
*/
async getidlist(p, q, req) {
let list = await this.service.findAll({upload_id: p.upload_id});
return system.getResult(list)
......
zhiquanquan/app/front/entry/public/css/chunk-18078264.457252cc.css 0 → 100644
.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}
\ No newline at end of file
zhiquanquan/app/front/entry/public/css/chunk-be671496.4f9b6cb1.css deleted 100644 → 0
.brand_from[data-v-0e423b27]{position:absolute;width:100%;bottom:0}.brand_from .brand_fix[data-v-0e423b27]{position:relative!important}.brand_from[data-v-0e423b27] .ivu-card{padding-bottom:0!important;border-top:1px solid #dcdee2!important}.brand_from[data-v-0e423b27] .ivu-btn{position:absolute;bottom:38px;right:20px}.brand_from[data-v-0e423b27] .ivu-card-head{display:none}.brand_from[data-v-0e423b27] .ivu-card-body{width:30%}.brand_from[data-v-0e423b27] .ivu-row-flex{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.brand_content[data-v-a71cc9a4]{width:100%;height:100%;position:relative}.brand_content .brand_header[data-v-a71cc9a4]{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-a71cc9a4]:first-child{cursor:pointer}.brand_content .brand_header>span[data-v-a71cc9a4]:last-child{height:22px;font-size:16px;font-family:PingFangSC-Semibold,PingFang SC;font-weight:600;color:#000;line-height:22px;margin-left:10px}
\ 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-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-786333e2.1e75f0e2.css rel=prefetch><link href=/css/chunk-79c019e0.c1174227.css rel=prefetch><link href=/css/chunk-be671496.4f9b6cb1.css rel=prefetch><link href=/css/chunk-d49c726a.0912b099.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-4fe8dd4f.c7f5a9a6.js rel=prefetch><link href=/js/chunk-51d8db1f.a77526ea.js rel=prefetch><link href=/js/chunk-786333e2.d81b11a4.js rel=prefetch><link href=/js/chunk-79c019e0.8a63610c.js rel=prefetch><link href=/js/chunk-be671496.88193134.js rel=prefetch><link href=/js/chunk-d49c726a.7e8004e5.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.968dfffc.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.968dfffc.js></script></body></html>
\ No newline at end of file
<!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-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-d49c726a.0912b099.css rel=prefetch><link href=/js/chunk-14b9857b.045d68b1.js rel=prefetch><link href=/js/chunk-18078264.312de7d3.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-786333e2.d81b11a4.js rel=prefetch><link href=/js/chunk-79c019e0.8a63610c.js rel=prefetch><link href=/js/chunk-d49c726a.7e8004e5.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.1a83e0db.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.1a83e0db.js></script></body></html>
\ No newline at end of file
zhiquanquan/app/front/entry/public/js/chunk-18078264.312de7d3.js 0 → 100644
(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
zhiquanquan/app/front/entry/public/js/chunk-be671496.88193134.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-be671496"],{"0139":function(e,t,a){e.exports=a.p+"img/placeholder.756a7125.svg"},2427: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},"432d":function(e,t,a){"use strict";var s=a("2427"),r=a.n(s);r.a},"5b5c":function(e,t,a){"use strict";var s=a("ff38"),r=a.n(s);r.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"),s=a.get()[0],r=window.innerHeight-s.offsetTop-t.advalue;t.frameHeight=r,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,a("1157"))},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=[],d=(a("7f7f"),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("5b5c"),a("2877")),b=Object(m["a"])(h,f,l,!1,null,"0e423b27",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("432d"),Object(m["a"])($,s,r,!1,null,"a71cc9a4",null));t["default"]=k.exports},ff38:function(e,t,a){}}]);
\ No newline at end of file
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