Skip to content

Z
zhichan
Commit 5fb6d24c by 庄冰
Options

Merge branch 'fqboss' of gitlab.gongsibao.com:jiangyong/zhichan into fqboss

parents 2d13d7aa 61f42fdf
Showing with 100 additions and 39 deletions
fqboss/app/base/api/impl/customerInfoPusherApi.js
......@@ -24,6 +24,9 @@ class CustomerInfoPusherApi {
let resultTmCustomer = await this.trademarkS.queryTmCustomerInfo();
let tmCustomers = resultTmCustomer;
console.log("联系人信息：", JSON.stringify(tmCustomers));
if (tmCustomers.length <= 0) {
return { code: 200, message: "所有数据已推送完成" };
}
for (let i = 0; i < tmCustomers.length; i++) {
let obj = {};
......@@ -51,7 +54,7 @@ class CustomerInfoPusherApi {
continue;
}
obj.BizId = bizId;
obj.BizId = bizId.businessId;
obj.ContactAddress = customerInfo.contactAddress;
obj.ContactName = customerInfo.customerContact;
obj.ContactNumber = customerInfo.mobile;
......@@ -59,7 +62,7 @@ class CustomerInfoPusherApi {
obj.ContactZipCode = customerInfo.zipCode;
//调用阿里API推送到阿里
let pushRes = await this.aliyunClient.post("CheckTmName", obj);
let pushRes = await this.aliyunClient.post("UpdateApplicantContacter", obj);
console.log("推送完成:" + i, pushRes);
//将成功结果写入到日志
await this.oplogSve.create({
......
fqboss/app/base/controller/impl/calculatepriceCtl.js
......@@ -53,6 +53,42 @@ class calculatepriceCtl extends CtlBase {
return System.getResult2(null, null);
}
}
//商标图样上传接口
async tmimage(o, req) {
let obj = {
"img_url": o.fileUrl
};
let url = settings.apiconfig.tmImage;
let rc = System.getObject("util.execClient");
let rtn = null;
try {
rtn = await rc.execPost(obj, url);
let j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return System.getResult2(null, null);
}
}
//商标委托书模板下载
async tmtrust(o, req) {
let obj = {
"assignor": o.assignor,
"tm_name": o.tm_name,
"address": o.address
};
let url = settings.apiconfig.tmTrust;
let rc = System.getObject("util.execClient");
let rtn = null;
try {
rtn = await rc.execPost(obj, url);
let j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return System.getResult2(null, null);
}
}
async toblack(o, req) {
var app = req.session.app;
var obj = {
......
fqboss/app/base/service/impl/trademarkSve.js
......@@ -1661,13 +1661,21 @@ class TrademarkService extends ServiceBase {
}
async updateIsPushed(id) {
// try {
// let setObj = { isPushed: '1' };
// let whereObj = { where: { id: id } };
// let tmResult = await this.dao.updateByWhere(setObj, whereObj);
// return tmResult;
// } catch (e) {
// console.log('updateIsPushed更新失败', e);
// }
try {
let setObj = { isPushed: '1' };
let whereObj = { where: { id: id } };
let tmResult = await this.dao.updateByWhere(setObj, whereObj);
return tmResult;
let sql = "UPDATE h_trade_mark SET isPushed='1' WHERE id='" + id + "';";
let updateResult = await this.dao.customUpdate(sql);
return updateResult;
} catch (e) {
console.log('updateIsPushed更新失败', e);
return e;
}
}
......
fqboss/app/config/settings.js
......@@ -191,6 +191,9 @@ var settings = {
LbsAddressUrl: "http://43.247.184.92:8880/lbs/api/addresssearch",//地址查询
LbsLalUrl: "http://43.247.184.92:8889/lbs/api/lalsearch",//坐标查询
LbsCityUrl: "http://43.247.184.92:8886/lbs/api/cityseicsoftwareCopyrightSearchUrlarch",//城市查询
tmImage: "http://43.247.184.92:15503/gsb/tmimage",//商标图样上传接口
tmTrust: "http://43.247.184.92:15503/gsb/tmtrust",//商标委托书模板下载
pdf2wordUrl: function () {
if (settings.env == "dev") {
return "http://59.110.125.77:3000/api/pdf2word/pdf2word";
......
fqboss/app/front/vues/base/upload.vue
......@@ -23,7 +23,7 @@ module.exports=
prop: 'value',
event: 'uploadsuccess'
},
props:["d","action","listtype","filetype","ifshowlist","value","flag","dataSouce"],
props:["d","action","listtype","filetype","ifshowlist","value","flag","dataSouce","isLt200K"],
data:function(){
return {
data:this.d,
......@@ -65,9 +65,17 @@ module.exports=
this.$message.warning('文件格式错误，请上传'+this.accept+'格式文件');
return false;
}
const isLt2M = file.size / 1024 / 1024 < 2;
let isLtMeg = "";
let isLt2M = file.size / 1024 < 200;
if(this.isLt200K) {
isLt2M = file.size / 1024 < 200;
isLtMeg = "200KB";
} else {
isLt2M = file.size / 1024 / 1024 < 2;
isLtMeg = "2MB";
}
if (!isLt2M) {
this.$message.warning('上传失败，上传内容大小不能超过 2MB!');
this.$message.warning('上传失败，上传内容大小不能超过' + isLtMeg + '!');
return false;
}
this.result="";
......
fqboss/app/front/vues/pages/automatictmsubmitedit/automatictmsubmitedit.html
......@@ -38,8 +38,8 @@
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else
src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg" />
<br />
<gsb-upload flag="picUrl" :d="d" ref="picUrl" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<gsb-upload flag="picUrl" :d="d" ref="picUrl" @setKey="setKey" :action="action" filetype="image/jpg, image/png, image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error" isLt200K="true">
<el-button type="primary">黑白商标上传</el-button>
</gsb-upload>
......@@ -52,7 +52,7 @@
src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg" />
<br />
<gsb-upload :d="d" :action="action" flag="colorizedPicUrl" ref="colorizedPicUrl" @setKey="setKey"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
filetype="image/jpg, image/png, image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error" isLt200K="true">
<el-button type="primary">彩色商标上传</el-button>
</gsb-upload>
</el-form-item>
......@@ -64,7 +64,7 @@
src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg" />
<br />
<gsb-upload :d="d" ref="colorizedPicUrl" :action="action" flag="colorizedPicUrl" @setKey="setKey"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
filetype="image/jpg, image/png, image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error" isLt200K="true">
<el-button type="primary">彩色商标上传</el-button>
</gsb-upload>
</el-form-item>
......
fqboss/app/front/vues/pages/automatictmsubmitedit/automatictmsubmitedit.js
......@@ -379,10 +379,10 @@
console.log(params);
var url = window.location.href.split("/autosubmitinside")[0] + "/mobile2?" + "params=" + params + "#/createwts2";
console.log(url);
this.$root.getReq("/web/calculatepriceCtl/createWTS2", { "url": url }).then(function (d) {
this.$root.getReq("/web/calculatepriceCtl/tmtrust", { assignor: this.apply.applyName, tm_name: this.form.tmName, address: this.apply.applyAddr}).then(function (d) {
if (d.data.url != "" && d.data.url != null) {
window.open(d.data.url);
if (d.data.tm_trust_url != "" && d.data.tm_trust_url != null) {
window.open(d.data.tm_trust_url);
} else {
that.$message.warning(`操作失败`);
}
......@@ -530,13 +530,16 @@
var that = this;
if (obj.flag == "picUrl") {
that.$root.showMask();
this.$root.getReq("/web/calculatepriceCtl/toblack", { "key": obj.key }).then(function (d) {
console.log("====" + JSON.stringify(obj));
this.$root.getReq("/web/calculatepriceCtl/tmimage", { "fileUrl": obj.result }).then(function (d) {
that.$root.hideMask();
if (d.status == 0) {
that.form.picUrl = d.data.url;
console.log(JSON.stringify(d));
if (d.status == 1) {
that.form.picUrl = d.data.gray_url;
} else {
that.form.picUrl = "";
that.$message.warning(`上传失败请重新上传`);
that.$message.warning(`上传失败请重新上传`+ d.msg);
return false;
}
}).catch(function () {
......@@ -548,13 +551,13 @@
}
if (obj.flag == "colorizedPicUrl") {
that.$root.showMask();
this.$root.getReq("/web/calculatepriceCtl/adjustTMSize", { "key": obj.key }).then(function (d) {
this.$root.getReq("/web/calculatepriceCtl/tmimage", { "fileUrl": obj.result }).then(function (d) {
that.$root.hideMask();
if (d.status == 0) {
that.form.colorizedPicUrl = d.data.url;
if (d.status == 1) {
that.form.colorizedPicUrl = d.data.original_url;
} else {
that.form.colorizedPicUrl = "";
that.$message.warning(`上传失败请重新上传`);
that.$message.warning(`上传失败请重新上传`+ d.msg);
return false;
}
}).catch(function () {
......
fqboss/app/front/vues/pages/automatictmsubmitinside/automatictmsubmitinside.html
......@@ -37,8 +37,8 @@
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else
src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg" />
<br />
<gsb-upload flag="picUrl" :d="d" ref="picUrl" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<gsb-upload flag="picUrl" :d="d" ref="picUrl" @setKey="setKey" :action="action" filetype="image/jpg, image/png, image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error" isLt200K="true">
<el-button type="primary">黑白商标上传</el-button>
</gsb-upload>
......@@ -51,8 +51,8 @@
src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg" />
<br />
<gsb-upload :d="d" ref="colorizedPicUrl" flag="colorizedPicUrl" @setKey="setKey" :action="action"
flag="colorizedPicUrl" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
flag="colorizedPicUrl" filetype="image/jpg, image/png, image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error" isLt200K="true">
<el-button type="primary">彩色商标上传</el-button>
</gsb-upload>
</el-form-item>
......
fqboss/app/front/vues/pages/automatictmsubmitinside/automatictmsubmitinside.js
......@@ -472,14 +472,14 @@
}
if (obj.flag == "picUrl") {
that.$root.showMask();
this.$root.getReq("/web/calculatepriceCtl/toblack", { "key": obj.key }).then(function (d) {
if (d.status == 0) {
that.form.picUrl = d.data.url;
this.$root.getReq("/web/calculatepriceCtl/tmimage", { "fileUrl": obj.result }).then(function (d) {
if (d.status == 1) {
that.form.picUrl = d.data.gray_url;
that.$root.hideMask();
} else {
that.form.picUrl = "";
that.$root.hideMask();
that.$message.warning(`上传失败请重新上传`);
that.$message.warning(`上传失败请重新上传`+ d.msg);
return false;
}
......@@ -492,15 +492,15 @@
}
if (obj.flag == "colorizedPicUrl") {
that.$root.showMask();
this.$root.getReq("/web/calculatepriceCtl/adjustTMSize", { "key": obj.key }).then(function (d) {
this.$root.getReq("/web/calculatepriceCtl/tmimage", { "fileUrl": obj.result }).then(function (d) {
if (d.status == 0) {
that.form.colorizedPicUrl = d.data.url;
if (d.status == 1) {
that.form.colorizedPicUrl = d.data.original_url;
that.$root.hideMask();
} else {
that.form.colorizedPicUrl = "";
that.$root.hideMask();
that.$message.warning(`上传失败请重新上传`);
that.$message.warning(`上传失败请重新上传`+ d.msg);
return false;
}
}).catch(function () {
......@@ -1050,10 +1050,10 @@
console.log(params);
var url = window.location.href.split("/autosubmitinside")[0] + "/mobile2?" + "params=" + params + "#/createwts2";
console.log(url);
this.$root.getReq("/web/calculatepriceCtl/createWTS2", { "url": url }).then(function (d) {
this.$root.getReq("/web/calculatepriceCtl/tmtrust", { assignor: this.apply.applyName, tm_name: this.form.tmName, address: this.apply.applyAddr}).then(function (d) {
if (d.data.url != "" && d.data.url != null) {
window.open(d.data.url);
if (d.data.tm_trust_url != "" && d.data.tm_trust_url != null) {
window.open(d.data.tm_trust_url);
} else {
that.$message.warning(`操作失败`);
}
......
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