Merge remote-tracking branch 'origin/master'

@@ -312,7 +312,7 @@
                     </el-table-column>
                     <el-table-column label="操作人" width="100">
                         <template slot-scope="scope">
-                            {{scope.row.operusername}}
+                            {{scope.row.opersystemname}}
                         </template>
                     </el-table-column>
                 </el-table>
@@ -465,6 +465,9 @@
                     contactName: undefined,
                     contactTel: undefined,
                     content: undefined,
+                    user: {
+                        username : JSON.parse(sessionStorage.getItem('user')).username
+                    }
                 },
                 respModel: {
                     uuid: undefined,
@@ -476,7 +479,7 @@
                     awba: undefined,
                     customCode: undefined,
                     flightDate: undefined,
-                    awbh: ''
+                    awbh: '',
                 },
                 loadingDeleteRules: {
                     reason: [{required: true, message: '删除原因不能为空', trigger: 'blur'}],
@@ -618,8 +621,12 @@
             },
             // 更新数据
             updateData() {
+                let _this = this;
                 this.$refs.loadingFormData.validate(valid => {
                     if (valid) {
+                        _this.loadingModel.user= {
+                            username : JSON.parse(sessionStorage.getItem('user')).username
+                        }
                         updateMT4201(this.loadingModel).then(res => {
                             if (res.data.count > 0) {
                                 this.dialogFormVisible = false
@@ -644,6 +651,9 @@
                     if(row.awbh === null || row.awbh === undefined){
                         row.awbh = ''
                     }
+                    row.user = {
+                        username : JSON.parse(sessionStorage.getItem('user')).username
+                    }
                     sendCreateMt4201(row).then(res => {
                         if (res.data.count > 0) {
                             Message.success(res.data.respMessage)
@@ -669,7 +679,8 @@
                     awba: undefined,
                     customCode: undefined,
                     flightDate: undefined,
-                    awbh: ''
+                    awbh: '',
+                    username: JSON.parse(sessionStorage.getItem('user')).username,
                 }
                 this.dialogDeleteVisible = true
                 this.respModel.carrier = row.carrier
@@ -783,7 +794,10 @@
                     loadingtime: undefined,
                     messageType: 'MT4201',
                     awbprice: undefined,
-                    awbweight: undefined
+                    awbweight: undefined,
+                    user: {
+                        username : JSON.parse(sessionStorage.getItem('user')).username,
+                    }
                 }
             },
             // 新增出港装载 弹框
@@ -798,6 +812,7 @@
                 this.loadingModel.customcode = this.loadingQuery.customcode
                 this.dialogStatus = 'create'
                 this.dialogFormVisible = true
+
                 this.$nextTick(() => {
                     this.$refs.loadingFormData.clearValidate()
                 })

@@ -23,7 +23,7 @@
                 <el-col :span="24">
                     <div class="grid-content content">预配舱单查询</div>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="22">
                     <div class="grid-content co">
                         <el-col :span="1">
                             <div class="grid-content"></div>
@@ -1627,6 +1627,7 @@
             uploadFile (item) {
                 const form = new FormData()
                 form.append('file', item.file)
+                form.append("username", JSON.parse(sessionStorage.getItem('user')).username);
                 uploadFileExcel(form).then(res =>{
                     if(res.data.count >0){
                         Message.success(res.data.respMessage)
@@ -1635,7 +1636,7 @@
                         Message.error(res.data.respMessage)
                     }
                 })
-            }
+            },
         }
     }