朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 8ceba65f5ebdc0b458c7dda3d2247dbfc87a7519 1 个父辈 e5a1d77e

操作类型显示 预配运单件重 显示问题

内嵌 并排对比
正在显示 4 个修改的文件 包含 91 行增加 和 16 行删除
@@ -51,9 +51,15 @@ @@ -51,9 +51,15 @@
51 </el-col> 51 </el-col>
52 </el-row> 52 </el-row>
53 </div> 53 </div>
54 - <tree-table v-loading="listLoading" :data="arriveData" stripe fit highlight-current-row  
55 - style="font-size: 12px" border @selection-change="handleSelectionChange">  
56 - <el-table-column label="航班号" width="60" align="center"> 54 + <el-table v-loading="listLoading" :data="arriveData" stripe
  55 + style="font-size: 12px" border @selection-change="handleSelectionChange"
  56 + default-expand-all
  57 + row-key="uuid"
  58 + border
  59 + :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
  60 + <el-table-column type="selection" width="55">
  61 + </el-table-column>
  62 + <el-table-column label="航班号" width="100" align="center">
57 <template slot-scope="scope"> 63 <template slot-scope="scope">
58 <span>{{scope.row.carrier}}{{scope.row.flightno}}</span> 64 <span>{{scope.row.carrier}}{{scope.row.flightno}}</span>
59 </template> 65 </template>
@@ -130,12 +136,15 @@ @@ -130,12 +136,15 @@
130 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)" 136 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
131 :disabled="scope.row.status ==='22'">更改状态 137 :disabled="scope.row.status ==='22'">更改状态
132 </el-button> 138 </el-button>
  139 + <el-button size="mini" type="primary" v-if="scope.row.awbh ===''"
  140 + @click="handleAddAwbh(scope.row)">新增分单
  141 + </el-button>
133 <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)" 142 <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
134 :disabled="scope.row.status ==='24'">发删除报 143 :disabled="scope.row.status ==='24'">发删除报
135 </el-button> 144 </el-button>
136 </template> 145 </template>
137 </el-table-column> 146 </el-table-column>
138 - </tree-table> 147 + </el-table>
139 <div class="btnFoot"> 148 <div class="btnFoot">
140 <el-row> 149 <el-row>
141 <el-button type="primary" size="mini" v-if="arriveQuery.flightno !==undefined || arriveData.length>0" 150 <el-button type="primary" size="mini" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"
@@ -161,7 +170,7 @@ @@ -161,7 +170,7 @@
161 <el-input v-model="arriveModel.awba"></el-input> 170 <el-input v-model="arriveModel.awba"></el-input>
162 </el-form-item> 171 </el-form-item>
163 </el-col> 172 </el-col>
164 - <el-col :span="7.5"> 173 + <el-col :span="7.5" v-if="fenStatus === 'addAwbh'">
165 <el-form-item label="分单号" prop="awbh"> 174 <el-form-item label="分单号" prop="awbh">
166 <el-input v-model="awbh"></el-input> 175 <el-input v-model="awbh"></el-input>
167 </el-form-item> 176 </el-form-item>
@@ -300,6 +309,11 @@ @@ -300,6 +309,11 @@
300 {{scope.row.cusrestext}} 309 {{scope.row.cusrestext}}
301 </template> 310 </template>
302 </el-table-column> 311 </el-table-column>
  312 + <el-table-column label="操作类型" width="100">
  313 + <template slot-scope="scope">
  314 + {{scope.row.opertype}}
  315 + </template>
  316 + </el-table-column>
303 <el-table-column label="操作人" width="100"> 317 <el-table-column label="操作人" width="100">
304 <template slot-scope="scope"> 318 <template slot-scope="scope">
305 {{scope.row.operusername}} 319 {{scope.row.operusername}}
@@ -415,6 +429,7 @@ @@ -415,6 +429,7 @@
415 airportCode: [], 429 airportCode: [],
416 dialogStatus: undefined, 430 dialogStatus: undefined,
417 awbhStatus: false, 431 awbhStatus: false,
  432 + fenStatus: undefined,
