Skip to content

Z
zhichan
Commit 6ac55c90 by 刘泽奇
Options

123

parent 24cefba6
Showing with 145 additions and 99 deletions
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<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/pdf.png\'"
alt=""> alt="" @click="window.open(applyInfo.businessLicensePdf)">
</div> </div>
</div> </div>
<p>营业执照</p> <p>营业执照</p>
...@@ -113,7 +113,8 @@ ...@@ -113,7 +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/jpg.png\'" alt=""
@click="window.open(deliveryInfo.gzwtsUrl)">
</div> </div>
</div> </div>
<p>委托书</p> <p>委托书</p>
...@@ -123,12 +124,13 @@ ...@@ -123,12 +124,13 @@
<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/jpg.png\'" alt=""
@click="window.open(deliveryInfo.smwjUrl)>
</div> </div>
</div> </div>
<p>优先权证明</p> <p>优先权证明</p>
</div> </div>
<div v-if="applyInfo.customerType == \'person\'"> <div v-if=" applyInfo.customerType==\'person\'">
<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>
...@@ -194,12 +196,14 @@ ...@@ -194,12 +196,14 @@
<el-radio :label="4">图形</el-radio> <el-radio :label="4">图形</el-radio>
<el-radio :label="5">文字及图形</el-radio> <el-radio :label="5">文字及图形</el-radio>
</el-radio-group> </el-radio-group>
<div class="categoryFrom-jieshao" @click="announcementsType = true">如何选择商标类型？</div> <div class="categoryFrom-jieshao" @click="announcementsType = true">如何选择商标类型？
</div>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label="商标名称" style="width:845px;float:left" prop="tmName" <el-form-item label="商标名称" style="width:845px;float:left" prop="tmName"
v-if="form.tmFormType != 4"> v-if="form.tmFormType != 4">
<el-input v-model="form.tmName" style="width:330px" placeholder="请输入商标名称"></el-input> <el-input v-model="form.tmName" style="width:330px" placeholder="请输入商标名称">
</el-input>
<span 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>
...@@ -210,24 +214,26 @@ ...@@ -210,24 +214,26 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item class="generated-icon" style="width:860px;float:left" label="商标图样" <el-form-item class="generated-icon" style="width:860px;float:left" label="商标图样"
prop="picUrl"> prop="picUrl">
<gsb-upload v-if="form.tmFormType == 3" style="float:left;" flag="picUrl" ref="picUrl" <gsb-upload v-if="form.tmFormType == 3" style="float:left;" flag="picUrl"
:d="d" @setKey="setKey" :action="action" filetype="image/jpeg" :ifshowlist="false" ref="picUrl" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
@uploadsuccess="uploadsuccess" @error="error"> :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<el-button size="mini" style="border-radius:0;color: #666666;">手动上传</el-button> <el-button size="mini" style="border-radius:0;color: #666666;">手动上传
</el-button>
</gsb-upload> </gsb-upload>
<gsb-upload v-if="form.tmFormType == 4 || form.tmFormType == 5" style="float:left;" <gsb-upload v-if="form.tmFormType == 4 || form.tmFormType == 5"
flag="picUrl" ref="picUrl" :d="d" @setKey="setKey" :action="action" style="float:left;" flag="picUrl" ref="picUrl" :d="d" @setKey="setKey"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" :action="action" filetype="image/jpeg" :ifshowlist="false"
@error="error"> @uploadsuccess="uploadsuccess" @error="error">
<div style="margin-top:15px;width: 120px;" v-loading="loading"> <div style="margin-top:15px;width: 120px;" v-loading="loading">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" <img width="120px" height="120px" style="border:2px dashed #e9e9e9"
v-if="form.colorizedPicUrl" :src="form.colorizedPicUrl" /> v-if="form.colorizedPicUrl" :src="form.colorizedPicUrl" />
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else <img width="120px" height="120px" style="border:2px dashed #e9e9e9"
src="/imgs/sctp.png" /> v-else src="/imgs/sctp.png" />
</div> </div>
</gsb-upload> </gsb-upload>
<div style="float:left;margin-left:10px;" v-if="form.tmFormType == 3"> <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> </el-button>
</div> </div>
...@@ -241,9 +247,11 @@ ...@@ -241,9 +247,11 @@
</div> </div>
<div class="categoryFrom-imgjieshao" <div class="categoryFrom-imgjieshao"
v-if="form.tmFormType == 4 || form.tmFormType == 5"> 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>
<div style="padding-left:17px">上传彩色图样，注册后只能按照该彩色图样使用，并在委托书商标名称后方增加文字“（指定颜色）”；</div> <div style="padding-left:17px">
上传彩色图样，注册后只能按照该彩色图样使用，并在委托书商标名称后方增加文字“（指定颜色）”；</div>
<div style="padding-left:17px">上传的彩色图样需与黑白图样的样式一致。</div> <div style="padding-left:17px">上传的彩色图样需与黑白图样的样式一致。</div>
<div style="padding-left:17px;color:#0F8EE9;cursor: pointer;" <div style="padding-left:17px;color:#0F8EE9;cursor: pointer;"
@click="announcementsImgType = true"> @click="announcementsImgType = true">
...@@ -270,9 +278,9 @@ ...@@ -270,9 +278,9 @@
</el-dialog> </el-dialog>
<div> <div>
<div> <div>
<el-cascader v-if="form.selecttype==\'智能推荐\'" expand-trigger="hover" :options="bigtype" <el-cascader v-if="form.selecttype==\'智能推荐\'" expand-trigger="hover"
v-model="selectedOptions" style="float:left;padding-left:10px" :options="bigtype" v-model="selectedOptions"
placeholder="请选择所属行业"> style="float:left;padding-left:10px" placeholder="请选择所属行业">
</el-cascader> </el-cascader>
<div style="float:left;padding-left:10px;" v-if="form.selecttype==\'智能推荐\'"> <div style="float:left;padding-left:10px;" v-if="form.selecttype==\'智能推荐\'">
<el-button @click="aiadive" round>推荐</el-button> <el-button @click="aiadive" round>推荐</el-button>
...@@ -292,14 +300,15 @@ ...@@ -292,14 +300,15 @@
<div class="selftmreg_Stickie"> <div class="selftmreg_Stickie">
<el-button size="small" style="border-radius:0;" @click="checkClick">分类</el-button> <el-button size="small" style="border-radius:0;" @click="checkClick">分类</el-button>
<el-input @blur="searchInputBlur" style="width:60%;height:31px;margin: 0" <el-input @blur="searchInputBlur" style="width:60%;height:31px;margin: 0"
placeholder="输入关键字进行过滤" @keyup.enter.native="nclSearch" suffix-icon="el-icon-search" placeholder="输入关键字进行过滤" @keyup.enter.native="nclSearch"
v-model="filterText"> suffix-icon="el-icon-search" v-model="filterText">
<i slot="suffix" style="position:relative;top:8%;right:5%;z-index:1" <i slot="suffix" style="position:relative;top:8%;right:5%;z-index:1"
class="el-input__icon" @click="nclSearch"> class="el-input__icon" @click="nclSearch">
<span><i class="tool-query" style="font-size : 1.5em;"></i></span> <span><i class="tool-query" style="font-size : 1.5em;"></i></span>
</i> </i>
</el-input> </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> </el-button>
</div> </div>
<el-card v-if="showSelectedNclList" <el-card v-if="showSelectedNclList"
...@@ -312,7 +321,8 @@ ...@@ -312,7 +321,8 @@
</el-checkbox> </el-checkbox>
</div> </div>
<div style="float:left;text-align:right;width:50%;"> <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> </el-button>
</div> </div>
...@@ -380,7 +390,8 @@ ...@@ -380,7 +390,8 @@
<div v-else <div v-else
style="overflow: auto;height: 100%;padding: 60px 20px 0px;box-sizing: border-box;text-align: center;"> 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: 330px;text-align: center;">请点击左侧选择商标类别</div> <div style="color: #828282;margin-top: 330px;text-align: center;">请点击左侧选择商标类别
</div>
</div> </div>
</el-main> </el-main>
...@@ -390,7 +401,8 @@ ...@@ -390,7 +401,8 @@
</div> </div>
<div v-show="headerInfo==\'交官文件\'"> <div v-show="headerInfo==\'交官文件\'">
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>交官文件</h4> <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>交官文件</h4>
<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;">
...@@ -408,10 +420,12 @@ ...@@ -408,10 +420,12 @@
</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>
<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\')"> @mouseleave="mouseLeaveDemo(1,\'a\')">
<img class="upload-applyimg" v-if="editApply.businessLicensePic" <img class="upload-applyimg" v-if="editApply.businessLicensePic"
:src="editApply.businessLicensePic?editApply.businessLicensePic:\'/imgs/sbzc/yyzzD.png\'" /> :src="editApply.businessLicensePic?editApply.businessLicensePic:\'/imgs/sbzc/yyzzD.png\'" />
...@@ -425,7 +439,8 @@ ...@@ -425,7 +439,8 @@
</gsb-upload> </gsb-upload>
<div class="upload-dialog" <div class="upload-dialog"
v-show="editApply.businessLicensePic && toViewImgKey == \'a\'"> v-show="editApply.businessLicensePic && toViewImgKey == \'a\'">
<div @click="window.open(editApply.businessLicensePic)">查看大图</div> <div @click="window.open(editApply.businessLicensePic)">查看大图
</div>
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" <gsb-upload flag="yyzz" ref="yyzz" :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">
...@@ -443,12 +458,14 @@ ...@@ -443,12 +458,14 @@
</div> </div>
</el-form-item> </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="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\')">
<img @click="window.open(editApply.identityCardPic)" class="upload-applyimg" <img @click="window.open(editApply.identityCardPic)"
v-if="editApply.identityCardPic" class="upload-applyimg" v-if="editApply.identityCardPic"
:src="editApply.identityCardPic?editApply.identityCardPic:\'/imgs/sbzc/pdf.png\'" /> :src="editApply.identityCardPic?editApply.identityCardPic:\'/imgs/sbzc/pdf.png\'" />
<gsb-upload v-else flag="sfz" ref="sfz" :d="d" @setKey="setKey" <gsb-upload v-else flag="sfz" ref="sfz" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
...@@ -482,10 +499,12 @@ ...@@ -482,10 +499,12 @@
<!-- <span @click="createWTS" <!-- <span @click="createWTS"
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</span> --> style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</span> -->
</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(editDeliveryInfo.gzwtsUrl)" class="upload-applyimg" <img @click="window.open(editDeliveryInfo.gzwtsUrl)"
v-if="editDeliveryInfo.gzwtsUrl" :src="editDeliveryInfo.gzwtsUrl" /> class="upload-applyimg" v-if="editDeliveryInfo.gzwtsUrl"
:src="editDeliveryInfo.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">
...@@ -519,10 +538,12 @@ ...@@ -519,10 +538,12 @@
<a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/yzq_201908281849646526xujnsedjnqwdoni.doc" <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> 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>
<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(editDeliveryInfo.smwjUrl)" class="upload-applyimg" <img @click="window.open(editDeliveryInfo.smwjUrl)"
v-if="editDeliveryInfo.smwjUrl" :src="editDeliveryInfo.smwjUrl" /> class="upload-applyimg" v-if="editDeliveryInfo.smwjUrl"
:src="editDeliveryInfo.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">
...@@ -550,9 +571,10 @@ ...@@ -550,9 +571,10 @@
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-dialog title="" :visible.sync="toViewImgType" center width="72%" append-to-body> <el-dialog title="" :visible.sync="toViewImgType" center width="72%"
<img :src="toViewImgSrc" style="max-width:100%;display: block;margin: 0 auto;" append-to-body>
alt=""> <img :src="toViewImgSrc"
style="max-width:100%;display: block;margin: 0 auto;" alt="">
</el-dialog> </el-dialog>
</div> </div>
</div> </div>
...@@ -560,7 +582,8 @@ ...@@ -560,7 +582,8 @@
</el-form> </el-form>
</div> </div>
<div v-show="headerInfo==\'申请人信息\'"> <div v-show="headerInfo==\'申请人信息\'">
<el-form ref="apply" :rules="applyrules" :model="editApply" class="demo-ruleForm" label-width="120px"> <el-form ref="apply" :rules="applyrules" :model="editApply" 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;">
...@@ -575,46 +598,53 @@ ...@@ -575,46 +598,53 @@
<div class="selftmregType" v-model="editApply.customerType" <div class="selftmregType" v-model="editApply.customerType"
:style="editApply.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'" :style="editApply.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
@click="editApply.customerType = \'person\'">个体户<img @click="editApply.customerType = \'person\'">个体户<img
v-if="editApply.customerType==\'person\'" src="/imgs/sjd.png" alt=""></div> v-if="editApply.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="editApply.customerType==\'ent\'" label-width="140px" label="公司名称" <el-form-item v-if="editApply.customerType==\'ent\'" label-width="140px"
style="width:493px;float:left;padding-right:50px;" prop="name"> label="公司名称" style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectentjd v-if="currentUser" @historychange="historyapplierchange" allowcreate="true" showhistory="false" <gsb-selectentjd v-if="currentUser" @historychange="historyapplierchange"
@change="applierChange" size="medium" v-model="editApply.name" allowcreate="true" showhistory="false" @change="applierChange" size="medium"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" v-model="editApply.name" refMethod="getCompanyInfoByLikeName"
refModel="tool" labelField="entName" valueField="entName" autoComplete="true" isFilter="true" refModel="tool" labelField="entName"
style="position:relative;width:100%;" placeHolder="请输入选择公司名称"> valueField="entName" style="position:relative;width:100%;"
placeHolder="请输入选择公司名称">
</gsb-selectentjd> </gsb-selectentjd>
<gsb-selectentjd v-if="!currentUser" @historychange="historyapplierchange" frombrowser="true" allowcreate="true" <gsb-selectentjd v-if="!currentUser" @historychange="historyapplierchange"
showhistory="false" @change="applierChange" size="medium" v-model="editApply.name" frombrowser="true" allowcreate="true" showhistory="false"
@change="applierChange" size="medium" v-model="editApply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true"
refModel="tool" labelField="entName" valueField="entName" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入选择公司名称"> style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd> </gsb-selectentjd>
</el-form-item> </el-form-item>
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px" label="姓名" <el-form-item v-if="editApply.customerType==\'person\'" label-width="140px"
style="width:493px;float:left;padding-right:50px;" prop="name"> label="姓名" 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"
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" allowcreate="true" showhistory="true" @historychange="historyapplierchange"
size="medium" v-model="editApply.name" refMethod="getCompanyInfoByLikeName" size="medium" v-model="editApply.name" refMethod="getCompanyInfoByLikeName"
autoComplete="true" isFilter="true" refModel="tool" labelField="entName" 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>
<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>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px" label="身份证号码" <el-form-item v-if="editApply.customerType==\'person\'" label-width="140px"
style="width:493px;float:left;padding-right:50px;" prop="identityCardNo"> label="身份证号码" style="width:493px;float:left;padding-right:50px;"
prop="identityCardNo">
<el-input placeHolder="请输入身份证号码" v-model="editApply.identityCardNo"> </el-input> <el-input placeHolder="请输入身份证号码" v-model="editApply.identityCardNo"> </el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px" label="身份证住址" <el-form-item v-if="editApply.customerType==\'person\'" label-width="140px"
style="width:493px;float:left;padding-right:50px;" prop="applyAddr"> label="身份证住址" style="width:493px;float:left;padding-right:50px;"
prop="applyAddr">
<el-input placeHolder="请输入身份证住址" v-model="editApply.applyAddr"></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>
...@@ -629,8 +659,9 @@ ...@@ -629,8 +659,9 @@
</div> </div>
</el-form-item> </el-form-item>
<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"
style="width:493px;float:left;padding-right:50px;" prop="applyAddr"> label="执照详细地址" style="width:493px;float:left;padding-right:50px;"
prop="applyAddr">
<el-input placeHolder="请输入执照详细地址" v-model="editApply.applyAddr"></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>
...@@ -647,9 +678,9 @@ ...@@ -647,9 +678,9 @@
@mouseleave="mouseLeaveDemo(1,\'a\')"> @mouseleave="mouseLeaveDemo(1,\'a\')">
<img class="upload-applyimg" v-if="editApply.businessLicensePic" <img class="upload-applyimg" v-if="editApply.businessLicensePic"
:src="editApply.businessLicensePic?editApply.businessLicensePic:\'/imgs/sbzc/yyzzD.png\'" /> :src="editApply.businessLicensePic?editApply.businessLicensePic:\'/imgs/sbzc/yyzzD.png\'" />
<gsb-upload v-else flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" <gsb-upload v-else flag="yyzz" ref="yyzz" :d="d" @setKey="setKey"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" :action="action" filetype="image/jpeg" :ifshowlist="false"
@error="error"> @uploadsuccess="uploadsuccess" @error="error">
<div class="upload-button" @click="loadingKey = 0"> <div class="upload-button" @click="loadingKey = 0">
<div><i class="el-icon-circle-plus-outline"></i></div> <div><i class="el-icon-circle-plus-outline"></i></div>
<div>(需盖公章)</div> <div>(需盖公章)</div>
...@@ -665,7 +696,8 @@ ...@@ -665,7 +696,8 @@
</gsb-upload> </gsb-upload>
</div> </div>
</div> </div>
<div class="upload-img" @mouseover="mouseOverDemo(1)" @mouseleave="mouseLeaveDemo(1)"> <div class="upload-img" @mouseover="mouseOverDemo(1)"
@mouseleave="mouseLeaveDemo(1)">
<img <img
:src="editApply.customerType == \'ent\' ? \'/imgs/sbzc/yyzz1.png\' : \'imgs/sbzc/yyzz.png\'" /> :src="editApply.customerType == \'ent\' ? \'/imgs/sbzc/yyzz1.png\' : \'imgs/sbzc/yyzz.png\'" />
<div v-if="toViewImgKey == 1" class="toViewImg" <div v-if="toViewImgKey == 1" class="toViewImg"
...@@ -689,7 +721,8 @@ ...@@ -689,7 +721,8 @@
<div>(需盖公章)</div> <div>(需盖公章)</div>
</div> </div>
</gsb-upload> </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> <div @click="window.open(applyInfo.identityCardPic)">查看大图</div>
<gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action" <gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
...@@ -698,7 +731,8 @@ ...@@ -698,7 +731,8 @@
</gsb-upload> </gsb-upload>
</div> </div>
</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" /> <img src="/imgs/sbzc/sfz.png" />
<div v-if="toViewImgKey == 4" class="toViewImg" <div v-if="toViewImgKey == 4" class="toViewImg"
@click="toViewImg(\'/imgs/sbzc/sfzD.png\')">查看大图</div> @click="toViewImg(\'/imgs/sbzc/sfzD.png\')">查看大图</div>
...@@ -711,7 +745,8 @@ ...@@ -711,7 +745,8 @@
</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> <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>申请人信息</h4>
<div style="clear:both;"></div> <div style="clear:both;"></div>
...@@ -799,7 +834,8 @@ ...@@ -799,7 +834,8 @@
<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="editApply.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="联系电话"
...@@ -809,7 +845,8 @@ ...@@ -809,7 +845,8 @@
<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="editApply.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="座机"
...@@ -831,8 +868,11 @@ ...@@ -831,8 +868,11 @@
<span v-if="showConfrim">{{nclOne[0].code}}类{{nclOne[0].name}}，商品/服务项目<span <span v-if="showConfrim">{{nclOne[0].code}}类{{nclOne[0].name}}，商品/服务项目<span
style="color:red;">不足10项</span>，已选{{nclSelected}}项，还可选{{10-nclSelected}}个小项</span> style="color:red;">不足10项</span>，已选{{nclSelected}}项，还可选{{10-nclSelected}}个小项</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button> <el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;"
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary" @click="submitEdit(\'商标类别\',true)">确 定</el-button> @click="closeConfrim()">修 改
</el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary"
@click="submitEdit(\'商标类别\',true)">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -850,4 +890,4 @@ ...@@ -850,4 +890,4 @@
{{message.info}} {{message.info}}
</div> </div>
</transition> </transition>
</div> </div>
\ No newline at end of file \ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
/*修改验证 对应表单的值 */ /*修改验证 对应表单的值 */
popupValue: "", popupValue: "",
/**订单付款信息 */ /**订单付款信息 */
receiptVoucher:"", receiptVoucher: "",
} }
}, },
mounted: function() { mounted: function() {
...@@ -699,7 +699,6 @@ ...@@ -699,7 +699,6 @@
} }
if (obj.flag == "yyzz") { if (obj.flag == "yyzz") {
console.log(obj, "oooooooooooooooooooooooooooooooo"); console.log(obj, "oooooooooooooooooooooooooooooooo");
that.apply.businessLicensePic = obj.result;
that.editApply = JSON.parse(JSON.stringify(that.apply)); that.editApply = JSON.parse(JSON.stringify(that.apply));
var pic2pdf = { "key": obj.result }; var pic2pdf = { "key": obj.result };
var pic2pdf = this.$root.copyParams(pic2pdf, "pic2pdf", "/action/tmTools/springBoard"); var pic2pdf = this.$root.copyParams(pic2pdf, "pic2pdf", "/action/tmTools/springBoard");
...@@ -709,6 +708,7 @@ ...@@ -709,6 +708,7 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.apply.businessLicensePic = obj.result;
that.apply["businessLicensePdf"] = d.data.url; that.apply["businessLicensePdf"] = d.data.url;
return return
} else { } else {
...@@ -728,7 +728,6 @@ ...@@ -728,7 +728,6 @@
} }
if (obj.flag == "sfz") { if (obj.flag == "sfz") {
var sfz = { "key": obj.result }; var sfz = { "key": obj.result };
that.apply.identityCardPic = obj.result;
that.editApply = JSON.parse(JSON.stringify(that.apply)); that.editApply = JSON.parse(JSON.stringify(that.apply));
var sfz = this.$root.copyParams(sfz, "pic2pdf", "/action/tmTools/springBoard"); var sfz = this.$root.copyParams(sfz, "pic2pdf", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", sfz).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", sfz).then(function (d) {
...@@ -737,6 +736,7 @@ ...@@ -737,6 +736,7 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.apply.identityCardPic = obj.result;
that.apply["identityCardPdf"] = d.data.url; that.apply["identityCardPdf"] = d.data.url;
return; return;
} else { } else {
...@@ -756,7 +756,6 @@ ...@@ -756,7 +756,6 @@
} }
if (obj.flag == "wts") { if (obj.flag == "wts") {
var adjustWTSSize = { "key": obj.result }; var adjustWTSSize = { "key": obj.result };
that.deliveryOrderNo.gzwtsUrl = obj.result;
that.editDeliveryOrderNo = JSON.parse(JSON.stringify(that.apply)); that.editDeliveryOrderNo = JSON.parse(JSON.stringify(that.apply));
var adjustWTSSize = this.$root.copyParams(adjustWTSSize, "adjustWTSSize", "/action/tmTools/springBoard"); var adjustWTSSize = this.$root.copyParams(adjustWTSSize, "adjustWTSSize", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", adjustWTSSize).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", adjustWTSSize).then(function (d) {
...@@ -765,6 +764,7 @@ ...@@ -765,6 +764,7 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.deliveryOrderNo.gzwtsUrl = obj.result;
that.apply["gzwtsUrl"] = d.data.url; that.apply["gzwtsUrl"] = d.data.url;
return; return;
} else { } else {
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -411,6 +411,7 @@ ...@@ -411,6 +411,7 @@
}, },
methods: { methods: {
pointsRuleColor(i) { pointsRuleColor(i) {
if (i < parseInt(this.step)) { if (i < parseInt(this.step)) {
return 'color: #FFFFFF;' return 'color: #FFFFFF;'
...@@ -580,7 +581,9 @@ ...@@ -580,7 +581,9 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.apply["businessLicensePic"] = d.data.url; that.apply["businessLicensePic"] = obj.result;
that.apply["businessLicensePdf"] = d.data.url;
return return
} else { } else {
that.apply.businessLicensePic = ""; that.apply.businessLicensePic = "";
...@@ -606,7 +609,8 @@ ...@@ -606,7 +609,8 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.apply["identityCardPic"] = d.data.url; that.apply["identityCardPic"] = obj.result;
that.apply["identityCardPdf"] = d.data.url;
return; return;
} else { } else {
that.apply.identityCardPic = ""; that.apply.identityCardPic = "";
...@@ -774,13 +778,14 @@ ...@@ -774,13 +778,14 @@
} }
},*/ },*/
historyapplierchange(d){ historyapplierchange(d){
console.log(d, this.apply, '~~~~~~~~~~~~~~~~~~~~~~`');
if (d) { if (d) {
this.editApply.name = d.entName || ""; this.apply.name = d.entName || "";
this.editApply.applyAddr = d.regLocation || ""; this.apply.applyAddr = d.regLocation || "";
this.editApply.code = d.creditCode || ""; this.apply.code = d.creditCode || "";
this.editApply.businessLicensePic = d.businessLicensePic || ""; this.apply.businessLicensePic = d.businessLicensePic || "";
this.editApply.identityCardNo = d.identityCardNo || ""; this.apply.identityCardNo = d.identityCardNo || "";
this.editApply.identityCardPic = d.identityCardPic || ""; this.apply.identityCardPic = d.identityCardPic || "";
} }
}, },
...@@ -1213,8 +1218,8 @@ ...@@ -1213,8 +1218,8 @@
nclones: that.nclOne, nclones: that.nclOne,
itemCode: that.itemCode, itemCode: that.itemCode,
}; };
this.$root.loading = true; that.$root.loading = true;
var channelOrderNo = this.$root.copyParams({ channelOrderNo: this.$route.query.channelOrderNo }, "get1688ChannelOrderInfo", "/action/tmOrder/springBoard", "yes", "yes"); var channelOrderNo = that.$root.copyParams({ channelOrderNo: that.$route.query.channelOrderNo }, "get1688ChannelOrderInfo", "/action/tmOrder/springBoard", "yes", "yes");
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", channelOrderNo).then((d) => { that.$root.postReq("/web/trademark/tmqueryCtl/doPost", channelOrderNo).then((d) => {
console.log(d); console.log(d);
that.orderSubInfo.channelOrder = d.data.channelOrder; that.orderSubInfo.channelOrder = d.data.channelOrder;
...@@ -1223,7 +1228,6 @@ ...@@ -1223,7 +1228,6 @@
console.log(that.orderSubInfo, '............................................'); console.log(that.orderSubInfo, '............................................');
var subInfo = that.$root.copyParams(that.orderSubInfo, "subExistTmOrder", "/action/tmOrder/springBoard", "yes", "yes"); var subInfo = that.$root.copyParams(that.orderSubInfo, "subExistTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", subInfo).then(function (d) { that.$root.postReq("/web/trademark/tmqueryCtl/doPost", subInfo).then(function (d) {
this.$root.loading = false;
console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d); console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d);
if (d.status == 0) { if (d.status == 0) {
var order = d.data; var order = d.data;
...@@ -1241,9 +1245,11 @@ ...@@ -1241,9 +1245,11 @@
that.$message.warning(d.msg); that.$message.warning(d.msg);
} }
}).then(() => {
that.$root.loading = false;
}).catch(function (e) { }).catch(function (e) {
that.$message.warning("操作失败", e); that.$message.warning("操作失败", e);
this.$root.loading = false; that.$root.loading = false;
console.log(e); console.log(e);
}); });
}) })
......
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