Skip to content

Z
zhichan
Commit 6bea4b63 by 刘泽奇
Options

123

parent 3d63047b
Showing with 139 additions and 67 deletions
igirl-channel-web/app/front/entry/public/css/pagecom.css 100644 → 100755
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-web/app/front/entry/public/imgs/indent/pdf.png
igirl-channel-web/app/front/entry/public/imgs/indent/pdf.png

1.86 KB | W: | H:

igirl-channel-web/app/front/entry/public/imgs/indent/pdf.png

1.43 KB | W: | H:

igirl-channel-web/app/front/entry/public/imgs/indent/pdf.png
igirl-channel-web/app/front/entry/public/imgs/indent/pdf.png
igirl-channel-web/app/front/entry/public/imgs/indent/pdf.png
igirl-channel-web/app/front/entry/public/imgs/indent/pdf.png
  • 2-up
  • Swipe
  • Onion skin
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
......@@ -66,10 +66,10 @@
<div class="jdindentdetail-main-type-box" v-for="(item, index) in nclInfo" :key="index">
<div class="jdindentdetail-main-type">
<div class="jdindentdetail-main-title">
{{item.nclOneCodes}}
商标类别
</div>
<div class="jdindentdetail-main-type-title">
广告销售
{{item.nclOneCodes}}
<span>{{item.tbCode}}</span>
<span>初审公告</span>
<span v-if="itemName" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
......@@ -307,8 +307,8 @@
deliveryStatus: "",
totalSum: "",
/*大类下标 */
nclIndex:"",
editNcl:{},
nclIndex: "",
editNcl: {},
}
},
mounted: function() {
......@@ -326,7 +326,7 @@
console.log(this.$route.query, '11111111111', this.form.tmFormType);
if (this.$route.query.deliveryOrderNo != "" && this.$route.query.channelUserId != "") {
this.deliveryOrderNo = this.$route.query.deliveryOrderNo;
this.$root.channelUserId = this.$route.query.channelUserId;
this.channelUserId = this.$root.channelUserId = this.$route.query.channelUserId;
this.itemName = this.$route.query.itemName == "商标自助注册" || this.$route.query.itemName == "商标自主注册" ? true : false;
this.initIndent();
}
......@@ -363,7 +363,7 @@
created: function() {
if (this.$route.query.channelUserId != "") {
this.$root.channelUserId = this.$route.query.channelUserId;
console.log(this.$route.query.channelUserId,"11111111111");
console.log(this.$route.query.channelUserId, "11111111111");
}
},
computed: {
......@@ -418,14 +418,12 @@
this.$root.loading = false;
}
});
},
/*订单流程 */
initOrderFlow(){
},
showDialog(from,index){
showDialog(from, index){
this.popupValue = from;
this.nclIndex = index;
this.dialogTableVisible = true;
......@@ -805,7 +803,7 @@
})
},
handleCheckChange(obj, a, b) {
console.log(obj, a, b, '1233333333333333333333344444444444444444444',this.checkedNcl);
console.log(obj, a, b, '1233333333333333333333344444444444444444444', this.checkedNcl);
let dataRecieve = this.$refs.tree.getCheckedNodes();
if (obj.type) {
return
......@@ -1303,7 +1301,7 @@
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,`xxxxxxxxxxxxxxxxxxxxxxxx`);
console.log(this.nclInfo, this.nclOne, `xxxxxxxxxxxxxxxxxxxxxxxx`);
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) {
......@@ -1362,7 +1360,7 @@
break;
case '订单联系人':
this.apply.deliveryOrderNo = this.deliveryOrderNo;
console.log(this.apply,`zzzzzzzzzzzzzzzzzzzz`);
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) {
......
igirl-channel-web/app/front/vues/pages/jdregscheme/jdregscheme.css
.jdregschemesubmit-footer {
text-align: center;
margin-top: 15px;
}
.jdregschemesubmit-footer-box button {
width: 208px;
height: 40px;
......@@ -24,32 +24,47 @@
color: rgba(130, 130, 130, 1);
margin-top: 15px;
}
..jdregscheme-nav {
height: 70px;
box-sizing: border-box;
width: 100%;
margin: 0 auto;
width:261px;
height:22px;
font-size:16px;
font-weight:400;
width: 261px;
height: 22px;
font-size: 16px;
font-weight: 400;
padding: 10px 0;
;}
;
}
.jdregscheme-footer-main>div>div{
.jdregscheme-footer-main>div>div {
text-align: center;
}
.jdregscheme_border{
width:100%;
height:2px;
.jdregscheme_border {
width: 100%;
height: 2px;
}
.jdregscheme_border,.dialog-footer,.el-dialog__title,.jdregscheme-footer-main>div>div{
.jdregscheme_border,
.dialog-footer,
.el-dialog__title,
.jdregscheme-footer-main>div>div {
display: block;
}
.dialog-footer{
.dialog-footer {
width: 100%;
}
.jdregscheme .jdindentdetail-main-type-services>p {
margin: 0;
float: none;
margin-left: 11px;
}
.jdregscheme .jdindentdetail-main-type-services>ul>li{
}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdregscheme/jdregscheme.html
......@@ -22,16 +22,16 @@
<div style="font-size:14px;font-family:PingFangSC-Regular; font-weight:400;">
<div style="width: 100%;margin-bottom: 23px">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">商标类型:</div>
<div style="display:inline-block;padding-left:10px;">{{tm_form_type[form.tmFormType]}}</div>
<div style="display:inline-block;padding-left:10px;">{{deliveryInfo.tmType}}</div>
</div>
<div style="width: 100%;margin-bottom: 23px">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">商标名称:</div>
<div style="display:inline-block;padding-left:10px;">{{form.name}}</div>
<div style="display:inline-block;padding-left:10px;">{{deliveryInfo.tmName}}</div>
</div>
<div style="width: 100%;margin-bottom: 23px">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">商标图样:</div>
<div style="display:inline-block;vertical-align: top;padding-left:10px;">
<img :src="form.colorizedPicUrl"
<img :src="deliveryInfo.picUrl"
style="height:100px;width:100px;border: 2px dashed rgb(233, 233, 233);">
</div>
</div>
......@@ -39,15 +39,19 @@
<div style="width:120px;display:inline-block;text-align: right;color:#636569;line-height: 25px">
商标类别:</div>
<div style="width:84%;display:inline-block;padding-left:10px;vertical-align: top;">
<!-- <div v-for="item in nclOne">
<div style="font-size: 20px; color: #373737;font-weight:400;line-height: 25px">
{{item.type ?\'第 \' +item.code + \' 类 \' : item.code}} {{item.name}}
<div class="jdindentdetail-main-type-box" v-for="(item, index) in nclInfo" :key="index">
<div class="jdindentdetail-main-type">
<div class="jdindentdetail-main-type-services">
<p>{{item.nclOneCodes}}</p>
<ul>
<li v-for="(item, index) in item.nclSmallCodes" :key="index">
{{item.pcode}}{{item.name}}
</li>
</ul>
</div>
</div>
<div style="margin: 10px 0;">
<span v-for="child in item.nclThree" style="line-height: 25px;margin-right:20px;color: #373737;font-weight: 400;font-family:PingFangSC-Regular,PingFang SC;">{{child.code}}
{{child.name}}</span>
</div>
</div> -->
</div>
</div>
<div style="clear:both"></div>
......@@ -61,69 +65,69 @@
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">申请人资质:</div>
<div style="display:inline-block;padding-left:10px;">
{{apply.customerType=="ent"?"企业":""}}{{apply.customerType=="person"?"个人":""}}</div>
{{applyInfo.customerType=="ent"?"企业":"个人"}}</div>
</div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div v-if="apply.customerType==\'ent\'"
<div v-if="applyInfo.customerType==\'ent\'"
style="width:120px;display:inline-block;text-align: right;color:#636569;">公司名称:</div>
<div v-if="apply.customerType==\'person\'"
<div v-if="applyInfo.customerType==\'person\'"
style="width:120px;display:inline-block;text-align: right;color:#636569;">申请人姓名:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.name}}</div>
<div style="display:inline-block;padding-left:10px;">{{applyInfo.name}}</div>
</div>
<div style="clear:both"></div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">邮政编码:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.zipCode}}</div>
<div style="display:inline-block;padding-left:10px;">{{applyInfo.zipCode}}</div>
</div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div v-if="apply.customerType==\'ent\'"
<div v-if="applyInfo.customerType==\'ent\'"
style="width:120px;display:inline-block;text-align: right;color:#636569;">公司地址:</div>
<div v-if="apply.customerType==\'person\'"
<div v-if="applyInfo.customerType==\'person\'"
style="width:120px;display:inline-block;text-align: right;color:#636569;">申请人地址:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.applyAddr}}</div>
<div style="display:inline-block;padding-left:10px;">{{applyInfo.applyInfoAddr}}</div>
</div>
<div style="clear:both"></div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">联系人:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.contacts}}</div>
<div style="display:inline-block;padding-left:10px;">{{applyInfo.contacts}}</div>
</div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">联系电话:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.mobile}}</div>
<div style="display:inline-block;padding-left:10px;">{{applyInfo.mobile}}</div>
</div>
<div style="clear:both"></div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">电子邮箱:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.email}}</div>
<div style="display:inline-block;padding-left:10px;">{{applyInfo.email}}</div>
</div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">信用编码:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.code}}</div>
<div style="display:inline-block;padding-left:10px;">{{applyInfo.code}}</div>
</div>
<div style="clear:both"></div>
<div v-if="apply.customerType==\'person\'"
<div v-if="applyInfo.customerType==\'person\'"
style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">身份证号:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.identityCardNo}}</div>
<div style="display:inline-block;padding-left:10px;">{{applyInfo.identityCardNo}}</div>
</div>
<div style="clear:both"></div>
</div>
<h4><i class="selftmreg_shuxian"></i>材料信息</h4>
<div style="font-size:14px;font-family:PingFangSC-Regular; font-weight:400;">
<div style="width: 100%;margin-bottom: 23px;padding-left: 40px;box-sizing: border-box;">
<div v-if="apply.businessLicensePic"
<div v-if="applyInfo.businessLicensePic"
style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px">
<img @click="window.open(apply.businessLicensePic)" v-if="apply.businessLicensePic"
<img @click="window.open(applyInfo.businessLicensePic)" v-if="applyInfo.businessLicensePic"
src="/imgs/sbzc/yyzzD.png"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737;
line-height:20px;display: block;text-align: center">企业营业执照 </span>
</div>
<div v-if="apply.identityCardPic"
<div v-if="applyInfo.identityCardPic"
style="position: relative;display:inline-block;padding-left:10px;cursor: pointer;margin-right: 50px">
<img @click="window.open(apply.identityCardPic)" v-if="apply.identityCardPic"
<img @click="window.open(applyInfo.identityCardPic)" v-if="applyInfo.identityCardPic"
src="/imgs/sbzc/wtsD.png"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
......@@ -134,9 +138,9 @@
</span>
</div>
<div v-if="apply.sealAuthorizeStuff"
<div v-if="applyInfo.sealAuthorizeStuff"
style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px;">
<img :src="apply.sealAuthorizeStuff"
<img :src="applyInfo.sealAuthorizeStuff"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737;
......@@ -144,9 +148,9 @@
style="color: rgb(15, 142, 233);" class="el-icon-question "></i></span>
</div>
<div v-if="apply.descUrl"
<div v-if="applyInfo.descUrl"
style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px">
<img :src="apply.descUrl"
<img :src="applyInfo.descUrl"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737;
......@@ -165,7 +169,7 @@
font-weight:600 !important;
color:#333333;
line-height:12px;
letter-spacing:1px;" :visible.sync="apply.centerDialogVisible" width="70%" center>
letter-spacing:1px;" :visible.sync="applyInfo.centerDialogVisible" width="70%" center>
<span style="display:block; border-bottom: 1px solid #E8E8E8;margin-top: -20px;"></span>
<span style="padding-left: 10px;
display: block;
......@@ -202,7 +206,7 @@
<el-button type="primary" @click="submitForm = false" style="width:140px;
height:36px;
background:rgba(38,146,255,1);
border-radius:4px;">保存</el-button>
border-radius:4px;">确定</el-button>
</span>
</el-dialog>
</div>
......@@ -210,8 +214,8 @@
<br />
<div class="jdregschemesubmit-footer">
<div class="jdregschemesubmit-footer-box">
<el-button type="primary" @click="submitForm(\'order\')">不同意该注册方案</el-button>
<el-button type="primary" @click="AgreedForm(\'order\')"> 同意该注册方案</el-button>
<el-button type="primary" @click="submitForm">不同意该注册方案</el-button>
<el-button style="color:#fff;" type="primary" @click="agreedForm()"> 同意该注册方案</el-button>
</div>
<div> <i class="el-icon-warning" style="color:#0F8EE9;"></i> 注：如果同意该注册方案后，我们即可递交商标局，如果不同意，请填写理由。</div>
</div>
......
igirl-channel-web/app/front/vues/pages/jdregscheme/jdregscheme.js
......@@ -116,23 +116,77 @@
centerDialogVisible: false
},
isRead: false,
nclOne: []
/*页面信息 */
deliveryInfo: "",
applyInfo: {},
deliveryOrderNo: '',
nclInfo:"",
}
},
mounted: function() {
this.initIndent();
},
created: function() {
if (this.$route.query.channelUserId != "" && this.$route.query.deliveryOrderNo) {
this.$root.channelUserId = this.$route.query.channelUserId;
this.deliveryOrderNo = this.$route.query.deliveryOrderNo;
}
},
methods: {
submitForm(done){
submitForm(){
this.apply.centerDialogVisible = true;
},
AgreedForm(){
this.$router.push({ path: "/1688/jdindentlist"});
agreedForm(){
this.$router.push({ path: "/1688/jdindentlist" });
},
/*初始化订单数据 */
initIndent(){
var deliveryObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$root.channelUserId }, "getTmOrderInfo", "/action/tmOrder/springBoard");
var applyObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$root.channelUserId }, "getTmApplyInfo", "/action/tmOrder/springBoard");
var nclObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$root.channelUserId }, "getTmNclList", "/action/tmOrder/springBoard");
let [loadingA, loadingB, loadingC] = [1, 1, 1];
this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", deliveryObj).then((d) => {
loadingA = 0;
if (d.status == 0 && d.data) {
console.log(d, `deliveryInfo`);
this.deliveryInfo = d.data.tm;
this.orderFlow = d.data.orderFlow;
this.orderFlow.map((item, index) => {
item.createDate = new Date(item.createDate).toLocaleString('chinese', { hour12: false });
})
}
}).then(() => {
if (loadingA == 0 && loadingB == 0 && loadingC == 0) {
this.$root.loading = false;
}
});
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", applyObj).then((d) => {
loadingB = 0;
console.log(d, `applyObj`);
if (d.status == 0 && d.data) {
this.applyInfo = d.data;
}
}).then(() => {
if (loadingA == 0 && loadingB == 0 && loadingC == 0) {
this.$root.loading = false;
}
});
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", nclObj).then((d) => {
loadingC = 0;
console.log(d, `nclObj`);
if (d.status == 0 && d.data) {
this.nclInfo = d.data;
this.nclInfo.map((item, index) => {
item.nclSmallCodes = JSON.parse(item.nclSmallCodes);
})
}
}).then(() => {
if (loadingA == 0 && loadingB == 0 && loadingC == 0) {
this.$root.loading = false;
}
});
},
},
vname: "gsb-jdregscheme"
}
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