Skip to content

Z
zhichan
Commit a233e365 by 刘泽奇
Options

123

parent 6ac55c90
Showing with 165 additions and 151 deletions
igirl-channel-web/app/front/entry/public/css/pagecom.css
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
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
height: 32px; height: 32px;
width: 100%; width: 100%;
padding-left: 12px; padding-left: 12px;
padding-right: 12px;
box-sizing: border-box; box-sizing: border-box;
line-height: 32px; line-height: 32px;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -103,8 +103,8 @@ ...@@ -103,8 +103,8 @@
<div class="license-uploader"> <div class="license-uploader">
<img v-if="imageUrl" :src="imageUrl" class="license"> <img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else> <div class="license-uploader-icon" v-else>
<img :src="applyInfo.businessLicensePic ? applyInfo.businessLicensePic : \'/imgs/indent/pdf.png\'" <img :src="applyInfo.businessLicensePic ? applyInfo.businessLicensePic : \'/imgs/indent/materialNull.png\'"
alt="" @click="window.open(applyInfo.businessLicensePdf)"> alt="" @click="openPdf(applyInfo.businessLicensePdf)">
</div> </div>
</div> </div>
<p>营业执照</p> <p>营业执照</p>
...@@ -113,8 +113,8 @@ ...@@ -113,8 +113,8 @@
<div class="license-uploader"> <div class="license-uploader">
<img v-if="imageUrl" :src="imageUrl" class="license"> <img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else> <div class="license-uploader-icon" v-else>
<img :src="deliveryInfo.gzwtsUrl?deliveryInfo.gzwtsUrl:\'/imgs/indent/jpg.png\'" alt="" <img :src="deliveryInfo.gzwtsUrl?deliveryInfo.gzwtsUrl:\'/imgs/indent/materialNull.png\'" alt=""
@click="window.open(deliveryInfo.gzwtsUrl)"> @click="openPdf(deliveryInfo.gzwtsUrl)">
</div> </div>
</div> </div>
<p>委托书</p> <p>委托书</p>
...@@ -124,8 +124,8 @@ ...@@ -124,8 +124,8 @@
<div class="license-uploader"> <div class="license-uploader">
<img v-if="imageUrl" :src="imageUrl" class="license"> <img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else> <div class="license-uploader-icon" v-else>
<img :src="deliveryInfo.smwjUrl?deliveryInfo.smwjUrl:\'/imgs/indent/jpg.png\'" alt="" <img :src="deliveryInfo.smwjUrl?deliveryInfo.smwjUrl:\'/imgs/indent/materialNull.png\'" alt=""
@click="window.open(deliveryInfo.smwjUrl)> @click="openPdf(deliveryInfo.smwjUrl)">
</div> </div>
</div> </div>
<p>优先权证明</p> <p>优先权证明</p>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<div class="license-uploader"> <div class="license-uploader">
<img v-if="imageUrl" :src="imageUrl" class="license"> <img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else> <div class="license-uploader-icon" v-else>
<img :src="applyInfo.identityCardPic?applyInfo.identityCardPic:\'/imgs/indent/jpg.png\'" <img :src="applyInfo.identityCardPic?applyInfo.identityCardPic:\'/imgs/indent/materialNull.png\'"
alt=""> alt="">
</div> </div>
</div> </div>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -306,7 +306,6 @@ ...@@ -306,7 +306,6 @@
channelUserId: "", channelUserId: "",
itemName: '', itemName: '',
deliveryStatus: "", deliveryStatus: "",
totalSum: "",
/*大类下标 */ /*大类下标 */
nclIndex: "", nclIndex: "",
editNcl: {}, editNcl: {},
...@@ -329,7 +328,7 @@ ...@@ -329,7 +328,7 @@
/*修改验证 对应表单的值 */ /*修改验证 对应表单的值 */
popupValue: "", popupValue: "",
/**订单付款信息 */ /**订单付款信息 */
receiptVoucher: "", receiptVoucher: {},
} }
}, },
mounted: function() { mounted: function() {
...@@ -444,7 +443,9 @@ ...@@ -444,7 +443,9 @@
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);
this.receiptVoucher = d.data.receiptVoucher[0]; if(d.data.receiptVoucher.length>0){
this.receiptVoucher = d.data.receiptVoucher[0];
}
switch (this.form.tmFormType) { switch (this.form.tmFormType) {
case 3: case 3:
this.brandType = "文字"; this.brandType = "文字";
...@@ -518,6 +519,7 @@ ...@@ -518,6 +519,7 @@
break; break;
case 2: case 2:
this.headerInfo = "商标类别"; this.headerInfo = "商标类别";
this.popupValue = "form";
break; break;
case 3: case 3:
this.headerInfo = "交官文件"; this.headerInfo = "交官文件";
...@@ -1365,155 +1367,166 @@ ...@@ -1365,155 +1367,166 @@
this.checkedNcl = []; this.checkedNcl = [];
this.nclSearch(); this.nclSearch();
}, },
openPdf(v){
if(v){
window.open(v);
}else{
this.$message.warning("您还没有上传相关材料");
}
},
submitEdit(v, agree){ submitEdit(v, agree){
console.log(v); console.log(v);
this.$nextTick(() => { this.$nextTick(() => {
this.$refs[this.popupValue].validate(valid => { if(this.$refs[this.popupValue].validate){
if (valid) { this.$refs[this.popupValue].validate(valid => {
console.log(valid); if (valid) {
switch (v) { console.log(valid);
switch (v) {
case '商标信息': case '商标信息':
/* /*
this.form.channelUserId = this.channelUserId; 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");
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);
this.dialogTableVisible = false; this.dialogTableVisible = false;
this.$message({ this.$message({
type: 'success', type: 'success',
message: '修改成功!' message: '修改成功!'
}); });
this.$root.loading = false; this.$root.loading = false;
this.$router.go(0); this.$router.go(0);
} else {
this.$message(res.msg);
this.$root.loading = false;
}
}).catch((e) => {
this.$message(e);
});
break;
case '商标类别':
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 { } else {
return; this.$message(res.msg);
this.$root.loading = false;
}
}).catch((e) => {
this.$message(e);
});
break;
case '商标类别':
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");
var obj = this.$root.copyParams(this.editNcl, "updateNclInfo", "/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); this.dialogTableVisible = false;
this.dialogTableVisible = false; this.$message({
this.$message({ type: 'success',
type: 'success', message: '修改成功!'
message: '修改成功!' });
}); 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); }
} }).catch((e) => {
}).catch((e) => { this.$message(e);
this.$message(e); });
}); break;
break; case '交官文件':
case '交官文件': this.$root.loading = true;
this.$root.loading = true; this.apply.deliveryOrderNo = this.deliveryOrderNo;
this.apply.deliveryOrderNo = this.deliveryOrderNo; console.log(this.apply);
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) { console.log(res);
console.log(res); this.dialogTableVisible = false;
this.dialogTableVisible = false; this.$message({
this.$message({ type: 'success',
type: 'success', message: '提交成功!'
message: '提交成功!' });
}); 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); }
} }).catch((e) => {
}).catch((e) => { 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");
var obj = this.$root.copyParams(this.editApply, "updateCustomerInfo", "/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); this.dialogTableVisible = false;
this.dialogTableVisible = false; this.$message({
this.$message({ type: 'success',
type: 'success', message: '提交成功!'
message: '提交成功!' });
}); 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); }
} }).catch((e) => {
}).catch((e) => { 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; this.editApply.name = this.editApply.contacts;
this.editApply.name = this.editApply.contacts; console.log(this.editApply, `zzzzzzzzzzzzzzzzzzzz`);
console.log(this.editApply, `zzzzzzzzzzzzzzzzzzzz`); var obj = this.$root.copyParams(this.editApply, "updateContacts", "/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); this.dialogTableVisible = false;
this.dialogTableVisible = false; this.$message({
this.$message({ type: 'success',
type: 'success', message: '提交成功!'
message: '提交成功!' });
}); 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); }
} }).catch((e) => {
}).catch((e) => { this.$message(e);
this.$message(e); });
}); break;
break; default:
default: break;
break; }
} else {
console.log('error submit!!');
this.$message.warning("请核对您的信息");
return false;
} }
});
}else{
} else { }
console.log('error submit!!');
this.$message.warning("请核对您的信息");
return false;
}
});
}); });
}, },
......
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