Skip to content

Z
zhichan
Commit fcd4a14b by 刘泽奇
Options

123

parent 0942e51c
Showing with 22 additions and 18 deletions
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> </div>
<el-tabs v-model="navActive" @tab-click="navClick"> <el-tabs v-model="navActive" @tab-click="navClick">
<el-tab-pane label="商标订单" name="first"> <el-tab-pane label="商标订单" name="first">
<div class="jdindentlist"> <div class="jdindentlist">
<div class="jdindentlist-inquire"> <div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form"> <div class="jdindentlist-inquire-form">
...@@ -93,7 +93,8 @@ ...@@ -93,7 +93,8 @@
<el-table-column prop="deliveryOrderNo" label="交付单号" width="180"> <el-table-column prop="deliveryOrderNo" label="交付单号" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo"> <el-tooltip placement="top" :content="scope.row.deliveryOrderNo">
<p solt="content">{{scope.row.deliveryOrderNo}} <p solt="content">
{{scope.row.deliveryOrderNo ? scope.row.deliveryOrderNo : \'---\'}}
</p> </p>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -101,7 +102,7 @@ ...@@ -101,7 +102,7 @@
<el-table-column prop="itemName" label="业务类型" width="180"> <el-table-column prop="itemName" label="业务类型" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.itemName"> <el-tooltip placement="top" :content="scope.row.itemName">
<p solt="content">{{scope.row.itemName}} <p solt="content">{{scope.row.itemName ? scope.row.itemName : \'---\'}}
</p> </p>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -109,7 +110,7 @@ ...@@ -109,7 +110,7 @@
<el-table-column prop="tmName" label="商标名称" width="180"> <el-table-column prop="tmName" label="商标名称" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.tmName"> <el-tooltip placement="top" :content="scope.row.tmName">
<p solt="content">{{scope.row.tmName}} <p solt="content">{{scope.row.tmName ? scope.row.tmName : \'---\'}}
</p> </p>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -117,7 +118,7 @@ ...@@ -117,7 +118,7 @@
<el-table-column prop="nclOneCodes" label="类别"> <el-table-column prop="nclOneCodes" label="类别">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCodes"> <el-tooltip placement="top" :content="scope.row.nclOneCodes">
<p solt="content">第{{scope.row.nclOneCodes}}类 <p solt="content">{{scope.row.nclOneCodes ?\'第\'+scope.row.nclOneCodes+\'类\': "---"}}
</p> </p>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -125,7 +126,7 @@ ...@@ -125,7 +126,7 @@
<el-table-column prop="nclOneCount" label="件数" width="" class-name="jdindentlist-brand-count"> <el-table-column prop="nclOneCount" label="件数" width="" class-name="jdindentlist-brand-count">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCount"> <el-tooltip placement="top" :content="scope.row.nclOneCount">
<p solt="content">{{scope.row.nclOneCount}} <p solt="content">{{scope.row.nclOneCount?scope.row.nclOneCount: \'---\'}}
</p> </p>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -133,7 +134,7 @@ ...@@ -133,7 +134,7 @@
<el-table-column prop="name" label="申请人"> <el-table-column prop="name" label="申请人">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.name"> <el-tooltip placement="top" :content="scope.row.name">
<p solt="content">{{scope.row.name}} <p solt="content">{{scope.row.name ? scope.row.name :\'---\'}}
</p> </p>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -141,7 +142,7 @@ ...@@ -141,7 +142,7 @@
<el-table-column prop="totalSum" label="订单金额"> <el-table-column prop="totalSum" label="订单金额">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.totalSum"> <el-tooltip placement="top" :content="scope.row.totalSum">
<p solt="content">{{scope.row.totalSum}} <p solt="content">{{scope.row.totalSum ? scope.row.totalSum : \'---\'}}
</p> </p>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -149,7 +150,7 @@ ...@@ -149,7 +150,7 @@
<el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl"> <el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryStatusName"> <el-tooltip placement="top" :content="scope.row.deliveryStatusName">
<p solt="content">{{scope.row.deliveryStatusName}} <p solt="content">{{scope.row.deliveryStatusName ? scope.row.deliveryStatusName : \'---\'}}
</p> </p>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -157,7 +158,7 @@ ...@@ -157,7 +158,7 @@
<el-table-column prop="CreateDate" label="下单时间"> <el-table-column prop="CreateDate" label="下单时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.CreateDate"> <el-tooltip placement="top" :content="scope.row.CreateDate">
<p solt="content">{{scope.row.CreateDate}} <p solt="content">{{scope.row.CreateDate ? scope.row.CreateDate: \'---\'}}
</p> </p>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -165,7 +166,7 @@ ...@@ -165,7 +166,7 @@
<el-table-column prop="submitTime" label="递交时间" class-name="subtime"> <el-table-column prop="submitTime" label="递交时间" class-name="subtime">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.submitTime"> <el-tooltip placement="top" :content="scope.row.submitTime">
<p solt="content">{{scope.row.submitTime}} <p solt="content">{{scope.row.submitTime ? scope.row.submitTime : \'---\'}}
</p> </p>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -188,9 +189,9 @@ ...@@ -188,9 +189,9 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" <el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" :page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper"
layout="prev, pager, next,jumper" :total="countPage"> :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
...@@ -479,9 +480,9 @@ ...@@ -479,9 +480,9 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" <el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" :page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper"
layout="prev, pager, next,jumper" :total="countPage"> :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -551,7 +551,10 @@ ...@@ -551,7 +551,10 @@
} }
}, },
showDetails(idx, row){ showDetails(idx, row){
if (row.deliveryStatus != 'dqrfa' || row.deliveryStatus == 'dfwsfw') { if(row.deliveryStatus == 'dfwsfw'){
return false;
}
if (row.deliveryStatus != 'dqrfa') {
if (this.showReg(idx, row)) { if (this.showReg(idx, row)) {
return false return false
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment