操作类型显示 预配运单件重 显示问题

@@ -51,9 +51,15 @@
                 </el-col>
             </el-row>
         </div>
-        <tree-table v-loading="listLoading" :data="arriveData" stripe fit highlight-current-row
-                  style="font-size: 12px" border @selection-change="handleSelectionChange">
-            <el-table-column label="航班号" width="60" align="center">
+        <el-table v-loading="listLoading" :data="arriveData" stripe
+                  style="font-size: 12px" border @selection-change="handleSelectionChange"
+                    default-expand-all
+                    row-key="uuid"
+                    border
+                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+            <el-table-column type="selection" width="55">
+            </el-table-column>
+            <el-table-column label="航班号" width="100" align="center">
                 <template slot-scope="scope">
                     <span>{{scope.row.carrier}}{{scope.row.flightno}}</span>
                 </template>
@@ -130,12 +136,15 @@
                     <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
                                :disabled="scope.row.status ==='22'">更改状态
                     </el-button>
+                    <el-button size="mini" type="primary" v-if="scope.row.awbh ===''"
+                               @click="handleAddAwbh(scope.row)">新增分单
+                    </el-button>
                     <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
                                :disabled="scope.row.status ==='24'">发删除报
                     </el-button>
                 </template>
             </el-table-column>
-        </tree-table>
+        </el-table>
         <div class="btnFoot">
             <el-row>
                 <el-button type="primary" size="mini" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"
@@ -161,7 +170,7 @@
                             <el-input v-model="arriveModel.awba"></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="7.5">
+                    <el-col :span="7.5" v-if="fenStatus === 'addAwbh'">
                         <el-form-item label="分单号" prop="awbh">
                             <el-input v-model="awbh"></el-input>
                         </el-form-item>
@@ -300,6 +309,11 @@
                         {{scope.row.cusrestext}}
                     </template>
                 </el-table-column>
+                <el-table-column label="操作类型" width="100">
+                    <template slot-scope="scope">
+                        {{scope.row.opertype}}
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作人" width="100">
                     <template slot-scope="scope">
                         {{scope.row.operusername}}
@@ -415,6 +429,7 @@
                 airportCode: [],
                 dialogStatus: undefined,
                 awbhStatus: false,
+                fenStatus: undefined,
                 dialogFormVisible: false,
                 dialogDeleteVisible: false,
                 listLoading: false,
