Commit b3a64d84 by 刘泽奇

123

parent 941a6c42
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -373,8 +373,8 @@ ...@@ -373,8 +373,8 @@
.jdindentdetail-main-official-img .license-uploader-icon>img { .jdindentdetail-main-official-img .license-uploader-icon>img {
margin: auto; margin: auto;
width: 39px; width: 100%;
height: 40px; height: 100%;
} }
.jdindentdetail-main-official-img .license { .jdindentdetail-main-official-img .license {
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,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="orderFlow.gzwtsUrl?orderFlow.gzwtsUrl:\'/imgs/indent/jpg.png\'" alt=""> <img :src="deliveryInfo.gzwtsUrl?deliveryInfo.gzwtsUrl:\'/imgs/indent/jpg.png\'" alt="">
</div> </div>
</div> </div>
<p>委托书</p> <p>委托书</p>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,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="/imgs/indent/jpg.png" alt=""> <img :src="deliveryInfo.smwjUrl?deliveryInfo.smwjUrl:\'/imgs/indent/jpg.png\'" alt="">
</div> </div>
</div> </div>
<p>优先权证明</p> <p>优先权证明</p>
...@@ -130,7 +130,8 @@ ...@@ -130,7 +130,8 @@
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-applicant"> <div class="jdindentdetail-main-applicant">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
申请人信息-(中国大陆-企业) <span v-if="itemName" @click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span> 申请人信息-(中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}) <span v-if="itemName"
@click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
<li><span>公司名称:</span><span>{{applyInfo.name}}</span></li> <li><span>公司名称:</span><span>{{applyInfo.name}}</span></li>
...@@ -189,8 +190,8 @@ ...@@ -189,8 +190,8 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label="商标名称" style="width:845px;float:left" prop="name" <el-form-item label="商标名称" style="width:845px;float:left" prop="name"
v-if="form.tmFormType != 4"> v-if="form.tmFormType != 4">
<el-input v-model="form.tmName" style="width:330px" placeholder="请输入商标名称"></el-input><span <el-input v-model="form.tmName" style="width:330px" placeholder="请输入商标名称"></el-input>
v-if="form.tmFormType == 5" <span v-if="form.tmFormType == 5"
style="font-size:14px;font-family:PingFangSC-Regular;font-weight:400;color:rgba(99,101,105,1);margin-left: 10px">及图</span> style="font-size:14px;font-family:PingFangSC-Regular;font-weight:400;color:rgba(99,101,105,1);margin-left: 10px">及图</span>
</el-form-item> </el-form-item>
<!-- <div style="float:left;padding-left:10px;padding-block-start:0" v-if="form.tmFormType==3"> <!-- <div style="float:left;padding-left:10px;padding-block-start:0" v-if="form.tmFormType==3">
...@@ -369,7 +370,7 @@ ...@@ -369,7 +370,7 @@
</div> </div>
</div> </div>
<div v-else <div v-else
style="overflow: auto;height: 100%;padding: 60px 20px 0px;box-sizing: border-box;"> style="overflow: auto;height: 100%;padding: 60px 20px 0px;box-sizing: border-box;text-align: center;">
<img src="/imgs/kong-2.png" style="margin-top: 124px;" alt=""> <img src="/imgs/kong-2.png" style="margin-top: 124px;" alt="">
<div style="color: #828282;margin-top: 10px;">请点击左侧选择商标类别</div> <div style="color: #828282;margin-top: 10px;">请点击左侧选择商标类别</div>
</div> </div>
...@@ -385,21 +386,19 @@ ...@@ -385,21 +386,19 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<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="customerType"> style="width:493px;float:left;padding-right:50px;" prop="customerType">
<div class="selftmregType" v-model="apply.customerType" <div class="selftmregType" v-model="applyInfo.customerType"
:style="apply.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'" :style="applyInfo.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
@click="apply.customerType = \'ent\'">企业<img v-if="apply.customerType==\'ent\'" @click="applyInfo.customerType = \'ent\'">企业<img v-if="applyInfo.customerType==\'ent\'"
src="/imgs/sjd.png" alt=""></div> src="/imgs/sjd.png" alt=""></div>
<div class="selftmregType" v-model="apply.customerType" <div class="selftmregType" v-model="applyInfo.customerType"
:style="apply.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'" :style="applyInfo.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
@click="apply.customerType = \'person\'">个体户<img @click="applyInfo.customerType = \'person\'">个体户<img
v-if="apply.customerType==\'person\'" src="/imgs/sjd.png" alt=""></div> v-if="applyInfo.customerType==\'person\'" src="/imgs/sjd.png" alt=""></div>
</el-form-item> </el-form-item> -->
<div style="clear:both;"></div> <div style="clear:both;"></div>
<div class="selftmreg_main"> <div class="selftmreg_main">
<div style="width: 100%;text-align: left;padding-left: 10px;box-sizing: border-box;"> <div style="width: 100%;text-align: left;padding-left: 10px;box-sizing: border-box;">
<el-form-item class="gsb_items" label=""> <el-form-item class="gsb_items" label="">
<div class="title special">上传材料:营业执照</div> <div class="title special">上传材料:营业执照</div>
...@@ -428,14 +427,14 @@ ...@@ -428,14 +427,14 @@
<div class="upload-img" @mouseover="mouseOverDemo(1)" <div class="upload-img" @mouseover="mouseOverDemo(1)"
@mouseleave="mouseLeaveDemo(1)"> @mouseleave="mouseLeaveDemo(1)">
<img <img
:src="apply.customerType == \'ent\' ? \'/imgs/sbzc/yyzz1.png\' : \'imgs/sbzc/yyzz.png\'" /> :src="applyInfo.customerType == \'ent\' ? \'/imgs/sbzc/yyzz1.png\' : \'imgs/sbzc/yyzz.png\'" />
<div v-if="toViewImgKey == 1" class="toViewImg" <div v-if="toViewImgKey == 1" class="toViewImg"
@click="toViewImg(apply.customerType == \'ent\' ? \'/imgs/sbzc/yyzzD1.png\' : \'imgs/sbzc/yyzzD.png\')"> @click="toViewImg(applyInfo.customerType == \'ent\' ? \'/imgs/sbzc/yyzzD1.png\' : \'imgs/sbzc/yyzzD.png\')">
查看大图</div> 查看大图</div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item class="gsb_items" v-if="apply.customerType==\'person\'" label=""> <el-form-item class="gsb_items" v-if="applyInfo.customerType==\'person\'" label="">
<div class="title special">上传材料:身份证明</div> <div class="title special">上传材料:身份证明</div>
<div class="upload-box" v-loading="loading1" @mouseover="mouseOverDemo(4,\'d\')" <div class="upload-box" v-loading="loading1" @mouseover="mouseOverDemo(4,\'d\')"
@mouseleave="mouseLeaveDemo(4,\'d\')"> @mouseleave="mouseLeaveDemo(4,\'d\')">
...@@ -475,8 +474,8 @@ ...@@ -475,8 +474,8 @@
</div> </div>
<div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')" <div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')"> @mouseleave="mouseLeaveDemo(2,\'b\')">
<img @click="window.open(apply.sealAuthorizeStuff)" class="upload-applyimg" <img @click="window.open(apply.gzwtsUrl)" class="upload-applyimg"
v-if="apply.sealAuthorizeStuff" :src="apply.sealAuthorizeStuff" /> v-if="apply.gzwtsUrl" :src="apply.gzwtsUrl" />
<gsb-upload v-else flag="wts" ref="wts" :d="d" @setKey="setKey" <gsb-upload v-else flag="wts" ref="wts" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
...@@ -485,9 +484,8 @@ ...@@ -485,9 +484,8 @@
<div>(需盖公章)</div> <div>(需盖公章)</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" <div class="upload-dialog" v-show="apply.gzwtsUrl && toViewImgKey == \'b\'">
v-show="apply.sealAuthorizeStuff && toViewImgKey == \'b\'"> <div @click="window.open(apply.gzwtsUrl)">查看大图</div>
<div @click="window.open(apply.sealAuthorizeStuff)">查看大图</div>
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" <gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
...@@ -498,9 +496,9 @@ ...@@ -498,9 +496,9 @@
<div class="upload-img" @mouseover="mouseOverDemo(2)" <div class="upload-img" @mouseover="mouseOverDemo(2)"
@mouseleave="mouseLeaveDemo(2)"> @mouseleave="mouseLeaveDemo(2)">
<img <img
:src="apply.customerType == \'ent\' ? \'/imgs/sbzc/wts1.png\' : \'imgs/sbzc/wts.png\'" /> :src="applyInfo.customerType == \'ent\' ? \'/imgs/sbzc/wts1.png\' : \'imgs/sbzc/wts.png\'" />
<div v-if="toViewImgKey == 2" class="toViewImg" <div v-if="toViewImgKey == 2" class="toViewImg"
@click="toViewImg(apply.customerType == \'ent\' ? \'/imgs/sbzc/wtsD1.png\' : \'imgs/sbzc/wtsD.png\')"> @click="toViewImg(applyInfo.customerType == \'ent\' ? \'/imgs/sbzc/wtsD1.png\' : \'imgs/sbzc/wtsD.png\')">
查看大图</div> 查看大图</div>
</div> </div>
...@@ -512,8 +510,8 @@ ...@@ -512,8 +510,8 @@
</div> </div>
<div class="upload-box" v-loading="loading3" @mouseover="mouseOverDemo(3,\'c\')" <div class="upload-box" v-loading="loading3" @mouseover="mouseOverDemo(3,\'c\')"
@mouseleave="mouseLeaveDemo(3,\'c\')"> @mouseleave="mouseLeaveDemo(3,\'c\')">
<img @click="window.open(apply.descUrl)" class="upload-applyimg" <img @click="window.open(apply.smwjUrl)" class="upload-applyimg"
v-if="apply.descUrl" :src="apply.descUrl" /> v-if="apply.smwjUrl" :src="apply.smwjUrl" />
<gsb-upload v-else flag="yxq" ref="yxq" :d="d" @setKey="setKey" <gsb-upload v-else flag="yxq" ref="yxq" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
...@@ -522,8 +520,8 @@ ...@@ -522,8 +520,8 @@
<div>(需盖公章)</div> <div>(需盖公章)</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" v-show="apply.descUrl && toViewImgKey == \'c\'"> <div class="upload-dialog" v-show="apply.smwjUrl && toViewImgKey == \'c\'">
<div @click="window.open(apply.descUrl)">查看大图</div> <div @click="window.open(apply.smwjUrl)">查看大图</div>
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" <gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
...@@ -545,7 +543,6 @@ ...@@ -545,7 +543,6 @@
alt=""> alt="">
</el-dialog> </el-dialog>
</div> </div>
</div> </div>
</el-form> </el-form>
...@@ -553,17 +550,16 @@ ...@@ -553,17 +550,16 @@
<div v-show="headerInfo==\'申请人信息\'"> <div v-show="headerInfo==\'申请人信息\'">
<el-form ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" label-width="120px"> <el-form ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" label-width="120px">
<div class="selftmreg_main"> <div class="selftmreg_main">
<div style="clear:both;"></div> <div style="clear:both;"></div>
<div style="width:100%;padding-left: 30px;box-sizing: border-box;"> <div style="width:100%;padding-left: 30px;box-sizing: border-box;">
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>申请人信息</h4>
<el-form-item label-width="140px" label="申请人类型" <el-form-item label-width="140px" label="申请人类型"
style="width:493px;float:left;padding-right:50px;" prop="customerType"> style="width:493px;float:left;padding-right:50px;" prop="customerType">
<div class="selftmregType" v-model="apply.customerType" <div class="selftmregType" v-model="apply.customerType"
:style="apply.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'" :style="apply.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
@click="apply.customerType = \'ent\'">企业<img v-if="apply.customerType==\'ent\'" @click="apply.customerType = \'ent\'">企业<img
src="/imgs/sjd.png" alt=""></div> v-if="apply.customerType==\'ent\'" src="/imgs/sjd.png" alt=""></div>
<div class="selftmregType" v-model="apply.customerType" <div class="selftmregType" v-model="apply.customerType"
:style="apply.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'" :style="apply.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
@click="apply.customerType = \'person\'">个体户<img @click="apply.customerType = \'person\'">个体户<img
...@@ -621,7 +617,7 @@ ...@@ -621,7 +617,7 @@
</div> </div>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="执照详细地址" <el-form-item v-if="applyInfo.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="apply.applyAddr"></el-input> <el-input placeHolder="请输入执照详细地址" v-model="apply.applyAddr"></el-input>
</el-form-item> </el-form-item>
...@@ -633,8 +629,71 @@ ...@@ -633,8 +629,71 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
</div> </div>
<el-form-item class="gsb_items" label="">
<div class="title special">上传材料:营业执照</div>
<div class="upload-box" v-loading="loading" @mouseover="mouseOverDemo(1,\'a\')"
@mouseleave="mouseLeaveDemo(1,\'a\')">
<img class="upload-applyimg" v-if="apply.businessLicensePic"
src="/imgs/sbzc/yyzzD.png" />
<gsb-upload v-else flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<div class="upload-button" @click="loadingKey = 0">
<div><i class="el-icon-circle-plus-outline"></i></div>
<div>(需盖公章)</div>
</div>
</gsb-upload>
<div class="upload-dialog" v-show="apply.businessLicensePic && toViewImgKey == \'a\'">
<div @click="window.open(apply.businessLicensePic)">查看大图</div>
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<div @click="loadingKey = 0">重新上传</div>
</gsb-upload>
</div>
</div> </div>
<div class="selftmreg_main"> <div class="upload-img" @mouseover="mouseOverDemo(1)" @mouseleave="mouseLeaveDemo(1)">
<img
:src="applyInfo.customerType == \'ent\' ? \'/imgs/sbzc/yyzz1.png\' : \'imgs/sbzc/yyzz.png\'" />
<div v-if="toViewImgKey == 1" class="toViewImg"
@click="toViewImg(applyInfo.customerType == \'ent\' ? \'/imgs/sbzc/yyzzD1.png\' : \'imgs/sbzc/yyzzD.png\')">
查看大图</div>
</div>
</el-form-item>
<el-form-item class="gsb_items" v-if="applyInfo.customerType==\'person\'" label="">
<div class="title special">上传材料:身份证明</div>
<div class="upload-box" v-loading="loading1" @mouseover="mouseOverDemo(4,\'d\')"
@mouseleave="mouseLeaveDemo(4,\'d\')">
<img @click="window.open(apply.identityCardPic)" class="upload-applyimg"
v-if="apply.identityCardPic" src="/imgs/sbzc/pdf.png" />
<gsb-upload v-else flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<div class="upload-button" @click="loadingKey = 1">
<div><i class="el-icon-circle-plus-outline"></i></div>
<div>(需盖公章)</div>
</div>
</gsb-upload>
<div class="upload-dialog" v-show="apply.identityCardPic && toViewImgKey == \'d\'">
<div @click="window.open(apply.identityCardPic)">查看大图</div>
<gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<div @click="loadingKey = 1">重新上传</div>
</gsb-upload>
</div>
</div>
<div class="upload-img" @mouseover="mouseOverDemo(4)" @mouseleave="mouseLeaveDemo(4)">
<img src="/imgs/sbzc/sfz.png" />
<div v-if="toViewImgKey == 4" class="toViewImg"
@click="toViewImg(\'/imgs/sbzc/sfzD.png\')">查看大图</div>
</div>
<div class="text"> <i class="el-icon-warning"></i> 格式为<span>PDF</span>
<span>JPG</span>,大小不能超过<span>10M</span></div>
</el-form-item>
</div>
<!-- <div class="selftmreg_main">
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>订单联系人</h4> <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>订单联系人</h4>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<div style="width:100%;padding-left: 30px;box-sizing: border-box;"> <div style="width:100%;padding-left: 30px;box-sizing: border-box;">
...@@ -666,32 +725,30 @@ ...@@ -666,32 +725,30 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
</div> </div>
</div> </div> -->
</el-form> </el-form>
</div> </div>
<div v-show="headerInfo==\'订单联系人\'"> <div v-show="headerInfo==\'订单联系人\'">
<el-form ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" label-width="120px"> <el-form ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" label-width="120px">
<div class="selftmreg_main"> <!-- <div class="selftmreg_main">
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>申请人信息</h4>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<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="customerType"> style="width:493px;float:left;padding-right:50px;" prop="customerType">
<div class="selftmregType" v-model="apply.customerType" <div class="selftmregType" v-model="applyInfo.customerType"
:style="apply.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'" :style="applyInfo.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
@click="apply.customerType = \'ent\'">企业<img v-if="apply.customerType==\'ent\'" @click="applyInfo.customerType = \'ent\'">企业<img v-if="applyInfo.customerType==\'ent\'"
src="/imgs/sjd.png" alt=""></div> src="/imgs/sjd.png" alt=""></div>
<div class="selftmregType" v-model="apply.customerType" <div class="selftmregType" v-model="applyInfo.customerType"
:style="apply.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'" :style="applyInfo.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
@click="apply.customerType = \'person\'">个体户<img @click="applyInfo.customerType = \'person\'">个体户<img
v-if="apply.customerType==\'person\'" src="/imgs/sjd.png" alt=""></div> v-if="applyInfo.customerType==\'person\'" src="/imgs/sjd.png" alt=""></div>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="公司名称" <el-form-item v-if="applyInfo.customerType==\'ent\'" label-width="140px" label="公司名称"
style="width:493px;float:left;padding-right:50px;" prop="name"> style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectent v-if="currentUser" allowcreate="true" showhistory="true" <gsb-selectent v-if="currentUser" allowcreate="true" showhistory="true"
@historychange="historyapplierchange" @change="applierChange" size="medium" @historychange="historyapplierchange" @change="applierChange" size="medium"
...@@ -705,7 +762,7 @@ ...@@ -705,7 +762,7 @@
valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称"> valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectent> </gsb-selectent>
</el-form-item> </el-form-item>
<el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名" <el-form-item v-if="applyInfo.customerType==\'person\'" label-width="140px" label="姓名"
style="width:493px;float:left;padding-right:50px;" prop="name"> style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectperson v-if="currentUser" @input="selectpersoninput" allowcreate="true" <gsb-selectperson v-if="currentUser" @input="selectpersoninput" allowcreate="true"
showhistory="true" @historychange="historyapplierchange" size="medium" showhistory="true" @historychange="historyapplierchange" size="medium"
...@@ -720,12 +777,12 @@ ...@@ -720,12 +777,12 @@
</gsb-selectperson> </gsb-selectperson>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="身份证号码" <el-form-item v-if="applyInfo.customerType==\'person\'" label-width="140px" label="身份证号码"
style="width:493px;float:left;padding-right:50px;" prop="identityCardNo"> style="width:493px;float:left;padding-right:50px;" prop="identityCardNo">
<el-input placeHolder="请输入身份证号码" v-model="apply.identityCardNo"> </el-input> <el-input placeHolder="请输入身份证号码" v-model="apply.identityCardNo"> </el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="身份证住址" <el-form-item v-if="applyInfo.customerType==\'person\'" 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="apply.applyAddr"></el-input> <el-input placeHolder="请输入身份证住址" v-model="apply.applyAddr"></el-input>
</el-form-item> </el-form-item>
...@@ -741,7 +798,7 @@ ...@@ -741,7 +798,7 @@
</div> </div>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="执照详细地址" <el-form-item v-if="applyInfo.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="apply.applyAddr"></el-input> <el-input placeHolder="请输入执照详细地址" v-model="apply.applyAddr"></el-input>
</el-form-item> </el-form-item>
...@@ -753,7 +810,7 @@ ...@@ -753,7 +810,7 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
</div> </div>
</div> </div> -->
<div class="selftmreg_main"> <div class="selftmreg_main">
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>订单联系人</h4> <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>订单联系人</h4>
<div style="clear:both;"></div> <div style="clear:both;"></div>
......
...@@ -201,8 +201,8 @@ ...@@ -201,8 +201,8 @@
fax: "", fax: "",
businessLicensePic: "", businessLicensePic: "",
identityCardPic: "", identityCardPic: "",
sealAuthorizeStuff: "", gzwtsUrl: "",
descUrl: "", smwjUrl: "",
notes: "", notes: "",
}, },
rules: { rules: {
...@@ -670,7 +670,7 @@ ...@@ -670,7 +670,7 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.apply["sealAuthorizeStuff"] = d.data.url; that.apply["gzwtsUrl"] = d.data.url;
return; return;
} else { } else {
that.$refs[obj.flag][0].result = ""; that.$refs[obj.flag][0].result = "";
...@@ -689,7 +689,8 @@ ...@@ -689,7 +689,8 @@
}); });
} }
if (obj.flag == "yxq") { if (obj.flag == "yxq") {
that.apply["descUrl"] = obj.result; console.log(obj);
that.apply["smwjUrl"] = obj.result;
setTimeout(() => { setTimeout(() => {
that.loading1 = false; that.loading1 = false;
that.loading2 = false; that.loading2 = false;
...@@ -801,7 +802,7 @@ ...@@ -801,7 +802,7 @@
}) })
}, },
handleCheckChange(obj, a, b) { handleCheckChange(obj, a, b) {
console.log(obj, a, b, '1233333333333333333333344444444444444444444'); console.log(obj, a, b, '1233333333333333333333344444444444444444444',this.checkedNcl);
let dataRecieve = this.$refs.tree.getCheckedNodes(); let dataRecieve = this.$refs.tree.getCheckedNodes();
if (obj.type) { if (obj.type) {
return return
...@@ -1297,8 +1298,8 @@ ...@@ -1297,8 +1298,8 @@
case '商标类别': case '商标类别':
this.editNcl.deliveryOrderNo = this.deliveryOrderNo; this.editNcl.deliveryOrderNo = this.deliveryOrderNo;
this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode; this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode;
this.editNcl.nclOneCodes = this.nclOne; this.editNcl.nclOneCodes = this.nclOne[0].code;
this.editNcl.nclSmallCodes = this.nclOne; 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"); 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) => {
...@@ -1310,7 +1311,6 @@ ...@@ -1310,7 +1311,6 @@
message: '修改成功!' message: '修改成功!'
}); });
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
} }
...@@ -1321,7 +1321,7 @@ ...@@ -1321,7 +1321,7 @@
case '交官文件': case '交官文件':
this.apply.deliveryOrderNo = this.deliveryOrderNo; this.apply.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.apply, "updateCustomerInfo", "/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);
...@@ -1331,7 +1331,6 @@ ...@@ -1331,7 +1331,6 @@
message: '提交成功!' message: '提交成功!'
}); });
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
} }
...@@ -1351,7 +1350,6 @@ ...@@ -1351,7 +1350,6 @@
message: '提交成功!' message: '提交成功!'
}); });
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
} }
...@@ -1360,8 +1358,9 @@ ...@@ -1360,8 +1358,9 @@
}); });
break; break;
case '订单联系人': case '订单联系人':
this.applyInfo.deliveryOrderNo = this.deliveryOrderNo; this.apply.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.applyInfo, "updateContacts", "/action/tmOrder/springBoard", "yes", "yes"); 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) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
if (res.status == 0) { if (res.status == 0) {
console.log(res); console.log(res);
...@@ -1371,7 +1370,6 @@ ...@@ -1371,7 +1370,6 @@
message: '提交成功!' message: '提交成功!'
}); });
this.$router.go(0); this.$router.go(0);
} else { } else {
this.$message(res.msg); this.$message(res.msg);
} }
...@@ -1379,8 +1377,6 @@ ...@@ -1379,8 +1377,6 @@
this.$message(e); this.$message(e);
}); });
break; break;
default: default:
break; break;
} }
......
...@@ -241,8 +241,8 @@ ...@@ -241,8 +241,8 @@
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
text-align: center; text-align: center;
border: 1px solid #DCDFE6; border: 1px solid #BBBBBB;
color: #DCDFE6; color: #BBBBBB;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
} }
......
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