Skip to content

Z
zhichan
Commit 513c37ec by 宋毅
Options

Merge branch 'igirl-channel-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-web

parents 8ab408c6 d976b24a
Showing with 165 additions and 144 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.html
...@@ -631,7 +631,7 @@ ...@@ -631,7 +631,7 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item v-if="editApply.customerType==\'ent\'" label-width="140px" label="执照详细地址" <el-form-item v-if="editApply.customerType==\'ent\'" label-width="140px" label="执照详细地址"
style="width:493px;float:left;padding-right:50px;" prop="applyAddr"> style="width:493px;float:left;padding-right:50px;" prop="applyAddr">
<el-input placeHolder="请输入执照详细地址" v-model="editApply.editApplyAddr"></el-input> <el-input placeHolder="请输入执照详细地址" v-model="editApply.applyAddr"></el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="邮政编码" <el-form-item label-width="140px" label="邮政编码"
...@@ -799,27 +799,27 @@ ...@@ -799,27 +799,27 @@
<div style="width:100%;padding-left: 30px;box-sizing: border-box;"> <div style="width:100%;padding-left: 30px;box-sizing: border-box;">
<el-form-item label-width="140px" label="客户联系人" <el-form-item label-width="140px" label="客户联系人"
style="width:493px;float:left;padding-right:50px;" prop="contacts"> style="width:493px;float:left;padding-right:50px;" prop="contacts">
<el-input v-model="apply.contacts" placeHolder="此信息很重要，官方文件送达需与您联系"></el-input> <el-input v-model="editApply.contacts" placeHolder="此信息很重要，官方文件送达需与您联系"></el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="联系电话" <el-form-item label-width="140px" label="联系电话"
style="width:493px;float:left;padding-right:50px;" prop="mobile"> style="width:493px;float:left;padding-right:50px;" prop="mobile">
<el-input v-model="apply.mobile" placeHolder="请填写11位手机号码"></el-input> <el-input v-model="editApply.mobile" placeHolder="请填写11位手机号码"></el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="电子邮箱" <el-form-item label-width="140px" label="电子邮箱"
style="width:493px;float:left;padding-right:50px;" prop="email"> style="width:493px;float:left;padding-right:50px;" prop="email">
<el-input v-model="apply.email" placeHolder="重要官文会通过邮件通知，请注意查收并及时回复"> </el-input> <el-input v-model="editApply.email" placeHolder="重要官文会通过邮件通知，请注意查收并及时回复"> </el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="座机" <el-form-item label-width="140px" label="座机"
style="width:493px;float:left;padding-right:50px;"> style="width:493px;float:left;padding-right:50px;">
<el-input v-model="apply.tel" placeHolder="区号-座机号码"> </el-input> <el-input v-model="editApply.tel" placeHolder="区号-座机号码"> </el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="传真" <el-form-item label-width="140px" label="传真"
style="width:493px;float:left;padding-right:50px;"> style="width:493px;float:left;padding-right:50px;">
<el-input v-model="apply.fax" placeHolder="请输入传真号"> </el-input> <el-input v-model="editApply.fax" placeHolder="请输入传真号"> </el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<div style="clear:both;"></div> <div style="clear:both;"></div>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -325,7 +325,9 @@ ...@@ -325,7 +325,9 @@
}, },
showConfrim: false, showConfrim: false,
agree: false, agree: false,
brandType:"", brandType: "",
/*修改验证 对应表单的值 */
popupValue: "",
} }
}, },
mounted: function() { mounted: function() {
...@@ -442,13 +444,13 @@ ...@@ -442,13 +444,13 @@
this.form.tmFormType = Number(this.form.tmFormType); this.form.tmFormType = Number(this.form.tmFormType);
switch (this.form.tmFormType) { switch (this.form.tmFormType) {
case 3: case 3:
this.brandType = "文字"; this.brandType = "文字";
break; break;
case 4: case 4:
this.brandType = "图形"; this.brandType = "图形";
break; break;
case 5: case 5:
this.brandType = "文字及图形"; this.brandType = "文字及图形";
break; break;
default: default:
break; break;
...@@ -502,25 +504,29 @@ ...@@ -502,25 +504,29 @@
}); });
}, },
showDialog(from, index){ showDialog(from, index){
this.popupValue = from;
this.nclIndex = index; this.nclIndex = index;
console.log(this.nclIndex); console.log(this.nclIndex, from);
this.dialogTableVisible = true; this.dialogTableVisible = true;
switch (from) { switch (from) {
case 1: case 1:
this.headerInfo = "商标信息"; this.headerInfo = "商标信息";
this.popupValue = "form";
break; break;
case 2: case 2:
this.headerInfo = "商标类别"; this.headerInfo = "商标类别";
break; break;
case 3: case 3:
this.headerInfo = "交官文件"; this.headerInfo = "交官文件";
this.popupValue = "apply";
break; break;
case 4: case 4:
this.headerInfo = "申请人信息"; this.headerInfo = "申请人信息";
this.popupValue = "apply";
break; break;
case 5: case 5:
this.headerInfo = "订单联系人"; this.headerInfo = "订单联系人";
this.popupValue = "apply";
break; break;
case 6: case 6:
this.headerInfo = "付款信息"; this.headerInfo = "付款信息";
...@@ -528,6 +534,7 @@ ...@@ -528,6 +534,7 @@
default: default:
break; break;
} }
}, },
pointsRuleColor(i) { pointsRuleColor(i) {
if (i < parseInt(this.step)) { if (i < parseInt(this.step)) {
...@@ -1357,141 +1364,155 @@ ...@@ -1357,141 +1364,155 @@
}, },
submitEdit(v, agree){ submitEdit(v, agree){
console.log(v); console.log(v);
this.$nextTick(() => {
this.$refs[this.popupValue].validate(valid => {
if (valid) {
console.log(valid);
switch (v) {
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");
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);
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) { case '商标信息':
if (this.nclOne[0].nclThree.length < 10) { /*
this.nclSelected = this.nclOne[0].nclThree.length; this.form.channelUserId = this.channelUserId;
this.showConfrim = true; */
if (agree) {
this.agree = agree;
this.showConfrim = false;
this.$root.loading = true; this.$root.loading = true;
} else { this.form.deliveryOrderNo = this.deliveryOrderNo;
return; var obj = this.$root.copyParams(this.form, "updateTmInfo", "/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);
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");
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.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;
var obj = this.$root.copyParams(this.editApply, "updateCustomerInfo", "/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;
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) => {
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;
default:
break;
} }
} else {
console.log('error submit!!');
this.$message.warning("请核对您的信息");
return false;
} }
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);
});
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.apply.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.apply, "updateCustomerInfo", "/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.apply.deliveryOrderNo = this.deliveryOrderNo;
console.log(this.apply, `zzzzzzzzzzzzzzzzzzzz`);
var obj = this.$root.copyParams(this.apply, "updateContacts", "/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;
default:
break;
}
}, },
closeConfrim(){ closeConfrim(){
this.showConfrim = false; this.showConfrim = false;
......
igirl-channel-web/app/front/vues/pages/selftmreg/index.css
...@@ -475,9 +475,9 @@ ...@@ -475,9 +475,9 @@
left: 100%; left: 100%;
} }
.categoryFrom .el-form-item__error { /* .categoryFrom .el-form-item__error {
left: 45% !important; left: 45% !important;
} } */
#selftmreg h4 { #selftmreg h4 {
font-size: 16px; font-size: 16px;
......
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