418 dialogFormVisible: false, 433 dialogFormVisible: false,
419 dialogDeleteVisible: false, 434 dialogDeleteVisible: false,
420 listLoading: false, 435 listLoading: false,
@@ -549,7 +564,7 @@ @@ -549,7 +564,7 @@
549 getMt3201ListForParam(this.arriveQuery).then(res => { 564 getMt3201ListForParam(this.arriveQuery).then(res => {
550 this.arriveData = res.data.dataList 565 this.arriveData = res.data.dataList
551 this.total = res.data.count 566 this.total = res.data.count
552 - if (res.data.count > 0) { 567 + if (res.data.dataList.length > 0){
553 this.arriveQuery.carrier = this.arriveData[0].carrier 568 this.arriveQuery.carrier = this.arriveData[0].carrier
554 this.arriveQuery.flightno = this.arriveData[0].flightno 569 this.arriveQuery.flightno = this.arriveData[0].flightno
555 this.arriveQuery.flightdate = this.arriveData[0].flightdate 570 this.arriveQuery.flightdate = this.arriveData[0].flightdate
@@ -599,6 +614,24 @@ @@ -599,6 +614,24 @@
599 this.$refs.arriveFormData.clearValidate() 614 this.$refs.arriveFormData.clearValidate()
600 }) 615 })
601 }, 616 },
  617 + // 新增出港运抵分单
  618 + handleAddAwbh(row){
  619 + this.restModel()
  620 + // 给model赋值，所使用数据是以单独单号查询数据所得
  621 + this.arriveModel.carrier = row.carrier
  622 + this.arriveModel.awba = row.awba
  623 + this.arriveModel.flightdate = row.flightdate
  624 + this.arriveModel.flightno = row.flightno
  625 + this.arriveModel.originstation = row.originstation
  626 + this.arriveModel.destinationstation = row.destinationstation
  627 + this.arriveModel.customcode = row.customcode
  628 + this.dialogStatus = 'create'
  629 + this.fenStatus = 'addAwbh'
  630 + this.dialogFormVisible = true
  631 + this.$nextTick(() => {
  632 + this.$refs.arriveFormData.clearValidate()
  633 + })
  634 + },
