朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 76759905970d977858130edb8fb9c6cffe45b17c 1 个父辈 31a9d418

进港业务申报回执内容优化

内嵌 并排对比
正在显示 4 个修改的文件 包含 21 行增加 和 11 行删除
@@ -135,7 +135,10 @@ @@ -135,7 +135,10 @@
135 label="回执内容" 135 label="回执内容"
136 width="250"> 136 width="250">
137 <template slot-scope="scope"> 137 <template slot-scope="scope">
138 - <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> 138 + <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常')>0" style="color: #F56C6C">
  139 + {{scope.row.ext5}}
  140 + </span>
  141 + <span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
139 {{scope.row.ext5}} 142 {{scope.row.ext5}}
140 </span> 143 </span>
141 <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> 144 <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
@@ -913,7 +916,7 @@ @@ -913,7 +916,7 @@
913 const map = {'mt6202':row,'username':loginedUserInfo().username} 916 const map = {'mt6202':row,'username':loginedUserInfo().username}
914 sendCreateMt6202(map).then(res=>{ 917 sendCreateMt6202(map).then(res=>{
915 let response=res.data; 918 let response=res.data;
916 - //console.log(res); 919 + console.log(res);
917 this.code=response.code; 920 this.code=response.code;
918 if(this.code=='200'){ 921 if(this.code=='200'){
919 row.status='23' 922 row.status='23'
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 label="舱单件数" 121 label="舱单件数"
122 width="80"> 122 width="80">
123 <template slot-scope="scope"> 123 <template slot-scope="scope">
124 - <span v-if="scope.row.piece != scope.row.awbinfo.pcs" style="color: #ff4d51;font-weight: bold"> 124 + <span v-if="scope.row.piece || scope.row.awbinfo.pcs || scope.row.piece != scope.row.awbinfo.pcs" style="color: #ff4d51;font-weight: bold">
125 {{scope.row.piece}} 125 {{scope.row.piece}}
126 </span> 126 </span>
127 <span v-else> 127 <span v-else>
@@ -134,7 +134,7 @@ @@ -134,7 +134,7 @@
134 label="舱单重量" 134 label="舱单重量"
135 width="100"> 135 width="100">
136 <template slot-scope="scope" style="text-align: center"> 136 <template slot-scope="scope" style="text-align: center">
137 - <span v-if="scope.row.weight != scope.row.awbinfo.weight" style="color: #ff4d51;font-weight: bold"> 137 + <span v-if="scope.row.weight || scope.row.awbinfo.weight || scope.row.weight != scope.row.awbinfo.weight" style="color: #ff4d51;font-weight: bold">
138 {{scope.row.weight}} 138 {{scope.row.weight}}
139 </span> 139 </span>
140 <span v-else> 140 <span v-else>
@@ -156,10 +156,10 @@ @@ -156,10 +156,10 @@
156 label="回执内容" 156 label="回执内容"
157 width="260"> 157 width="260">
158 <template slot-scope="scope"> 158 <template slot-scope="scope">
159 -<!-- <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常')" style="color: #F56C6C">-->  
160 -<!-- {{scope.row.ext5}}-->  
161 -<!-- </span>-->  
162 - <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> 159 + <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常')>0" style="color: #F56C6C">
  160 + {{scope.row.ext5}}
  161 + </span>
  162 + <span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
163 {{scope.row.ext5}} 163 {{scope.row.ext5}}
164 </span> 164 </span>
165 <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> 165 <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
@@ -1400,6 +1400,7 @@ @@ -1400,6 +1400,7 @@
1400 this.sumNmmsPrice=0; 1400 this.sumNmmsPrice=0;
1401 this.sumNmmsWeight=0; 1401 this.sumNmmsWeight=0;
1402 let response=res.data.data; 1402 let response=res.data.data;
  1403 + console.log(response)
1403 this.tableData=response; 1404 this.tableData=response;
1404 this.tableloading=false; 1405 this.tableloading=false;
1405 response.forEach((item,i) => { 1406 response.forEach((item,i) => {
@@ -108,7 +108,10 @@ @@ -108,7 +108,10 @@
108 label="回执内容" 108 label="回执内容"
109 width="250"> 109 width="250">
110 <template slot-scope="scope"> 110 <template slot-scope="scope">
111 - <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> 111 + <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常')>0" style="color: #F56C6C">
  112 + {{scope.row.ext5}}
  113 + </span>
  114 + <span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
112 {{scope.row.ext5}} 115 {{scope.row.ext5}}
113 </span> 116 </span>
114 <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> 117 <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
@@ -183,13 +183,16 @@ @@ -183,13 +183,16 @@
183 label="回执内容" 183 label="回执内容"
184 width="250"> 184 width="250">
185 <template slot-scope="scope"> 185 <template slot-scope="scope">
186 - <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> 186 + <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常')>0" style="color: #F56C6C">
  187 + {{scope.row.ext5}}
  188 + </span>
  189 + <span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
187 {{scope.row.ext5}} 190 {{scope.row.ext5}}
188 </span> 191 </span>
189 <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> 192 <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
190 {{scope.row.ext5}} 193 {{scope.row.ext5}}
191 </span> 194 </span>
192 - <span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C"> 195 + <span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #f56c6c">
193 {{scope.row.ext5}} 196 {{scope.row.ext5}}
194 </span> 197 </span>
195 <span v-else style="color: #909399;"> 198 <span v-else style="color: #909399;">