Skip to content

Z
zhichan
Commit 9ad04140 by 刘泽奇
Options

123

parent 6bea4b63
Showing with 43 additions and 13 deletions
igirl-channel-web/app/front/entry/index.ejs
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<body> <body>
<div class="jc_hd"> </div> <div class="jc_hd"> </div>
<div id="app" v-loading="loading" class="app-main" style="visibility:hidden"> <div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main" style="visibility:hidden">
<div id="admin-warpper" v-if="0"> <div id="admin-warpper" v-if="0">
<div class="admin-menu"> <div class="admin-menu">
<el-menu default-active="2" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose" <el-menu default-active="2" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose"
......
igirl-channel-web/app/front/entry/public/css/pagecom.css 100755 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.css
...@@ -475,3 +475,4 @@ ...@@ -475,3 +475,4 @@
.jdindentdetail-diag .el-dialog__header { .jdindentdetail-diag .el-dialog__header {
border-bottom: 1px solid #E8E8E8; border-bottom: 1px solid #E8E8E8;
} }
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -200,6 +200,7 @@ ...@@ -200,6 +200,7 @@
tel: "", tel: "",
fax: "", fax: "",
businessLicensePic: "", businessLicensePic: "",
businessLicensePdf: "",
identityCardPic: "", identityCardPic: "",
gzwtsUrl: "", gzwtsUrl: "",
smwjUrl: "", smwjUrl: "",
...@@ -309,6 +310,8 @@ ...@@ -309,6 +310,8 @@
/*大类下标 */ /*大类下标 */
nclIndex: "", nclIndex: "",
editNcl: {}, editNcl: {},
editDeliveryInfo: {},
editApply: {},
} }
}, },
mounted: function() { mounted: function() {
...@@ -383,6 +386,10 @@ ...@@ -383,6 +386,10 @@
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
console.log(d, `deliveryInfo`); console.log(d, `deliveryInfo`);
this.deliveryInfo = d.data.tm; this.deliveryInfo = d.data.tm;
this.form = JSON.parse(JSON.stringify(this.deliveryInfo));
this.editDeliveryInfo = JSON.parse(JSON.stringify(this.deliveryInfo));
this.form.tmFormType = Number(this.form.tmFormType);
console.log(this.form, "lllllllllllllllllllllllllllllll");
this.orderFlow = d.data.orderFlow; this.orderFlow = d.data.orderFlow;
this.orderFlow.map((item, index) => { this.orderFlow.map((item, index) => {
item.createDate = new Date(item.createDate).toLocaleString('chinese', { hour12: false }); item.createDate = new Date(item.createDate).toLocaleString('chinese', { hour12: false });
...@@ -398,6 +405,8 @@ ...@@ -398,6 +405,8 @@
console.log(d, `applyObj`); console.log(d, `applyObj`);
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
this.applyInfo = d.data; this.applyInfo = d.data;
this.apply = JSON.parse(JSON.stringify(this.applyInfo));
this.editApply = JSON.parse(JSON.stringify(this.apply));
} }
}).then(() => { }).then(() => {
if (loadingA == 0 && loadingB == 0 && loadingC == 0) { if (loadingA == 0 && loadingB == 0 && loadingC == 0) {
...@@ -409,9 +418,13 @@ ...@@ -409,9 +418,13 @@
console.log(d, `nclObj`); console.log(d, `nclObj`);
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
this.nclInfo = d.data; this.nclInfo = d.data;
/*
this.nclOne = this.nclInfo;
*/
this.nclInfo.map((item, index) => { this.nclInfo.map((item, index) => {
item.nclSmallCodes = JSON.parse(item.nclSmallCodes); item.nclSmallCodes = JSON.parse(item.nclSmallCodes);
}) });
this.ncl = JSON.parse(JSON.stringify(this.nclInfo));
} }
}).then(() => { }).then(() => {
if (loadingA == 0 && loadingB == 0 && loadingC == 0) { if (loadingA == 0 && loadingB == 0 && loadingC == 0) {
...@@ -611,6 +624,8 @@ ...@@ -611,6 +624,8 @@
} }
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));
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) {
...@@ -619,15 +634,15 @@ ...@@ -619,15 +634,15 @@
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["businessLicensePdf"] = d.data.url;
return return
} else { } else {
that.apply.businessLicensePic = ""; that.apply.businessLicensePdf = "";
that.$message.warning(`上传失败请重新上传`); that.$message.warning(`上传失败请重新上传`);
return false; return false;
} }
}).catch(function (e) { }).catch(function (e) {
that.apply.businessLicensePic = ""; that.apply.businessLicensePdf = "";
that.loading1 = false; that.loading1 = false;
that.loading2 = false; that.loading2 = false;
that.loading3 = false; that.loading3 = false;
...@@ -638,6 +653,8 @@ ...@@ -638,6 +653,8 @@
} }
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));
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;
...@@ -645,15 +662,15 @@ ...@@ -645,15 +662,15 @@
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["identityCardPdf"] = d.data.url;
return; return;
} else { } else {
that.apply.identityCardPic = ""; that.apply.identityCardPdf = "";
that.$message.warning(`上传失败请重新上传`); that.$message.warning(`上传失败请重新上传`);
return false; return false;
} }
}).catch(function (e) { }).catch(function (e) {
that.apply.identityCardPic = ""; that.apply.identityCardPdf = "";
that.loading1 = false; that.loading1 = false;
that.loading2 = false; that.loading2 = false;
that.loading3 = false; that.loading3 = false;
...@@ -664,6 +681,8 @@ ...@@ -664,6 +681,8 @@
} }
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));
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) {
that.loading1 = false; that.loading1 = false;
...@@ -691,7 +710,10 @@ ...@@ -691,7 +710,10 @@
} }
if (obj.flag == "yxq") { if (obj.flag == "yxq") {
console.log(obj); console.log(obj);
that.apply["smwjUrl"] = obj.result; that.form.gzwtsUrl = obj.result;
that.editDeliveryInfo = JSON.parse(JSON.stringify(that.deliveryInfo));
console.log(that.editDeliveryInfo,`mmmmmmmmmmmmmmmmmmmmmmmmmmmmm`);
/**that.apply["smwjUrl"] = obj.result; */
setTimeout(() => { setTimeout(() => {
that.loading1 = false; that.loading1 = false;
that.loading2 = false; that.loading2 = false;
...@@ -803,8 +825,8 @@ ...@@ -803,8 +825,8 @@
}) })
}, },
handleCheckChange(obj, a, b) { handleCheckChange(obj, a, b) {
console.log(obj, a, b, '1233333333333333333333344444444444444444444', this.checkedNcl);
let dataRecieve = this.$refs.tree.getCheckedNodes(); let dataRecieve = this.$refs.tree.getCheckedNodes();
console.log(obj, a, b, '1233333333333333333333344444444444444444444',dataRecieve,this.checkedNcl);
if (obj.type) { if (obj.type) {
return return
} }
...@@ -1272,6 +1294,7 @@ ...@@ -1272,6 +1294,7 @@
}, },
submitEdit(v){ submitEdit(v){
console.log(v); console.log(v);
this.$root.loading = true;
switch (v) { switch (v) {
case '商标信息': case '商标信息':
/* /*
...@@ -1287,10 +1310,11 @@ ...@@ -1287,10 +1310,11 @@
type: 'success', type: 'success',
message: '修改成功!' message: '修改成功!'
}); });
this.$root.loading = false;
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
this.$root.loading = false;
} }
}).catch((e) => { }).catch((e) => {
this.$message(e); this.$message(e);
...@@ -1311,6 +1335,7 @@ ...@@ -1311,6 +1335,7 @@
type: 'success', type: 'success',
message: '修改成功!' message: '修改成功!'
}); });
this.$root.loading = false;
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
...@@ -1320,8 +1345,8 @@ ...@@ -1320,8 +1345,8 @@
}); });
break; break;
case '交官文件': case '交官文件':
this.apply.deliveryOrderNo = this.deliveryOrderNo; this.apply.deliveryOrderNo = this.deliveryOrderNo;
console.log(this.apply);
var obj = this.$root.copyParams(this.apply, "updateOfficial", "/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) {
...@@ -1331,6 +1356,7 @@ ...@@ -1331,6 +1356,7 @@
type: 'success', type: 'success',
message: '提交成功!' message: '提交成功!'
}); });
this.$root.loading = false;
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
...@@ -1350,6 +1376,7 @@ ...@@ -1350,6 +1376,7 @@
type: 'success', type: 'success',
message: '提交成功!' message: '提交成功!'
}); });
this.$root.loading = false;
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
...@@ -1370,6 +1397,7 @@ ...@@ -1370,6 +1397,7 @@
type: 'success', type: 'success',
message: '提交成功!' message: '提交成功!'
}); });
this.$root.loading = false;
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
...@@ -1382,7 +1410,8 @@ ...@@ -1382,7 +1410,8 @@
break; break;
} }
} },
}, },
vname: "gsb-jdindentdetail" vname: "gsb-jdindentdetail"
......
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