进港原始舱单件重对比优化+进港运单申报回执内容优化

@@ -121,7 +121,10 @@
                                     label="舱单件数"
                                     label="舱单件数"
                                     width="80">
                                     width="80">
                                 <template slot-scope="scope">
                                 <template slot-scope="scope">
-                                    <span v-if="scope.row.piece != scope.row.awbinfo.pcs" style="color: #ff4d51;font-weight: bold">
+                                    <span v-if="scope.row.awbinfo==null" style="color: #ff4d51;font-weight: bold">
+                                           {{scope.row.piece}}
+                                        </span>
+                                    <span v-else-if="scope.row.awbinfo.pcs!=scope.row.piece" style="color: #ff4d51;font-weight: bold">
                                            {{scope.row.piece}}
                                            {{scope.row.piece}}
                                         </span>
                                         </span>
                                     <span v-else>
                                     <span v-else>
@@ -134,7 +137,10 @@
                                     label="舱单重量"
                                     label="舱单重量"
                                     width="100">
                                     width="100">
                                 <template slot-scope="scope" style="text-align: center">
                                 <template slot-scope="scope" style="text-align: center">
-                                    <span v-if="scope.row.weight != scope.row.awbinfo.weight" style="color: #ff4d51;font-weight: bold">
+                                    <span v-if="scope.row.awbinfo==null" style="color: #ff4d51;font-weight: bold">
+                                           {{scope.row.weight}}
+                                        </span>
+                                    <span v-else-if="scope.row.weight != scope.row.awbinfo.weight" style="color: #ff4d51;font-weight: bold">
                                            {{scope.row.weight}}
                                            {{scope.row.weight}}
                                         </span>
                                         </span>
                                     <span v-else>
                                     <span v-else>

@@ -183,7 +183,13 @@
                                     label="回执内容"
                                     label="回执内容"
                                     width="250">
                                     width="250">
                                 <template slot-scope="scope">
                                 <template slot-scope="scope">
-                                    <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常')>0" style="color: #F56C6C">
+                                    <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常') != -1" style="color: #F56C6C">
+                                       {{scope.row.ext5}}
+                                    </span>
+                                    <span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不通过') != -1" style="color: #F56C6C">
+                                       {{scope.row.ext5}}
+                                    </span>
+                                    <span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不接受') != -1" style="color: #F56C6C">
                                        {{scope.row.ext5}}
                                        {{scope.row.ext5}}
                                     </span>
                                     </span>
                                     <span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
                                     <span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
@@ -200,6 +206,7 @@
                                     </span>
                                     </span>
                                 </template>
                                 </template>
                             </el-table-column>
                             </el-table-column>
+<!--                            || scope.row.ext5.indexOf('不通过') != -1 || scope.row.ext5.indexOf('不接受') != -1-->
                         </el-table>
                         </el-table>
                     </template>
                     </template>
                 </el-col>
                 </el-col>