朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 3ae675bdf1ca393e1f98c00c1c13864755333fed 2 个父辈 826f808d 5e1f87ab

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 4 个修改的文件 包含 7 行增加 和 9 行删除
@@ -316,7 +316,7 @@ @@ -316,7 +316,7 @@
316 </el-table-column> 316 </el-table-column>
317 <el-table-column label="操作人" width="100"> 317 <el-table-column label="操作人" width="100">
318 <template slot-scope="scope"> 318 <template slot-scope="scope">
319 - {{scope.row.opersystemname}} 319 + {{scope.row.operusername}}
320 </template> 320 </template>
321 </el-table-column> 321 </el-table-column>
322 </el-table> 322 </el-table>
@@ -312,7 +312,7 @@ @@ -312,7 +312,7 @@
312 </el-table-column> 312 </el-table-column>
313 <el-table-column label="操作人" width="100"> 313 <el-table-column label="操作人" width="100">
314 <template slot-scope="scope"> 314 <template slot-scope="scope">
315 - {{scope.row.opersystemname}} 315 + {{scope.row.operusername}}
316 </template> 316 </template>
317 </el-table-column> 317 </el-table-column>
318 </el-table> 318 </el-table>
@@ -612,7 +612,7 @@ @@ -612,7 +612,7 @@
612 </el-table-column> 612 </el-table-column>
613 <el-table-column label="操作人" width="100"> 613 <el-table-column label="操作人" width="100">
614 <template slot-scope="scope"> 614 <template slot-scope="scope">
615 - {{scope.row.opersystemname}} 615 + {{scope.row.operusername}}
616 </template> 616 </template>
617 </el-table-column> 617 </el-table-column>
618 </el-table> 618 </el-table>
@@ -324,7 +324,7 @@ @@ -324,7 +324,7 @@
324 </el-table-column> 324 </el-table-column>
325 <el-table-column label="操作人" width="100"> 325 <el-table-column label="操作人" width="100">
326 <template slot-scope="scope"> 326 <template slot-scope="scope">
327 - {{scope.row.opersystemname}} 327 + {{scope.row.operusername}}
328 </template> 328 </template>
329 </el-table-column> 329 </el-table-column>
330 </el-table> 330 </el-table>
@@ -467,7 +467,7 @@ @@ -467,7 +467,7 @@
467 awbpiece: undefined, 467 awbpiece: undefined,
468 awbweight: undefined, 468 awbweight: undefined,
469 rcfdep: 'MT5202', 469 rcfdep: 'MT5202',
470 - user: { 470 + userinfo: {
471 username : JSON.parse(sessionStorage.getItem('user')).username 471 username : JSON.parse(sessionStorage.getItem('user')).username
472 } 472 }
473 }, 473 },
@@ -649,8 +649,7 @@ @@ -649,8 +649,7 @@
649 confirmButtonText: '发送', 649 confirmButtonText: '发送',
650 cancelButtonText: '取消' 650 cancelButtonText: '取消'
651 }).then(() => { 651 }).then(() => {
652 - console.log(row)  
653 - row.user = { 652 + row.userinfo = {
654 username : JSON.parse(sessionStorage.getItem('user')).username 653 username : JSON.parse(sessionStorage.getItem('user')).username
655 } 654 }
656 sendCreateMt5202(row).then(res => { 655 sendCreateMt5202(row).then(res => {
@@ -831,7 +830,7 @@ @@ -831,7 +830,7 @@
831 awbpiece: undefined, 830 awbpiece: undefined,
832 awbweight: undefined, 831 awbweight: undefined,
833 rcfdep: 'MT5202', 832 rcfdep: 'MT5202',
834 - user: { 833 + userinfo: {
835 username: JSON.parse(sessionStorage.getItem('user')).username 834 username: JSON.parse(sessionStorage.getItem('user')).username
836 } 835 }
837 } 836 }
@@ -856,7 +855,6 @@ @@ -856,7 +855,6 @@
856 // 新增出港理货请求 855 // 新增出港理货请求
857 createData() { 856 createData() {
858 this.$refs.tidyFormData.validate(valid => { 857 this.$refs.tidyFormData.validate(valid => {
859 - console.log(this.tidyModel)  
860 if (valid) { 858 if (valid) {
861 addMt520X(this.tidyModel).then(res => { 859 addMt520X(this.tidyModel).then(res => {
862 if (res.data.count > 0) { 860 if (res.data.count > 0) {