Skip to content

Z
zhichan
Commit fcd4a14b by 刘泽奇
Options

123

parent 0942e51c
Showing with 48 additions and 45 deletions
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.html
......@@ -22,9 +22,7 @@
</div>
<el-tabs v-model="navActive" @tab-click="navClick">
<el-tab-pane label="商标订单" name="first">
<div class="jdindentlist-nav">
</div>
<div class="jdindentlist">
<div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form">
......@@ -71,7 +69,7 @@
</div> -->
</div>
<div>
<el-button @click="find()" style="background:#3071fe;border:1px solid #3071fe;color:#fff;">查询
<el-button @click="find()" style="border: #3071fe;background: #3071fe; color: #fff;">查询
</el-button>
<el-button @click="reset()">重置</el-button>
</div>
......@@ -95,7 +93,8 @@
<el-table-column prop="deliveryOrderNo" label="交付单号" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo">
<p solt="content">{{scope.row.deliveryOrderNo}}
<p solt="content">
{{scope.row.deliveryOrderNo ? scope.row.deliveryOrderNo : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -103,7 +102,7 @@
<el-table-column prop="itemName" label="业务类型" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.itemName">
<p solt="content">{{scope.row.itemName}}
<p solt="content">{{scope.row.itemName ? scope.row.itemName : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -111,7 +110,7 @@
<el-table-column prop="tmName" label="商标名称" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.tmName">
<p solt="content">{{scope.row.tmName}}
<p solt="content">{{scope.row.tmName ? scope.row.tmName : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -119,15 +118,15 @@
<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 solt="content">{{scope.row.nclOneCodes ?\'第\'+scope.row.nclOneCodes+\'类\': "---"}}
</p>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="nclOneCount" label="件数">
<el-table-column prop="nclOneCount" label="件数" width="" class-name="jdindentlist-brand-count">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCount">
<p solt="content">{{scope.row.nclOneCount}}
<p solt="content">{{scope.row.nclOneCount?scope.row.nclOneCount: \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -135,7 +134,7 @@
<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 solt="content">{{scope.row.name ? scope.row.name :\'---\'}}
</p>
</el-tooltip>
</template>
......@@ -143,7 +142,7 @@
<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 solt="content">{{scope.row.totalSum ? scope.row.totalSum : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -151,7 +150,7 @@
<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 solt="content">{{scope.row.deliveryStatusName ? scope.row.deliveryStatusName : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -159,7 +158,7 @@
<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 solt="content">{{scope.row.CreateDate ? scope.row.CreateDate: \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -167,12 +166,12 @@
<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 solt="content">{{scope.row.submitTime ? scope.row.submitTime : \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column>
<!-- <el-table-column prop="address" label="操作">
<el-table-column prop="address" label="操作" class-name="jdindentlist-tablecolumn-handle">
<template slot-scope="scope">
<el-button v-show="showDetails(scope.$index, scope.row)"
style="border:0;width:100%;color: #0F8EE9;" size="mini"
......@@ -187,12 +186,12 @@
style="border:0;width:100%;color: #0F8EE9;margin:0;" size="mini"
@click="goSelftmreg(scope.$index, scope.row)">去注册</el-button>
</template>
</el-table-column> -->
</el-table-column>
</el-table>
<div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
layout="prev, pager, next,jumper" :total="countPage">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper"
:total="countPage">
</el-pagination>
</div>
......@@ -367,8 +366,8 @@
</div>
</el-form>
<div style="text-align:center;padding:50px 0;">
<el-button @click="hideUploadStuff">取消</el-button>
<div class="dailogButton">
<el-button @click="hideUploadStuff" style="border: 1px solid #409eff;">取消</el-button>
<el-button type="primary" @click="uploadStuffs">确认</el-button>
</div>
<div style="clear:both"></div>
......@@ -433,7 +432,7 @@
<el-button @click="icbcReset()">重置</el-button>
</div>
</div>
<div class="jdindentlist-null" v-if="!tableData">
<div class="jdindentlist-null" v-if="tableData.length == 0">
<div>
<img src="/imgs/listnull.png" alt="">
</div>
......@@ -441,8 +440,8 @@
</div>
<div class="jdindentlist-list" v-else>
<el-table header-row-class-name="companydetail-name-header" :data="tableData" style="width: 100%">
<!-- <el-table-column prop="channelServiceNo" label="订单编号">
</el-table-column> -->
<el-table-column prop="channelServiceNo" label="订单编号">
</el-table-column>
<el-table-column prop="deliveryOrderNo" label="交付单号">
</el-table-column>
<el-table-column prop="itemName" label="业务类型">
......@@ -481,9 +480,9 @@
</el-table-column>
</el-table>
<div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
layout="prev, pager, next,jumper" :total="countPage">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper"
:total="countPage">
</el-pagination>
</div>
</div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
......@@ -22,7 +22,7 @@
</div>
<el-tabs v-model="navActive" @tab-click="navClick">
<el-tab-pane label="商标订单" name="first">
<div class="jdindentlist">
<div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form">
......@@ -93,7 +93,8 @@
<el-table-column prop="deliveryOrderNo" label="交付单号" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo">
<p solt="content">{{scope.row.deliveryOrderNo}}
<p solt="content">
{{scope.row.deliveryOrderNo ? scope.row.deliveryOrderNo : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -101,7 +102,7 @@
<el-table-column prop="itemName" label="业务类型" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.itemName">
<p solt="content">{{scope.row.itemName}}
<p solt="content">{{scope.row.itemName ? scope.row.itemName : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -109,7 +110,7 @@
<el-table-column prop="tmName" label="商标名称" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.tmName">
<p solt="content">{{scope.row.tmName}}
<p solt="content">{{scope.row.tmName ? scope.row.tmName : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -117,7 +118,7 @@
<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 solt="content">{{scope.row.nclOneCodes ?\'第\'+scope.row.nclOneCodes+\'类\': "---"}}
</p>
</el-tooltip>
</template>
......@@ -125,7 +126,7 @@
<el-table-column prop="nclOneCount" label="件数" width="" class-name="jdindentlist-brand-count">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCount">
<p solt="content">{{scope.row.nclOneCount}}
<p solt="content">{{scope.row.nclOneCount?scope.row.nclOneCount: \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -133,7 +134,7 @@
<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 solt="content">{{scope.row.name ? scope.row.name :\'---\'}}
</p>
</el-tooltip>
</template>
......@@ -141,7 +142,7 @@
<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 solt="content">{{scope.row.totalSum ? scope.row.totalSum : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -149,7 +150,7 @@
<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 solt="content">{{scope.row.deliveryStatusName ? scope.row.deliveryStatusName : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -157,7 +158,7 @@
<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 solt="content">{{scope.row.CreateDate ? scope.row.CreateDate: \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -165,7 +166,7 @@
<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 solt="content">{{scope.row.submitTime ? scope.row.submitTime : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -188,9 +189,9 @@
</el-table-column>
</el-table>
<div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
layout="prev, pager, next,jumper" :total="countPage">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper"
:total="countPage">
</el-pagination>
</div>
......@@ -479,9 +480,9 @@
</el-table-column>
</el-table>
<div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
layout="prev, pager, next,jumper" :total="countPage">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper"
:total="countPage">
</el-pagination>
</div>
</div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -551,7 +551,10 @@
}
},
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)) {
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