作者 朱兆平

Merge remote-tracking branch 'origin/master'

... ... @@ -316,7 +316,7 @@
</el-table-column>
<el-table-column label="操作人" width="100">
<template slot-scope="scope">
{{scope.row.opersystemname}}
{{scope.row.operusername}}
</template>
</el-table-column>
</el-table>
... ...
... ... @@ -312,7 +312,7 @@
</el-table-column>
<el-table-column label="操作人" width="100">
<template slot-scope="scope">
{{scope.row.opersystemname}}
{{scope.row.operusername}}
</template>
</el-table-column>
</el-table>
... ...
... ... @@ -612,7 +612,7 @@
</el-table-column>
<el-table-column label="操作人" width="100">
<template slot-scope="scope">
{{scope.row.opersystemname}}
{{scope.row.operusername}}
</template>
</el-table-column>
</el-table>
... ...
... ... @@ -324,7 +324,7 @@
</el-table-column>
<el-table-column label="操作人" width="100">
<template slot-scope="scope">
{{scope.row.opersystemname}}
{{scope.row.operusername}}
</template>
</el-table-column>
</el-table>
... ... @@ -467,7 +467,7 @@
awbpiece: undefined,
awbweight: undefined,
rcfdep: 'MT5202',
user: {
userinfo: {
username : JSON.parse(sessionStorage.getItem('user')).username
}
},
... ... @@ -649,8 +649,7 @@
confirmButtonText: '发送',
cancelButtonText: '取消'
}).then(() => {
console.log(row)
row.user = {
row.userinfo = {
username : JSON.parse(sessionStorage.getItem('user')).username
}
sendCreateMt5202(row).then(res => {
... ... @@ -831,7 +830,7 @@
awbpiece: undefined,
awbweight: undefined,
rcfdep: 'MT5202',
user: {
userinfo: {
username: JSON.parse(sessionStorage.getItem('user')).username
}
}
... ... @@ -856,7 +855,6 @@
// 新增出港理货请求
createData() {
this.$refs.tidyFormData.validate(valid => {
console.log(this.tidyModel)
if (valid) {
addMt520X(this.tidyModel).then(res => {
if (res.data.count > 0) {
... ...