Skip to content

Z
zhichan
Commit d9c94871 by 刘泽奇
Options

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

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-jdweb
parents 2dd7fb51 99f26c18
Showing with 71 additions and 5 deletions
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()" style="border: #3071fe;background: #3071fe; color: #fff;">查询</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,8 +191,7 @@ ...@@ -124,8 +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-sizes="[10, 20, 30, 40]" :current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" background
:page-size="10" background
layout="prev, pager, next,jumper" :total="countPage"> layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
...@@ -416,8 +482,7 @@ ...@@ -416,8 +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-sizes="[10, 20, 30, 40]" :current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" background
: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;
......
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