Skip to content

Z
zhichan
Commit f99b22ec by 宋毅
Options

gMerge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan… 

gMerge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-jdweb
parents e252e881 e03addd1
Showing with 484 additions and 159 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/OAjddetails/OAjddetails.html
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<span>1366*565445</span> <span>1366*565445</span>
</div> </div>
</div> </div>
<div> <!-- <div>
<div style="display:flex;height: 60px;align-items: center;"> <div style="display:flex;height: 60px;align-items: center;">
<div style="background:#ffffff; <div style="background:#ffffff;
border:3px solid #3071fe; border:3px solid #3071fe;
...@@ -26,11 +26,19 @@ ...@@ -26,11 +26,19 @@
订单详情 订单详情
</div> </div>
</div> </div>
</div> </div> -->
<div class="jdindentdetail"> <div class="jdindentdetail">
<div class="jdindentdetail-nav"> <div class="jdindentdetail-nav">
<!-- <span>当前位置：</span> --> <div style="background:#ffffff;
border:3px solid #3071fe;
width:6px;
height:6px;
border-radius:100%;
margin: 0 10px 0 0;
display: inline-block;">
</div>
<span>当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">交付中心 <el-breadcrumb-item :to="listPath">交付中心
</el-breadcrumb-item> </el-breadcrumb-item>
...@@ -44,7 +52,7 @@ ...@@ -44,7 +52,7 @@
<div class="jdindentdetail-flow"> <div class="jdindentdetail-flow">
<div class="jdindentdetail-main-step-col"> <div class="jdindentdetail-main-step-col">
<el-steps :active="currentStep" align-center process-status="process"> <el-steps :active="currentStep" align-center process-status="process" id="steps">
<el-step v-if="itemCode" title="待上传材料" description=""></el-step> <el-step v-if="itemCode" title="待上传材料" description=""></el-step>
<el-step v-if="!itemCode" title="待确认方案"></el-step> <el-step v-if="!itemCode" title="待确认方案"></el-step>
<!-- <el-step v-show="itemCode" title="方案不通过"></el-step> --> <!-- <el-step v-show="itemCode" title="方案不通过"></el-step> -->
......
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.css
.el-table__header-wrapper{
background: #eef2fb;
}
#el-drawer__title{
padding: 10px 20px;
background: #f6f9ff;
}
.jdc-footer{
display: none;
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.html
...@@ -71,7 +71,8 @@ ...@@ -71,7 +71,8 @@
</div> --> </div> -->
</div> </div>
<div> <div>
<el-button @click="find()">查询</el-button> <el-button @click="find()" style="background:#3071fe;border:1px solid #3071fe;color:#fff;">查询
</el-button>
<el-button @click="reset()">重置</el-button> <el-button @click="reset()">重置</el-button>
</div> </div>
</div> </div>
...@@ -84,26 +85,92 @@ ...@@ -84,26 +85,92 @@
<div class="jdindentlist-list" v-else> <div class="jdindentlist-list" v-else>
<el-table header-row-class-name="companydetail-name-header" :data="tableData" style="width: 100%"> <el-table header-row-class-name="companydetail-name-header" :data="tableData" style="width: 100%">
<el-table-column prop="channelServiceNo" label="订单编号"> <el-table-column prop="channelServiceNo" label="订单编号">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.channelServiceNo">
<p solt="content">{{scope.row.channelServiceNo}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="deliveryOrderNo" label="交付单号"> <el-table-column prop="deliveryOrderNo" label="交付单号">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo">
<p solt="content">{{scope.row.deliveryOrderNo}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="itemName" label="业务类型"> <el-table-column prop="itemName" label="业务类型">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.itemName">
<p solt="content">{{scope.row.itemName}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="tmName" label="商标名称"> <el-table-column prop="tmName" label="商标名称">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.tmName">
<p solt="content">{{scope.row.tmName}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="nclOneCodes" label="商标类别"> <el-table-column prop="nclOneCodes" label="商标类别">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCodes">
<p solt="content">{{scope.row.nclOneCodes}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="nclOneCount" label="商标件数"> <el-table-column prop="nclOneCount" label="商标件数">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCount">
<p solt="content">{{scope.row.nclOneCount}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="申请人"> <el-table-column prop="name" label="申请人">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.name">
<p solt="content">{{scope.row.name}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="totalSum" label="订单金额"> <el-table-column prop="totalSum" label="订单金额">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.totalSum">
<p solt="content">{{scope.row.totalSum}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl"> <el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryStatusName">
<p solt="content">{{scope.row.deliveryStatusName}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="CreateDate" label="下单时间"> <el-table-column prop="CreateDate" label="下单时间">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.CreateDate">
<p solt="content">{{scope.row.CreateDate}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="submitTime" label="递交时间" class-name="subtime"> <el-table-column prop="submitTime" label="递交时间" class-name="subtime">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.submitTime">
<p solt="content">{{scope.row.submitTime}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="address" label="操作"> <!-- <el-table-column prop="address" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -123,8 +190,9 @@ ...@@ -123,8 +190,9 @@
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()" :current-page.sync="currentPage" <el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()"
:page-size="10" background layout="prev, pager, next,jumper" :total="countPage"> :current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" background
layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
...@@ -413,8 +481,9 @@ ...@@ -413,8 +481,9 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()" :current-page.sync="currentPage" <el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()"
:page-size="10" background layout="prev, pager, next,jumper" :total="countPage"> :current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" background
layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.css
.jdindentdetail-warpper { .wrapper-bg{
width: 100%; width: 100%;
background: rgb(236, 238, 243);
}
.jdindentdetail-warpper {
background: #fff;
max-width:1320px;
margin: 0 auto;
} }
.jdindentdetail-header { .jdindentdetail-header {
...@@ -54,9 +60,8 @@ ...@@ -54,9 +60,8 @@
} }
.jdindentdetail-nav { .jdindentdetail-nav {
height: 70px;
box-sizing: border-box; box-sizing: border-box;
padding: 1.42% 2.64% 2.7% 3.28%; padding-top: 17px;
} }
.jdindentdetail-nav .el-breadcrumb { .jdindentdetail-nav .el-breadcrumb {
...@@ -67,7 +72,7 @@ ...@@ -67,7 +72,7 @@
width: 100%; width: 100%;
background: #fff; background: #fff;
box-sizing: border-box; box-sizing: border-box;
padding: 1.42% 2.64% 2.7% 3.28%; padding: 1.42% 0 2.7% 0;
overflow: hidden; overflow: hidden;
} }
...@@ -235,12 +240,12 @@ ...@@ -235,12 +240,12 @@
height: 0px; height: 0px;
background: #E1E1E1; background: #E1E1E1;
width: 100%; width: 100%;
margin-top: 56px; margin-top: 20px;
margin-bottom: 48px; margin-bottom: 28px;
} }
.jdindentdetail-info { .jdindentdetail-info {
margin-top: 39px; margin-top: 20px;
} }
.jdindentdetail-info::after { .jdindentdetail-info::after {
...@@ -253,8 +258,7 @@ ...@@ -253,8 +258,7 @@
.jdindentdetail-info>div:nth-child(2) { .jdindentdetail-info>div:nth-child(2) {
float: left; float: left;
margin-top: 24px; padding: 28px 10px 0 20px;
margin-right: 47px;
} }
.jdindentdetail-info>div:nth-child(3) { .jdindentdetail-info>div:nth-child(3) {
...@@ -284,6 +288,7 @@ ...@@ -284,6 +288,7 @@
width: 100px; width: 100px;
text-align: center; text-align: center;
color: #B2B2B2; color: #B2B2B2;
margin-top: 5px;
} }
.jdindentdetail-info>div:nth-child(2)>p:nth-child(1)>img { .jdindentdetail-info>div:nth-child(2)>p:nth-child(1)>img {
...@@ -507,9 +512,6 @@ ...@@ -507,9 +512,6 @@
color: rgba(130, 130, 130, 1); color: rgba(130, 130, 130, 1);
} }
/* 弹框部分 */ /* 弹框部分 */
...@@ -538,3 +540,31 @@ ...@@ -538,3 +540,31 @@
width: 100%; width: 100%;
padding: 0 20px; padding: 0 20px;
} }
#steps{
display: block;
}
#steps>div{
width: 170px;
}
.btnBottom>span{
position: absolute;
bottom: 0px;
left: 0px;
padding: 10px 20px 20px;
background: #fff;
margin-top: 5px;
box-sizing: border-box;
border-top: 1px solid #dee0ed;
z-index: 9999;
}
.btnBottom>span>button{
border-radius: 100px !important;
}
.el-dialog__wrapper{
cursor: pointer;
}
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.html
<div class="jdindentdetail-warpper"> <div class="wrapper-bg">
<div class="jdindentdetail-warpper">
<!-- <div class="jdindentdetail-header"> <!-- <div class="jdindentdetail-header">
<div>个人中心</div> <div>个人中心</div>
<div> <div>
...@@ -15,7 +17,7 @@ ...@@ -15,7 +17,7 @@
</div> </div>
</div> </div>
<div> <div>
<div style="display:flex;height: 60px;align-items: center;"> <!-- <div style="display:flex;height: 60px;align-items: center;">
<div style="background:#ffffff; <div style="background:#ffffff;
border:3px solid #3071fe; border:3px solid #3071fe;
width:6px; width:6px;
...@@ -25,11 +27,19 @@ ...@@ -25,11 +27,19 @@
<div style="font-size: 16px;"> <div style="font-size: 16px;">
订单详情 订单详情
</div> </div>
</div> </div> -->
</div> </div>
<div class="jdindentdetail"> <div class="jdindentdetail">
<div class="jdindentdetail-nav"> <div class="jdindentdetail-nav">
<div style="background:#ffffff;
border:3px solid #3071fe;
width:6px;
height:6px;
border-radius:100%;
margin: 0 10px 0 0;
display: inline-block;">
</div>
<span>当前位置：</span> <span>当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">交付中心 <el-breadcrumb-item :to="listPath">交付中心
...@@ -44,8 +54,9 @@ ...@@ -44,8 +54,9 @@
<div class="jdindentdetail-flow"> <div class="jdindentdetail-flow">
<div class="jdindentdetail-main-step-col"> <div class="jdindentdetail-main-step-col">
<el-steps :active="currentStep" align-center process-status="process"> <el-steps :active="currentStep" align-center process-status="process" id="steps">
<el-step v-if="itemCode" title="待上传材料" description=""></el-step> <el-step v-if="itemCode" title="待上传材料" description="">
</el-step>
<el-step v-if="!itemCode" title="待确认方案"></el-step> <el-step v-if="!itemCode" title="待确认方案"></el-step>
<!-- <el-step v-show="itemCode" title="方案不通过"></el-step> --> <!-- <el-step v-show="itemCode" title="方案不通过"></el-step> -->
<el-step title="待审核"></el-step> <el-step title="待审核"></el-step>
...@@ -61,7 +72,8 @@ ...@@ -61,7 +72,8 @@
<div> <div>
<el-steps direction="vertical" :active="currentStep"> <el-steps direction="vertical" :active="currentStep">
<el-step v-for="(item, index) in orderFlow" <el-step v-for="(item, index) in orderFlow"
:title="item.createDate +\' \' +item.opContent"></el-step> :title="item.createDate +\' \' +item.opContent">
</el-step>
</el-steps> </el-steps>
</div> </div>
</div> </div>
...@@ -69,7 +81,8 @@ ...@@ -69,7 +81,8 @@
<div class="jdindentdetail-info"> <div class="jdindentdetail-info">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
商标信息 <span v-show="itemCode" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span> 商标信息 <span v-show="itemCode" @click="showDialog(1)"><i class="el-icon-edit"></i>
修改</span>
</div> </div>
<div> <div>
<p> <p>
...@@ -78,9 +91,11 @@ ...@@ -78,9 +91,11 @@
<p>商标图样</p> <p>商标图样</p>
</div> </div>
<div> <div>
<p>商标名称：<span>{{deliveryInfo.tmName?deliveryInfo.tmName:\"-\"}}</span></p> <p>商标名称：<span>{{deliveryInfo.tmName?deliveryInfo.tmName:\"-\"}}</span>
</p>
<p>商标类型：<span>{{brandType?brandType:\"-\"}}</span></p> <p>商标类型：<span>{{brandType?brandType:\"-\"}}</span></p>
<p>商标说明：<span>{{deliveryInfo.notes?deliveryInfo.notes:\"-\"}}</span></p> <p>商标说明：<span>{{deliveryInfo.notes?deliveryInfo.notes:\"-\"}}</span>
</p>
</div> </div>
</div> </div>
...@@ -92,7 +107,7 @@ ...@@ -92,7 +107,7 @@
商标类别 商标类别
</div> </div>
<div class="jdindentdetail-main-type-title"> <div class="jdindentdetail-main-type-title">
{{item.nclOneCodes}} 第{{item.nclOneCodes}}类
<span>{{item.tmRegistNum}}</span> <span>{{item.tmRegistNum}}</span>
<span>{{item.officialTypeName}}</span> <span>{{item.officialTypeName}}</span>
<span v-show="itemCode" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span> <span v-show="itemCode" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span>
...@@ -100,7 +115,8 @@ ...@@ -100,7 +115,8 @@
<div class="jdindentdetail-main-type-services"> <div class="jdindentdetail-main-type-services">
<p>商品服务项目：</p> <p>商品服务项目：</p>
<ul> <ul>
<li v-for="(item, index) in item.nclSmallCodes" :key="index">{{item.pcode}}{{item.name}} <li v-for="(item, index) in item.nclSmallCodes" :key="index">
{{item.pcode}}{{item.name}}
</li> </li>
</ul> </ul>
</div> </div>
...@@ -109,6 +125,7 @@ ...@@ -109,6 +125,7 @@
官方回执文件: 官方回执文件:
<span v-for="(el, index) in item.tmOfficials" <span v-for="(el, index) in item.tmOfficials"
:key="item.officialType">{{el.officialTypeName}}</span> :key="item.officialType">{{el.officialTypeName}}</span>
<p v-if="item.tmOfficials.length==0" style="display:inline-block;marginLeft:20px;">暂无</p>
</div> </div>
</div> </div>
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
...@@ -116,7 +133,8 @@ ...@@ -116,7 +133,8 @@
<div class="jdindentdetail-main-official"> <div class="jdindentdetail-main-official">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
交官文件 <span v-show="itemCode" @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span> 交官文件 <span v-show="itemCode" @click="showDialog(3)"><i class="el-icon-edit"></i>
修改</span>
</div> </div>
<div class="jdindentdetail-main-official-img"> <div class="jdindentdetail-main-official-img">
<div> <div>
...@@ -165,14 +183,19 @@ ...@@ -165,14 +183,19 @@
<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">
申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}） <span v-show="itemCode" 申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}）
@click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span> <span v-show="itemCode" @click="showDialog(4)"><i class="el-icon-edit"></i>
修改</span>
</div> </div>
<ul> <ul>
<li><span>公司名称：</span><span>{{applyInfo.name?applyInfo.name:\"-\"}}</span></li> <li><span>公司名称：</span><span>{{applyInfo.name?applyInfo.name:\"-\"}}</span>
<li><span>统一社会信用代码：</span><span>{{applyInfo.code?applyInfo.code:\'-\'}}</span></li> </li>
<li><span>公司地址：</span><span>{{applyInfo.applyAddr?applyInfo.applyAddr:\"-\"}}</span></li> <li><span>统一社会信用代码：</span><span>{{applyInfo.code?applyInfo.code:\'-\'}}</span>
<li><span>邮编地址：</span><span>{{applyInfo.zipCode?applyInfo.zipCode:\'-\'}}</span></li> </li>
<li><span>公司地址：</span><span>{{applyInfo.applyAddr?applyInfo.applyAddr:\"-\"}}</span>
</li>
<li><span>邮编地址：</span><span>{{applyInfo.zipCode?applyInfo.zipCode:\'-\'}}</span>
</li>
</ul> </ul>
</div> </div>
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
...@@ -181,10 +204,14 @@ ...@@ -181,10 +204,14 @@
订单联系人 <span v-show="itemCode" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span> 订单联系人 <span v-show="itemCode" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
<li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li> <li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span>
<li><span>手机号码：</span><span>{{applyInfo.mobile?applyInfo.mobile:\'-\'}}</span></li> </li>
<li><span>电子邮箱：</span><span>{{applyInfo.email?applyInfo.email:\'-\'}}</span></li> <li><span>手机号码：</span><span>{{applyInfo.mobile?applyInfo.mobile:\'-\'}}</span>
<li><span>座机号码：</span><span>{{applyInfo.tel?applyInfo.tel:\'-\'}}</span></li> </li>
<li><span>电子邮箱：</span><span>{{applyInfo.email?applyInfo.email:\'-\'}}</span>
</li>
<li><span>座机号码：</span><span>{{applyInfo.tel?applyInfo.tel:\'-\'}}</span>
</li>
</ul> </ul>
</div> </div>
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
...@@ -193,7 +220,8 @@ ...@@ -193,7 +220,8 @@
付款信息 付款信息
</div> </div>
<div> <div>
<span>实付金额： <span>¥{{receiptVoucher.totalSum?receiptVoucher.totalSum:\' -\'}}</span></span> <span>实付金额：
<span>¥{{receiptVoucher.totalSum?receiptVoucher.totalSum:\' -\'}}</span></span>
<!-- <span>官费：<span>¥300.00</span></span> <!-- <span>官费：<span>¥300.00</span></span>
<span>服务费：<span>¥213</span></span> --> <span>服务费：<span>¥213</span></span> -->
</div> </div>
...@@ -204,7 +232,7 @@ ...@@ -204,7 +232,7 @@
<!-- 修改弹窗 --> <!-- 修改弹窗 -->
<div class="jdindentdetail-diag"> <div class="jdindentdetail-diag">
<el-drawer :title="headerInfo" custom-class="jdindentdetail-drawer" size="58.3333%" <el-drawer :title="\'修改\'+headerInfo" custom-class="jdindentdetail-drawer" size="58.3333%"
:visible.sync="dialogTableVisible" center> :visible.sync="dialogTableVisible" center>
<div v-show="headerInfo==\'商标信息\'"> <div v-show="headerInfo==\'商标信息\'">
<el-form v-show="step==1" ref="form" :rules="rules" label-position="left" :model="form" <el-form v-show="step==1" ref="form" :rules="rules" label-position="left" :model="form"
...@@ -213,11 +241,15 @@ ...@@ -213,11 +241,15 @@
<div class="categoryFrom"> <div class="categoryFrom">
<el-form-item label="商标类型" style="float:left;padding-right:10px;" prop="tmFormType"> <el-form-item label="商标类型" style="float:left;padding-right:10px;" prop="tmFormType">
<el-radio-group style="display:inline-block;" v-model="form.tmFormType"> <el-radio-group style="display:inline-block;" v-model="form.tmFormType">
<el-radio :label="3">文字</el-radio> <el-radio :label="3">文字
<el-radio :label="4">图形</el-radio> </el-radio>
<el-radio :label="5">文字及图形</el-radio> <el-radio :label="4">图形
</el-radio>
<el-radio :label="5">文字及图形
</el-radio>
</el-radio-group> </el-radio-group>
<div class="categoryFrom-jieshao" @click="announcementsType = true">如何选择商标类型？ <div class="categoryFrom-jieshao" @click="announcementsType = true">
如何选择商标类型？
</div> </div>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
...@@ -235,10 +267,11 @@ ...@@ -235,10 +267,11 @@
<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:100px;color: #666666;">手动上传 <el-button size="mini" style="border-radius:100px;color: #666666;">
手动上传
</el-button> </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" style="float:left;"
...@@ -253,7 +286,8 @@ ...@@ -253,7 +286,8 @@
</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:100px;color: #666666;" size="mini"> <el-button @click="word2pic" style="border-radius:100px;color: #666666;"
size="mini">
自动生成 自动生成
</el-button> </el-button>
</div> </div>
...@@ -267,11 +301,15 @@ ...@@ -267,11 +301,15 @@
</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 style="padding-left:17px">
上传彩色图样，注册后只能按照该彩色图样使用，并在委托书商标名称后方增加文字“（指定颜色）”；
</div> </div>
<div style="padding-left:17px"> <div style="padding-left:17px">
上传彩色图样，注册后只能按照该彩色图样使用，并在委托书商标名称后方增加文字“（指定颜色）”；</div> 上传的彩色图样需与黑白图样的样式一致。
<div style="padding-left:17px">上传的彩色图样需与黑白图样的样式一致。</div> </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">
查看上传商标图样注意事项</div> 查看上传商标图样注意事项</div>
...@@ -287,22 +325,27 @@ ...@@ -287,22 +325,27 @@
<img style="width:100%;margin-top: 30px;" src="/imgs/jdt/shuoming.png" alt=""> <img style="width:100%;margin-top: 30px;" src="/imgs/jdt/shuoming.png" alt="">
</el-drawer> </el-drawer>
<el-drawer :visible.sync="announcementsImgType" width="60%" append-to-body> <el-drawer :visible.sync="announcementsImgType" width="60%" append-to-body>
<h1 style="width:100%;text-align: center;">上传商标图样注意事项</h1> <h1 style="width:100%;text-align: center;">
上传商标图样注意事项
</h1>
<div class="popannouncementsText"> <div class="popannouncementsText">
图样文件格式应为jpg，图形应清晰，图样文件大小应小于“<span>200KB</span>”，且图形像素介于“<span>600X600 - 图样文件格式应为jpg，图形应清晰，图样文件大小应小于“<span>200KB</span>”，且图形像素介于“<span>600X600
-
1500X1500</span>”之间，如果通过扫描获得图样的，应按 1500X1500</span>”之间，如果通过扫描获得图样的，应按
<span>24</span>位彩色，<span>300dpi</span>分辨率扫描符合《商标法》及其实施条例规定的图形（图形清晰，大于5X5厘米且小于10X10厘米），申请人（或代理人）应确保扫描后的图 <span>24</span>位彩色，<span>300dpi</span>分辨率扫描符合《商标法》及其实施条例规定的图形（图形清晰，大于5X5厘米且小于10X10厘米），申请人（或代理人）应确保扫描后的图
形与原图形的色彩深浅（或灰度）一致，否则，可能影响《商标注册证》上图形的清晰度）如上传图样为黑白，取得注册后，可以更换商标颜色使用；<span>如上传图样为彩色，取得注册后只能按 形与原图形的色彩深浅（或灰度）一致，否则，可能影响《商标注册证》上图形的清晰度）如上传图样为黑白，取得注册后，可以更换商标颜色使用；<span>如上传图样为彩色，取得注册后只能按
照该彩色图样使用；如确认提交彩色图样，需在委托书商标名称后方增加以下文字“（指定颜色）”</span></div> 照该彩色图样使用；如确认提交彩色图样，需在委托书商标名称后方增加以下文字“（指定颜色）”</span>
</div>
</el-drawer> </el-drawer>
<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>
</div> </div>
</div> </div>
<div style="clear:both;"></div> <div style="clear:both;"></div>
...@@ -326,7 +369,8 @@ ...@@ -326,7 +369,8 @@
<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"
...@@ -339,7 +383,8 @@ ...@@ -339,7 +383,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>
...@@ -352,7 +397,9 @@ ...@@ -352,7 +397,9 @@
<el-checkbox-group v-model="checkedNcl" @change="handleCheckedNclChange"> <el-checkbox-group v-model="checkedNcl" @change="handleCheckedNclChange">
<ul style="list-style:none; padding:0;margin:0;text-align:left;"> <ul style="list-style:none; padding:0;margin:0;text-align:left;">
<li v-for="n in ncl" :key="n" style="float:left;width:33.33%"> <li v-for="n in ncl" :key="n" style="float:left;width:33.33%">
<el-checkbox :label="n">{{n}}</el-checkbox> <el-checkbox :label="n">
{{n}}
</el-checkbox>
</li> </li>
</ul> </ul>
</el-checkbox-group> </el-checkbox-group>
...@@ -383,7 +430,8 @@ ...@@ -383,7 +430,8 @@
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;">
<div v-for="(nclone,index) in nclOne" <div v-for="(nclone,index) in nclOne"
style="text-align: left;padding-left:5px;padding-bottom:5px;"> style="text-align: left;padding-left:5px;padding-bottom:5px;">
<span style="font-size:16px"><b>{{nclone.code}} {{nclone.name}}</b></span> <span style="font-size:16px"><b>{{nclone.code}}
{{nclone.name}}</b></span>
<span style="font-size:16px;float:right"><b>已选择<span <span style="font-size:16px;float:right"><b>已选择<span
style="color:#0F8EE9;">{{nclone.nclThree.length}}</span>项</b> style="color:#0F8EE9;">{{nclone.nclThree.length}}</span>项</b>
<!-- <span style="color:#FF2E22;">￥{{nclone.price}}</span> --> <!-- <span style="color:#FF2E22;">￥{{nclone.price}}</span> -->
...@@ -397,7 +445,8 @@ ...@@ -397,7 +445,8 @@
<span v-for="(nclThree,index2) in nclone.nclThree"> <span v-for="(nclThree,index2) in nclone.nclThree">
<el-tag key="nclThree.code" closable="true" <el-tag key="nclThree.code" closable="true"
@close="closeTag(nclThree,index,index2)"> @close="closeTag(nclThree,index,index2)">
{{nclThree.code}} {{nclThree.name}} {{nclThree.code}}
{{nclThree.name}}
</el-tag> </el-tag>
&nbsp; &nbsp;
</span> </span>
...@@ -407,7 +456,8 @@ ...@@ -407,7 +456,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;text-align: center;">请点击左侧选择商标类别 <div style="color: #828282;text-align: center;">
请点击左侧选择商标类别
</div> </div>
</div> </div>
...@@ -418,8 +468,8 @@ ...@@ -418,8 +468,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 label-position="left" ref="apply" :rules="applyrules" :model="editApply" class="demo-ruleForm" <el-form label-position="left" ref="apply" :rules="applyrules" :model="editApply"
label-width="120px"> class="demo-ruleForm" label-width="120px">
<!-- 头部 --> <!-- 头部 -->
<!-- <el-form-item label-width="140px" label="申请人类型" <!-- <el-form-item label-width="140px" label="申请人类型"
...@@ -437,31 +487,38 @@ ...@@ -437,31 +487,38 @@
<div class="selftmreg_main" style="padding:0;"> <div class="selftmreg_main" style="padding:0;">
<div style="width: 100%;text-align: left;box-sizing: border-box;"> <div style="width: 100%;text-align: left;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\'" />
<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-plus"></i></div> <div><i class="el-icon-plus"></i>
<div>(需盖公章)</div> </div>
<div>(需盖公章)
</div>
</div> </div>
</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 @click="window.open(editApply.businessLicensePic)">
查看大图
</div> </div>
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" <gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<div @click="loadingKey = 0">重新上传</div> <div @click="loadingKey = 0">
重新上传
</div>
</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="applyInfo.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"
...@@ -471,7 +528,8 @@ ...@@ -471,7 +528,8 @@
</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)" class="upload-applyimg"
...@@ -481,27 +539,36 @@ ...@@ -481,27 +539,36 @@
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<div class="upload-button" @click="loadingKey = 1"> <div class="upload-button" @click="loadingKey = 1">
<div><i class="el-icon-plus"></i></div> <div><i class="el-icon-plus"></i>
<div>(需盖公章)</div> </div>
<div>(需盖公章)
</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" <div class="upload-dialog"
v-show="editApply.identityCardPic && toViewImgKey == \'d\'"> v-show="editApply.identityCardPic && toViewImgKey == \'d\'">
<div @click="window.open(editApply.identityCardPic)">查看大图</div> <div @click="window.open(editApply.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"
@error="error"> @error="error">
<div @click="loadingKey = 1">重新上传</div> <div @click="loadingKey = 1">
重新上传
</div>
</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>
</div>
<div class="text"> <i class="el-icon-warning"></i>
格式为<span>PDF</span> 或
<span>JPG</span>，大小不能超过<span>10M</span>
</div> </div>
<div class="text"> <i class="el-icon-warning"></i> 格式为<span>PDF</span> 或
<span>JPG</span>，大小不能超过<span>10M</span></div>
</el-form-item> </el-form-item>
<el-form-item class="gsb_items"> <el-form-item class="gsb_items">
<div class="title special">上传材料：代理委托书 <div class="title special">上传材料：代理委托书
...@@ -516,21 +583,27 @@ ...@@ -516,21 +583,27 @@
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<div class="upload-button" @click="loadingKey = 2"> <div class="upload-button" @click="loadingKey = 2">
<div><i class="el-icon-plus"></i></div> <div><i class="el-icon-plus"></i>
<div>(需盖公章)</div> </div>
<div>(需盖公章)
</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" <div class="upload-dialog"
v-show="editDeliveryInfo.gzwtsUrl && toViewImgKey == \'b\'"> v-show="editDeliveryInfo.gzwtsUrl && toViewImgKey == \'b\'">
<div @click="window.open(editDeliveryInfo.gzwtsUrl)">查看大图</div> <div @click="window.open(editDeliveryInfo.gzwtsUrl)">
查看大图</div>
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action" <gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<div @click="loadingKey = 2">重新上传</div> <div @click="loadingKey = 2">
重新上传
</div>
</gsb-upload> </gsb-upload>
</div> </div>
</div> </div>
<div class="upload-img" @mouseover="mouseOverDemo(2)" @mouseleave="mouseLeaveDemo(2)"> <div class="upload-img" @mouseover="mouseOverDemo(2)"
@mouseleave="mouseLeaveDemo(2)">
<img <img
:src="editApply.customerType == \'ent\' ? \'/imgs/sbzc/wts1.png\' : \'imgs/sbzc/wts.png\'" /> :src="editApply.customerType == \'ent\' ? \'/imgs/sbzc/wts1.png\' : \'imgs/sbzc/wts.png\'" />
<div v-if="toViewImgKey == 2" class="toViewImg" <div v-if="toViewImgKey == 2" class="toViewImg"
...@@ -552,30 +625,38 @@ ...@@ -552,30 +625,38 @@
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<div class="upload-button" @click="loadingKey = 3"> <div class="upload-button" @click="loadingKey = 3">
<div><i class="el-icon-plus"></i></div> <div><i class="el-icon-plus"></i>
<div>(需盖公章)</div> </div>
<div>(需盖公章)
</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" <div class="upload-dialog"
v-show="editDeliveryInfo.smwjUrl && toViewImgKey == \'c\'"> v-show="editDeliveryInfo.smwjUrl && toViewImgKey == \'c\'">
<div @click="window.open(editDeliveryInfo.smwjUrl)">查看大图</div> <div @click="window.open(editDeliveryInfo.smwjUrl)">
查看大图</div>
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" :action="action" <gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<div @click="loadingKey = 3">重新上传</div> <div @click="loadingKey = 3">
重新上传
</div>
</gsb-upload> </gsb-upload>
</div> </div>
</div> </div>
<div class="upload-img" @mouseover="mouseOverDemo(3)" @mouseleave="mouseLeaveDemo(3)"> <div class="upload-img" @mouseover="mouseOverDemo(3)"
@mouseleave="mouseLeaveDemo(3)">
<img src="/imgs/sbzc/yxq.png" /> <img src="/imgs/sbzc/yxq.png" />
<div v-if="toViewImgKey == 3" class="toViewImg" <div v-if="toViewImgKey == 3" class="toViewImg"
@click="toViewImg(\'/imgs/sbzc/yxqD.png\')">查看大图</div> @click="toViewImg(\'/imgs/sbzc/yxqD.png\')">
查看大图</div>
</div> </div>
</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%" append-to-body>
<img :src="toViewImgSrc" style="max-width:100%;display: block;margin: 0 auto;" alt=""> <img :src="toViewImgSrc" style="max-width:100%;display: block;margin: 0 auto;"
alt="">
</el-dialog> </el-dialog>
</div> </div>
</div> </div>
...@@ -583,8 +664,8 @@ ...@@ -583,8 +664,8 @@
</el-form> </el-form>
</div> </div>
<div v-show="headerInfo==\'申请人信息\'"> <div v-show="headerInfo==\'申请人信息\'">
<el-form label-position="left" ref="apply" :rules="applyrules" :model="editApply" class="demo-ruleForm" <el-form label-position="left" ref="apply" :rules="applyrules" :model="editApply"
label-width="120px"> 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%;box-sizing: border-box;"> <div style="width:100%;box-sizing: border-box;">
...@@ -594,12 +675,13 @@ ...@@ -594,12 +675,13 @@
<div class="selftmregType" v-model="editApply.customerType" <div class="selftmregType" v-model="editApply.customerType"
:style="editApply.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'" :style="editApply.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
@click="editApply.customerType = \'ent\'">企业<img @click="editApply.customerType = \'ent\'">
v-if="editApply.customerType==\'ent\'" src="/imgs/sjd.png" alt=""></div> 企业<img v-if="editApply.customerType==\'ent\'" src="/imgs/sjd.png" alt="">
</div>
<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\'">
v-if="editApply.customerType==\'person\'" src="/imgs/sjd.png" alt=""> 个体户<img v-if="editApply.customerType==\'person\'" src="/imgs/sjd.png" alt="">
</div> </div>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
...@@ -607,61 +689,73 @@ ...@@ -607,61 +689,73 @@
style="width:493px;float:left;padding-right:50px;" prop="name"> style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectentjd v-if="currentUser" @historychange="historyapplierchange" <gsb-selectentjd v-if="currentUser" @historychange="historyapplierchange"
allowcreate="true" showhistory="false" @change="applierChange" size="medium" allowcreate="true" showhistory="false" @change="applierChange" size="medium"
v-model="editApply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true" v-model="editApply.name" refMethod="getCompanyInfoByLikeName"
isFilter="true" 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" <gsb-selectentjd v-if="!currentUser" @historychange="historyapplierchange"
frombrowser="true" allowcreate="true" showhistory="false" @change="applierChange" frombrowser="true" allowcreate="true" showhistory="false"
size="medium" v-model="editApply.name" refMethod="getCompanyInfoByLikeName" @change="applierChange" size="medium" v-model="editApply.name"
autoComplete="true" isFilter="true" refModel="tool" labelField="entName" refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true"
valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称"> refModel="tool" labelField="entName" valueField="entName"
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" 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"
v-model="editApply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true" v-model="editApply.name" refMethod="getCompanyInfoByLikeName"
isFilter="true" refModel="tool" labelField="entName" valueField="entName" autoComplete="true" isFilter="true" refModel="tool" labelField="entName"
style="position:relative;width:100%;" placeHolder="请输入身份证姓名"></gsb-selectperson> valueField="entName" style="position:relative;width:100%;"
placeHolder="请输入身份证姓名">
</gsb-selectperson>
<gsb-selectperson v-if="!currentUser" frombrowser="true" @input="selectpersoninput" <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>
</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;"
<el-input placeHolder="请输入身份证号码" v-model="editApply.identityCardNo"> </el-input> prop="identityCardNo">
<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>
<el-form-item label-width="140px" label="统一社会信用代码" <el-form-item label-width="140px" label="统一社会信用代码"
style="width:493px;float:left;padding-right:50px;" prop="code"> style="width:493px;float:left;padding-right:50px;" prop="code">
<el-input placeHolder="请输入统一社会信用代码" v-model="editApply.code"></el-input> <el-input placeHolder="请输入统一社会信用代码" v-model="editApply.code">
</el-input>
<div class="floatBox-right"> <div class="floatBox-right">
<i class="el-icon-question" @mouseover="mouseOverDemo(99)" <i class="el-icon-question" @mouseover="mouseOverDemo(99)"
@mouseleave="mouseLeaveDemo(99)"></i> @mouseleave="mouseLeaveDemo(99)"></i>
<div id="floatBox-demo" v-show="floatBoxDemo"> <div id="floatBox-demo" v-show="floatBoxDemo">
由于官方商标注册增加“统一社会信用代码”的填写，企业申请必填，个体工商户申请可不填此项，请仔细核对营业执照填写。 </div> 由于官方商标注册增加“统一社会信用代码”的填写，企业申请必填，个体工商户申请可不填此项，请仔细核对营业执照填写。
</div>
</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" label="执照详细地址"
style="width:493px;float:left;padding-right:50px;" prop="applyAddr"> style="width:493px;float:left;padding-right:50px;" prop="applyAddr">
<el-input placeHolder="请输入执照详细地址" v-model="editApply.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>
<el-form-item label-width="140px" label="邮政编码" <el-form-item label-width="140px" label="邮政编码"
style="width:493px;float:left;padding-right:50px;" prop="zipCode"> style="width:493px;float:left;padding-right:50px;" prop="zipCode">
<el-input placeHolder="请输入邮政编码" v-model="editApply.zipCode"></el-input> <el-input placeHolder="请输入邮政编码" v-model="editApply.zipCode">
</el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
...@@ -676,17 +770,20 @@ ...@@ -676,17 +770,20 @@
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<div class="upload-button" @click="loadingKey = 0"> <div class="upload-button" @click="loadingKey = 0">
<div><i class="el-icon-plus"></i></div> <div><i class="el-icon-plus"></i>
</div>
<div>(需盖公章)</div> <div>(需盖公章)</div>
</div> </div>
</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" :action="action" <gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<div @click="loadingKey = 0">重新上传</div> <div @click="loadingKey = 0">
重新上传</div>
</gsb-upload> </gsb-upload>
</div> </div>
</div> </div>
...@@ -710,26 +807,34 @@ ...@@ -710,26 +807,34 @@
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error"> @error="error">
<div class="upload-button" @click="loadingKey = 1"> <div class="upload-button" @click="loadingKey = 1">
<div><i class="el-icon-plus"></i></div> <div><i class="el-icon-plus"></i>
</div>
<div>(需盖公章)</div> <div>(需盖公章)</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" v-show="applyInfo.identityCardPic && toViewImgKey == \'d\'"> <div class="upload-dialog"
<div @click="window.open(applyInfo.identityCardPic)">查看大图</div> 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" <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"
@error="error"> @error="error">
<div @click="loadingKey = 1">重新上传</div> <div @click="loadingKey = 1">
重新上传</div>
</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>
</div>
<div class="text"> <i class="el-icon-warning"></i>
格式为<span>PDF</span> 或
<span>JPG</span>，大小不能超过<span>10M</span>
</div> </div>
<div class="text"> <i class="el-icon-warning"></i> 格式为<span>PDF</span> 或
<span>JPG</span>，大小不能超过<span>10M</span></div>
</el-form-item> </el-form-item>
</div> </div>
...@@ -831,7 +936,8 @@ ...@@ -831,7 +936,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="mobile"> style="width:493px;float:left;padding-right:50px;" prop="mobile">
<el-input v-model="editApply.mobile" placeHolder="请填写11位手机号码"></el-input> <el-input v-model="editApply.mobile" placeHolder="请填写11位手机号码">
</el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="电子邮箱" <el-form-item label-width="140px" label="电子邮箱"
...@@ -842,12 +948,14 @@ ...@@ -842,12 +948,14 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="座机" <el-form-item label-width="140px" label="座机"
style="width:493px;float:left;padding-right:50px;"> style="width:493px;float:left;padding-right:50px;">
<el-input v-model="editApply.tel" placeHolder="区号-座机号码"> </el-input> <el-input v-model="editApply.tel" placeHolder="区号-座机号码">
</el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="传真" <el-form-item label-width="140px" label="传真"
style="width:493px;float:left;padding-right:50px;"> style="width:493px;float:left;padding-right:50px;">
<el-input v-model="editApply.fax" placeHolder="请输入传真号"> </el-input> <el-input v-model="editApply.fax" placeHolder="请输入传真号">
</el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<div style="clear:both;"></div> <div style="clear:both;"></div>
...@@ -866,13 +974,17 @@ ...@@ -866,13 +974,17 @@
@click="closeConfrim()">修 改 @click="closeConfrim()">修 改
</el-button> </el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary" <el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary"
@click="submitEdit(\'商标类别\',true)">确 定</el-button> @click="submitEdit(\'商标类别\',true)">确 定
</el-button>
</span> </span>
</div> </div>
</el-dialog> </el-dialog>
<div style="text-align:center;"> <div class="btnBottom">
<span class="dialog-footer" style="margin-top:5px;"> <span class="dialog-footer" style="margin-top:5px;">
<el-button @click="dialogTableVisible = false;"
style="width:140px;height:36px;border:1px solid rgba(38,146,255,1);border-radius:4px;">
取消</el-button>
<el-button @click="submitEdit(headerInfo)" <el-button @click="submitEdit(headerInfo)"
style="width:140px;height:36px;background:rgba(38,146,255,1);border-radius:4px;color:#fff;"> style="width:140px;height:36px;background:rgba(38,146,255,1);border-radius:4px;color:#fff;">
提交</el-button> 提交</el-button>
...@@ -889,4 +1001,5 @@ ...@@ -889,4 +1001,5 @@
{{message.info}} {{message.info}}
</div> </div>
</transition> </transition>
</div>
</div> </div>
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.css
...@@ -53,10 +53,12 @@ ...@@ -53,10 +53,12 @@
.jdindentlist-warpper .el-tabs__header { .jdindentlist-warpper .el-tabs__header {
box-sizing: border-box; box-sizing: border-box;
padding: 0 20px; /* padding: 0 20px; */
background: #eef2fb; background: #eef2fb;
} }
.jdindentlist-warpper .el-tabs--top{
padding: 0 20px;
}
.jdindentlist-warpper .el-tabs__nav-scroll { .jdindentlist-warpper .el-tabs__nav-scroll {
margin: 0; margin: 0;
} }
...@@ -71,7 +73,7 @@ ...@@ -71,7 +73,7 @@
/* 上面是公共部分 */ /* 上面是公共部分 */
.jdindentlist { .jdindentlist {
padding: 0px 20px 30px; /* padding: 0px 20px 30px; */
background: #F9F9F9; background: #F9F9F9;
} }
...@@ -150,11 +152,17 @@ ...@@ -150,11 +152,17 @@
background: #ffffff; background: #ffffff;
max-height: 30%; max-height: 30%;
box-sizing: border-box; box-sizing: border-box;
padding: 32px 25px 25px; /* padding: 32px 25px 25px; */
}
.el-table .cell{
text-align: center;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
} }
.jdindentlist-list .el-table th>.cell { .jdindentlist-list .el-table th>.cell {
text-align: left; text-align: center;
font-size: 14px; font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
...@@ -172,7 +180,7 @@ ...@@ -172,7 +180,7 @@
} }
.jdindentlist-list .subtime { .jdindentlist-list .subtime {
padding-right: 25px; /* padding-right: 25px; */
} }
.jdindentlist-list .dsqcl { .jdindentlist-list .dsqcl {
...@@ -197,7 +205,24 @@ ...@@ -197,7 +205,24 @@
justify-content: space-around; justify-content: space-around;
} }
.dailogButton{
width: 100%;
text-align:left;
padding:10px 20px 20px;
position: absolute;
bottom: 0;
left: 0;
box-sizing: border-box;
border-top: 1px solid #dee0eb;
}
.dailogButton>button{
border-radius: 100px;
padding: 6px 28px;
}
.jdindentlist-warpper .jdindentlist-list-header{ .el-table_1_column_12>.cell{
background: #f6f9ff; display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
} }
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -71,7 +71,8 @@ ...@@ -71,7 +71,8 @@
</div> --> </div> -->
</div> </div>
<div> <div>
<el-button @click="find()">查询</el-button> <el-button @click="find()" style="border: #3071fe;background: #3071fe; color: #fff;">查询
</el-button>
<el-button @click="reset()">重置</el-button> <el-button @click="reset()">重置</el-button>
</div> </div>
</div> </div>
...@@ -84,26 +85,92 @@ ...@@ -84,26 +85,92 @@
<div class="jdindentlist-list" v-else> <div class="jdindentlist-list" v-else>
<el-table header-row-class-name="companydetail-name-header" :data="tableData" style="width: 100%"> <el-table header-row-class-name="companydetail-name-header" :data="tableData" style="width: 100%">
<el-table-column prop="channelServiceNo" label="订单编号"> <el-table-column prop="channelServiceNo" label="订单编号">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.channelServiceNo">
<p solt="content">{{scope.row.channelServiceNo}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="deliveryOrderNo" label="交付单号"> <el-table-column prop="deliveryOrderNo" label="交付单号">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo">
<p solt="content">{{scope.row.deliveryOrderNo}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="itemName" label="业务类型"> <el-table-column prop="itemName" label="业务类型">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.itemName">
<p solt="content">{{scope.row.itemName}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="tmName" label="商标名称"> <el-table-column prop="tmName" label="商标名称">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.tmName">
<p solt="content">{{scope.row.tmName}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="nclOneCodes" label="商标类别"> <el-table-column prop="nclOneCodes" label="商标类别">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCodes">
<p solt="content">{{scope.row.nclOneCodes}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="nclOneCount" label="商标件数"> <el-table-column prop="nclOneCount" label="商标件数">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCount">
<p solt="content">{{scope.row.nclOneCount}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="申请人"> <el-table-column prop="name" label="申请人">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.name">
<p solt="content">{{scope.row.name}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="totalSum" label="订单金额"> <el-table-column prop="totalSum" label="订单金额">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.totalSum">
<p solt="content">{{scope.row.totalSum}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl"> <el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryStatusName">
<p solt="content">{{scope.row.deliveryStatusName}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="CreateDate" label="下单时间"> <el-table-column prop="CreateDate" label="下单时间">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.CreateDate">
<p solt="content">{{scope.row.CreateDate}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="submitTime" label="递交时间" class-name="subtime"> <el-table-column prop="submitTime" label="递交时间" class-name="subtime">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.submitTime">
<p solt="content">{{scope.row.submitTime}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="address" label="操作"> <el-table-column prop="address" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -124,7 +191,7 @@ ...@@ -124,7 +191,7 @@
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()" <el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-size="10" background :current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" background
layout="prev, pager, next,jumper" :total="countPage"> layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
...@@ -300,8 +367,8 @@ ...@@ -300,8 +367,8 @@
</div> </div>
</el-form> </el-form>
<div style="text-align:center;padding:50px 0;"> <div class="dailogButton">
<el-button @click="hideUploadStuff">取消</el-button> <el-button @click="hideUploadStuff" style="border: 1px solid #409eff;">取消</el-button>
<el-button type="primary" @click="uploadStuffs">确认</el-button> <el-button type="primary" @click="uploadStuffs">确认</el-button>
</div> </div>
<div style="clear:both"></div> <div style="clear:both"></div>
...@@ -415,7 +482,7 @@ ...@@ -415,7 +482,7 @@
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()" <el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-size="10" background :current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" background
layout="prev, pager, next,jumper" :total="countPage"> layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -594,6 +594,7 @@ ...@@ -594,6 +594,7 @@
this.$root.loading = false; this.$root.loading = false;
console.log(d.data); console.log(d.data);
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
console.log(d.data,"12313213");
this.tableData = d.data; this.tableData = d.data;
/* 没有分页参数 需要重新改*/ /* 没有分页参数 需要重新改*/
this.countPage = d.dataCount; this.countPage = d.dataCount;
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css → igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.css
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
text-align: right; text-align: right;
box-sizing: border-box; box-sizing: border-box;
background: #EFF0F7; background: #EFF0F7;
z-index: 299; z-index: 2999;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
......
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