朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 cfbefa082f530a946fd2b101f2f1e9580dd8f507 1 个父辈 e022fe13

20200623-trans

内嵌 并排对比
正在显示 2 个修改的文件 包含 127 行增加 和 155 行删除
@@ -155,123 +155,7 @@ @@ -155,123 +155,7 @@
155 <el-row style="margin-left: 120px"> 155 <el-row style="margin-left: 120px">
156 <el-col :span="24"> 156 <el-col :span="24">
157 <el-button type="primary" @click="submitForm('bill')">保 存</el-button> 157 <el-button type="primary" @click="submitForm('bill')">保 存</el-button>
158 - <el-button type="success">保存并发送</el-button></el-col>  
159 - </el-row>  
160 - <el-row class="row-bg">  
161 - <el-col :span="24">  
162 - <div class="grid-content content">机组名单<el-button type="primary" size="mini" @click="dialogTableVisible = true" style="margin-left:50px">添加机组人员</el-button></div>  
163 - </el-col>  
164 - </el-row>  
165 - <!--添加机组人员dialog-->  
166 - <el-row>  
167 - <el-dialog title="机组人员添加" :visible.sync="dialogTableVisible">  
168 - <el-form :model="billperson" :rules="brules" ref="billperson" label-width="100px" class="demo-ruleForm">  
169 - <el-row>  
170 - <el-col :span="12">  
171 - <el-form-item label="姓名" prop="name">  
172 - <el-input v-model="billperson.name" placeholder="请输入"></el-input>  
173 - </el-form-item>  
174 - </el-col>  
175 - <el-col :span="12">  
176 - <el-form-item label="性别" prop="gender">  
177 - <el-input v-model="billperson.gender" placeholder="M/F"></el-input>  
178 - </el-form-item>  
179 - </el-col>  
180 - <el-col :span="12">  
181 - <el-form-item label="证件类型" prop="certType">  
182 - <el-input v-model="billperson.certType" placeholder="请输入"></el-input>  
183 - </el-form-item>  
184 </el-col> 158 </el-col>
185 - <el-col :span="12">  
186 - <el-form-item label="证件号码" prop="ceterNo">  
187 - <el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>  
188 - </el-form-item>  
189 - </el-col>  
190 - <el-col :span="12">  
191 - <el-form-item label="国籍" prop="nationality">  
192 - <el-input v-model="billperson.nationality" placeholder="请输入"></el-input>  
193 - </el-form-item>  
194 - </el-col>  
195 - <el-col :span="12">  
196 - <el-form-item label="职务" prop="gareer">  
197 - <el-input v-model="billperson.gareer" placeholder="请输入"></el-input>  
198 - </el-form-item>  
199 - </el-col>  
200 - <el-col :span="24">  
201 - <el-form-item label="备注" prop="meno">  
202 - <el-input v-model="billperson.meno" placeholder="请输入"></el-input>  
203 - </el-form-item>  
204 - </el-col>  
205 - <el-col :span="24"> <el-button type="primary" @click="submitPerson('billperson')" style="float: right">提 交</el-button></el-col>  
206 - </el-row>  
207 - </el-form>  
208 - </el-dialog>  
209 - </el-row>  
210 - <el-row>  
211 - <el-table  
212 - :data="tableData"  
213 - border  
214 - style="width: 100%;margin-bottom: 10px">  
215 - <el-table-column  
216 - fixed="left"  
217 - label="操作"  
218 - width="150">  
219 - <template slot-scope="scope">  
220 - <el-button  
221 - size="mini"  
222 - type="primary"  
223 - @click="handleEdit(scope.$index, scope.row)">选择</el-button>  
224 - </template>  
225 - </el-table-column>  
226 - <el-table-column  
227 - prop="name"  
228 - label="姓名"  
229 - width="150">  
230 - </el-table-column>  
231 - <el-table-column  
232 - prop="gender"  
233 - label="性别"  
234 - width="150">  
235 - </el-table-column>  
236 - <el-table-column  
237 - prop="nationality"  
238 - label="国籍"  
239 - width="150">  
240 - </el-table-column>  
241 - <el-table-column  
242 - prop="certType"  
243 - label="证件类型"  
244 - width="150">  
245 - </el-table-column>  
246 - <el-table-column  
247 - prop="ceterNo"  
248 - label="证件编辑"  
249 - width="150">  
250 - </el-table-column>  
251 - <el-table-column  
252 - prop="gareer"  
253 - label="职务"  
254 - width="150">  
255 - </el-table-column>  
256 - <el-table-column  
257 - prop="meno"  
258 - label="备注"  
259 - width="350">  
260 - </el-table-column>  
261 - </el-table>  
262 - </el-row>  
263 - <el-row>  
264 - <div class="block">  
265 - <el-pagination  
266 - @size-change="handleSizeChange"  
267 - @current-change="handleCurrentChange"  
268 - :current-page="currentPage"  
269 - :page-sizes="[10, 20, 30, 40]"  
270 - :page-size="pageSize"  
271 - layout="total, sizes, prev, pager, next, jumper"  
272 - :total="total">  
273 - </el-pagination>  
274 - </div>  
275 </el-row> 159 </el-row>
276 <!--对话提示框--> 160 <!--对话提示框-->
277 <el-row> 161 <el-row>
@@ -422,43 +306,6 @@ background-color: white; @@ -422,43 +306,6 @@ background-color: white;
422 {required: true, message: '请输入', trigger: 'blur'} 306 {required: true, message: '请输入', trigger: 'blur'}
423 ], 307 ],
424 }, 308 },
425 - dialogTableVisible:false,  
426 - billperson:{  
427 - autoId:undefined,  
428 - name:undefined,  
429 - gender:undefined,  
430 - gareer:undefined,  
431 - nationality:undefined,  
432 - certType:undefined,  
433 - ceterNo:undefined,  
434 - createTime:undefined,  
435 - createBy:loginUserInfo.username,  
436 - updateTime:undefined,  
437 - updateBy:loginUserInfo.username,  
438 - meno:undefined,  
439 - isDelete:undefined,  
440 - billsId:undefined  
441 - },  
442 - brules:{  
443 - name: [  
444 - {required: true, message: '请输入', trigger: 'blur'}  
445 - ],  
446 - gender: [  
447 - {required: true, message: '请输入', trigger: 'blur'}  
448 - ],  
449 - certType: [  
450 - {required: true, message: '请输入', trigger: 'blur'}  
451 - ],  
452 - ceterNo: [  
453 - {required: true, message: '请输入', trigger: 'blur'}  
454 - ],  
455 - nationality: [  
456 - {required: true, message: '请输入', trigger: 'blur'}  
457 - ],  
458 - gareer: [  
459 - {required: true, message: '请输入', trigger: 'blur'}  
460 - ],  
461 - },  
462 tableData:[{ 309 tableData:[{
463 arrivaldatetime: '161146', 310 arrivaldatetime: '161146',
464 departuredatetime: '161146', 311 departuredatetime: '161146',
@@ -52,12 +52,16 @@ @@ -52,12 +52,16 @@
52 <el-table-column 52 <el-table-column
53 fixed="left" 53 fixed="left"
54 label="操作" 54 label="操作"
55 - width="100"> 55 + width="200">
56 <template slot-scope="scope"> 56 <template slot-scope="scope">
57 <el-button 57 <el-button
58 size="mini" 58 size="mini"
59 type="primary" 59 type="primary"
60 @click="handleEdit(scope.$index, scope.row)">编辑</el-button> 60 @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
  61 + <el-button
  62 + size="mini"
  63 + type="primary"
  64 + @click="dialogTableVisibles = true">添加机组人员</el-button>
61 </template> 65 </template>
62 </el-table-column> 66 </el-table-column>
63 <el-table-column 67 <el-table-column
@@ -100,12 +104,13 @@ @@ -100,12 +104,13 @@
100 fixed="right" 104 fixed="right"
101 prop="" 105 prop=""
102 label="报文操作" 106 label="报文操作"
103 - width="200"> 107 + width="280">
104 <template slot-scope="scope"> 108 <template slot-scope="scope">
105 <el-button 109 <el-button
106 size="mini" 110 size="mini"
107 type="primary" 111 type="primary"
108 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button> 112 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
  113 + <el-button size="mini" type="success">保存并发送</el-button>
109 <el-button 114 <el-button
110 size="mini" 115 size="mini"
111 type="danger" 116 type="danger"
@@ -138,6 +143,87 @@ @@ -138,6 +143,87 @@
138 </el-table> 143 </el-table>
139 </el-dialog> 144 </el-dialog>
140 </el-main> 145 </el-main>
  146 + <!--添加机组人员dialog-->
  147 + <el-row>
  148 + <el-dialog title="机组人员添加" :visible.sync="dialogTableVisibles" >
  149 + <el-form :model="billperson" :rules="brules" ref="billperson" label-width="130px" class="demo-ruleForm">
  150 + <el-row>
  151 + <el-col :span="10">
  152 + <el-form-item label="姓名" prop="name">
  153 + <el-input v-model="billperson.name" placeholder="请输入"></el-input>
  154 + </el-form-item>
  155 + </el-col>
  156 + <el-col :span="10">
  157 + <el-form-item label="性别" prop="gender">
  158 + <el-input v-model="billperson.gender" placeholder="M/F"></el-input>
  159 + </el-form-item>
  160 + </el-col>
  161 + <el-col :span="10">
  162 + <el-form-item label="证件类型" prop="certType">
  163 + <el-input v-model="billperson.certType" placeholder="请输入"></el-input>
  164 + </el-form-item>
  165 + </el-col>
  166 + <el-col :span="10">
  167 + <el-form-item label="证件号码" prop="ceterNo">
  168 + <el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>
  169 + </el-form-item>
  170 + </el-col>
  171 + <el-col :span="10">
  172 + <el-form-item label="国籍" prop="nationality">
  173 + <el-input v-model="billperson.nationality" placeholder="请输入"></el-input>
  174 + </el-form-item>
  175 + </el-col>
  176 + <el-col :span="10">
  177 + <el-form-item label="职务" prop="gareer">
  178 + <el-input v-model="billperson.gareer" placeholder="请输入"></el-input>
  179 + </el-form-item>
  180 + </el-col>
  181 + <el-col :span="24">
  182 + <el-form-item label="备注" prop="meno">
  183 + <el-input v-model="billperson.meno" placeholder="请输入"></el-input>
  184 + </el-form-item>
  185 + </el-col>
  186 + <el-col :span="24"> <el-button type="primary" @click="submitPerson('billperson')" style="float: right">提 交</el-button></el-col>
  187 + </el-row>
  188 + </el-form>
  189 + <el-row>
  190 + <el-table
  191 + :data="tableData2"
  192 + border
  193 + style="width: 100%;margin-bottom: 10px">
  194 + <el-table-column
  195 + prop="name"
  196 + label="姓名">
  197 + </el-table-column>
  198 + <el-table-column
  199 + prop="gender"
  200 + label="性别">
  201 + </el-table-column>
  202 + <el-table-column
  203 + prop="nationality"
  204 + label="国籍">
  205 + </el-table-column>
  206 + <el-table-column
  207 + prop="certType"
  208 + label="证件类型">
  209 + </el-table-column>
  210 + <el-table-column
  211 + prop="ceterNo"
  212 + label="证件编辑">
  213 + </el-table-column>
  214 + <el-table-column
  215 + prop="gareer"
  216 + label="职务">
  217 + </el-table-column>
  218 + <el-table-column
  219 + prop="meno"
  220 + label="备注">
  221 + </el-table-column>
  222 + </el-table>
  223 + </el-row>
  224 + </el-dialog>
  225 + </el-row>
  226 +
141 </el-container> 227 </el-container>
142 </template> 228 </template>
143 <style scoped> 229 <style scoped>
@@ -160,6 +246,7 @@ @@ -160,6 +246,7 @@
160 </style> 246 </style>
161 <script> 247 <script>
162 import {editBill,selectBill,selectReturnMsg} from "../../api/transport"; 248 import {editBill,selectBill,selectReturnMsg} from "../../api/transport";
  249 + import loginUserInfo from "../../api/base";
163 export default { 250 export default {
164 data(){ 251 data(){
165 return{ 252 return{
@@ -169,6 +256,43 @@ @@ -169,6 +256,43 @@
169 flightDate:undefined, 256 flightDate:undefined,
170 accessFlag:undefined, 257 accessFlag:undefined,
171 }, 258 },
  259 + billperson:{
  260 + autoId:undefined,
  261 + name:undefined,
  262 + gender:undefined,
  263 + gareer:undefined,
  264 + nationality:undefined,
  265 + certType:undefined,
  266 + ceterNo:undefined,
  267 + createTime:undefined,
  268 + createBy:loginUserInfo.username,
  269 + updateTime:undefined,
  270 + updateBy:loginUserInfo.username,
  271 + meno:undefined,
  272 + isDelete:undefined,
  273 + billsId:undefined
  274 + },
  275 + brules:{
  276 + name: [
  277 + {required: true, message: '请输入', trigger: 'blur'}
  278 + ],
  279 + gender: [
  280 + {required: true, message: '请输入', trigger: 'blur'}
  281 + ],
  282 + certType: [
  283 + {required: true, message: '请输入', trigger: 'blur'}
  284 + ],
  285 + ceterNo: [
  286 + {required: true, message: '请输入', trigger: 'blur'}
  287 + ],
  288 + nationality: [
  289 + {required: true, message: '请输入', trigger: 'blur'}
  290 + ],
  291 + gareer: [
  292 + {required: true, message: '请输入', trigger: 'blur'}
  293 + ],
  294 + },
  295 + dialogTableVisibles:false,
172 tableloading:false, 296 tableloading:false,
173 rules:{}, 297 rules:{},
174 labelPosition:'left', 298 labelPosition:'left',
@@ -176,6 +300,7 @@ @@ -176,6 +300,7 @@
176 pageSize:10, 300 pageSize:10,
177 total:0, 301 total:0,
178 tableData:[], 302 tableData:[],
  303 + tableData2:[],
179 gridData:[], 304 gridData:[],
180 dialogTableVisible: false, 305 dialogTableVisible: false,
181 } 306 }