Skip to content

Z
zhichan
Commit f83ebbff by 刘泽奇
Options

123

parent 6996aeee
Showing with 85 additions and 87 deletions
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
......@@ -401,7 +401,7 @@
</div>
<div v-show="headerInfo==\'交官文件\'">
<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">
<div class="selftmreg_main">
<div style="clear:both;"></div>
......@@ -502,9 +502,9 @@
<div class="upload-box" v-loading="loading2"
@mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')">
<img @click="window.open(editDeliveryInfo.gzwtsUrl)"
class="upload-applyimg" v-if="editDeliveryInfo.gzwtsUrl"
:src="editDeliveryInfo.gzwtsUrl" />
<img @click="window.open(editApply.gzwtsUrl)"
class="upload-applyimg" v-if="editApply.gzwtsUrl"
:src="editApply.gzwtsUrl" />
<gsb-upload v-else flag="wts" ref="wts" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
......@@ -514,8 +514,8 @@
</div>
</gsb-upload>
<div class="upload-dialog"
v-show="editDeliveryInfo.gzwtsUrl && toViewImgKey == \'b\'">
<div @click="window.open(editDeliveryInfo.gzwtsUrl)">查看大图</div>
v-show="editApply.gzwtsUrl && toViewImgKey == \'b\'">
<div @click="window.open(editApply.gzwtsUrl)">查看大图</div>
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
......@@ -541,9 +541,9 @@
<div class="upload-box" v-loading="loading3"
@mouseover="mouseOverDemo(3,\'c\')"
@mouseleave="mouseLeaveDemo(3,\'c\')">
<img @click="window.open(editDeliveryInfo.smwjUrl)"
class="upload-applyimg" v-if="editDeliveryInfo.smwjUrl"
:src="editDeliveryInfo.smwjUrl" />
<img @click="window.open(editApply.smwjUrl)"
class="upload-applyimg" v-if="editApply.smwjUrl"
:src="editApply.smwjUrl" />
<gsb-upload v-else flag="yxq" ref="yxq" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
......@@ -553,8 +553,8 @@
</div>
</gsb-upload>
<div class="upload-dialog"
v-show="editDeliveryInfo.smwjUrl && toViewImgKey == \'c\'">
<div @click="window.open(editDeliveryInfo.smwjUrl)">查看大图</div>
v-show="editApply.smwjUrl && toViewImgKey == \'c\'">
<div @click="window.open(editApply.smwjUrl)">查看大图</div>
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
......@@ -443,7 +443,7 @@
this.form = JSON.parse(JSON.stringify(this.deliveryInfo));
this.editDeliveryInfo = JSON.parse(JSON.stringify(this.deliveryInfo));
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];
}
switch (this.form.tmFormType) {
......@@ -700,7 +700,6 @@
}
if (obj.flag == "yyzz") {
console.log(obj, "oooooooooooooooooooooooooooooooo");
that.editApply = JSON.parse(JSON.stringify(that.apply));
var pic2pdf = { "key": obj.result };
var pic2pdf = this.$root.copyParams(pic2pdf, "pic2pdf", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", pic2pdf).then(function (d) {
......@@ -709,8 +708,8 @@
that.loading3 = false;
that.loading = false;
if (d.status == 0) {
that.apply.businessLicensePic = obj.result;
that.apply["businessLicensePdf"] = d.data.url;
that.editApply.businessLicensePic = obj.result;
that.editApply["businessLicensePdf"] = d.data.url;
return
} else {
that.apply.businessLicensePdf = "";
......@@ -729,7 +728,6 @@
}
if (obj.flag == "sfz") {
var sfz = { "key": obj.result };
that.editApply = JSON.parse(JSON.stringify(that.apply));
var sfz = this.$root.copyParams(sfz, "pic2pdf", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", sfz).then(function (d) {
that.loading1 = false;
......@@ -737,8 +735,8 @@
that.loading3 = false;
that.loading = false;
if (d.status == 0) {
that.apply.identityCardPic = obj.result;
that.apply["identityCardPdf"] = d.data.url;
that.editApply.identityCardPic = obj.result;
that.editApply["identityCardPdf"] = d.data.url;
return;
} else {
that.apply.identityCardPdf = "";
......@@ -765,8 +763,7 @@
that.loading3 = false;
that.loading = false;
if (d.status == 0) {
that.deliveryOrderNo.gzwtsUrl = obj.result;
that.apply["gzwtsUrl"] = d.data.url;
that.editApply.gzwtsUrl = obj.result;
return;
} else {
that.$refs[obj.flag][0].result = "";
......@@ -786,7 +783,7 @@
}
if (obj.flag == "yxq") {
console.log(obj);
that.form.gzwtsUrl = obj.result;
that.editApply.smwjUrl = obj.result;
that.editDeliveryInfo = JSON.parse(JSON.stringify(that.deliveryInfo));
console.log(that.editDeliveryInfo, `mmmmmmmmmmmmmmmmmmmmmmmmmmmmm`);
/**that.apply["smwjUrl"] = obj.result; */
......@@ -1367,25 +1364,21 @@
this.nclSearch();
},
openPdf(v){
if(v){
if (v) {
window.open(v);
}else{
} else {
this.$message.warning("您还没有上传相关材料");
}
},
submitEdit(v, agree){
console.log(v);
this.$nextTick(() => {
if(v != "商标类别"){
if (v != "商标类别" && v != "交官文件" ) {
this.$refs[this.popupValue].validate(valid => {
if (valid) {
console.log(valid);
switch (v) {
case '商标信息':
/*
this.form.channelUserId = this.channelUserId;
*/
this.$root.loading = true;
this.form.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.form, "updateTmInfo", "/action/tmOrder/springBoard", "yes", "yes");
......@@ -1407,29 +1400,7 @@
this.$message(e);
});
break;
case '交官文件':
this.$root.loading = true;
this.apply.deliveryOrderNo = this.deliveryOrderNo;
console.log(this.apply);
var obj = this.$root.copyParams(this.apply, "updateOfficial", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
if (res.status == 0) {
console.log(res);
this.dialogTableVisible = false;
this.$message({
type: 'success',
message: '提交成功!'
});
this.$root.loading = false;
this.$router.go(0);
} else {
this.$message(res.msg);
}
}).catch((e) => {
this.$message(e);
});
break;
case '申请人信息':
this.$root.loading = true;
this.editApply.deliveryOrderNo = this.deliveryOrderNo;
......@@ -1444,7 +1415,7 @@
});
this.$root.loading = false;
this.$router.go(0);
} else {
this.$message(res.msg);
}
......@@ -1478,52 +1449,80 @@
default:
break;
}
} else {
console.log('error submit!!');
this.$message.warning("请核对您的信息");
return false;
}
});
}else{
this.editNcl.deliveryOrderNo = this.deliveryOrderNo;
this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode;
this.editNcl.nclOneCodes = this.nclOne[0].code;
this.editNcl.nclSmallCodes = this.nclOne[0].nclThree;
console.log(this.nclInfo, this.nclOne, this.editNcl, `xxxxxxxxxxxxxxxxxxxxxxxx`);
if (this.nclOne.length > 0) {
if (this.nclOne[0].nclThree.length < 10) {
this.nclSelected = this.nclOne[0].nclThree.length;
this.showConfrim = true;
if (agree) {
this.agree = agree;
this.showConfrim = false;
this.$root.loading = true;
} else {
if (v == "交官文件") {
this.$root.loading = true;
this.editApply.deliveryOrderNo = this.deliveryOrderNo;
console.log(this.editApply);
var obj = this.$root.copyParams(this.editApply, "updateOfficial", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
if (res.status == 0) {
console.log(res);
this.dialogTableVisible = false;
this.$message({
type: 'success',
message: '提交成功!'
});
this.$root.loading = false;
this.$router.go(0);
} else {
return;
this.$message(res.msg);
}
}).catch((e) => {
this.$message(e);
});
}
if (v == "商标类别") {
this.editNcl.deliveryOrderNo = this.deliveryOrderNo;
this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode;
this.editNcl.nclOneCodes = this.nclOne[0].code;
this.editNcl.nclSmallCodes = this.nclOne[0].nclThree;
console.log(this.nclInfo, this.nclOne, this.editNcl, `xxxxxxxxxxxxxxxxxxxxxxxx`);
if (this.nclOne.length > 0) {
if (this.nclOne[0].nclThree.length < 10) {
this.nclSelected = this.nclOne[0].nclThree.length;
this.showConfrim = true;
if (agree) {
this.agree = agree;
this.showConfrim = false;
this.$root.loading = true;
} else {
return;
}
}
}
var obj = this.$root.copyParams(this.editNcl, "updateNclInfo", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
if (res.status == 0) {
console.log(res);
this.dialogTableVisible = false;
this.$message({
type: 'success',
message: '修改成功!'
});
this.$root.loading = false;
this.$router.go(0);
} else {
this.$message(res.msg);
}
}).catch((e) => {
this.$message(e);
});
}
var obj = this.$root.copyParams(this.editNcl, "updateNclInfo", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
if (res.status == 0) {
console.log(res);
this.dialogTableVisible = false;
this.$message({
type: 'success',
message: '修改成功!'
});
this.$root.loading = false;
this.$router.go(0);
} else {
this.$message(res.msg);
}
}).catch((e) => {
this.$message(e);
});
}
});
},
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
......@@ -583,7 +583,6 @@
if (d.status == 0) {
that.apply["businessLicensePic"] = obj.result;
that.apply["businessLicensePdf"] = d.data.url;
return
} else {
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