Commit 6ac55c90 by 刘泽奇

123

parent 24cefba6
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
/*修改验证 对应表单的值 */ /*修改验证 对应表单的值 */
popupValue: "", popupValue: "",
/**订单付款信息 */ /**订单付款信息 */
receiptVoucher:"", receiptVoucher: "",
} }
}, },
mounted: function() { mounted: function() {
...@@ -699,7 +699,6 @@ ...@@ -699,7 +699,6 @@
} }
if (obj.flag == "yyzz") { if (obj.flag == "yyzz") {
console.log(obj, "oooooooooooooooooooooooooooooooo"); console.log(obj, "oooooooooooooooooooooooooooooooo");
that.apply.businessLicensePic = obj.result;
that.editApply = JSON.parse(JSON.stringify(that.apply)); 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");
...@@ -709,6 +708,7 @@ ...@@ -709,6 +708,7 @@
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.apply["businessLicensePdf"] = d.data.url; that.apply["businessLicensePdf"] = d.data.url;
return return
} else { } else {
...@@ -728,7 +728,6 @@ ...@@ -728,7 +728,6 @@
} }
if (obj.flag == "sfz") { if (obj.flag == "sfz") {
var sfz = { "key": obj.result }; var sfz = { "key": obj.result };
that.apply.identityCardPic = obj.result;
that.editApply = JSON.parse(JSON.stringify(that.apply)); 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) {
...@@ -737,6 +736,7 @@ ...@@ -737,6 +736,7 @@
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.apply["identityCardPdf"] = d.data.url; that.apply["identityCardPdf"] = d.data.url;
return; return;
} else { } else {
...@@ -756,7 +756,6 @@ ...@@ -756,7 +756,6 @@
} }
if (obj.flag == "wts") { if (obj.flag == "wts") {
var adjustWTSSize = { "key": obj.result }; var adjustWTSSize = { "key": obj.result };
that.deliveryOrderNo.gzwtsUrl = obj.result;
that.editDeliveryOrderNo = JSON.parse(JSON.stringify(that.apply)); that.editDeliveryOrderNo = JSON.parse(JSON.stringify(that.apply));
var adjustWTSSize = this.$root.copyParams(adjustWTSSize, "adjustWTSSize", "/action/tmTools/springBoard"); var adjustWTSSize = this.$root.copyParams(adjustWTSSize, "adjustWTSSize", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", adjustWTSSize).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", adjustWTSSize).then(function (d) {
...@@ -765,6 +764,7 @@ ...@@ -765,6 +764,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.apply["gzwtsUrl"] = d.data.url; that.apply["gzwtsUrl"] = d.data.url;
return; return;
} else { } else {
......
...@@ -411,6 +411,7 @@ ...@@ -411,6 +411,7 @@
}, },
methods: { methods: {
pointsRuleColor(i) { pointsRuleColor(i) {
if (i < parseInt(this.step)) { if (i < parseInt(this.step)) {
return 'color: #FFFFFF;' return 'color: #FFFFFF;'
...@@ -580,7 +581,9 @@ ...@@ -580,7 +581,9 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.apply["businessLicensePic"] = d.data.url; that.apply["businessLicensePic"] = obj.result;
that.apply["businessLicensePdf"] = d.data.url;
return return
} else { } else {
that.apply.businessLicensePic = ""; that.apply.businessLicensePic = "";
...@@ -606,7 +609,8 @@ ...@@ -606,7 +609,8 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.apply["identityCardPic"] = d.data.url; that.apply["identityCardPic"] = obj.result;
that.apply["identityCardPdf"] = d.data.url;
return; return;
} else { } else {
that.apply.identityCardPic = ""; that.apply.identityCardPic = "";
...@@ -774,13 +778,14 @@ ...@@ -774,13 +778,14 @@
} }
},*/ },*/
historyapplierchange(d){ historyapplierchange(d){
console.log(d, this.apply, '~~~~~~~~~~~~~~~~~~~~~~`');
if (d) { if (d) {
this.editApply.name = d.entName || ""; this.apply.name = d.entName || "";
this.editApply.applyAddr = d.regLocation || ""; this.apply.applyAddr = d.regLocation || "";
this.editApply.code = d.creditCode || ""; this.apply.code = d.creditCode || "";
this.editApply.businessLicensePic = d.businessLicensePic || ""; this.apply.businessLicensePic = d.businessLicensePic || "";
this.editApply.identityCardNo = d.identityCardNo || ""; this.apply.identityCardNo = d.identityCardNo || "";
this.editApply.identityCardPic = d.identityCardPic || ""; this.apply.identityCardPic = d.identityCardPic || "";
} }
}, },
...@@ -1213,8 +1218,8 @@ ...@@ -1213,8 +1218,8 @@
nclones: that.nclOne, nclones: that.nclOne,
itemCode: that.itemCode, itemCode: that.itemCode,
}; };
this.$root.loading = true; that.$root.loading = true;
var channelOrderNo = this.$root.copyParams({ channelOrderNo: this.$route.query.channelOrderNo }, "get1688ChannelOrderInfo", "/action/tmOrder/springBoard", "yes", "yes"); var channelOrderNo = that.$root.copyParams({ channelOrderNo: that.$route.query.channelOrderNo }, "get1688ChannelOrderInfo", "/action/tmOrder/springBoard", "yes", "yes");
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", channelOrderNo).then((d) => { that.$root.postReq("/web/trademark/tmqueryCtl/doPost", channelOrderNo).then((d) => {
console.log(d); console.log(d);
that.orderSubInfo.channelOrder = d.data.channelOrder; that.orderSubInfo.channelOrder = d.data.channelOrder;
...@@ -1223,7 +1228,6 @@ ...@@ -1223,7 +1228,6 @@
console.log(that.orderSubInfo, '............................................'); console.log(that.orderSubInfo, '............................................');
var subInfo = that.$root.copyParams(that.orderSubInfo, "subExistTmOrder", "/action/tmOrder/springBoard", "yes", "yes"); var subInfo = that.$root.copyParams(that.orderSubInfo, "subExistTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", subInfo).then(function (d) { that.$root.postReq("/web/trademark/tmqueryCtl/doPost", subInfo).then(function (d) {
this.$root.loading = false;
console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d); console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d);
if (d.status == 0) { if (d.status == 0) {
var order = d.data; var order = d.data;
...@@ -1241,9 +1245,11 @@ ...@@ -1241,9 +1245,11 @@
that.$message.warning(d.msg); that.$message.warning(d.msg);
} }
}).then(() => {
that.$root.loading = false;
}).catch(function (e) { }).catch(function (e) {
that.$message.warning("操作失败", e); that.$message.warning("操作失败", e);
this.$root.loading = false; that.$root.loading = false;
console.log(e); console.log(e);
}); });
}) })
......
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