朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 e022fe13481909cc26e01991798a5ecd4de57342 1 个父辈 005feb54

20200623-trans

内嵌 并排对比
正在显示 6 个修改的文件 包含 188 行增加 和 76 行删除
@@ -90,14 +90,13 @@ @@ -90,14 +90,13 @@
90 <el-table-column 90 <el-table-column
91 fixed="right" 91 fixed="right"
92 prop="" 92 prop=""
93 - label="报文操作"> 93 + label="报文操作"
  94 + width="200">
94 <template slot-scope="scope"> 95 <template slot-scope="scope">
95 <el-button 96 <el-button
96 size="mini" 97 size="mini"
97 - type="success"  
98 - @click="handleEdit(scope.$index, scope.row)">查看</el-button>  
99 - </template>  
100 - <template slot-scope="scope"> 98 + type="primary"
  99 + @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
101 <el-button 100 <el-button
102 size="mini" 101 size="mini"
103 type="danger" 102 type="danger"
@@ -119,6 +118,16 @@ @@ -119,6 +118,16 @@
119 </el-pagination> 118 </el-pagination>
120 </div> 119 </div>
121 </el-row> 120 </el-row>
  121 + <!--查看回执弹框-->
  122 + <el-dialog title="回执明细" :visible.sync="dialogTableVisible">
  123 + <el-table :data="gridData">
  124 + <el-table-column property="sendtime" label="操作时间" ></el-table-column>
  125 + <el-table-column property="createBy" label="操作人" ></el-table-column>
  126 + <el-table-column property="flightNo" label="航班号"></el-table-column>
  127 + <el-table-column property="flightDate" label="航班日期" ></el-table-column>
  128 + <el-table-column property="receiptContent" label="回执内容" ></el-table-column>
  129 + </el-table>
  130 + </el-dialog>
