123

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
                 }