@@ -549,7 +564,7 @@
                     getMt3201ListForParam(this.arriveQuery).then(res => {
                         this.arriveData = res.data.dataList
                         this.total = res.data.count
-                        if (res.data.count > 0) {
+                        if (res.data.dataList.length > 0){
                             this.arriveQuery.carrier = this.arriveData[0].carrier
                             this.arriveQuery.flightno = this.arriveData[0].flightno
                             this.arriveQuery.flightdate = this.arriveData[0].flightdate
@@ -599,6 +614,24 @@
                     this.$refs.arriveFormData.clearValidate()
                 })
             },
+            // 新增出港运抵分单
+            handleAddAwbh(row){
+                this.restModel()
+                // 给model赋值，所使用数据是以单独单号查询数据所得
+                this.arriveModel.carrier = row.carrier
+                this.arriveModel.awba = row.awba
+                this.arriveModel.flightdate = row.flightdate
+                this.arriveModel.flightno = row.flightno
+                this.arriveModel.originstation = row.originstation
+                this.arriveModel.destinationstation = row.destinationstation
+                this.arriveModel.customcode = row.customcode
+                this.dialogStatus = 'create'
+                this.fenStatus = 'addAwbh'
+                this.dialogFormVisible = true
+                this.$nextTick(() => {
+                    this.$refs.arriveFormData.clearValidate()
+                })
+            },
             createData() {
                 this.$refs.arriveFormData.validate(valid => {
                     if (valid) {
@@ -636,6 +669,13 @@
             // 编辑
             handleEdit(row) {
                 this.arriveModel = Object.assign({}, row) // copy obj
+
+                if (row.awbh === ''){
+                    this.fenStatus = undefined
+                }else {
+                    this.fenStatus = 'addAwbh'
+                }
+
                 this.dialogStatus = 'update'
                 this.dialogFormVisible = true
                 this.$nextTick(() => {
@@ -734,6 +774,7 @@
                     carrier: row.carrier,
                     flightNo: row.flightno,
                     flightDate: row.flightdate,
+                    opertype:row.opertype,
                     awba: row.awba,
                     awbh: row.awbh,
                     messageType: 'MT3201'

@@ -297,6 +297,11 @@
                             {{scope.row.cusrestext}}
                         </template>
                     </el-table-column>
+                    <el-table-column label="操作类型" width="100">
+                        <template slot-scope="scope">
+                            {{scope.row.opertype}}
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作人" width="100">
                         <template slot-scope="scope">
                             {{scope.row.operusername}}
@@ -581,6 +586,7 @@
                     carrier: row.carrier,
                     flightNo: row.flightno,
                     flightDate: row.flightdate,
+                    opertype: row.opertype,
                     awba: row.awba,
                     awbh: row.awbh,
                     messageType: 'MT4201'

@@ -52,8 +52,14 @@
             </el-row>
         </div>
 
-        <tree-table :data="preData" stripe style="font-size: 12px" :eval-func="func" :expand-all="true" border
-                    @selection-change="handleSelectionChange" v-loading="listLoading">
+        <el-table :data="preData" stripe style="font-size: 12px" stripe
+                    @selection-change="handleSelectionChange" v-loading="listLoading"
+                  default-expand-all
+                  row-key="uuid"
+                  border
+                  :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+            <el-table-column type="selection" width="55">
+            </el-table-column>
             <el-table-column label="航班信息" width="90" align="center">
                 <template slot-scope="scope">
                     <p class="tableInline">{{scope.row.carrier}}{{scope.row.flightno}}</p>
@@ -71,12 +77,12 @@
             </el-table-column>
             <el-table-column label="运单件数/重量" width="100" align="center">
                 <template slot-scope="scope">
-                    {{scope.row.piece}}
+                    {{scope.row.awbinfo.pcs}}/{{scope.row.awbinfo.weight}}
                 </template>
             </el-table-column>
             <el-table-column label="预配件数/重量" width="100" align="center">
                 <template slot-scope="scope">
-                    {{scope.row.weight}}
+                    {{scope.row.piece}}/{{scope.row.weight}}
                 </template>
             </el-table-column>
             <el-table-column label="货物描述" width="120" align="center">
@@ -144,7 +150,7 @@
                                :disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button>
                 </template>
             </el-table-column>
-        </tree-table>
+        </el-table>
         <div class="btnFoot">
             <el-row>
                 <el-button type="primary" size="mini" v-if="preQuery.flightno !== undefined | preData.length > 0"
@@ -621,6 +627,11 @@
                         {{scope.row.cusrestext}}
                     </template>
                 </el-table-column>
+                <el-table-column label="操作类型" width="100">
+                    <template slot-scope="scope">
+                        {{scope.row.opertype}}
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作人" width="100">
                     <template slot-scope="scope">
                         {{scope.row.operusername}}
@@ -1112,7 +1123,8 @@
                     getMt2201ListForParam(this.preQuery).then(res => {
                         this.preData = res.data.dataList
                         this.total = res.data.count
-                        if (res.data.count > 0) {
+
+                        if (res.data.dataList.length > 0) {
                             this.preQuery.carrier = this.preData[0].carrier
                             this.preQuery.flightno = this.preData[0].flightno
                             this.preQuery.flightdate = this.preData[0].flightdate
@@ -1245,6 +1257,7 @@
                     carrier: row.carrier,
                     flightno: row.flightno,
                     flightdate: row.flightdate,
+                    orpertype: row.orpertype,
                     awba: row.awba,
                     awbh: row.awbh,
                     messageType: 'MT2201'

@@ -124,7 +124,7 @@
                     <p></p>
                     <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
                                :disabled="scope.row.status ==='22'">更改状态</el-button>
-                    <el-button size="mini" type="primary" v-if="scope.row.awbh ===null"
+                    <el-button size="mini" type="primary" v-if="scope.row.awbh ===''"
                                @click="handleAddAwbh(scope.row)">新增分单</el-button>
                     <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
                                :disabled="deleteStatus(scope.row.status)">发出港理货删除报</el-button>
@@ -160,8 +160,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="7.5">
-                        <el-form-item label="分单号" prop="awbh">
-                            <el-input v-model="awbh" clearable :disabled="dialogStatus === 'update'"></el-input>
+                        <el-form-item label="分单号" prop="awbh" v-if="fenStatus === 'addAwbh'">
+                            <el-input v-model="awbh" clearable></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -317,6 +317,11 @@
                         {{scope.row.cusrestext}}
                     </template>
                 </el-table-column>
+                <el-table-column label="操作类型" width="100">
+                    <template slot-scope="scope">
+                        {{scope.row.opertype}}
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作人" width="100">
                     <template slot-scope="scope">
                         {{scope.row.operusername}}
@@ -440,6 +445,7 @@
                 dialogDeleteVisible: false,
                 dialogStatus: undefined,
                 disabledStatus: false,
+                fenStatus: undefined,
                 listLoading: false,
                 customLoading:false,
                 dialogFormVisible: false,
@@ -578,7 +584,7 @@
                     getMt520XListForParam(this.tidyQuery).then(res => {
                         this.tidyData = res.data.dataList
                         this.total = res.data.count
-                        if (res.data.count > 0) {
+                        if (res.data.dataList.length > 0) {
                             this.tidyQuery.carrier = this.tidyData[0].carrier
                             this.tidyQuery.flightno = this.tidyData[0].flightno
                             this.tidyQuery.flightdate = this.tidyData[0].flightdate
@@ -620,6 +626,7 @@
                     carrier: row.carrier,
                     flightNo: row.flightno,
                     flightDate: row.flightdate,
+                    opertype: row.opertype,
                     awba: row.awba,
                     awbh: row.awbh,
                     rcfdep: 'MT5202'
@@ -665,6 +672,8 @@
             },
             //新增分单理货
             handleAddAwbh(row) {
+
+                this.fenStatus='addAwbh'
                 // 清空from列表
                 this.restModel();
 
@@ -820,6 +829,7 @@
             },
             // 新增出港理货弹框
             handelAddTidyInfo() {
+                this.fenStatus=undefined;
                 this.restModel()
                 // 给model赋值，所使用数据是以单独单号查询数据所得
                 this.tidyModel.carrier = this.tidyQuery.carrier
@@ -852,6 +862,11 @@
             },
             // 更新出港理货弹框
             handleEdit(row) {
+                if(row.awbh !==''){
+                    this.fenStatus='addAwbh'
+                }else {
+                    this.fenStatus=undefined
+                }
                 this.tidyModel = Object.assign({}, row)
                 this.dialogStatus = 'update'
                 this.dialogFormVisible = true