完善页面展示问题 修改支付方式 字段名称 paymodel

@@ -17,3 +17,6 @@ export const addMt4201 = params => { return http.post(`${baseUrl}/addMt4201`,par
 export const sendCreateMt4201 = params => { return http.post(`${baseUrl}/sendCreateMt4201`,params)};
 
 export const sendDeleteMt4201 = params => { return http.post(`${baseUrl}/sendDeleteMt4201`,params)};
+
+
+

@@ -128,7 +128,7 @@
                     <el-button size="mini" @click="handleSendDesc(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'">发送舱单报
+                               :disabled="scope.row.status ==='23'">发送出港运抵报
                     </el-button>
                     <p></p>
                     <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
@@ -409,7 +409,7 @@
                 isAdmin: false,
                 arriveQuery: {
                     pageSize: 1,
-                    limitSize: 100,
+                    limitSize: 30,
                     awba: undefined,
                     carrier: undefined,
                     flightno: undefined,

@@ -106,7 +106,7 @@
                         <span>{{scope.row.ext5}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center" fixed="right" width="245">
+                <el-table-column label="操作" align="center" fixed="right">
                     <template slot-scope="scope">
                         <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
 
@@ -114,7 +114,7 @@
                         </el-button>
 
                         <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)"
-                                   :disabled="scope.row.status ==='23'">发送舱单报
+                                   :disabled="scope.row.status ==='23'">发送出港装载报
                         </el-button>
 
                         <br><br>
@@ -346,9 +346,9 @@
     import {getCustomCode,getAirportCode} from "@/api/country";
     import {
         getMt4201ListForParam, deleteByIsDelete, updateStatus,
-        updateMT4201, addMt4201, sendCreateMt4201, sendDeleteMt4201
+        updateMT4201, addMt4201, sendCreateMt4201, sendDeleteMt4201, test
     } from '@/api/exitLoading'
-    import {Message} from "element-ui";
+    import {Message} from "element-ui"
     import {
         validAwb,
         validAlphabets,

@@ -363,8 +363,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="7.5">
-                        <el-form-item label="付费方式" prop="awbinfo.collected">
-                            <el-select v-model="preModel.awbinfo.collected" class="filter-item" placeholder="付费方式">
+                        <el-form-item label="付费方式" prop="awbinfo.paymodel">
+                            <el-select v-model="preModel.awbinfo.paymodel" class="filter-item" placeholder="付费方式">
                                 <el-option
                                         v-for="item in payTypes"
                                         :key="item.value"
@@ -778,7 +778,7 @@
                     customcode: [{required: true, message: '关区代码必须选择', trigger: 'change'}],
                     awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
                     awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
-                    'awbinfo.collected': [{required: true, message: '付款方式必选', trigger: 'change'}],
+                    'awbinfo.paymodel': [{required: true, message: '付款方式必选', trigger: 'change'}],
                     goodsname: [{required: true, trigger: 'change', validator: validAlphabetsSpanceKey}],
                     ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}],
                     reason:[{required: true, message: '修改原因不能为空', trigger: 'blur'}],
@@ -854,7 +854,7 @@
                         dest3: undefined,
                         eairportid: undefined,
                         csgcustomerid: undefined,
-                        collected: '0',
+                        paymodel: '0',
                         awbtype: undefined
                     }
                 },
@@ -1203,7 +1203,7 @@
                         dest3: undefined,
                         eairportid: undefined,
                         csgcustomerid: undefined,
-                        collected: '0',
+                        paymodel: '0',
                     }
                 }
             },
@@ -1300,9 +1300,13 @@
             },
             // >>>>>>>>>>>>>>>>更新运单数据<<<<<<<<<<<<<<<<<<
             handleEdit(row) {
+                console.log(row)
                 this.preModel = Object.assign({}, row)
                 this.dialogStatus = 'update'
+                if (row.awbh !== undefined && row.awbh !== ""){
                     this.fenStatus = 'addAwbh'
+                }
+
                 this.dialogFormVisible = true
                 this.$nextTick(() => {
                     this.$refs.preFormData.clearValidate()
@@ -1514,7 +1518,7 @@
                 this.preModel.carrier = template.carrier
                 this.preModel.awbinfo.shprcountyr = template.awbinfo.shprcountyr
                 this.preModel.originstation = template.originstation
-                this.preModel.awbinfo.collected = template.awbinfo.collected
+                this.preModel.awbinfo.paymodel = template.awbinfo.paymodel
                 this.preModel.awbinfo.sairportid = template.awbinfo.sairportid
                 this.preModel.awbinfo.eairportid = template.awbinfo.eairportid
                 this.preModel.awbinfo.ex5 = template.awbinfo.ex5