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 248 additions and 37 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,11 +190,12 @@ ...@@ -123,11 +190,12 @@
</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>
</div> </div>
<el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%" <el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%"
...@@ -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/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