朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 2b2651d665a75cabddd3d9f1279d73e871c62873 1 个父辈 b8409bb2

快邮舱单申报 主分单编辑 分单显示

内嵌 并排对比
正在显示 2 个修改的文件 包含 129 行增加 和 40 行删除
@@ -9,5 +9,9 @@ export const getExpressList = params => { return axios.get(`${baseUrl}/list`, { @@ -9,5 +9,9 @@ export const getExpressList = params => { return axios.get(`${baseUrl}/list`, {
9 9
10 export const awbaAdd = params => { return http.post(`${baseUrl}/awbaAdd`,params)}; 10 export const awbaAdd = params => { return http.post(`${baseUrl}/awbaAdd`,params)};
11 11
12 -export const awbahAdd = params => { return http.post(`${baseUrl}/awbhAdd`,params)}; 12 +export const awbaEdit = params => { return http.put(`${baseUrl}/awbaEdit`,params)};
  13 +
  14 +export const awbhAdd = params => { return http.post(`${baseUrl}/awbhAdd`,params)};
  15 +
  16 +export const awbhEdit = params => { return http.put(`${baseUrl}/awbhEdit`,params)};
13 17
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <el-button type="primary" @click="getList()">查询</el-button> 21 <el-button type="primary" @click="getList()">查询</el-button>
22 </el-form-item> 22 </el-form-item>
23 <el-form-item> 23 <el-form-item>
24 - <el-button type="primary" @click="expressAdd()">新增</el-button> 24 + <el-button type="primary" @click="expressAdd()">新增主单</el-button>
25 </el-form-item> 25 </el-form-item>
26 </el-form> 26 </el-form>
27 </el-col> 27 </el-col>
@@ -32,40 +32,36 @@ @@ -32,40 +32,36 @@
32 border 32 border
33 v-loading="listLoading" 33 v-loading="listLoading"
34 lazy 34 lazy
35 - :load="load" 35 + default-expand-all
36 :tree-props="{children: 'children', hasChildren: 'hasChildren'}" 36 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
37 @selection-change="handleSelectionChange"> 37 @selection-change="handleSelectionChange">
38 <el-table-column type="selection" width="55"> 38 <el-table-column type="selection" width="55">
39 </el-table-column> 39 </el-table-column>
40 <el-table-column prop="billno" label="主单号" width="180"> 40 <el-table-column prop="billno" label="主单号" width="180">
41 </el-table-column> 41 </el-table-column>
42 - <el-table-column prop="voyageno" label="运输工具航次(班)号" width="180"> 42 + <el-table-column prop="assbillno" label="分单号" width="180">
43 </el-table-column> 43 </el-table-column>
44 - <el-table-column prop="ieflag" label="进出口标识"> 44 + <el-table-column prop="flightNo" label="航班号" width="180">
45 </el-table-column> 45 </el-table-column>
46 - <el-table-column prop="trafcnname" label="运输工具中文名称"> 46 + <el-table-column prop="flightDate" label="航班日期" width="180">
47 </el-table-column> 47 </el-table-column>
48 - <el-table-column prop="trafenname" label="运输工具英文名称"> 48 + <el-table-column prop="maingname" label="分单主商品名称" width="180">
  49 + </el-table-column>
  50 + <el-table-column prop="ieflag" label="进出口标识" width="100px">
49 </el-table-column> 51 </el-table-column>
50 <el-table-column prop="grosswt" label="毛重"> 52 <el-table-column prop="grosswt" label="毛重">
51 </el-table-column> 53 </el-table-column>
52 <el-table-column prop="packno" label="件数"> 54 <el-table-column prop="packno" label="件数">
53 </el-table-column> 55 </el-table-column>
54 - <el-table-column prop="billnum" label="分运单总数">  
55 - </el-table-column>  
56 - <el-table-column prop="iedate" label="进出口日期">  
57 - </el-table-column>  
58 - <el-table-column prop="ieport" label="进出口岸代码"> 56 + <el-table-column prop="billnum" label="分运单总数" width="100px">
59 </el-table-column> 57 </el-table-column>
60 - <el-table-column prop="tradename" label="经营单位名称"> 58 + <el-table-column prop="iedate" label="进出口日期" width="100px">
61 </el-table-column> 59 </el-table-column>
62 - <el-table-column prop="inputopname" label="录入人姓名">  
63 - </el-table-column>  
64 - <el-table-column prop="inputcompanyname" label="录入单位名称">  
65 - </el-table-column>  
66 - <el-table-column label="操作" min-width="150"> 60 + <el-table-column label="操作" min-width="300px">
67 <template slot-scope="scope"> 61 <template slot-scope="scope">
68 <el-button type="primary" size="small" v-if="scope.row.ext1 == 'awba'" @click="expressAwbhAdd(scope.$index, scope.row)">新增分单</el-button> 62 <el-button type="primary" size="small" v-if="scope.row.ext1 == 'awba'" @click="expressAwbhAdd(scope.$index, scope.row)">新增分单</el-button>
  63 + <el-button type="primary" size="small" v-if="scope.row.ext1 == 'awba'" @click="expressEditAwbaAdd(scope.$index, scope.row)">编辑主单</el-button>
  64 + <el-button type="primary" size="small" v-else @click="expressEditAwbhAdd(scope.$index, scope.row)">编辑分单</el-button>
69 </template> 65 </template>
70 </el-table-column> 66 </el-table-column>
71 </el-table> 67 </el-table>
@@ -83,7 +79,7 @@ @@ -83,7 +79,7 @@
83 </el-pagination> 79 </el-pagination>
84 </el-col> 80 </el-col>
85 <!--新增主单弹框--> 81 <!--新增主单弹框-->
86 - <el-dialog title="快邮舱单主单新增" :visible.sync="expressAwbaAddVisible" width="60%"> 82 + <el-dialog :title="'快邮舱单'+awbatitle[dialogCommon]" :visible.sync="expressAwbaAddVisible" width="60%">
87 <el-form :model="expressAwbaAddModel" :rules="expressAwbaRules" ref="expressAwbaAddModel" > 83 <el-form :model="expressAwbaAddModel" :rules="expressAwbaRules" ref="expressAwbaAddModel" >
88 <el-row> 84 <el-row>
89 <el-col :span="8"> 85 <el-col :span="8">
@@ -183,7 +179,7 @@ @@ -183,7 +179,7 @@
183 </el-col> 179 </el-col>
184 <el-col :span="8"> 180 <el-col :span="8">
185 <el-form-item label="经营单位名称" :label-width="expressAddlWidth" prop="tradename"> 181 <el-form-item label="经营单位名称" :label-width="expressAddlWidth" prop="tradename">
186 - <el-input style="width: 80%" v-model="expressAwbaAddModel.tradename" autocomplete="off"></el-input> 182 + <el-input style="width: 80%" type="textarea" v-model="expressAwbaAddModel.tradename" autocomplete="off"></el-input>
187 </el-form-item> 183 </el-form-item>
188 </el-col> 184 </el-col>
189 </el-row> 185 </el-row>
@@ -207,18 +203,18 @@ @@ -207,18 +203,18 @@
207 <el-row> 203 <el-row>
208 <el-col :span="8"> 204 <el-col :span="8">
209 <el-form-item label="录入单位名称" :label-width="expressAddlWidth" prop="inputcompanyname"> 205 <el-form-item label="录入单位名称" :label-width="expressAddlWidth" prop="inputcompanyname">
210 - <el-input style="width: 80%" v-model="expressAwbaAddModel.inputcompanyname" autocomplete="off"></el-input> 206 + <el-input style="width: 80%" type="textarea" v-model="expressAwbaAddModel.inputcompanyname" autocomplete="off"></el-input>
211 </el-form-item> 207 </el-form-item>
212 </el-col> 208 </el-col>
213 </el-row> 209 </el-row>
214 </el-form> 210 </el-form>
215 <div slot="footer" class="dialog-footer"> 211 <div slot="footer" class="dialog-footer">
216 <el-button type="primary" @click="expressAwbaAddVisible = false">取消</el-button> 212 <el-button type="primary" @click="expressAwbaAddVisible = false">取消</el-button>
217 - <el-button type="primary" @click="expressAwbaAddSubmit()">提交</el-button> 213 + <el-button type="primary" @click="dialogCommon=='add'?expressAwbaAddSubmit():expressAwbaEditSubmit()">提交</el-button>
218 </div> 214 </div>
219 </el-dialog> 215 </el-dialog>
220 <!--新增分单弹框--> 216 <!--新增分单弹框-->
221 - <el-dialog title="快邮舱单分单新增" :visible.sync="expressAwbhAddVisible" width="60%"> 217 + <el-dialog :title="'快邮舱单'+awbhtitle[dialogCommon]" :visible.sync="expressAwbhAddVisible" width="60%">
222 <el-form :model="expressAwbhAddModel" :rules="expressAwbhRules" ref="expressAwbhAddModel" > 218 <el-form :model="expressAwbhAddModel" :rules="expressAwbhRules" ref="expressAwbhAddModel" >
223 <el-row> 219 <el-row>
224 <el-col :span="8"> 220 <el-col :span="8">
@@ -279,14 +275,14 @@ @@ -279,14 +275,14 @@
279 </el-form> 275 </el-form>
280 <div slot="footer" class="dialog-footer"> 276 <div slot="footer" class="dialog-footer">
281 <el-button type="primary" @click="expressAwbhAddVisible = false">取消</el-button> 277 <el-button type="primary" @click="expressAwbhAddVisible = false">取消</el-button>
282 - <el-button type="primary" @click="expressAwbhAddSubmit()">提交</el-button> 278 + <el-button type="primary" @click="dialogCommon=='add'?expressAwbhAddSubmit():expressAwbhEditSubmit()">提交</el-button>
283 </div> 279 </div>
284 </el-dialog> 280 </el-dialog>
285 </section> 281 </section>
286 </template> 282 </template>
287 283
288 <script> 284 <script>
289 - import {getExpressList, awbaAdd, awbahAdd} from '../../api/express/express' 285 + import {getExpressList, awbaAdd, awbaEdit, awbhAdd, awbhEdit} from '../../api/express/express'
290 import loginUserInfo from "../../api/base"; 286 import loginUserInfo from "../../api/base";
291 export default { 287 export default {
292 name: "express", 288 name: "express",
@@ -436,7 +432,16 @@ @@ -436,7 +432,16 @@
436 tradecurr:"", 432 tradecurr:"",
437 userid:"", 433 userid:"",
438 userName:"", 434 userName:"",
439 - } 435 + },
  436 + awbatitle:{
  437 + add:'主单新增',
  438 + edit:'主单编辑'
  439 + },
  440 + awbhtitle:{
  441 + add:'分单新增',
  442 + edit:'分单编辑'
  443 + },
  444 + dialogCommon: ''
440 } 445 }
441 }, 446 },
442 methods: { 447 methods: {
@@ -461,16 +466,6 @@ @@ -461,16 +466,6 @@
461 this.listLoading = false; 466 this.listLoading = false;
462 }); 467 });
463 }, 468 },
464 -  
465 - /**  
466 - * 分单懒加载  
467 - */  
468 - load(tree, treeNode, resolve) {  
469 - setTimeout(() => {  
470 - resolve([  
471 - ])  
472 - }, 1000)  
473 - },  
474 /** 469 /**
475 * 多选单选 470 * 多选单选
476 * @param val 471 * @param val
@@ -493,16 +488,16 @@ @@ -493,16 +488,16 @@
493 * 新增主单页面 488 * 新增主单页面
494 */ 489 */
495 expressAdd(){ 490 expressAdd(){
496 - this.expressAwbaAddVisible = true 491 + this.dialogCommon = 'add';
  492 + this.expressAwbaAddVisible = true;
497 if (this.$refs.expressAwbaAddModel != undefined){ 493 if (this.$refs.expressAwbaAddModel != undefined){
498 this.$refs.expressAwbaAddModel.resetFields(); 494 this.$refs.expressAwbaAddModel.resetFields();
499 } 495 }
500 }, 496 },
501 /** 497 /**
502 - * 新增提交 498 + * 主单新增提交
503 */ 499 */
504 expressAwbaAddSubmit(){ 500 expressAwbaAddSubmit(){
505 -  
506 this.$refs.expressAwbaAddModel.validate((valid) => { 501 this.$refs.expressAwbaAddModel.validate((valid) => {
507 if (valid) { 502 if (valid) {
508 this.$confirm('确认提交吗？', '提示', {}).then(() => { 503 this.$confirm('确认提交吗？', '提示', {}).then(() => {
@@ -534,9 +529,53 @@ @@ -534,9 +529,53 @@
534 }); 529 });
535 }, 530 },
536 /** 531 /**
  532 + * 主单编辑
  533 + */
  534 + expressEditAwbaAdd(index, row){
  535 + if (this.$refs.expressAwbhAddModel != undefined){
  536 + this.$refs.expressAwbhAddModel.resetFields();
  537 + }
  538 + this.dialogCommon = 'edit';
  539 + this.expressAwbaAddVisible = true;
  540 + this.expressAwbaAddModel = Object.assign({}, row);
  541 + },
  542 + /**
  543 + * 主单编辑提交
  544 + */
  545 + expressAwbaEditSubmit(){
  546 + this.$refs.expressAwbaAddModel.validate((valid) => {
  547 + if (valid) {
  548 + this.$confirm('确认提交吗？', '提示', {}).then(() => {
  549 + //NProgress.start();
  550 + this.listLoading = true;
  551 + let para = Object.assign({}, this.expressAwbaAddModel);
  552 + awbaEdit(para).then((res) => {
  553 + if (res.data.code == 200){
  554 + this.$message({
  555 + message: '提交成功',
  556 + type: 'success'
  557 + });
  558 + this.$refs.expressAwbaAddModel.resetFields();
  559 + this.expressAwbaAddVisible = false;
  560 + this.getList();
  561 + }else {
  562 + this.$message({
  563 + message: '提交失败',
  564 + type: 'error'
  565 + });
  566 + }
  567 + }).catch(error => alert(error));
  568 + }).catch(() =>{
  569 +
  570 + });
  571 + }
  572 + });
  573 + },
  574 + /**
537 * 新增分单页面 575 * 新增分单页面
538 */ 576 */
539 expressAwbhAdd(index, row){ 577 expressAwbhAdd(index, row){
  578 + this.dialogCommon = 'add'
540 this.expressAwbhAddModel.billno = row.billno; 579 this.expressAwbhAddModel.billno = row.billno;
541 this.expressAwbhAddModel.flightNo = row.flightNo; 580 this.expressAwbhAddModel.flightNo = row.flightNo;
542 this.expressAwbhAddModel.flightDate = row.flightDate; 581 this.expressAwbhAddModel.flightDate = row.flightDate;
@@ -545,6 +584,7 @@ @@ -545,6 +584,7 @@
545 if (this.$refs.expressAwbhAddModel != undefined){ 584 if (this.$refs.expressAwbhAddModel != undefined){
546 this.$refs.expressAwbhAddModel.resetFields(); 585 this.$refs.expressAwbhAddModel.resetFields();
547 } 586 }
  587 +
548 }, 588 },
549 /** 589 /**
550 * 新增分单提交 590 * 新增分单提交
@@ -558,7 +598,7 @@ @@ -558,7 +598,7 @@
558 this.expressAwbhAddModel.userName = loginUserInfo.username; 598 this.expressAwbhAddModel.userName = loginUserInfo.username;
559 this.expressAwbhAddModel.userid = loginUserInfo.userId; 599 this.expressAwbhAddModel.userid = loginUserInfo.userId;
560 let para = Object.assign({}, this.expressAwbhAddModel); 600 let para = Object.assign({}, this.expressAwbhAddModel);
561 - awbahAdd(para).then((res) => { 601 + awbhAdd(para).then((res) => {
562 if (res.data.code == 200){ 602 if (res.data.code == 200){
563 this.$message({ 603 this.$message({
564 message: '提交成功', 604 message: '提交成功',
@@ -579,7 +619,52 @@ @@ -579,7 +619,52 @@
579 }); 619 });
580 } 620 }
581 }); 621 });
  622 + },
  623 + /**
  624 + * 编辑分单页面
  625 + */
  626 + expressEditAwbhAdd(index, row){
  627 + if (this.$refs.expressAwbhAddModel != undefined){
  628 + this.$refs.expressAwbhAddModel.resetFields();
  629 + }
  630 + this.dialogCommon = 'edit';
  631 + this.expressAwbhAddVisible = true;
  632 + this.expressAwbhAddModel = Object.assign({}, row);
  633 + },
  634 + /**
  635 + * 分单编辑
  636 + */
  637 + expressAwbhEditSubmit(){
  638 + this.$refs.expressAwbhAddModel.validate((valid) => {
  639 + if (valid) {
  640 + this.$confirm('确认提交吗？', '提示', {}).then(() => {
  641 + //NProgress.start();
  642 + this.listLoading = true;
  643 + let para = Object.assign({}, this.expressAwbhAddModel);
  644 + awbhEdit(para).then((res) => {
  645 + if (res.data.code == 200){
  646 + this.$message({
  647 + message: '提交成功',
  648 + type: 'success'
  649 + });
  650 + this.$refs.expressAwbhAddModel.resetFields();
  651 + this.expressAwbhAddVisible = false;
  652 + this.getList();
  653 + }else {
  654 + this.$message({
  655 + message: '提交失败',
  656 + type: 'error'
  657 + });
  658 + }
  659 + }).catch(error => alert(error));
  660 + }).catch(() =>{
  661 +
  662 + });
582 } 663 }
  664 + });
  665 + },
  666 +
  667 +
583 }, 668 },
584 mounted() { 669 mounted() {
585 this.getList(); 670 this.getList();