Skip to content

Z
zhichan
Commit 57e8eab9 by 王栋源
Options

wdy

parent 6e456cdc
Showing with 86 additions and 88 deletions
jiaxiya/app/base/api/impl/transfer/tradeApi.js
...@@ -32,22 +32,22 @@ class TradeTransferAPI extends APIBase { ...@@ -32,22 +32,22 @@ class TradeTransferAPI extends APIBase {
} }
async test(pobj, query){ async test(pobj, query){
var url = 'http://jaxiya.gongsibao.com/orders/refuse'; var url = 'https://jaxiya.gongsibao.com/orders/refuse';
var result = await client.post(url, { var result = await client.post(url, {
data:{ data:{
"BizId":"dd541635415234345", "BizId":"trademark_prepayment_pre-cn-o401er9gv01",
"UserName":"tom", "UserName":"阿里云",
"Mobile":"15900152417", "Mobile":"18600480430",
"RegisterNumber":"1525555", "RegisterNumber":"25559504",
"Classification":"02", "Classification":"20",
"Price":"5000" "Price":"10"
}, },
headers: { headers: {
accept: 'application/json' accept: 'application/json'
} }
}); });
return result;
console.log(JSON.stringify(result)); console.log(JSON.stringify(result));
} }
exam() { exam() {
......
jiaxiya/app/base/controller/impl/transfer/tradetransferCtl.js
...@@ -95,7 +95,7 @@ class TradetransferCtl extends CtlBase { ...@@ -95,7 +95,7 @@ class TradetransferCtl extends CtlBase {
gobj.reqbody.FileType = 'PARTNER_SYNC_FILE'; gobj.reqbody.FileType = 'PARTNER_SYNC_FILE';
} }
try { try {
var rst = await self.service.aliclient.reqbyget(gobj); var rst = await self.service.aliclient(gobj);
console.log(rst) console.log(rst)
var source = { var source = {
OSSAccessKeyId: rst.AccessId, OSSAccessKeyId: rst.AccessId,
......
jiaxiya/app/base/db/metadata/bizs/bizjs/mytradetransferdiliver.js
...@@ -3,7 +3,7 @@ module.exports={ ...@@ -3,7 +3,7 @@ module.exports={
columnMetaData:[ columnMetaData:[
{"width":"100","label":"买方姓名 ","prop":"user_name","isShowTip":true,"isTmpl":false}, {"width":"100","label":"买方姓名 ","prop":"user_name","isShowTip":true,"isTmpl":false},
{"width":"80","label":"注册号","prop":"tm_number","isShowTip":true,"isTmpl":false}, {"width":"80","label":"注册号","prop":"tm_number","isShowTip":true,"isTmpl":false},
{"width":"80","label":"状态","prop":"status_name","isShowTip":true,"isTmpl":false}, {"width":"80","label":"状态","prop":"tranfer_status_name","isShowTip":true,"isTmpl":false},
{"width":"100","label":"买方电话","prop":"mobile","isShowTip":true,"isTmpl":false}, {"width":"100","label":"买方电话","prop":"mobile","isShowTip":true,"isTmpl":false},
{"width":"100","label":"尼斯大类","prop":"ncl_one","isShowTip":true,"isTmpl":false}, {"width":"100","label":"尼斯大类","prop":"ncl_one","isShowTip":true,"isTmpl":false},
{"width":"null","label":"操作","name":"null","isShowTip":false,"isTmpl":true,"isBtns":true}, {"width":"null","label":"操作","name":"null","isShowTip":false,"isTmpl":true,"isBtns":true},
...@@ -24,14 +24,6 @@ module.exports={ ...@@ -24,14 +24,6 @@ module.exports={
{"type":"input","label":"邮寄单号","prop":"logistics","disabled":false,"placeHolder":"邮寄单号","style":""}, {"type":"input","label":"邮寄单号","prop":"logistics","disabled":false,"placeHolder":"邮寄单号","style":""},
] ]
}, },
{
"title":"办理资料",
ctls:[
{"type":"upload","label":"商标证","prop":"tm_cert_url","disabled":false,"placeHolder":"","style":""},
{"type":"upload","label":"转让证明","prop":"transfer_cert_url","placeHolder":"应用名称","style":""},
{"type":"upload","label":"公证书","prop":"notarization_url","disabled":false,"placeHolder":"","style":"width:100px;height:100px"},
]
},
], ],
"search":[ "search":[
{ {
......
jiaxiya/app/base/service/impl/transfer/tradetransferSve.js
...@@ -89,30 +89,30 @@ class TradetransferService extends ServiceBase { ...@@ -89,30 +89,30 @@ class TradetransferService extends ServiceBase {
fq_ordernum: obj.fq_ordernum fq_ordernum: obj.fq_ordernum
} }
var rtn = await this.create(source); var rtn = await this.create(source);
if(rtn){ if (rtn) {
return { return {
"status": 0, "status": 0,
"msg": "success", "msg": "success",
"data": { "data": {
"orderNo": obj.fq_ordernum, "orderNo": obj.fq_ordernum,
"channelServiceNo": obj.BizId, "channelServiceNo": obj.BizId,
"channelParams": {} "channelParams": {}
}, },
"requestid": obj.requestid "requestid": obj.requestid
} }
}else{ } else {
return { return {
"status": -1, "status": -1,
"msg": "error", "msg": "error",
"data": { "data": {
"orderNo": obj.fq_ordernum, "orderNo": obj.fq_ordernum,
"channelServiceNo": obj.BizId, "channelServiceNo": obj.BizId,
"channelParams": {} "channelParams": {}
}, },
"requestid": obj.requestid "requestid": obj.requestid
} }
} }
} }
} }
//订单查询 //订单查询
...@@ -275,6 +275,8 @@ class TradetransferService extends ServiceBase { ...@@ -275,6 +275,8 @@ class TradetransferService extends ServiceBase {
obj.seller_proxy = obj.seller_proxy == null ? null : obj.seller_proxy.split("com//")[1]; obj.seller_proxy = obj.seller_proxy == null ? null : obj.seller_proxy.split("com//")[1];
obj.tm_cert_url = obj.tm_cert_url == null ? null : obj.tm_cert_url.split("com//")[1]; obj.tm_cert_url = obj.tm_cert_url == null ? null : obj.tm_cert_url.split("com//")[1];
obj.seller_apply = obj.seller_apply == null ? null : obj.seller_apply.split("com//")[1]; obj.seller_apply = obj.seller_apply == null ? null : obj.seller_apply.split("com//")[1];
obj.transfer_cert_url = obj.transfer_cert_url == null ? null : obj.transfer_cert_url.split("com//")[1];
obj.notarization_url= obj.notarization_url == null ? null : obj.notarization_url.split("com//")[1];
obj.user_type = obj.user_type == "person" ? 2 : 1; obj.user_type = obj.user_type == "person" ? 2 : 1;
var sobj = { var sobj = {
action: "SupplyMaterail", action: "SupplyMaterail",
...@@ -295,7 +297,7 @@ class TradetransferService extends ServiceBase { ...@@ -295,7 +297,7 @@ class TradetransferService extends ServiceBase {
SellerProxy: obj.seller_proxy, SellerProxy: obj.seller_proxy,
RegistrationCert: obj.tm_cert_url, RegistrationCert: obj.tm_cert_url,
SellerApply: obj.seller_apply, SellerApply: obj.seller_apply,
Notarization: obj.notarization Notarization: obj.notarization_url + "," + obj.transfer_cert_url
} }
} }
console.log(sobj); console.log(sobj);
......
jiaxiya/app/front/vues/pages/tansfersupplymaterail/tansfersupplymaterail.html
...@@ -77,6 +77,11 @@ ...@@ -77,6 +77,11 @@
mtype="test"> mtype="test">
</gsb-aliupload> </gsb-aliupload>
</el-form-item> </el-form-item>
<el-form-item label="转让证明" style="width:600px;">
<gsb-aliupload v-model="supplymaterail.transfer_cert_url" @uploadsuccess="upsuccess"
mtype="test">
</gsb-aliupload>
</el-form-item>
<el-form-item label="公证书" style="width:600px;"> <el-form-item label="公证书" style="width:600px;">
<gsb-aliupload v-model="supplymaterail.notarization_url" @uploadsuccess="upsuccess" <gsb-aliupload v-model="supplymaterail.notarization_url" @uploadsuccess="upsuccess"
mtype="test"> mtype="test">
......
jiaxiya/app/front/vues/pages/tradetransferdiliver/tradetransferdiliver.js
{ {
template:'${tmpl}', template: '${tmpl}',
data:function(){ data: function() {
return { return {
multipleSelection: [], multipleSelection: [],
isSingleSelect:false, isSingleSelect: false,
bizCode:'mytradetransferdiliver', bizCode: 'mytradetransferdiliver',
showUploadform:false, showUploadform: false,
f1:"", f1: "",
} }
}, },
mounted:function(){ mounted: function() {
},
created: function() {
/* if(this.codePath.indexOf("appuser")>=0){
this.bizCode="appuser";
}else{
this.bizCode="allusers";
}*/
},
methods: {
validateformmethod(rule, value, cbk){
return cbk();
}, },
created:function(){ onDlgFormClick(k, model){
/* if(this.codePath.indexOf("appuser")>=0){ if (k = "submit") {
this.bizCode="appuser"; this.$root.postReq("/web/transfer/tradetransferCtl/submit", model).then(function (d) {
}else{ if (d.status > -1) {
this.bizCode="allusers"; $("[name='grdid']").show();
}*/ $("[name='frmid']").hide();
this.$message({
type: 'success',
message: '提交成功!'
});
}
})
}
}, },
methods:{ onColFormater(row, column, cellvalue, index){
validateformmethod(rule,value,cbk){
return cbk();
},
onDlgFormClick(k,model){
if(k="submit"){
debugger;
this.$root.postReq("/web/transfer/tradetransferCtl/submit", model).then(function (d) {
debugger;
if (d.status > -1) {
this.$root.hideMask();
this.$message({
type: 'success',
message: '提交成功!'
});
}
})
}
},
onColFormater(row,column,cellvalue,index){
return cellvalue;
},
handleSelectionChange:function(val){
this.multipleSelection = val;
console.log(val);
},
fetchData:function(){
}, return cellvalue;
onRowClick(row,key,e){ },
if(key=="upfiles"){ handleSelectionChange: function(val) {
console.log(this.$router); this.multipleSelection = val;
this.$router.push({ path: "/tansfersupplymaterail", query: {ali_bizid:row.ali_bizid} }); console.log(val);
}
if(key=="notar"){
console.log(this.$router);
this.$router.push({ path: "/mynotarizationflow", query: {ali_bizid:row.ali_bizid} });
}
},
upsuccess(result){
console.log(result);
}
}, },
computed: Vuex.mapState({ fetchData: function() {
headStyle:function(){
return {"background-color":"white"}; },
onRowClick(row, key, e){
if (key == "upfiles") {
console.log(this.$router);
this.$router.push({ path: "/tansfersupplymaterail", query: { ali_bizid: row.ali_bizid } });
} }
}), if (key == "notar") {
vname:"gsb-tradetransferdiliver" console.log(this.$router);
this.$router.push({ path: "/mynotarizationflow", query: { ali_bizid: row.ali_bizid } });
}
},
upsuccess(result){
console.log(result);
}
},
computed: Vuex.mapState({
headStyle: function () {
return { "background-color": "white" };
}
}),
vname: "gsb-tradetransferdiliver"
} }
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