Skip to content

Z
zhichan
Commit f83ebbff by 刘泽奇
Options

123

parent 6996aeee
Showing with 49 additions and 51 deletions
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
</div> </div>
<div v-show="headerInfo==\'交官文件\'"> <div v-show="headerInfo==\'交官文件\'">
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>交官文件</h4> <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>交官文件</h4>
<el-form ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" <el-form ref="apply" :rules="applyrules" :model="editApply" class="demo-ruleForm"
label-width="120px"> label-width="120px">
<div class="selftmreg_main"> <div class="selftmreg_main">
<div style="clear:both;"></div> <div style="clear:both;"></div>
...@@ -502,9 +502,9 @@ ...@@ -502,9 +502,9 @@
<div class="upload-box" v-loading="loading2" <div class="upload-box" v-loading="loading2"
@mouseover="mouseOverDemo(2,\'b\')" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')"> @mouseleave="mouseLeaveDemo(2,\'b\')">
<img @click="window.open(editDeliveryInfo.gzwtsUrl)" <img @click="window.open(editApply.gzwtsUrl)"
class="upload-applyimg" v-if="editDeliveryInfo.gzwtsUrl" class="upload-applyimg" v-if="editApply.gzwtsUrl"
:src="editDeliveryInfo.gzwtsUrl" /> :src="editApply.gzwtsUrl" />
<gsb-upload v-else flag="wts" ref="wts" :d="d" @setKey="setKey" <gsb-upload v-else flag="wts" ref="wts" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
...@@ -514,8 +514,8 @@ ...@@ -514,8 +514,8 @@
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" <div class="upload-dialog"
v-show="editDeliveryInfo.gzwtsUrl && toViewImgKey == \'b\'"> v-show="editApply.gzwtsUrl && toViewImgKey == \'b\'">
<div @click="window.open(editDeliveryInfo.gzwtsUrl)">查看大图</div> <div @click="window.open(editApply.gzwtsUrl)">查看大图</div>
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" <gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
...@@ -541,9 +541,9 @@ ...@@ -541,9 +541,9 @@
<div class="upload-box" v-loading="loading3" <div class="upload-box" v-loading="loading3"
@mouseover="mouseOverDemo(3,\'c\')" @mouseover="mouseOverDemo(3,\'c\')"
@mouseleave="mouseLeaveDemo(3,\'c\')"> @mouseleave="mouseLeaveDemo(3,\'c\')">
<img @click="window.open(editDeliveryInfo.smwjUrl)" <img @click="window.open(editApply.smwjUrl)"
class="upload-applyimg" v-if="editDeliveryInfo.smwjUrl" class="upload-applyimg" v-if="editApply.smwjUrl"
:src="editDeliveryInfo.smwjUrl" /> :src="editApply.smwjUrl" />
<gsb-upload v-else flag="yxq" ref="yxq" :d="d" @setKey="setKey" <gsb-upload v-else flag="yxq" ref="yxq" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
...@@ -553,8 +553,8 @@ ...@@ -553,8 +553,8 @@
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" <div class="upload-dialog"
v-show="editDeliveryInfo.smwjUrl && toViewImgKey == \'c\'"> v-show="editApply.smwjUrl && toViewImgKey == \'c\'">
<div @click="window.open(editDeliveryInfo.smwjUrl)">查看大图</div> <div @click="window.open(editApply.smwjUrl)">查看大图</div>
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" <gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
this.form = JSON.parse(JSON.stringify(this.deliveryInfo)); this.form = JSON.parse(JSON.stringify(this.deliveryInfo));
this.editDeliveryInfo = JSON.parse(JSON.stringify(this.deliveryInfo)); this.editDeliveryInfo = JSON.parse(JSON.stringify(this.deliveryInfo));
this.form.tmFormType = Number(this.form.tmFormType); this.form.tmFormType = Number(this.form.tmFormType);
if(d.data.receiptVoucher.length>0){ if (d.data.receiptVoucher.length > 0) {
this.receiptVoucher = d.data.receiptVoucher[0]; this.receiptVoucher = d.data.receiptVoucher[0];
} }
switch (this.form.tmFormType) { switch (this.form.tmFormType) {
...@@ -700,7 +700,6 @@ ...@@ -700,7 +700,6 @@
} }
if (obj.flag == "yyzz") { if (obj.flag == "yyzz") {
console.log(obj, "oooooooooooooooooooooooooooooooo"); console.log(obj, "oooooooooooooooooooooooooooooooo");
that.editApply = JSON.parse(JSON.stringify(that.apply));
var pic2pdf = { "key": obj.result }; var pic2pdf = { "key": obj.result };
var pic2pdf = this.$root.copyParams(pic2pdf, "pic2pdf", "/action/tmTools/springBoard"); var pic2pdf = this.$root.copyParams(pic2pdf, "pic2pdf", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", pic2pdf).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", pic2pdf).then(function (d) {
...@@ -709,8 +708,8 @@ ...@@ -709,8 +708,8 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.apply.businessLicensePic = obj.result; that.editApply.businessLicensePic = obj.result;
that.apply["businessLicensePdf"] = d.data.url; that.editApply["businessLicensePdf"] = d.data.url;
return return
} else { } else {
that.apply.businessLicensePdf = ""; that.apply.businessLicensePdf = "";
...@@ -729,7 +728,6 @@ ...@@ -729,7 +728,6 @@
} }
if (obj.flag == "sfz") { if (obj.flag == "sfz") {
var sfz = { "key": obj.result }; var sfz = { "key": obj.result };
that.editApply = JSON.parse(JSON.stringify(that.apply));
var sfz = this.$root.copyParams(sfz, "pic2pdf", "/action/tmTools/springBoard"); var sfz = this.$root.copyParams(sfz, "pic2pdf", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", sfz).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", sfz).then(function (d) {
that.loading1 = false; that.loading1 = false;
...@@ -737,8 +735,8 @@ ...@@ -737,8 +735,8 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.apply.identityCardPic = obj.result; that.editApply.identityCardPic = obj.result;
that.apply["identityCardPdf"] = d.data.url; that.editApply["identityCardPdf"] = d.data.url;
return; return;
} else { } else {
that.apply.identityCardPdf = ""; that.apply.identityCardPdf = "";
...@@ -765,8 +763,7 @@ ...@@ -765,8 +763,7 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.deliveryOrderNo.gzwtsUrl = obj.result; that.editApply.gzwtsUrl = obj.result;
that.apply["gzwtsUrl"] = d.data.url;
return; return;
} else { } else {
that.$refs[obj.flag][0].result = ""; that.$refs[obj.flag][0].result = "";
...@@ -786,7 +783,7 @@ ...@@ -786,7 +783,7 @@
} }
if (obj.flag == "yxq") { if (obj.flag == "yxq") {
console.log(obj); console.log(obj);
that.form.gzwtsUrl = obj.result; that.editApply.smwjUrl = obj.result;
that.editDeliveryInfo = JSON.parse(JSON.stringify(that.deliveryInfo)); that.editDeliveryInfo = JSON.parse(JSON.stringify(that.deliveryInfo));
console.log(that.editDeliveryInfo, `mmmmmmmmmmmmmmmmmmmmmmmmmmmmm`); console.log(that.editDeliveryInfo, `mmmmmmmmmmmmmmmmmmmmmmmmmmmmm`);
/**that.apply["smwjUrl"] = obj.result; */ /**that.apply["smwjUrl"] = obj.result; */
...@@ -1367,25 +1364,21 @@ ...@@ -1367,25 +1364,21 @@
this.nclSearch(); this.nclSearch();
}, },
openPdf(v){ openPdf(v){
if(v){ if (v) {
window.open(v); window.open(v);
}else{ } else {
this.$message.warning("您还没有上传相关材料"); this.$message.warning("您还没有上传相关材料");
} }
}, },
submitEdit(v, agree){ submitEdit(v, agree){
console.log(v); console.log(v);
this.$nextTick(() => { this.$nextTick(() => {
if(v != "商标类别"){ if (v != "商标类别" && v != "交官文件" ) {
this.$refs[this.popupValue].validate(valid => { this.$refs[this.popupValue].validate(valid => {
if (valid) { if (valid) {
console.log(valid); console.log(valid);
switch (v) { switch (v) {
case '商标信息': case '商标信息':
/*
this.form.channelUserId = this.channelUserId;
*/
this.$root.loading = true; this.$root.loading = true;
this.form.deliveryOrderNo = this.deliveryOrderNo; this.form.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.form, "updateTmInfo", "/action/tmOrder/springBoard", "yes", "yes"); var obj = this.$root.copyParams(this.form, "updateTmInfo", "/action/tmOrder/springBoard", "yes", "yes");
...@@ -1408,11 +1401,10 @@ ...@@ -1408,11 +1401,10 @@
}); });
break; break;
case '交官文件': case '申请人信息':
this.$root.loading = true; this.$root.loading = true;
this.apply.deliveryOrderNo = this.deliveryOrderNo; this.editApply.deliveryOrderNo = this.deliveryOrderNo;
console.log(this.apply); var obj = this.$root.copyParams(this.editApply, "updateCustomerInfo", "/action/tmOrder/springBoard", "yes", "yes");
var obj = this.$root.copyParams(this.apply, "updateOfficial", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
if (res.status == 0) { if (res.status == 0) {
console.log(res); console.log(res);
...@@ -1423,6 +1415,7 @@ ...@@ -1423,6 +1415,7 @@
}); });
this.$root.loading = false; this.$root.loading = false;
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
} }
...@@ -1430,10 +1423,12 @@ ...@@ -1430,10 +1423,12 @@
this.$message(e); this.$message(e);
}); });
break; break;
case '申请人信息': case '订单联系人':
this.$root.loading = true; this.$root.loading = true;
this.editApply.deliveryOrderNo = this.deliveryOrderNo; this.editApply.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.editApply, "updateCustomerInfo", "/action/tmOrder/springBoard", "yes", "yes"); this.editApply.name = this.editApply.contacts;
console.log(this.editApply, `zzzzzzzzzzzzzzzzzzzz`);
var obj = this.$root.copyParams(this.editApply, "updateContacts", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
if (res.status == 0) { if (res.status == 0) {
console.log(res); console.log(res);
...@@ -1444,7 +1439,6 @@ ...@@ -1444,7 +1439,6 @@
}); });
this.$root.loading = false; this.$root.loading = false;
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
} }
...@@ -1452,12 +1446,22 @@ ...@@ -1452,12 +1446,22 @@
this.$message(e); this.$message(e);
}); });
break; break;
case '订单联系人': default:
break;
}
} else {
console.log('error submit!!');
this.$message.warning("请核对您的信息");
return false;
}
});
} else {
if (v == "交官文件") {
this.$root.loading = true; this.$root.loading = true;
this.editApply.deliveryOrderNo = this.deliveryOrderNo; this.editApply.deliveryOrderNo = this.deliveryOrderNo;
this.editApply.name = this.editApply.contacts; console.log(this.editApply);
console.log(this.editApply, `zzzzzzzzzzzzzzzzzzzz`); var obj = this.$root.copyParams(this.editApply, "updateOfficial", "/action/tmOrder/springBoard", "yes", "yes");
var obj = this.$root.copyParams(this.editApply, "updateContacts", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
if (res.status == 0) { if (res.status == 0) {
console.log(res); console.log(res);
...@@ -1474,18 +1478,8 @@ ...@@ -1474,18 +1478,8 @@
}).catch((e) => { }).catch((e) => {
this.$message(e); this.$message(e);
}); });
break;
default:
break;
}
} else {
console.log('error submit!!');
this.$message.warning("请核对您的信息");
return false;
} }
}); if (v == "商标类别") {
}else{
this.editNcl.deliveryOrderNo = this.deliveryOrderNo; this.editNcl.deliveryOrderNo = this.deliveryOrderNo;
this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode; this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode;
this.editNcl.nclOneCodes = this.nclOne[0].code; this.editNcl.nclOneCodes = this.nclOne[0].code;
...@@ -1524,6 +1518,11 @@ ...@@ -1524,6 +1518,11 @@
}); });
} }
}
}); });
}, },
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -583,7 +583,6 @@ ...@@ -583,7 +583,6 @@
if (d.status == 0) { if (d.status == 0) {
that.apply["businessLicensePic"] = obj.result; that.apply["businessLicensePic"] = obj.result;
that.apply["businessLicensePdf"] = d.data.url; that.apply["businessLicensePdf"] = d.data.url;
return return
} else { } else {
that.apply.businessLicensePic = ""; that.apply.businessLicensePic = "";
......
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