Skip to content

Z
zhichan
Commit 224c8060 by 蒋勇
Options

change last submit

parent 22980f70
Showing with 154 additions and 9 deletions
jiaxiya/app/base/db/metadata/bizs/bizjs/mytradetransferdiliver.js
......@@ -34,6 +34,37 @@ module.exports={
{"type":"aliupload","label":"商标局回执","prop":"transfer_receive_ack","disabled":false,"placeHolder":"商标局回执","style":""},
]
},
{
"title":"上传盖章资料(买家)",
"colnum":1,
ctls:[
{"type":"select","dicKey":"tranferperson_type","label":"买方类型","prop":"user_type","labelField":"label","valueField":"value","style":"","isButton":true},
{"type":"aliupload","label":"买家营业执照","prop":"buyer_businesslicense","disabled":false,"placeHolder":"买方营业执照","style":""},
{"type":"aliupload","label":"买家营业执照翻译件","prop":"buyer_businesslicense_en","disabled":false,"placeHolder":"买方营业执照","style":""},
{"type":"aliupload","label":"买家身份证","prop":"buyer_idcard","disabled":false,"placeHolder":"买家身份证","style":""},
{"type":"aliupload","label":"买家委托书","prop":"buyer_proxy","disabled":false,"placeHolder":"买家委托书","style":""},
]
},
{
"title":"上传盖章资料(卖家)",
"colnum":1,
ctls:[
{"type":"select","dicKey":"tranferperson_type","label":"卖方类型","prop":"seller_type","labelField":"label","valueField":"value","style":"","isButton":true},
{"type":"aliupload","label":"卖方营业执照","prop":"seller_businesslicense","disabled":false,"placeHolder":"卖方营业执照","style":""},
{"type":"aliupload","label":"卖方营业执照翻译件","prop":"seller_businesslicense_en","disabled":false,"placeHolder":"卖方营业执照翻译件","style":""},
{"type":"aliupload","label":"卖方身份证","prop":"seller_idcard","disabled":false,"placeHolder":"卖方身份证","style":""},
{"type":"aliupload","label":"卖方委托书","prop":"seller_proxy","disabled":false,"placeHolder":"卖方委托书","style":""},
]
},
{
"title":"上传盖章资料(其它)",
ctls:[
{"type":"aliupload","label":"商标注册证","prop":"tm_cert_url","disabled":false,"placeHolder":"公证书","style":""},
{"type":"aliupload","label":"公证书","prop":"notarization_url","disabled":false,"placeHolder":"公证书","style":""},
{ "type": "textarea", "label": "备注", "prop": "remark", "placeHolder": "备注", "style": "" },
]
},
],
"search":[
......
jiaxiya/app/base/db/models/transfer/tradetransfer.js
......@@ -64,6 +64,19 @@ module.exports = (db, DataTypes) => {
mail_zip_url: DataTypes.STRING, //邮寄文件链接　
logistics: DataTypes.STRING, //邮寄单编号
remark: DataTypes.STRING,
buyer_businesslicense_en:DataTypes.STRING,
seller_businesslicense_en:DataTypes.STRING,
buyer_proxy:DataTypes.STRING,
seller_type: { // "卖家用户类型",
type: DataTypes.ENUM,
values: Object.keys(uiconfig.config.pdict.tranferperson_type), //
set: function (val) {
this.setDataValue("seller_type", val);
this.setDataValue("seller_type_name", uiconfig.config.pdict.tranferperson_type[val]);
}
},
seller_type_name:DataTypes.STRING
//communicationLog: DataTypes.TEXT //沟通记录
}, {
paranoid: true,//假的删除
......
jiaxiya/app/base/service/impl/transfer/tradetransferSve.js
......@@ -408,14 +408,30 @@ async modifySubmitTransferMaterail(obj) {
msg: "参数异常"
}
}
//先存储到库里
await this.dao.update(obj)
var BizId = obj.ali_bizid;
var obj = {
action: "ReceivedTransferMaterail",
reqbody: {
BizId: BizId
BizId: BizId,
Note:obj.remark,
BuyerBusinessLicense:buildurl(obj.buyer_businesslicense),
BuyerIdCard:buildurl(obj.buyer_idcard),
RegistrationCert:buildurl(obj.tm_cert_url),
Notarization:buildurl(obj.notarization_url),
SellerBusinessLicense:buildurl(obj.seller_businesslicense),
SellerIdCard:buildurl(obj.seller_idcard),
SellerProxy:buildurl(obj.seller_proxy),
BuyersCardType:obj.user_type=="ent"?"1":"2",
SellerBusinessLicenseTranslation:buildurl(obj.buyer_businesslicense_en),
BuyerBusinessLicenseTranslation:buildurl(obj.seller_businesslicense_en),
AssigneeProxy:buildurl(obj.buyer_proxy),
CardType:obj.seller_type=="ent"?"1":"2",
}
}
var rtn = await this.aliclient(obj)
console.log(obj)
console.log(rtn)
return rtn;
}
......@@ -736,7 +752,7 @@ function buildurl(url){
}
module.exports = TradetransferService;
(async ()=>{
let rs=await new TradetransferService().queryAuditStateFromAli()
console.log(JSON.stringify(rs.Data.TradeProduces))
})()
\ No newline at end of file
// (async ()=>{
// let rs=await new TradetransferService().queryAuditStateFromAli()
// console.log(JSON.stringify(rs.Data.TradeProduces))
// })()
\ No newline at end of file
jiaxiya/app/front/vues/pages/tradetransferdiliver/tradetransferdiliver.js
......@@ -31,7 +31,29 @@
},
mounted: function() {
this.currentRow=null;
setTimeout(()=>{
let $q=$("button span:contains('邮寄资料')");
let $groupMailSend= $q.parent().parent().parent();
$groupMailSend.hide();
let $jg=$("button span:contains('递交官方资料')");
let $groupJG= $jg.parent().parent().parent();
$groupJG.hide();
let $upBuyerGZ=$("button span:contains('上传盖章资料(买家)')");
console.log($upBuyerGZ.text());
let $groupBuyerGZ= $upBuyerGZ.parent().parent().parent();
$groupBuyerGZ.hide();
let $upSellerGZ=$("button span:contains('上传盖章资料(卖家)')");
let $groupSellerGZ= $upSellerGZ.parent().parent().parent();
$groupSellerGZ.hide();
let $upOtherGZ=$("button span:contains('上传盖章资料(其它)')");
let $groupOtherGZ= $upOtherGZ.parent().parent().parent();
$groupOtherGZ.hide();
},1500);
},
created: function() {
......@@ -50,23 +72,53 @@
},
onselchange(prop,fm,target,ctls){
let $q=$("button span:contains('邮寄资料')");
let $groupMailSend= $q.parent().parent().parent();
let $jg=$("button span:contains('递交官方资料')");
let $groupJG= $jg.parent().parent().parent();
let $upBuyerGZ=$("button span:contains('上传盖章资料(买家)')");
let $groupBuyerGZ= $upBuyerGZ.parent().parent().parent();
let $upSellerGZ=$("button span:contains('上传盖章资料(卖家)')");
let $groupSellerGZ= $upSellerGZ.parent().parent().parent();
let $upOtherGZ=$("button span:contains('上传盖章资料(其它)')");
let $groupOtherGZ= $upOtherGZ.parent().parent().parent();
if(fm[prop]=="BUYER_EXPRESS"){
$groupMailSend.show();
ctls["logistics"]=true;
ctls["mail_zip_url"]=true;
}else{
ctls["logistics"]=false;
ctls["mail_zip_url"]=false;
$groupMailSend.hide();
}
if(fm[prop]=="SUBMIT_TO_SBJ"){
ctls["seller_proxy"]=true;
ctls["transfer_receive_ack"]=true;
$groupJG.show();
}else{
ctls["seller_proxy"]=false;
ctls["transfer_receive_ack"]=false;
$groupJG.hide();
}
if(fm[prop]=="BUYER_PROVIDE_MATERIAL"){
$groupBuyerGZ.show();
$groupSellerGZ.show();
$groupOtherGZ.show();
}else{
$groupBuyerGZ.hide();
$groupSellerGZ.hide();
$groupOtherGZ.hide();
}
console.log(prop,fm[prop]);
},
......@@ -118,11 +170,16 @@
onDlgFormClick(k, model){
var that=this;
if (k = "alisubmit") {
debugger;
if(model.transfer_status=="PAY_OVER" || model.transfer_status=="MATERIAL_PROVIDE" || model.transfer_status=="MATERIALS_TO_BE_SUBMITTED" || model.transfer_status=="PASS_ALIYUN_VERIFY"){
that.$message.warning("状态不可修改");
return;
}
if(model.transfer_status=="BUYER_PROVIDE_MATERIAL"){
this.$confirm('提交盖章资料后,阿里开始审核,资料再无法修改，除非审核不通过，是否继续提交？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$root.postReq("/web/transfer/tradetransferCtl/submit", model).then(function (d) {
if (d.status > -1) {
$("[name='grdid']").show();
......@@ -140,7 +197,35 @@
that.$message.warning("提交失败");
}
}
})
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消提交'
});
});
return
}
this.$root.postReq("/web/transfer/tradetransferCtl/submit", model).then(function (d) {
if (d.status > -1) {
$("[name='grdid']").show();
$("[name='frmid']").hide();
that.$message({
type: 'success',
message: '提交成功!'
});
}else{
$("[name='grdid']").show();
$("[name='frmid']").hide();
if(d.msg){
that.$message.warning("提交失败:"+d.msg);
}else{
that.$message.warning("提交失败");
}
}
});
}
},
onColFormater(row, column, cellvalue, index){
......
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