Skip to content

Z
zhichan
Commit edec4ab1 by 刘泽奇
Options

123

parent e240ac0f
Showing with 146 additions and 142 deletions
igirl-channel-jdweb/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-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.css
......@@ -131,7 +131,7 @@
}
.jdindentdetail-main-step-col .el-step.is-horizontal .el-step__line {
transform: scaleX(0.7);
transform: scaleX(1);
}
.jdindentdetail-main-step-col .el-step.is-horizontal .el-step__main .is-process {
......@@ -521,3 +521,11 @@
.jdindentdetail-warpper .categoryFrom .el-form-item__error {
left: 0 !important;
}
.jdindentdetail-diag .el-drawer__open .el-drawer.rtl{
width: 66%;
}
.jdindentdetail-drawer .selftmreg_main .el-form-item{
margin-bottom: 10px !important;
}
.jdindentdetail-drawer .selftmreg_main
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.html
......@@ -48,7 +48,7 @@
<div class="jdindentdetail-info">
<div class="jdindentdetail-main-title">
商标信息 <span v-show="itemCode" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span>
商标信息 <span v-show="1" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span>
</div>
<div>
<p>
......@@ -74,7 +74,7 @@
{{item.nclOneCodes}}
<span>{{item.tmRegistNum}}</span>
<span>{{item.officialTypeName}}</span>
<span v-show="itemCode" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span>
<span v-show="1" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span>
</div>
<div class="jdindentdetail-main-type-services">
<p>商品服务项目：</p>
......@@ -96,7 +96,7 @@
<div class="jdindentdetail-main-official">
<div class="jdindentdetail-main-title">
交官文件 <span v-show="itemCode" @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span>
交官文件 <span v-show="1" @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span>
</div>
<div class="jdindentdetail-main-official-img">
<div>
......@@ -113,8 +113,8 @@
<div class="license-uploader">
<img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else>
<img :src="deliveryInfo.gzwtsUrl?deliveryInfo.gzwtsUrl:\'/imgs/indent/materialNull.png\'" alt=""
@click="openPdf(deliveryInfo.gzwtsUrl)">
<img :src="deliveryInfo.gzwtsUrl?deliveryInfo.gzwtsUrl:\'/imgs/indent/materialNull.png\'"
alt="" @click="openPdf(deliveryInfo.gzwtsUrl)">
</div>
</div>
<p>委托书</p>
......@@ -124,8 +124,8 @@
<div class="license-uploader">
<img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else>
<img :src="deliveryInfo.smwjUrl?deliveryInfo.smwjUrl:\'/imgs/indent/materialNull.png\'" alt=""
@click="openPdf(deliveryInfo.smwjUrl)">
<img :src="deliveryInfo.smwjUrl?deliveryInfo.smwjUrl:\'/imgs/indent/materialNull.png\'"
alt="" @click="openPdf(deliveryInfo.smwjUrl)">
</div>
</div>
<p>优先权证明</p>
......@@ -135,7 +135,7 @@
<img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else>
<img :src="applyInfo.identityCardPic?applyInfo.identityCardPic:\'/imgs/indent/materialNull.png\'"
alt="">
alt="" @click="openPdf(applyInfo.identityCardPic)">
</div>
</div>
<p>身份证</p>
......@@ -145,7 +145,7 @@
<div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-applicant">
<div class="jdindentdetail-main-title">
申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}） <span v-show="itemCode"
申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}） <span v-show="1"
@click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
</div>
<ul>
......@@ -158,7 +158,7 @@
<div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-contact">
<div class="jdindentdetail-main-title">
订单联系人 <span v-show="itemCode" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
订单联系人 <span v-show="1" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
</div>
<ul>
<li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li>
......@@ -184,10 +184,11 @@
<!-- 修改弹窗 -->
<div class="jdindentdetail-diag">
<el-dialog :title="headerInfo" width="62.5%" :visible.sync="dialogTableVisible" center>
<el-drawer :title="headerInfo" custom-class="jdindentdetail-drawer" size="58.3333%"
:visible.sync="dialogTableVisible" center>
<div v-show="headerInfo==\'商标信息\'">
<el-form v-show="step==1" ref="form" :rules="rules" :model="form" class="demo-ruleForm"
label-width="120px">
<el-form v-show="step==1" ref="form" :rules="rules" label-position="left" :model="form"
class="demo-ruleForm" label-width="120px">
<div class="selftmreg_main">
<div class="categoryFrom">
<el-form-item label="商标类型" style="float:left;padding-right:10px;" prop="tmFormType">
......@@ -214,26 +215,25 @@
<div style="clear:both;"></div>
<el-form-item class="generated-icon" style="width:860px;float:left" label="商标图样"
prop="picUrl">
<gsb-upload v-if="form.tmFormType == 3" style="float:left;" flag="picUrl"
ref="picUrl" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<gsb-upload v-if="form.tmFormType == 3" style="float:left;" flag="picUrl" ref="picUrl"
:d="d" @setKey="setKey" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
<el-button size="mini" style="border-radius:0;color: #666666;">手动上传
</el-button>
</gsb-upload>
<gsb-upload v-if="form.tmFormType == 4 || form.tmFormType == 5"
style="float:left;" flag="picUrl" ref="picUrl" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
<gsb-upload v-if="form.tmFormType == 4 || form.tmFormType == 5" style="float:left;"
flag="picUrl" ref="picUrl" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<div style="margin-top:15px;width: 120px;" v-loading="loading">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9"
v-if="form.colorizedPicUrl" :src="form.colorizedPicUrl" />
<img width="120px" height="120px" style="border:2px dashed #e9e9e9"
v-else src="/imgs/sctp.png" />
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else
src="/imgs/sctp.png" />
</div>
</gsb-upload>
<div style="float:left;margin-left:10px;" v-if="form.tmFormType == 3">
<el-button @click="word2pic" style="border-radius:0;color: #666666;"
size="mini">
<el-button @click="word2pic" style="border-radius:0;color: #666666;" size="mini">
自动生成
</el-button>
</div>
......@@ -247,8 +247,7 @@
</div>
<div class="categoryFrom-imgjieshao"
v-if="form.tmFormType == 4 || form.tmFormType == 5">
<div><i class="el-icon-warning"
style="margin-right:6px;"></i>上传黑白图样，注册后可以更换商标颜色使用；
<div><i class="el-icon-warning" style="margin-right:6px;"></i>上传黑白图样，注册后可以更换商标颜色使用；
</div>
<div style="padding-left:17px">
上传彩色图样，注册后只能按照该彩色图样使用，并在委托书商标名称后方增加文字“（指定颜色）”；</div>
......@@ -264,10 +263,10 @@
</el-form-item>
<div style="clear:both;"></div>
</div>
<el-dialog title="如何选择商标类型？" :visible.sync="announcementsType" append-to-body>
<el-drawer title="如何选择商标类型？" :visible.sync="announcementsType" append-to-body>
<img style="width:100%;margin-top: 30px;" src="/imgs/jdt/shuoming.png" alt="">
</el-dialog>
<el-dialog :visible.sync="announcementsImgType" width="60%" append-to-body>
</el-drawer>
<el-drawer :visible.sync="announcementsImgType" width="60%" append-to-body>
<h1 style="width:100%;text-align: center;">上传商标图样注意事项</h1>
<div class="announcementsText">
图样文件格式应为jpg，图形应清晰，图样文件大小应小于“<span>200KB</span>”，且图形像素介于“<span>600X600 -
......@@ -275,12 +274,12 @@
<span>24</span>位彩色，<span>300dpi</span>分辨率扫描符合《商标法》及其实施条例规定的图形（图形清晰，大于5X5厘米且小于10X10厘米），申请人（或代理人）应确保扫描后的图
形与原图形的色彩深浅（或灰度）一致，否则，可能影响《商标注册证》上图形的清晰度）如上传图样为黑白，取得注册后，可以更换商标颜色使用；<span>如上传图样为彩色，取得注册后只能按
照该彩色图样使用；如确认提交彩色图样，需在委托书商标名称后方增加以下文字“（指定颜色）”</span></div>
</el-dialog>
</el-drawer>
<div>
<div>
<el-cascader v-if="form.selecttype==\'智能推荐\'" expand-trigger="hover"
:options="bigtype" v-model="selectedOptions"
style="float:left;padding-left:10px" placeholder="请选择所属行业">
<el-cascader v-if="form.selecttype==\'智能推荐\'" expand-trigger="hover" :options="bigtype"
v-model="selectedOptions" style="float:left;padding-left:10px"
placeholder="请选择所属行业">
</el-cascader>
<div style="float:left;padding-left:10px;" v-if="form.selecttype==\'智能推荐\'">
<el-button @click="aiadive" round>推荐</el-button>
......@@ -300,15 +299,14 @@
<div class="selftmreg_Stickie">
<el-button size="small" style="border-radius:0;" @click="checkClick">分类</el-button>
<el-input @blur="searchInputBlur" style="width:60%;height:31px;margin: 0"
placeholder="输入关键字进行过滤" @keyup.enter.native="nclSearch"
suffix-icon="el-icon-search" v-model="filterText">
placeholder="输入关键字进行过滤" @keyup.enter.native="nclSearch" suffix-icon="el-icon-search"
v-model="filterText">
<i slot="suffix" style="position:relative;top:8%;right:5%;z-index:1"
class="el-input__icon" @click="nclSearch">
<span><i class="tool-query" style="font-size : 1.5em;"></i></span>
</i>
</el-input>
<el-button style="padding: 12px 5px;color:#0989C5; " type="text"
@click="clearNclText">取消
<el-button style="padding: 12px 5px;color:#0989C5; " type="text" @click="clearNclText">取消
</el-button>
</div>
<el-card v-if="showSelectedNclList"
......@@ -321,8 +319,7 @@
</el-checkbox>
</div>
<div style="float:left;text-align:right;width:50%;">
<el-button type="text" style="padding: 0 10px;color:#828282;"
@click="checkConfirm">
<el-button type="text" style="padding: 0 10px;color:#828282;" @click="checkConfirm">
确定
</el-button>
</div>
......@@ -400,12 +397,12 @@
</div>
<div v-show="headerInfo==\'交官文件\'">
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>交官文件</h4>
<el-form ref="apply" :rules="applyrules" :model="editApply" class="demo-ruleForm"
<!-- <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>交官文件</h4> -->
<el-form label-position="left" ref="apply" :rules="applyrules" :model="editApply" class="demo-ruleForm"
label-width="120px">
<div class="selftmreg_main">
<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="申请人类型"
style="width:493px;float:left;padding-right:50px;" prop="customerType">
......@@ -420,12 +417,10 @@
</el-form-item> -->
<div style="clear:both;"></div>
<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;box-sizing: border-box;">
<el-form-item class="gsb_items" label="">
<div class="title special">上传材料：营业执照</div>
<div class="upload-box" v-loading="loading"
@mouseover="mouseOverDemo(1,\'a\')"
<div class="upload-box" v-loading="loading" @mouseover="mouseOverDemo(1,\'a\')"
@mouseleave="mouseLeaveDemo(1,\'a\')">
<img class="upload-applyimg" v-if="editApply.businessLicensePic"
:src="editApply.businessLicensePic?editApply.businessLicensePic:\'/imgs/sbzc/yyzzD.png\'" />
......@@ -433,7 +428,7 @@
: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><i class="el-icon-plus"></i></div>
<div>(需盖公章)</div>
</div>
</gsb-upload>
......@@ -458,20 +453,18 @@
</div>
</el-form-item>
<el-form-item class="gsb_items" v-if="editApply.customerType==\'person\'"
label="">
<el-form-item class="gsb_items" v-if="editApply.customerType==\'person\'" label="">
<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\')">
<img @click="window.open(editApply.identityCardPic)"
class="upload-applyimg" v-if="editApply.identityCardPic"
<img @click="window.open(editApply.identityCardPic)" class="upload-applyimg"
v-if="editApply.identityCardPic"
:src="editApply.identityCardPic?editApply.identityCardPic:\'/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><i class="el-icon-plus"></i></div>
<div>(需盖公章)</div>
</div>
</gsb-upload>
......@@ -497,19 +490,17 @@
<el-form-item class="gsb_items">
<div class="title special">上传材料：代理委托书
<a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc"
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</a >
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</a>
</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\')">
<img @click="window.open(editDeliveryInfo.gzwtsUrl)"
class="upload-applyimg" v-if="editDeliveryInfo.gzwtsUrl"
:src="editDeliveryInfo.gzwtsUrl" />
<img @click="window.open(editDeliveryInfo.gzwtsUrl)" class="upload-applyimg"
v-if="editDeliveryInfo.gzwtsUrl" :src="editDeliveryInfo.gzwtsUrl" />
<gsb-upload v-else flag="wts" ref="wts" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
<div class="upload-button" @click="loadingKey = 2">
<div><i class="el-icon-circle-plus-outline"></i></div>
<div><i class="el-icon-plus"></i></div>
<div>(需盖公章)</div>
</div>
</gsb-upload>
......@@ -538,17 +529,15 @@
<a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/yzq_201908281849646526xujnsedjnqwdoni.doc"
style="width:95px;color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 37%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">下载优先权证明</a>
</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\')">
<img @click="window.open(editDeliveryInfo.smwjUrl)"
class="upload-applyimg" v-if="editDeliveryInfo.smwjUrl"
:src="editDeliveryInfo.smwjUrl" />
<img @click="window.open(editDeliveryInfo.smwjUrl)" class="upload-applyimg"
v-if="editDeliveryInfo.smwjUrl" :src="editDeliveryInfo.smwjUrl" />
<gsb-upload v-else flag="yxq" ref="yxq" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
<div class="upload-button" @click="loadingKey = 3">
<div><i class="el-icon-circle-plus-outline"></i></div>
<div><i class="el-icon-plus"></i></div>
<div>(需盖公章)</div>
</div>
</gsb-upload>
......@@ -571,23 +560,22 @@
</el-form-item>
<div style="clear:both;"></div>
<el-dialog title="" :visible.sync="toViewImgType" center width="72%"
append-to-body>
<img :src="toViewImgSrc"
style="max-width:100%;display: block;margin: 0 auto;" alt="">
</el-dialog>
<el-drawer title="" :visible.sync="toViewImgType" center width="72%" append-to-body>
<img :src="toViewImgSrc" style="max-width:100%;display: block;margin: 0 auto;"
alt="">
</el-drawer>
</div>
</div>
</el-form>
</div>
<div v-show="headerInfo==\'申请人信息\'">
<el-form ref="apply" :rules="applyrules" :model="editApply" class="demo-ruleForm"
<el-form label-position="left" ref="apply" :rules="applyrules" :model="editApply" class="demo-ruleForm"
label-width="120px">
<div class="selftmreg_main">
<div style="clear:both;"></div>
<div style="width:100%;padding-left: 30px;box-sizing: border-box;">
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>申请人信息</h4>
<div style="width:100%;box-sizing: border-box;">
<!-- <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>申请人信息</h4> -->
<el-form-item label-width="140px" label="申请人类型"
style="width:493px;float:left;padding-right:50px;" prop="customerType">
......@@ -602,49 +590,43 @@
</div>
</el-form-item>
<div style="clear:both;"></div>
<el-form-item v-if="editApply.customerType==\'ent\'" label-width="140px"
label="公司名称" style="width:493px;float:left;padding-right:50px;" prop="name">
<el-form-item v-if="editApply.customerType==\'ent\'" label-width="140px" label="公司名称"
style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectentjd v-if="currentUser" @historychange="historyapplierchange"
allowcreate="true" showhistory="false" @change="applierChange" size="medium"
v-model="editApply.name" refMethod="getCompanyInfoByLikeName"
autoComplete="true" isFilter="true" refModel="tool" labelField="entName"
valueField="entName" style="position:relative;width:100%;"
placeHolder="请输入选择公司名称">
v-model="editApply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true"
isFilter="true" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd>
<gsb-selectentjd v-if="!currentUser" @historychange="historyapplierchange"
frombrowser="true" allowcreate="true" showhistory="false"
@change="applierChange" size="medium" v-model="editApply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true"
refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
frombrowser="true" allowcreate="true" showhistory="false" @change="applierChange"
size="medium" v-model="editApply.name" refMethod="getCompanyInfoByLikeName"
autoComplete="true" isFilter="true" refModel="tool" labelField="entName"
valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd>
</el-form-item>
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px"
label="姓名" style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectperson v-if="currentUser" @input="selectpersoninput"
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px" label="姓名"
style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectperson v-if="currentUser" @input="selectpersoninput" allowcreate="true"
showhistory="true" @historychange="historyapplierchange" size="medium"
v-model="editApply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true"
isFilter="true" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入身份证姓名"></gsb-selectperson>
<gsb-selectperson v-if="!currentUser" frombrowser="true" @input="selectpersoninput"
allowcreate="true" showhistory="true" @historychange="historyapplierchange"
size="medium" v-model="editApply.name" refMethod="getCompanyInfoByLikeName"
autoComplete="true" isFilter="true" refModel="tool" labelField="entName"
valueField="entName" style="position:relative;width:100%;"
placeHolder="请输入身份证姓名"></gsb-selectperson>
<gsb-selectperson v-if="!currentUser" frombrowser="true"
@input="selectpersoninput" allowcreate="true" showhistory="true"
@historychange="historyapplierchange" size="medium" v-model="editApply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true"
refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入身份证姓名">
valueField="entName" style="position:relative;width:100%;" placeHolder="请输入身份证姓名">
</gsb-selectperson>
</el-form-item>
<div style="clear:both;"></div>
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px"
label="身份证号码" style="width:493px;float:left;padding-right:50px;"
prop="identityCardNo">
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px" label="身份证号码"
style="width:493px;float:left;padding-right:50px;" prop="identityCardNo">
<el-input placeHolder="请输入身份证号码" v-model="editApply.identityCardNo"> </el-input>
</el-form-item>
<div style="clear:both;"></div>
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px"
label="身份证住址" style="width:493px;float:left;padding-right:50px;"
prop="applyAddr">
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px" label="身份证住址"
style="width:493px;float:left;padding-right:50px;" prop="applyAddr">
<el-input placeHolder="请输入身份证住址" v-model="editApply.applyAddr"></el-input>
</el-form-item>
<div style="clear:both;"></div>
......@@ -659,9 +641,8 @@
</div>
</el-form-item>
<div style="clear:both;"></div>
<el-form-item v-if="editApply.customerType==\'ent\'" label-width="140px"
label="执照详细地址" style="width:493px;float:left;padding-right:50px;"
prop="applyAddr">
<el-form-item v-if="editApply.customerType==\'ent\'" label-width="140px" label="执照详细地址"
style="width:493px;float:left;padding-right:50px;" prop="applyAddr">
<el-input placeHolder="请输入执照详细地址" v-model="editApply.applyAddr"></el-input>
</el-form-item>
<div style="clear:both;"></div>
......@@ -678,11 +659,11 @@
@mouseleave="mouseLeaveDemo(1,\'a\')">
<img class="upload-applyimg" v-if="editApply.businessLicensePic"
:src="editApply.businessLicensePic?editApply.businessLicensePic:\'/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">
<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><i class="el-icon-plus"></i></div>
<div>(需盖公章)</div>
</div>
</gsb-upload>
......@@ -696,8 +677,7 @@
</gsb-upload>
</div>
</div>
<div class="upload-img" @mouseover="mouseOverDemo(1)"
@mouseleave="mouseLeaveDemo(1)">
<div class="upload-img" @mouseover="mouseOverDemo(1)" @mouseleave="mouseLeaveDemo(1)">
<img
:src="editApply.customerType == \'ent\' ? \'/imgs/sbzc/yyzz1.png\' : \'imgs/sbzc/yyzz.png\'" />
<div v-if="toViewImgKey == 1" class="toViewImg"
......@@ -717,12 +697,11 @@
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><i class="el-icon-plus"></i></div>
<div>(需盖公章)</div>
</div>
</gsb-upload>
<div class="upload-dialog"
v-show="applyInfo.identityCardPic && toViewImgKey == \'d\'">
<div class="upload-dialog" v-show="applyInfo.identityCardPic && toViewImgKey == \'d\'">
<div @click="window.open(applyInfo.identityCardPic)">查看大图</div>
<gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
......@@ -731,8 +710,7 @@
</gsb-upload>
</div>
</div>
<div class="upload-img" @mouseover="mouseOverDemo(4)"
@mouseleave="mouseLeaveDemo(4)">
<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>
......@@ -745,7 +723,7 @@
</el-form>
</div>
<div v-show="headerInfo==\'订单联系人\'">
<el-form ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm"
<el-form ref="apply" label-position="left" :rules="applyrules" :model="apply" class="demo-ruleForm"
label-width="120px">
<!-- <div class="selftmreg_main">
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>申请人信息</h4>
......@@ -829,9 +807,9 @@
</div>
</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="width:100%;padding-left: 30px;box-sizing: border-box;">
<div style="width:100%;box-sizing: border-box;">
<el-form-item label-width="140px" label="客户联系人"
style="width:493px;float:left;padding-right:50px;" prop="contacts">
<el-input v-model="editApply.contacts" placeHolder="此信息很重要，官方文件送达需与您联系">
......@@ -864,23 +842,30 @@
</div>
</el-form>
</div>
<el-dialog title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;" append-to-body>
<span v-if="showConfrim">{{nclOne[0].code}}类{{nclOne[0].name}}，商品/服务项目<span
style="color:red;">不足10项</span>，已选{{nclSelected}}项，还可选{{10-nclSelected}}个小项</span>
<span slot="footer" class="dialog-footer">
<el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;"
@click="closeConfrim()">修 改
<el-drawer title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;" append-to-body>
<div v-for="(item, index) in nclOne" :key="index" style="margin-bottom:10px;">
{{item.code}}类{{item.name}}，商品/服务项目<span
style="color:red;">不足10项</span>，已选{{item.checked}}项，还可选{{10-item.checked}}个小项</span>
</div>
<div style="margin-top: 10px;">
<span class="dialog-footer">
<el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改
</el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary"
@click="submitEdit(\'商标类别\',true)">确 定</el-button>
</span>
</el-dialog>
<span slot="footer" class="dialog-footer">
</div>
</el-drawer>
<div style="text-align:center;">
<span class="dialog-footer" style="margin-top:15px;">
<el-button @click="submitEdit(headerInfo)"
style="width:140px;height:36px;background:rgba(38,146,255,1);border-radius:4px;color:#fff;">
提交</el-button>
</span>
</el-dialog>
</div>
</el-drawer>
</div>
<!-- -->
......@@ -890,4 +875,4 @@
{{message.info}}
</div>
</transition>
</div>
\ No newline at end of file
</div>
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.js
......@@ -399,7 +399,7 @@
this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
this.message.show = !this.message.show;
this.message.info = "只能选择同一个类别";
this.message.info = "只能修改一个类别";
var timer = setTimeout(() => {
this.message.show = false;
clearTimeout(timer);
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
......@@ -429,7 +429,8 @@
}
.upload-button>div>i {
font-size: 16px;
font-size: 37px;
color: #dee0eb;
}
.toViewImg {
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
......@@ -789,8 +789,10 @@
</div>
</transition>
<el-dialog title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;">
<span v-if="showConfrim">{{nclOne[0].code}}类{{nclOne[0].name}}，商品/服务项目<span
style="color:red;">不足10项</span>，已选{{nclSelected}}项，还可选{{10-nclSelected}}个小项</span>
<div v-for="(item, index) in nclOne" :key="index" style="margin-bottom:10px;">
{{item.code}}类{{item.name}}，商品/服务项目<span
style="color:red;">不足10项</span>，已选{{item.checked}}项，还可选{{10-item.checked}}个小项</span>
</div>
<span slot="footer" class="dialog-footer">
<el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary"
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
......@@ -64,7 +64,7 @@
};
return {
listPath: {
path: '/1688/jdindentlist',
path: '/1688/jdtrademark',
query: {
channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo,
......@@ -303,7 +303,7 @@
},
showConfrim: false,
agree: false,
nclSelected: null,
nclSelectedList: null,
orderSubInfo: null,
totalPrices: null,
}
......@@ -354,7 +354,7 @@
nclOne: {
handler(newVal, oldVal){
this.totalPrices = newVal.length * 300;
console.log(this,newVal.length, '???????????????????');
console.log(this, newVal.length, '???????????????????');
if (newVal.length > 0) {
newVal.forEach((item, index) => {
if (item.nclThree.length > 10) {
......@@ -1132,13 +1132,16 @@
this.showConfrim = false;
},
submitForm(formName, agree) {
/** this.step++; */
var that = this;
if (this.nclOne.length > 0) {
if (this.nclOne[0].nclThree.length < 10 && formName == "form") {
console.log(this.nclOne,",,,,,,,,,,,,,,,,,,,,,,,,");
this.nclOne.map((item, index) => {
if (item.nclThree.length < 10 && formName == "form") {
console.log(item,'111111111111111111111111111111111111111');
item.checked = item.nclThree.length;
this.showConfrim = true;
this.nclSelected = this.nclOne[0].nclThree.length;
if (agree) {
if (!this.form.tmName || !this.form.colorizedPicUrl) {
this.$message.warning("请完善信息");
......@@ -1150,7 +1153,9 @@
} else {
return;
}
}
});
}
if (!this.form.tmName || !this.form.colorizedPicUrl) {
......@@ -1175,8 +1180,10 @@
that.$message.warning(`请选择商标分类`);
return false;
}
if(!this.showConfrim){
that.toTop();
that.step = Number(that.step) + 1;
}
} else {
console.log('error submit!!');
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