Merge remote-tracking branch 'origin/master'

朱兆平
src/views/nmms/ExitFlight.vue
src/views/nmms/ExitLoading.vue
src/views/nmms/ExitPre.vue
src/views/nmms/ExitTidy.vue
--- a/src/views/nmms/ExitFlight.vue
查看文件 @0a976ab
+++ b/src/views/nmms/ExitFlight.vue
查看文件 @0a976ab
@@ -21,17 +21,17 @@
                     <span>{{ scope.row.flightDate }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="始发站" width="280px" align="center">
+            <el-table-column label="始发站" width="235px" align="center">
                 <template slot-scope="scope">
                     <span>{{ scope.row.originstation }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="目的站" width="280px" align="center">
+            <el-table-column label="目的站" width="235px" align="center">
                 <template slot-scope="scope">
                     <span>{{ scope.row.destinationstation }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" width="400px" align="center">
                 <template slot-scope="scope">
                     <el-button type="primary" size="mini" @click="handlePre(scope.row)">预配舱单</el-button>
                     <el-button type="primary" size="mini" @click="handleArrive(scope.row)">出港运抵</el-button>
--- a/src/views/nmms/ExitLoading.vue
查看文件 @0a976ab
+++ b/src/views/nmms/ExitLoading.vue
查看文件 @0a976ab
@@ -109,18 +109,26 @@
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                         <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
+
                         <el-button size="mini" type="success" @click="handleEdit(scope.row)" >编辑
                         </el-button>
+
                         <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)"
                                    :disabled="scope.row.status ==='23'">发送舱单报
                         </el-button>
+
+                        <br><br>
                         <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
                         </el-button>
+
                         <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
                                    :disabled="scope.row.status ==='22'">更改状态
                         </el-button>
+
                         <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
-                                   :disabled="scope.row.status ==='24'">发删除报</el-button>
+                                   :disabled="scope.row.status ==='24'">发删除报
+                        </el-button>
+
                     </template>
                 </el-table-column>
             </el-table>
--- a/src/views/nmms/ExitPre.vue
查看文件 @0a976ab
+++ b/src/views/nmms/ExitPre.vue
查看文件 @0a976ab
@@ -60,19 +60,17 @@
                   :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
             <el-table-column type="selection" width="55">
             </el-table-column>
-            <el-table-column label="航班信息" width="90" align="center">
+<!--            <el-table-column label="航班信息" width="90" align="center">-->
+<!--                <template slot-scope="scope">-->
+<!--                    <p class="tableInline">{{scope.row.carrier}}{{scope.row.flightno}}</p>-->
+<!--                    <p class="tableInline">{{scope.row.flightdate}}</p>-->
+<!--                    <p class="tableInline">{{scope.row.originstation}}-{{scope.row.destinationstation}}</p>-->
+<!--                </template>-->
+<!--            </el-table-column>-->
+            <el-table-column label="运单号" width="200" align="center">
                 <template slot-scope="scope">
-                    <p class="tableInline">{{scope.row.carrier}}{{scope.row.flightno}}</p>
-                    <p class="tableInline">{{scope.row.flightdate}}</p>
-                    <p class="tableInline">{{scope.row.originstation}}-{{scope.row.destinationstation}}</p>
-                </template>
-            </el-table-column>
-            <el-table-column label="运单号" width="120" align="center">
-                <template slot-scope="scope">
-
-
-                    <p class="tableInline" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</p>
-                    <p class="tableInline" v-else>{{scope.row.awba}}</p>
+                    <span class="tableInline" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</span>
+                    <span class="tableInline" v-else>{{scope.row.awba}}</span>
                 </template>
             </el-table-column>
             <el-table-column label="运单件数/重量" width="100" align="center">
--- a/src/views/nmms/ExitTidy.vue
查看文件 @0a976ab
+++ b/src/views/nmms/ExitTidy.vue
查看文件 @0a976ab
@@ -70,11 +70,11 @@
                     <span>{{scope.row.awbh}}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="运单件数/重量" width="100" align="center">
-                <template slot-scope="scope">
-                    <span>{{scope.row.awbpiece}} / {{scope.row.awbweight}}</span>
-                </template>
-            </el-table-column>
+<!--            <el-table-column label="运单件数/重量" width="100" align="center">-->
+<!--                <template slot-scope="scope">-->
+<!--                    <span>{{scope.row.awbpiece}} / {{scope.row.awbweight}}</span>-->
+<!--                </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="理货件数/重量" width="100" align="center">
                 <template slot-scope="scope">
                     <span>{{scope.row.piece}} / {{scope.row.weight}}</span>
@@ -108,18 +108,18 @@
                     <span v-if="scope.row.status ==='25'">已发送修改报</span>
                 </template>
             </el-table-column>
-            <el-table-column label="回执信息" show-overflow-tooltip width="300" align="center">
+            <el-table-column label="回执信息" show-overflow-tooltip width="230" align="center">
                 <template slot-scope="scope">
                     <span>{{scope.row.ext5}}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="operation" label="操作"  align="center">
+            <el-table-column prop="operation" label="操作" width="420px" align="center">
                 <template slot-scope="scope">
                     <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
                     <el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)"
                                :disabled="addStatus(scope.row.status)">发送出港理货报</el-button>
-<!--                               :disabled="scope.row.status ==='23'">发舱单报</el-button>-->
+
                     <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
                     <p></p>
                     <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
@@ -128,7 +128,6 @@
                                @click="handleAddAwbh(scope.row)">新增分单</el-button>
                     <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
                                :disabled="deleteStatus(scope.row.status)">发出港理货删除报</el-button>
-<!--                               :disabled="scope.row.status ==='24'">发删除报</el-button>-->
                 </template>
             </el-table-column>
         </el-table>