602 createData() { 635 createData() {
603 this.$refs.arriveFormData.validate(valid => { 636 this.$refs.arriveFormData.validate(valid => {
604 if (valid) { 637 if (valid) {
@@ -636,6 +669,13 @@ @@ -636,6 +669,13 @@
636 // 编辑 669 // 编辑
637 handleEdit(row) { 670 handleEdit(row) {
638 this.arriveModel = Object.assign({}, row) // copy obj 671 this.arriveModel = Object.assign({}, row) // copy obj
  672 +
  673 + if (row.awbh === ''){
  674 + this.fenStatus = undefined
  675 + }else {
  676 + this.fenStatus = 'addAwbh'
  677 + }
  678 +
639 this.dialogStatus = 'update' 679 this.dialogStatus = 'update'
640 this.dialogFormVisible = true 680 this.dialogFormVisible = true
641 this.$nextTick(() => { 681 this.$nextTick(() => {
@@ -734,6 +774,7 @@ @@ -734,6 +774,7 @@
734 carrier: row.carrier, 774 carrier: row.carrier,
735 flightNo: row.flightno, 775 flightNo: row.flightno,
736 flightDate: row.flightdate, 776 flightDate: row.flightdate,
  777 + opertype:row.opertype,
737 awba: row.awba, 778 awba: row.awba,
738 awbh: row.awbh, 779 awbh: row.awbh,
739 messageType: 'MT3201' 780 messageType: 'MT3201'
@@ -297,6 +297,11 @@ @@ -297,6 +297,11 @@
297 {{scope.row.cusrestext}} 297 {{scope.row.cusrestext}}
298 </template> 298 </template>
299 </el-table-column> 299 </el-table-column>
  300 + <el-table-column label="操作类型" width="100">
  301 + <template slot-scope="scope">
  302 + {{scope.row.opertype}}
  303 + </template>
  304 + </el-table-column>
300 <el-table-column label="操作人" width="100"> 305 <el-table-column label="操作人" width="100">
301 <template slot-scope="scope"> 306 <template slot-scope="scope">
302 {{scope.row.operusername}} 307 {{scope.row.operusername}}
@@ -581,6 +586,7 @@ @@ -581,6 +586,7 @@
581 carrier: row.carrier, 586 carrier: row.carrier,
582 flightNo: row.flightno, 587 flightNo: row.flightno,
583 flightDate: row.flightdate, 588 flightDate: row.flightdate,
  589 + opertype: row.opertype,
584 awba: row.awba, 590 awba: row.awba,
585 awbh: row.awbh, 591 awbh: row.awbh,
586 messageType: 'MT4201' 592 messageType: 'MT4201'
@@ -52,8 +52,14 @@ @@ -52,8 +52,14 @@
52 </el-row> 52 </el-row>
53 </div> 53 </div>
54 54
55 - <tree-table :data="preData" stripe style="font-size: 12px" :eval-func="func" :expand-all="true" border  
56 - @selection-change="handleSelectionChange" v-loading="listLoading"> 55 + <el-table :data="preData" stripe style="font-size: 12px" stripe
  56 + @selection-change="handleSelectionChange" v-loading="listLoading"
  57 + default-expand-all
  58 + row-key="uuid"
  59 + border
  60 + :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
  61 + <el-table-column type="selection" width="55">
  62 + </el-table-column>
57 <el-table-column label="航班信息" width="90" align="center"> 63 <el-table-column label="航班信息" width="90" align="center">
58 <template slot-scope="scope"> 64 <template slot-scope="scope">
59 <p class="tableInline">{{scope.row.carrier}}{{scope.row.flightno}}</p> 65 <p class="tableInline">{{scope.row.carrier}}{{scope.row.flightno}}</p>
@@ -71,12 +77,12 @@ @@ -71,12 +77,12 @@
71 </el-table-column> 77 </el-table-column>
72 <el-table-column label="运单件数/重量" width="100" align="center"> 78 <el-table-column label="运单件数/重量" width="100" align="center">
73 <template slot-scope="scope"> 79 <template slot-scope="scope">
74 - {{scope.row.piece}} 80 + {{scope.row.awbinfo.pcs}}/{{scope.row.awbinfo.weight}}
75 </template> 81 </template>
76 </el-table-column> 82 </el-table-column>
77 <el-table-column label="预配件数/重量" width="100" align="center"> 83 <el-table-column label="预配件数/重量" width="100" align="center">
78 <template slot-scope="scope"> 84 <template slot-scope="scope">
79 - {{scope.row.weight}} 85 + {{scope.row.piece}}/{{scope.row.weight}}
80 </template> 86 </template>
81 </el-table-column> 87 </el-table-column>
82 <el-table-column label="货物描述" width="120" align="center"> 88 <el-table-column label="货物描述" width="120" align="center">
@@ -144,7 +150,7 @@ @@ -144,7 +150,7 @@
144 :disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button> 150 :disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button>
145 </template> 151 </template>
146 </el-table-column> 152 </el-table-column>
147 - </tree-table> 153 + </el-table>
148 <div class="btnFoot"> 154 <div class="btnFoot">
149 <el-row> 155 <el-row>
150 <el-button type="primary" size="mini" v-if="preQuery.flightno !== undefined | preData.length > 0" 156 <el-button type="primary" size="mini" v-if="preQuery.flightno !== undefined | preData.length > 0"
@@ -621,6 +627,11 @@ @@ -621,6 +627,11 @@
621 {{scope.row.cusrestext}} 627 {{scope.row.cusrestext}}
622 </template> 628 </template>
623 </el-table-column> 629 </el-table-column>
  630 + <el-table-column label="操作类型" width="100">
  631 + <template slot-scope="scope">
  632 + {{scope.row.opertype}}
  633 + </template>
  634 + </el-table-column>
624 <el-table-column label="操作人" width="100"> 635 <el-table-column label="操作人" width="100">
625 <template slot-scope="scope"> 636 <template slot-scope="scope">
626 {{scope.row.operusername}} 637 {{scope.row.operusername}}
@@ -1112,7 +1123,8 @@ @@ -1112,7 +1123,8 @@
1112 getMt2201ListForParam(this.preQuery).then(res => { 1123 getMt2201ListForParam(this.preQuery).then(res => {
1113 this.preData = res.data.dataList 1124 this.preData = res.data.dataList
1114 this.total = res.data.count 1125 this.total = res.data.count
1115 - if (res.data.count > 0) { 1126 +
  1127 + if (res.data.dataList.length > 0) {
1116 this.preQuery.carrier = this.preData[0].carrier 1128 this.preQuery.carrier = this.preData[0].carrier
1117 this.preQuery.flightno = this.preData[0].flightno 1129 this.preQuery.flightno = this.preData[0].flightno
1118 this.preQuery.flightdate = this.preData[0].flightdate 1130 this.preQuery.flightdate = this.preData[0].flightdate
@@ -1245,6 +1257,7 @@ @@ -1245,6 +1257,7 @@
1245 carrier: row.carrier, 1257 carrier: row.carrier,
1246 flightno: row.flightno, 1258 flightno: row.flightno,
1247 flightdate: row.flightdate, 1259 flightdate: row.flightdate,
  1260 + orpertype: row.orpertype,
1248 awba: row.awba, 1261 awba: row.awba,
1249 awbh: row.awbh, 1262 awbh: row.awbh,
1250 messageType: 'MT2201' 1263 messageType: 'MT2201'
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
124 <p></p> 124 <p></p>
125 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)" 125 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
126 :disabled="scope.row.status ==='22'">更改状态</el-button> 126 :disabled="scope.row.status ==='22'">更改状态</el-button>
127 - <el-button size="mini" type="primary" v-if="scope.row.awbh ===null" 127 + <el-button size="mini" type="primary" v-if="scope.row.awbh ===''"
128 @click="handleAddAwbh(scope.row)">新增分单</el-button> 128 @click="handleAddAwbh(scope.row)">新增分单</el-button>
129 <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)" 129 <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
130 :disabled="deleteStatus(scope.row.status)">发出港理货删除报</el-button> 130 :disabled="deleteStatus(scope.row.status)">发出港理货删除报</el-button>
@@ -160,8 +160,8 @@ @@ -160,8 +160,8 @@
160 </el-form-item> 160 </el-form-item>
161 </el-col> 161 </el-col>
162 <el-col :span="7.5"> 162 <el-col :span="7.5">
163 - <el-form-item label="分单号" prop="awbh">  
164 - <el-input v-model="awbh" clearable :disabled="dialogStatus === 'update'"></el-input> 163 + <el-form-item label="分单号" prop="awbh" v-if="fenStatus === 'addAwbh'">
  164 + <el-input v-model="awbh" clearable></el-input>
165 </el-form-item> 165 </el-form-item>
166 </el-col> 166 </el-col>
167 </el-row> 167 </el-row>
@@ -317,6 +317,11 @@ @@ -317,6 +317,11 @@
317 {{scope.row.cusrestext}} 317 {{scope.row.cusrestext}}
318 </template> 318 </template>
319 </el-table-column> 319 </el-table-column>
  320 + <el-table-column label="操作类型" width="100">
  321 + <template slot-scope="scope">
  322 + {{scope.row.opertype}}
  323 + </template>
  324 + </el-table-column>
320 <el-table-column label="操作人" width="100"> 325 <el-table-column label="操作人" width="100">
321 <template slot-scope="scope"> 326 <template slot-scope="scope">
322 {{scope.row.operusername}} 327 {{scope.row.operusername}}
@@ -440,6 +445,7 @@ @@ -440,6 +445,7 @@
440 dialogDeleteVisible: false, 445 dialogDeleteVisible: false,
441 dialogStatus: undefined, 446 dialogStatus: undefined,
442 disabledStatus: false, 447 disabledStatus: false,
  448 + fenStatus: undefined,
443 listLoading: false, 449 listLoading: false,
444 customLoading:false, 450 customLoading:false,
445 dialogFormVisible: false, 451 dialogFormVisible: false,
@@ -578,7 +584,7 @@ @@ -578,7 +584,7 @@
578 getMt520XListForParam(this.tidyQuery).then(res => { 584 getMt520XListForParam(this.tidyQuery).then(res => {
579 this.tidyData = res.data.dataList 585 this.tidyData = res.data.dataList
580 this.total = res.data.count 586 this.total = res.data.count
581 - if (res.data.count > 0) { 587 + if (res.data.dataList.length > 0) {
582 this.tidyQuery.carrier = this.tidyData[0].carrier 588 this.tidyQuery.carrier = this.tidyData[0].carrier
583 this.tidyQuery.flightno = this.tidyData[0].flightno 589 this.tidyQuery.flightno = this.tidyData[0].flightno
584 this.tidyQuery.flightdate = this.tidyData[0].flightdate 590 this.tidyQuery.flightdate = this.tidyData[0].flightdate
@@ -620,6 +626,7 @@ @@ -620,6 +626,7 @@
620 carrier: row.carrier, 626 carrier: row.carrier,
621 flightNo: row.flightno, 627 flightNo: row.flightno,
622 flightDate: row.flightdate, 628 flightDate: row.flightdate,
  629 + opertype: row.opertype,
623 awba: row.awba, 630 awba: row.awba,
624 awbh: row.awbh, 631 awbh: row.awbh,
625 rcfdep: 'MT5202' 632 rcfdep: 'MT5202'
@@ -665,6 +672,8 @@ @@ -665,6 +672,8 @@
665 }, 672 },
666 //新增分单理货 673 //新增分单理货
667 handleAddAwbh(row) { 674 handleAddAwbh(row) {
  675 +
  676 + this.fenStatus='addAwbh'
668 // 清空from列表 677 // 清空from列表
669 this.restModel(); 678 this.restModel();
670 679
@@ -820,6 +829,7 @@ @@ -820,6 +829,7 @@
820 }, 829 },
821 // 新增出港理货弹框 830 // 新增出港理货弹框
822 handelAddTidyInfo() { 831 handelAddTidyInfo() {
  832 + this.fenStatus=undefined;
823 this.restModel() 833 this.restModel()
824 // 给model赋值，所使用数据是以单独单号查询数据所得 834 // 给model赋值，所使用数据是以单独单号查询数据所得
825 this.tidyModel.carrier = this.tidyQuery.carrier 835 this.tidyModel.carrier = this.tidyQuery.carrier
@@ -852,6 +862,11 @@ @@ -852,6 +862,11 @@
852 }, 862 },
853 // 更新出港理货弹框 863 // 更新出港理货弹框
854 handleEdit(row) { 864 handleEdit(row) {
  865 + if(row.awbh !==''){
  866 + this.fenStatus='addAwbh'
  867 + }else {
  868 + this.fenStatus=undefined
  869 + }
855 this.tidyModel = Object.assign({}, row) 870 this.tidyModel = Object.assign({}, row)
856 this.dialogStatus = 'update' 871 this.dialogStatus = 'update'
857 this.dialogFormVisible = true 872 this.dialogFormVisible = true