122 </el-main> 131 </el-main>
123 </el-container> 132 </el-container>
124 </template> 133 </template>
@@ -141,7 +150,7 @@ @@ -141,7 +150,7 @@
141 150
142 </style> 151 </style>
143 <script> 152 <script>
144 - import {editPrediction, selectPrediction} from "../../api/transport"; 153 + import {editPrediction, selectPrediction, selectReturnMsg} from "../../api/transport";
145 154
146 export default { 155 export default {
147 data(){ 156 data(){
@@ -156,10 +165,23 @@ @@ -156,10 +165,23 @@
156 pageSize:10, 165 pageSize:10,
157 total:0, 166 total:0,
158 tableData:[], 167 tableData:[],
159 - tableloading:false 168 + tableloading:false,
  169 + gridData:[],
  170 + dialogTableVisible: false,
160 } 171 }
161 }, 172 },
162 methods: { 173 methods: {
  174 + //查询回执列表
  175 + selectDetail(index,row){
  176 + this.gridData=[];
  177 + this.dialogTableVisible=true;
  178 + let params={messageid:row.messageid};
  179 + selectReturnMsg(params).then(res=>{
  180 + let response=res.data.data;
  181 + console.log(response)
  182 + this.gridData=response;
  183 + });
  184 + },
163 //分页 185 //分页
164 handleSizeChange(val) { 186 handleSizeChange(val) {
165 this.pageSize=val; 187 this.pageSize=val;
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 <el-table-column 58 <el-table-column
59 prop="createtime" 59 prop="createtime"
60 label="创建时间" 60 label="创建时间"
61 - width="120"> 61 + width="130">
62 </el-table-column> 62 </el-table-column>
63 <el-table-column 63 <el-table-column
64 prop="updateby" 64 prop="updateby"
@@ -67,20 +67,18 @@ @@ -67,20 +67,18 @@
67 <el-table-column 67 <el-table-column
68 prop="updatetime" 68 prop="updatetime"
69 label="更新时间" 69 label="更新时间"
70 - width="120"> 70 + width="130">
71 </el-table-column> 71 </el-table-column>
72 <el-table-column 72 <el-table-column
73 fixed="right" 73 fixed="right"
74 prop="" 74 prop=""
75 label="报文操作" 75 label="报文操作"
76 - width="150"> 76 + width="200">
77 <template slot-scope="scope"> 77 <template slot-scope="scope">
78 <el-button 78 <el-button
79 size="mini" 79 size="mini"
80 - type="success"  
81 - @click="handleEdit(scope.$index, scope.row)">查看</el-button>  
82 - </template>  
83 - <template slot-scope="scope"> 80 + type="primary"
  81 + @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
84 <el-button 82 <el-button
85 size="mini" 83 size="mini"
86 type="danger" 84 type="danger"
@@ -102,6 +100,16 @@ @@ -102,6 +100,16 @@
102 </el-pagination> 100 </el-pagination>
103 </div> 101 </div>
104 </el-row> 102 </el-row>
  103 + <!--查看回执弹框-->
  104 + <el-dialog title="回执明细" :visible.sync="dialogTableVisible">
  105 + <el-table :data="gridData">
  106 + <el-table-column property="sendtime" label="操作时间" ></el-table-column>
  107 + <el-table-column property="createBy" label="操作人" ></el-table-column>
  108 + <el-table-column property="flightNo" label="航班号"></el-table-column>
  109 + <el-table-column property="flightDate" label="航班日期" ></el-table-column>
  110 + <el-table-column property="receiptContent" label="回执内容" ></el-table-column>
  111 + </el-table>
  112 + </el-dialog>
105 </el-main> 113 </el-main>
106 </el-container> 114 </el-container>
107 </template> 115 </template>
@@ -124,7 +132,7 @@ @@ -124,7 +132,7 @@
124 132
125 </style> 133 </style>
126 <script> 134 <script>
127 - import {editSchedule, selectSchedule} from "../../api/transport"; 135 + import {editSchedule, selectReturnMsg, selectSchedule} from "../../api/transport";
128 136
129 export default { 137 export default {
130 data(){ 138 data(){
@@ -137,10 +145,23 @@ @@ -137,10 +145,23 @@
137 pageSize:10, 145 pageSize:10,
138 total:0, 146 total:0,
139 tableloading:false, 147 tableloading:false,
140 - tableData:[] 148 + tableData:[],
  149 + gridData:[],
  150 + dialogTableVisible: false,
141 } 151 }
142 }, 152 },
143 methods: { 153 methods: {
  154 + //查询回执列表
  155 + selectDetail(index,row){
  156 + this.gridData=[];
  157 + this.dialogTableVisible=true;
  158 + let params={messageid:row.messageid};
  159 + selectReturnMsg(params).then(res=>{
  160 + let response=res.data.data;
  161 + console.log(response)
  162 + this.gridData=response;
  163 + });
  164 + },
144 //分页 165 //分页
145 handleSizeChange(val) { 166 handleSizeChange(val) {
146 this.pageSize=val; 167 this.pageSize=val;
@@ -92,14 +92,12 @@ @@ -92,14 +92,12 @@
92 fixed="right" 92 fixed="right"
93 prop="" 93 prop=""
94 label="报文操作" 94 label="报文操作"
95 - width="150"> 95 + width="200">
96 <template slot-scope="scope"> 96 <template slot-scope="scope">
97 <el-button 97 <el-button
98 size="mini" 98 size="mini"
99 - type="success"  
100 - @click="handleEdit(scope.$index, scope.row)">查看</el-button>  
101 - </template>  
102 - <template slot-scope="scope"> 99 + type="primary"
  100 + @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
103 <el-button 101 <el-button
104 size="mini" 102 size="mini"
105 type="danger" 103 type="danger"
@@ -121,6 +119,16 @@ @@ -121,6 +119,16 @@
121 </el-pagination> 119 </el-pagination>
122 </div> 120 </div>
123 </el-row> 121 </el-row>
  122 + <!--查看回执弹框-->
  123 + <el-dialog title="回执明细" :visible.sync="dialogTableVisible">
  124 + <el-table :data="gridData">
  125 + <el-table-column property="sendtime" label="操作时间" ></el-table-column>
  126 + <el-table-column property="createBy" label="操作人" ></el-table-column>
  127 + <el-table-column property="flightNo" label="航班号"></el-table-column>
  128 + <el-table-column property="flightDate" label="航班日期" ></el-table-column>
  129 + <el-table-column property="receiptContent" label="回执内容" ></el-table-column>
  130 + </el-table>
  131 + </el-dialog>
124 </el-main> 132 </el-main>
125 </el-container> 133 </el-container>
126 </template> 134 </template>
@@ -143,7 +151,7 @@ @@ -143,7 +151,7 @@
143 151
144 </style> 152 </style>
145 <script> 153 <script>
146 - import {editConfirm, selectConfirm} from "../../api/transport"; 154 + import {editConfirm, selectConfirm, selectReturnMsg} from "../../api/transport";
147 155
148 export default { 156 export default {
149 data(){ 157 data(){
@@ -157,10 +165,23 @@ @@ -157,10 +165,23 @@
157 pageSize:10, 165 pageSize:10,
158 total:0, 166 total:0,
159 tableloading:false, 167 tableloading:false,
160 - tableData:[] 168 + tableData:[],
  169 + gridData:[],
  170 + dialogTableVisible: false,
161 } 171 }
162 }, 172 },
163 methods: { 173 methods: {
  174 + //查询回执列表
  175 + selectDetail(index,row){
  176 + this.gridData=[];
  177 + this.dialogTableVisible=true;
  178 + let params={messageid:row.messageid};
  179 + selectReturnMsg(params).then(res=>{
  180 + let response=res.data.data;
  181 + console.log(response)
  182 + this.gridData=response;
  183 + });
  184 + },
164 //分页 185 //分页
165 handleSizeChange(val) { 186 handleSizeChange(val) {
166 this.pageSize=val; 187 this.pageSize=val;
@@ -55,13 +55,11 @@ @@ -55,13 +55,11 @@
55 </el-table-column> 55 </el-table-column>
56 <el-table-column 56 <el-table-column
57 prop="flightNo" 57 prop="flightNo"
58 - label="航班号"  
59 - width="80"> 58 + label="航班号">
60 </el-table-column> 59 </el-table-column>
61 <el-table-column 60 <el-table-column
62 prop="flightDate" 61 prop="flightDate"
63 - label="航班日期"  
64 - width="120"> 62 + label="航班日期">
65 </el-table-column> 63 </el-table-column>
66 <el-table-column 64 <el-table-column
67 prop="aircraftNo" 65 prop="aircraftNo"
@@ -70,28 +68,23 @@ @@ -70,28 +68,23 @@
70 </el-table-column> 68 </el-table-column>
71 <el-table-column 69 <el-table-column
72 prop="departurePort" 70 prop="departurePort"
73 - label="出发港"  
74 - width="80"> 71 + label="出发港">
75 </el-table-column> 72 </el-table-column>
76 <el-table-column 73 <el-table-column
77 prop="arrivalPort" 74 prop="arrivalPort"
78 - label="目的港"  
79 - width="80"> 75 + label="目的港">
80 </el-table-column> 76 </el-table-column>
81 <el-table-column 77 <el-table-column
82 prop="customDistrictNo" 78 prop="customDistrictNo"
83 - label="关区代码"  
84 - width="80"> 79 + label="关区代码">
85 </el-table-column> 80 </el-table-column>
86 <el-table-column 81 <el-table-column
87 prop="transportflag" 82 prop="transportflag"
88 - label="运输计划"  
89 - width="120"> 83 + label="运输计划">
90 </el-table-column> 84 </el-table-column>
91 <el-table-column 85 <el-table-column
92 prop="departuredatetime" 86 prop="departuredatetime"
93 - label="离港时间"  
94 - width="120"> 87 + label="离港时间">
95 </el-table-column> 88 </el-table-column>
96 <el-table-column 89 <el-table-column
97 prop="statusMsg" 90 prop="statusMsg"
@@ -101,14 +94,12 @@ @@ -101,14 +94,12 @@
101 <el-table-column 94 <el-table-column
102 prop="" 95 prop=""
103 label="报文操作" 96 label="报文操作"
104 - width="150"> 97 + width="200">
105 <template slot-scope="scope"> 98 <template slot-scope="scope">
106 <el-button 99 <el-button
107 size="mini" 100 size="mini"
108 - type="success"  
109 - @click="handleEdit(scope.$index, scope.row)">查看</el-button>  
110 - </template>  
111 - <template slot-scope="scope"> 101 + type="primary"
  102 + @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
112 <el-button 103 <el-button
113 size="mini" 104 size="mini"
114 type="danger" 105 type="danger"
@@ -130,6 +121,16 @@ @@ -130,6 +121,16 @@
130 </el-pagination> 121 </el-pagination>
131 </div> 122 </div>
132 </el-row> 123 </el-row>
  124 + <!--查看回执弹框-->
  125 + <el-dialog title="回执明细" :visible.sync="dialogTableVisible">
  126 + <el-table :data="gridData">
  127 + <el-table-column property="sendtime" label="操作时间" ></el-table-column>
  128 + <el-table-column property="createBy" label="操作人" ></el-table-column>
  129 + <el-table-column property="flightNo" label="航班号"></el-table-column>
  130 + <el-table-column property="flightDate" label="航班日期" ></el-table-column>
  131 + <el-table-column property="receiptContent" label="回执内容" ></el-table-column>
  132 + </el-table>
  133 + </el-dialog>
133 </el-main> 134 </el-main>
134 </el-container> 135 </el-container>
135 </template> 136 </template>
@@ -152,7 +153,7 @@ @@ -152,7 +153,7 @@
152 153
153 </style> 154 </style>
154 <script> 155 <script>
155 - import {editConfirm, selectConfirm} from "../../api/transport"; 156 + import {editConfirm, selectConfirm, selectReturnMsg} from "../../api/transport";
156 157
157 export default { 158 export default {
158 data(){ 159 data(){
@@ -167,10 +168,23 @@ @@ -167,10 +168,23 @@
167 pageSize:10, 168 pageSize:10,
168 total:0, 169 total:0,
169 tableloading:false, 170 tableloading:false,
170 - tableData:[] 171 + tableData:[],
  172 + gridData:[],
  173 + dialogTableVisible: false,
171 } 174 }
172 }, 175 },
173 methods: { 176 methods: {
  177 + //查询回执列表
  178 + selectDetail(index,row){
  179 + this.gridData=[];
  180 + this.dialogTableVisible=true;
  181 + let params={messageid:row.messageid};
  182 + selectReturnMsg(params).then(res=>{
  183 + let response=res.data.data;
  184 + console.log(response)
  185 + this.gridData=response;
  186 + });
  187 + },
174 //分页 188 //分页
175 handleSizeChange(val) { 189 handleSizeChange(val) {
176 this.pageSize=val; 190 this.pageSize=val;
@@ -55,13 +55,11 @@ @@ -55,13 +55,11 @@
55 </el-table-column> 55 </el-table-column>
56 <el-table-column 56 <el-table-column
57 prop="flightNo" 57 prop="flightNo"
58 - label="航班号"  
59 - width="80"> 58 + label="航班号">
60 </el-table-column> 59 </el-table-column>
61 <el-table-column 60 <el-table-column
62 prop="flightDate" 61 prop="flightDate"
63 - label="航班日期"  
64 - width="120"> 62 + label="航班日期">
65 </el-table-column> 63 </el-table-column>
66 <el-table-column 64 <el-table-column
67 prop="aircraftNo" 65 prop="aircraftNo"
@@ -70,45 +68,37 @@ @@ -70,45 +68,37 @@
70 </el-table-column> 68 </el-table-column>
71 <el-table-column 69 <el-table-column
72 prop="departurePort" 70 prop="departurePort"
73 - label="出发港"  
74 - width="80"> 71 + label="出发港">
75 </el-table-column> 72 </el-table-column>
76 <el-table-column 73 <el-table-column
77 prop="arrivalPort" 74 prop="arrivalPort"
78 - label="目的港"  
79 - width="80"> 75 + label="目的港">
80 </el-table-column> 76 </el-table-column>
81 <el-table-column 77 <el-table-column
82 prop="customDistrictNo" 78 prop="customDistrictNo"
83 - label="关区代码"  
84 - width="80"> 79 + label="关区代码">
85 </el-table-column> 80 </el-table-column>
86 <el-table-column 81 <el-table-column
87 prop="transportflag" 82 prop="transportflag"
88 - label="运输计划"  
89 - width="150"> 83 + label="运输计划">
90 </el-table-column> 84 </el-table-column>
91 <el-table-column 85 <el-table-column
92 prop="departuredatetime" 86 prop="departuredatetime"
93 - label="离港时间"  
94 - width="120"> 87 + label="离港时间">
95 </el-table-column> 88 </el-table-column>
96 <el-table-column 89 <el-table-column
97 prop="statusMsg" 90 prop="statusMsg"
98 - label="海关回执"  
99 - width="150"> 91 + label="海关回执">
100 </el-table-column> 92 </el-table-column>
101 <el-table-column 93 <el-table-column
102 prop="" 94 prop=""
103 label="报文操作" 95 label="报文操作"
104 - width="150"> 96 + width="200">
105 <template slot-scope="scope"> 97 <template slot-scope="scope">
106 <el-button 98 <el-button
107 size="mini" 99 size="mini"
108 - type="success"  
109 - @click="handleEdit(scope.$index, scope.row)">查看</el-button>  
110 - </template>  
111 - <template slot-scope="scope"> 100 + type="primary"
  101 + @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
112 <el-button 102 <el-button
113 size="mini" 103 size="mini"
114 type="danger" 104 type="danger"
@@ -130,6 +120,16 @@ @@ -130,6 +120,16 @@
130 </el-pagination> 120 </el-pagination>
131 </div> 121 </div>
132 </el-row> 122 </el-row>
  123 + <!--查看回执弹框-->
  124 + <el-dialog title="回执明细" :visible.sync="dialogTableVisible">
  125 + <el-table :data="gridData">
  126 + <el-table-column property="sendtime" label="操作时间" ></el-table-column>
  127 + <el-table-column property="createBy" label="操作人" ></el-table-column>
  128 + <el-table-column property="flightNo" label="航班号"></el-table-column>
  129 + <el-table-column property="flightDate" label="航班日期" ></el-table-column>
  130 + <el-table-column property="receiptContent" label="回执内容" ></el-table-column>
  131 + </el-table>
  132 + </el-dialog>
133 </el-main> 133 </el-main>
134 </el-container> 134 </el-container>
135 </template> 135 </template>
@@ -152,7 +152,7 @@ @@ -152,7 +152,7 @@
152 152
153 </style> 153 </style>
154 <script> 154 <script>
155 - import {editPrediction, selectPrediction} from "../../api/transport"; 155 + import {editPrediction, selectPrediction, selectReturnMsg} from "../../api/transport";
156 156
157 export default { 157 export default {
158 data(){ 158 data(){
@@ -166,10 +166,23 @@ @@ -166,10 +166,23 @@
166 pageSize:10, 166 pageSize:10,
167 total:0, 167 total:0,
168 tableData:[], 168 tableData:[],
169 - tableloading:false 169 + tableloading:false,
  170 + gridData:[],
  171 + dialogTableVisible: false,
170 } 172 }
171 }, 173 },
172 methods: { 174 methods: {
  175 + //查询回执列表
  176 + selectDetail(index,row){
  177 + this.gridData=[];
  178 + this.dialogTableVisible=true;
  179 + let params={messageid:row.messageid};
  180 + selectReturnMsg(params).then(res=>{
  181 + let response=res.data.data;
  182 + console.log(response)
  183 + this.gridData=response;
  184 + });
  185 + },
173 //分页 186 //分页
174 handleSizeChange(val) { 187 handleSizeChange(val) {
175 this.pageSize=val; 188 this.pageSize=val;
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 <el-table-column 58 <el-table-column
59 prop="createtime" 59 prop="createtime"
60 label="创建时间" 60 label="创建时间"
61 - width="120"> 61 + width="130">
62 </el-table-column> 62 </el-table-column>
63 <el-table-column 63 <el-table-column
64 prop="updateby" 64 prop="updateby"
@@ -67,20 +67,18 @@ @@ -67,20 +67,18 @@
67 <el-table-column 67 <el-table-column
68 prop="updatetime" 68 prop="updatetime"
69 label="更新时间" 69 label="更新时间"
70 - width="120"> 70 + width="130">
71 </el-table-column> 71 </el-table-column>
72 <el-table-column 72 <el-table-column
73 fixed="right" 73 fixed="right"
74 prop="" 74 prop=""
75 label="报文操作" 75 label="报文操作"
76 - width="150"> 76 + width="200">
77 <template slot-scope="scope"> 77 <template slot-scope="scope">
78 <el-button 78 <el-button
79 size="mini" 79 size="mini"
80 - type="success"  
81 - @click="handleEdit(scope.$index, scope.row)">查看</el-button>  
82 - </template>  
83 - <template slot-scope="scope"> 80 + type="primary"
  81 + @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
84 <el-button 82 <el-button
85 size="mini" 83 size="mini"
86 type="danger" 84 type="danger"
@@ -102,6 +100,16 @@ @@ -102,6 +100,16 @@
102 </el-pagination> 100 </el-pagination>
103 </div> 101 </div>
104 </el-row> 102 </el-row>
  103 + <!--查看回执弹框-->
  104 + <el-dialog title="回执明细" :visible.sync="dialogTableVisible">
  105 + <el-table :data="gridData">
  106 + <el-table-column property="sendtime" label="操作时间" ></el-table-column>
  107 + <el-table-column property="createBy" label="操作人" ></el-table-column>
  108 + <el-table-column property="flightNo" label="航班号"></el-table-column>
  109 + <el-table-column property="flightDate" label="航班日期" ></el-table-column>
  110 + <el-table-column property="receiptContent" label="回执内容" ></el-table-column>
  111 + </el-table>
  112 + </el-dialog>
105 </el-main> 113 </el-main>
106 </el-container> 114 </el-container>
107 </template> 115 </template>
@@ -124,7 +132,7 @@ @@ -124,7 +132,7 @@
124 132
125 </style> 133 </style>
126 <script> 134 <script>
127 - import {editSchedule, selectSchedule} from "../../api/transport"; 135 + import {editSchedule, selectReturnMsg, selectSchedule} from "../../api/transport";
128 136
129 export default { 137 export default {
130 data(){ 138 data(){
@@ -137,10 +145,23 @@ @@ -137,10 +145,23 @@
137 pageSize:10, 145 pageSize:10,
138 total:0, 146 total:0,
139 tableloading:false, 147 tableloading:false,
140 - tableData:[] 148 + tableData:[],
  149 + gridData:[],
  150 + dialogTableVisible: false,
141 } 151 }
142 }, 152 },
143 methods: { 153 methods: {
  154 + //查询回执列表
  155 + selectDetail(index,row){
  156 + this.gridData=[];
  157 + this.dialogTableVisible=true;
  158 + let params={messageid:row.messageid};
  159 + selectReturnMsg(params).then(res=>{
  160 + let response=res.data.data;
  161 + console.log(response)
  162 + this.gridData=response;
  163 + });
  164 + },
144 //分页 165 //分页
145 handleSizeChange(val) { 166 handleSizeChange(val) {
146 this.pageSize=val; 167 this.pageSize=val;