Skip to content

Z
zhichan
Commit d3bd3f10 by 庄冰
Options

tmbz

parent 43c66c88
Showing with 147 additions and 2 deletions
fqboss/app/base/controller/impl/trademarkCtl.js
...@@ -586,6 +586,29 @@ class TrademarkCtl extends CtlBase { ...@@ -586,6 +586,29 @@ class TrademarkCtl extends CtlBase {
return { code: -100, msg: "当前用户不存在，请重新登录" }; return { code: -100, msg: "当前用户不存在，请重新登录" };
} }
} }
//查询阿里商标状态 用于补证
async queryAliTmStatus(obj) {
var rc = System.getObject("util.aliyunClient");
try {
if (!obj.methodType) {
return { code: -1, message: "methodType不能为空", data: null };
}
if(obj.body && typeof(obj.body)=="string"){
obj.body = JSON.parse(obj.body);
}
var submitTm = await rc.post(obj.methodType, obj.body);
return { code: 200, message: "ok", data: submitTm };
} catch (e) {
//日志记录
logCtl.error({
optitle: "查询阿里商标状态异常---error",
op: "base/api/impl/tmsub/queryAliTmStatus",
content: e.stack,
clientIp: ""
});
return { code: -200, message: "err", data: e.stack };
}
}
} }
module.exports = TrademarkCtl; module.exports = TrademarkCtl;
// var task = new TrademarkCtl(); // var task = new TrademarkCtl();
......
fqboss/app/base/db/metadata/bizs/wx76a324c5d201d1a4/alltrademark.js
...@@ -89,7 +89,7 @@ module.exports = { ...@@ -89,7 +89,7 @@ module.exports = {
"add": [ "add": [
{ "icon": "tool-upload", "title": "阿里数据同步", "type": "default", "key": "aliDataSync", "isOnGrid": true }, { "icon": "tool-upload", "title": "阿里数据同步", "type": "default", "key": "aliDataSync", "isOnGrid": true },
{ "icon": "tool-upload", "title": "阿里数据关闭", "type": "default", "key": "aliDataClose", "isOnGrid": true }, { "icon": "tool-upload", "title": "阿里数据关闭", "type": "default", "key": "aliDataClose", "isOnGrid": true },
{ "icon": "tool-upload", "title": "补证", "type": "default", "key": "tmSupplementaryEvidence", "isInRow": true },
{ "icon": "tool-upload", "title": "修改状态", "type": "default", "key": "putTMStatus", "isOnGrid": true }, { "icon": "tool-upload", "title": "修改状态", "type": "default", "key": "putTMStatus", "isOnGrid": true },
{ "icon": "tool-upload", "title": "人工审核通过", "type": "default", "key": "awte", "isOnGrid": true }, { "icon": "tool-upload", "title": "人工审核通过", "type": "default", "key": "awte", "isOnGrid": true },
{ "icon": "tool-upload", "title": "人工审核不予通过", "type": "default", "key": "repulses", "isOnGrid": true }, { "icon": "tool-upload", "title": "人工审核不予通过", "type": "default", "key": "repulses", "isOnGrid": true },
......
fqboss/app/front/vues/pages/trademark/trademark.html
...@@ -39,6 +39,27 @@ ...@@ -39,6 +39,27 @@
<el-button type="primary" @click="changeStatus(selectIds,tmStatus)">确 定</el-button> <el-button type="primary" @click="changeStatus(selectIds,tmStatus)">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div>
<div>
<el-dialog title="商标补证" :visible.sync="showSupplementaryEvidence">
<div>
<div style="clear:both"></div>
<el-form :model="supplementaryEvidenceTmInfo" label-width="80px">
<el-form-item label="补证文件">
<gsb-upload3 ref="supplementaryevidenceupload" :d="d" :action="action" limitnum=1000 @error="error" :ifshowlist="true"
@uploadsuccess="uploadsuccess" v-model="supplementaryEvidenceTmInfo.UploadOssKeyList">
</gsb-upload3>
</el-form-item>
<el-form-item label="补证说明">
<el-input type="textarea" v-model="supplementaryEvidenceTmInfo.Content"></el-input>
</el-form-item>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="showSupplementaryEvidence = false">取 消</el-button>
<el-button type="primary" @click="submitSupplementaryEvidence(supplementaryEvidenceTmInfo)">确 定</el-button>
</div>
</el-dialog>
</div> </div>
<div slot="top" style="text-align:left" :showData="showData"> <div slot="top" style="text-align:left" :showData="showData">
<div v-if="showData==1"> <div v-if="showData==1">
......
fqboss/app/front/vues/pages/trademark/trademark.js
...@@ -9,6 +9,13 @@ ...@@ -9,6 +9,13 @@
} }
}; };
return { return {
supplementaryEvidenceTmInfo:{
UploadOssKeyList:[],
BizId:"",
SupplementId:"",
Content:""
},/**补证商标信息 */
showSupplementaryEvidence:false,/**是否显示补证窗口*/
dialogFormVisible: false, dialogFormVisible: false,
tmStatus: "", tmStatus: "",
activeNames: [0], activeNames: [0],
...@@ -810,9 +817,103 @@ ...@@ -810,9 +817,103 @@
} }
return cellvalue; return cellvalue;
}, },
submitSupplementaryEvidence(obj){
console.log(obj);
if(!obj){
this.$message.warning("参数错误");
return;
}
if(!obj.Content){
this.$message.warning("补证说明不能为空");
return;
}
if(!obj.UploadOssKeyList || obj.UploadOssKeyList.length<1){
this.$message.warning("补证材料不能为空");
return;
}
var UploadOssKeyList=[];
for(var i=0;i<obj.UploadOssKeyList.length;i++){
UploadOssKeyList.push(obj.UploadOssKeyList[i].url);
}
obj.UploadOssKeyList = UploadOssKeyList;
console.log(obj);
/**提交补证*/
var that = this;
this.$root.getReq("/web/trademarkCtl/queryAliTmStatus", {methodType:"SubmitPartnerSupplement",body:obj}).then(function (d) {
if (d.code == 200) {
that.$message.success("提交补证材料成功");
that.showSupplementaryEvidence=false;
return;
}else{
that.$message.warning("提交补证材料操作失败");
return;
}
}).catch(e=>{
that.$message.warning(`操作失败`);
return false;
});
},
rowClick(row, key){ rowClick(row, key){
var that = this; var that = this;
if (key == "tmSupplementaryEvidence") {/**补证 */
if(row.tmSourceType != "32"){
that.$message.warning("非阿里云渠道，不能执行此操作");
return;
}
if(row.tmStatus && (row.tmStatus == "2"||row.tmStatus == "ADDTIONALPROOF")){
if(!row.businessId){
that.$message.warning("businessId参数错误");
return;
}
this.supplementaryEvidenceTmInfo = {
UploadOssKeyList:[],
BizId:"",
SupplementId:"",
Content:""
};
/**查询商标状态*/
this.$root.getReq("/web/trademarkCtl/queryAliTmStatus", {methodType:"QueryPartnerTradeMarkApplications",body:{"BizId":row.businessId}}).then(function (d) {
if (d.code == 200 && d.data) {
if(d.data.data && d.data.data.Data && d.data.data.Data.TmProduces && d.data.data.Data.TmProduces.length>0 && !d.data.data.Data.TmProduces[0].SupplementId ){
that.supplementaryEvidenceTmInfo = {
UploadOssKeyList:[],
BizId:row.businessId,
SupplementId:d.data.data.Data.TmProduces[0].SupplementId,
Content:""
};
that.showSupplementaryEvidence = true;
}else{
that.$message.warning("阿里云商标状态有误");
return false;
}
return;
} else {
that.$message.warning("查询阿里商标状态失败");
return false;
}
}).catch(function () {
that.$message.warning(`操作失败`);
return false;
});
return false;
}else{
this.$message.warning(`商标状态错误`);
return false;
}
if (!selectedRows || selectedRows.length < 1) {
this.$message.warning(`请选择至少一行记录`);
return false;
} else {
var ids = [];
for (var i = 0; i < selectedRows.length; i++) {
ids.push(selectedRows[i].id);
}
this.selectIds = ids;
this.dialogFormVisible = true;
}
}
if (key == "yyzz") { if (key == "yyzz") {
var url = row.applier.businessLicensePic; var url = row.applier.businessLicensePic;
if (url == null || url == "") { if (url == null || url == "") {
......
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