Commit 92f4123a by 蒋勇

d

parent 6d5d7f68
...@@ -213,9 +213,13 @@ class Dao { ...@@ -213,9 +213,13 @@ class Dao {
async update (obj, tm) { async update (obj, tm) {
var obj2 = this.preUpdate(obj); var obj2 = this.preUpdate(obj);
if (tm != null && tm != 'undefined') { if (tm != null && tm != 'undefined') {
return this.model.update(obj2, { where: { id: obj2.id }, transaction: tm }); await this.model.update(obj2, { where: { id: obj2.id }, transaction: tm });
let n = await this.model.findOne({ where: { id: obj2.id }, transaction: tm });
return n
} else { } else {
return this.model.update(obj2, { where: { id: obj2.id } }); await this.model.update(obj2, { where: { id: obj2.id } });
let n = await this.model.findById(obj2.id)
return n
} }
} }
async bulkCreate (ids, t) { async bulkCreate (ids, t) {
......
...@@ -103,7 +103,7 @@ class ProductService extends ServiceBase { ...@@ -103,7 +103,7 @@ class ProductService extends ServiceBase {
if (productprices.length > 0) { if (productprices.length > 0) {
await self.priceDao.bulkCreate(productprices, t) await self.priceDao.bulkCreate(productprices, t)
} }
return {}; return pupdate;
}); });
} }
} }
......
<!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-175acaff.7a825095.css rel=prefetch><link href=/css/chunk-1b756945.9e7173ae.css rel=prefetch><link href=/css/chunk-21b5182a.6e6ae301.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-34953cb0.71e3d438.css rel=prefetch><link href=/css/chunk-480215f6.84fd9662.css rel=prefetch><link href=/css/chunk-5ccefbbb.9e7173ae.css rel=prefetch><link href=/css/chunk-61b0b1e5.9e7173ae.css rel=prefetch><link href=/css/chunk-8e32057a.e8e9a917.css rel=prefetch><link href=/css/chunk-e7e51fa0.9e7173ae.css rel=prefetch><link href=/css/chunk-ff3eaeb0.9e7173ae.css rel=prefetch><link href=/js/chunk-0109d85c.d8a39ef0.js rel=prefetch><link href=/js/chunk-037694a5.a74514c3.js rel=prefetch><link href=/js/chunk-0aa2a834.9028f9e8.js rel=prefetch><link href=/js/chunk-137dcf78.d8fcc61f.js rel=prefetch><link href=/js/chunk-14b9857b.35e42781.js rel=prefetch><link href=/js/chunk-15d6294e.42eb4739.js rel=prefetch><link href=/js/chunk-175acaff.ca3f7e65.js rel=prefetch><link href=/js/chunk-1792c498.4841b7fc.js rel=prefetch><link href=/js/chunk-1a0615f2.370fcaf1.js rel=prefetch><link href=/js/chunk-1b756945.d840b734.js rel=prefetch><link href=/js/chunk-21b5182a.74708748.js rel=prefetch><link href=/js/chunk-22347577.2275ebec.js rel=prefetch><link href=/js/chunk-24a41303.88feac34.js rel=prefetch><link href=/js/chunk-25d9ab36.087a7b9f.js rel=prefetch><link href=/js/chunk-291faf05.3991ad7a.js rel=prefetch><link href=/js/chunk-2aeda6fa.2bd11851.js rel=prefetch><link href=/js/chunk-2b3066fa.71705e35.js rel=prefetch><link href=/js/chunk-2c359864.90a950b1.js rel=prefetch><link href=/js/chunk-2d0d61ef.ca1865db.js rel=prefetch><link href=/js/chunk-2d0e68e0.1a313c84.js rel=prefetch><link href=/js/chunk-2d0efc5d.662e1339.js rel=prefetch><link href=/js/chunk-2d20828f.7627562b.js rel=prefetch><link href=/js/chunk-3385141a.a6e1a986.js rel=prefetch><link href=/js/chunk-34953cb0.2fc03dd6.js rel=prefetch><link href=/js/chunk-3a0bcea0.192dd1cf.js rel=prefetch><link href=/js/chunk-477a8e91.c522ef77.js rel=prefetch><link href=/js/chunk-480215f6.993a41cf.js rel=prefetch><link href=/js/chunk-4b58f216.e79a0ff7.js rel=prefetch><link href=/js/chunk-4fbb2454.6d97b621.js rel=prefetch><link href=/js/chunk-5ccefbbb.0f021a99.js rel=prefetch><link href=/js/chunk-5e7b929d.9e85be22.js rel=prefetch><link href=/js/chunk-61b0b1e5.322b588f.js rel=prefetch><link href=/js/chunk-65e97401.3b9c7780.js rel=prefetch><link href=/js/chunk-8e32057a.ffe15693.js rel=prefetch><link href=/js/chunk-9947983a.dea0cc2e.js rel=prefetch><link href=/js/chunk-e7e51fa0.c45982a9.js rel=prefetch><link href=/js/chunk-ff3eaeb0.d3d1af72.js rel=prefetch><link href=/css/app.4f840f8a.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.46f7f58c.js rel=preload as=script><link href=/js/chunk-vendors.9ae5f635.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.4f840f8a.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.9ae5f635.js></script><script src=/js/app.46f7f58c.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-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-175acaff.7a825095.css rel=prefetch><link href=/css/chunk-1b756945.9e7173ae.css rel=prefetch><link href=/css/chunk-21b5182a.6e6ae301.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-34953cb0.71e3d438.css rel=prefetch><link href=/css/chunk-480215f6.84fd9662.css rel=prefetch><link href=/css/chunk-5ccefbbb.9e7173ae.css rel=prefetch><link href=/css/chunk-61b0b1e5.9e7173ae.css rel=prefetch><link href=/css/chunk-8e32057a.e8e9a917.css rel=prefetch><link href=/css/chunk-e7e51fa0.9e7173ae.css rel=prefetch><link href=/css/chunk-ff3eaeb0.9e7173ae.css rel=prefetch><link href=/js/chunk-0109d85c.d8a39ef0.js rel=prefetch><link href=/js/chunk-037694a5.a74514c3.js rel=prefetch><link href=/js/chunk-0aa2a834.9e04d151.js rel=prefetch><link href=/js/chunk-137dcf78.d8fcc61f.js rel=prefetch><link href=/js/chunk-14b9857b.35e42781.js rel=prefetch><link href=/js/chunk-15d6294e.42eb4739.js rel=prefetch><link href=/js/chunk-175acaff.ca3f7e65.js rel=prefetch><link href=/js/chunk-1792c498.4841b7fc.js rel=prefetch><link href=/js/chunk-1a0615f2.370fcaf1.js rel=prefetch><link href=/js/chunk-1b756945.d840b734.js rel=prefetch><link href=/js/chunk-21b5182a.74708748.js rel=prefetch><link href=/js/chunk-22347577.2275ebec.js rel=prefetch><link href=/js/chunk-24a41303.88feac34.js rel=prefetch><link href=/js/chunk-25d9ab36.087a7b9f.js rel=prefetch><link href=/js/chunk-291faf05.3991ad7a.js rel=prefetch><link href=/js/chunk-2aeda6fa.2bd11851.js rel=prefetch><link href=/js/chunk-2b3066fa.62e62ad4.js rel=prefetch><link href=/js/chunk-2c359864.90a950b1.js rel=prefetch><link href=/js/chunk-2d0d61ef.ca1865db.js rel=prefetch><link href=/js/chunk-2d0e68e0.1a313c84.js rel=prefetch><link href=/js/chunk-2d0efc5d.662e1339.js rel=prefetch><link href=/js/chunk-2d20828f.7627562b.js rel=prefetch><link href=/js/chunk-3385141a.a6e1a986.js rel=prefetch><link href=/js/chunk-34953cb0.2fc03dd6.js rel=prefetch><link href=/js/chunk-3a0bcea0.192dd1cf.js rel=prefetch><link href=/js/chunk-477a8e91.c522ef77.js rel=prefetch><link href=/js/chunk-480215f6.177fc8ec.js rel=prefetch><link href=/js/chunk-4b58f216.e79a0ff7.js rel=prefetch><link href=/js/chunk-4fbb2454.6d97b621.js rel=prefetch><link href=/js/chunk-5ccefbbb.0f021a99.js rel=prefetch><link href=/js/chunk-5e7b929d.9e85be22.js rel=prefetch><link href=/js/chunk-61b0b1e5.322b588f.js rel=prefetch><link href=/js/chunk-65e97401.3b9c7780.js rel=prefetch><link href=/js/chunk-8e32057a.ffe15693.js rel=prefetch><link href=/js/chunk-9947983a.dea0cc2e.js rel=prefetch><link href=/js/chunk-e7e51fa0.c45982a9.js rel=prefetch><link href=/js/chunk-ff3eaeb0.d3d1af72.js rel=prefetch><link href=/css/app.4f840f8a.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.b88d12f7.js rel=preload as=script><link href=/js/chunk-vendors.9ae5f635.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.4f840f8a.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.9ae5f635.js></script><script src=/js/app.b88d12f7.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0aa2a834"],{"391e":function(e,t,n){"use strict";var r=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticStyle:{width:"100%"},attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},i=[],a=n("9ee1"),o=a["a"],c=n("9ca4"),u=Object(c["a"])(o,r,i,!1,null,null,null);t["a"]=u.exports},"560c":function(e,t,n){"use strict";n.r(t);var r=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var r=t.adjustHeight;return[n("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,metaName:"product_info",modelName:"product",packageName:"product",tblheight:r-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd,noExpandAuth:""},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}})]}}])})},i=[],a=(n("6d57"),n("cc57"),n("163d"),n("06d3")),o=n("391e"),c=(n("60b7"),{name:"appinfo_page",data:function(){return{}},components:{PageSpace:o["a"],BizTable:a["a"]},methods:{oninitbtn:function(e,t){},beforeadd:function(e,t){return t({value:!0,message:null})},beforedit:function(e,t,n){return t({value:!0,message:null})},beforesave:function(e,t,n){return n(t)},onexec:function(e,t){},validmethod:function(e,t,n){return n()},formatCol:function(e,t,n){if("isEnabled"==t){var r=e["isEnabled"]?"已上架":"待上架";return e["isEnabled"]?'<span style="color:green">'.concat(r,"</span>"):'<span style="color:orange">'.concat(r,"</span>")}if("deliverfile"==t){var i=e["deliverfile"];return"<img src='".concat(i,"' style='height:40px'>")}if("extrafile"==t){var a=e["extrafile"];return"<img src='".concat(a,"' style='height:40px'>")}if("lowpriceref"==t)return e["lowpriceref"]=Number(e["lowpriceref"]),"".concat(e["lowpriceref"]);if("hignpriceref"==t)return e["hignpriceref"]=Number(e["hignpriceref"]),"".concat(e["hignpriceref"]);if("pname"==t)return e.pname=e.product.name,e.product.name;if("strategyitems"==t)return e.strategyitems=e.pricestrategy.optionunion,e.pricestrategy.optionunion;if("code"==t){var o=[];return e.skus.forEach((function(e){o.push(e.pricestrategy_id)})),e.sts=o,e["code"]}}}}),u=c,s=n("9ca4"),f=Object(s["a"])(u,r,i,!1,null,null,null);t["default"]=f.exports},"9ee1":function(e,t,n){"use strict";(function(e){n("163d");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 n=e("#framediv"),r=n.get()[0],i=window.innerHeight-r.offsetTop-t.advalue;t.frameHeight=i,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,n("a336"))}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0aa2a834"],{"391e":function(e,t,n){"use strict";var r=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticStyle:{width:"100%"},attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},a=[],i=n("9ee1"),o=i["a"],c=n("9ca4"),s=Object(c["a"])(o,r,a,!1,null,null,null);t["a"]=s.exports},"560c":function(e,t,n){"use strict";n.r(t);var r=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(t){var r=t.adjustHeight;return[n("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,metaName:"product_info",modelName:"product",packageName:"product",tblheight:r-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd,noExpandAuth:""},on:{onexec:e.onexec,oninitbtn:e.oninitbtn,postformsave:e.postformsave}})]}}])})},a=[],i=(n("6d57"),n("cc57"),n("163d"),n("06d3")),o=n("391e"),c=(n("60b7"),{name:"appinfo_page",data:function(){return{}},components:{PageSpace:o["a"],BizTable:i["a"]},methods:{oninitbtn:function(e,t){},beforeadd:function(e,t){return t({value:!0,message:null})},beforedit:function(e,t,n){return t({value:!0,message:null})},beforesave:function(e,t,n){return n(t)},onexec:function(e,t){},validmethod:function(e,t,n){return n()},formatCol:function(e,t,n){if("isEnabled"==t){var r=e["isEnabled"]?"已上架":"待上架";return e["isEnabled"]?'<span style="color:green">'.concat(r,"</span>"):'<span style="color:orange">'.concat(r,"</span>")}if("deliverfile"==t){var a=e["deliverfile"];return"<img src='".concat(a,"' style='height:40px'>")}if("extrafile"==t){var i=e["extrafile"];return"<img src='".concat(i,"' style='height:40px'>")}if("lowpriceref"==t)return e["lowpriceref"]=Number(e["lowpriceref"]),"".concat(e["lowpriceref"]);if("hignpriceref"==t)return e["hignpriceref"]=Number(e["hignpriceref"]),"".concat(e["hignpriceref"]);if("pname"==t)return e.pname=e.product.name,e.product.name;if("strategyitems"==t)return e.strategyitems=e.pricestrategy.optionunion,e.pricestrategy.optionunion;if("code"==t){var o=[];return e.skus.forEach((function(e){o.push(e.pricestrategy_id)})),e.sts=o,e["code"]}},postformsave:function(e){var t=[];e.skus.forEach((function(e){t.push(e.pricestrategy_id)})),e.sts=t}}}),s=c,u=n("9ca4"),f=Object(u["a"])(s,r,a,!1,null,null,null);t["default"]=f.exports},"9ee1":function(e,t,n){"use strict";(function(e){n("163d");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 n=e("#framediv"),r=n.get()[0],a=window.innerHeight-r.offsetTop-t.advalue;t.frameHeight=a,t.$emit("sizechange",t.frameHeight)}))}}}}).call(this,n("a336"))}}]);
\ 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