朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 2668fbfcc4020c6386a83fbddb4d26d5c3c02d47 2 个父辈 548d6ce1 20edfda3

合并分支 'nmms' 到 'master' 

页面部分修改 (更新)



查看合并请求 !9
内嵌 并排对比
正在显示 4 个修改的文件 包含 155 行增加 和 115 行删除
@@ -51,15 +51,15 @@ @@ -51,15 +51,15 @@
51 </el-col> 51 </el-col>
52 </el-row> 52 </el-row>
53 </div> 53 </div>
54 - <el-table v-loading="listLoading" :data="arriveData" stripe fit highlight-current-row 54 + <tree-table v-loading="listLoading" :data="arriveData" stripe fit highlight-current-row
55 style="font-size: 12px" border @selection-change="handleSelectionChange"> 55 style="font-size: 12px" border @selection-change="handleSelectionChange">
56 <el-table-column type="selection" width="55" align="center"></el-table-column> 56 <el-table-column type="selection" width="55" align="center"></el-table-column>
57 - <el-table-column label="航班号" width="70" align="center"> 57 + <el-table-column label="航班号" width="60" align="center">
58 <template slot-scope="scope"> 58 <template slot-scope="scope">
59 <span>{{scope.row.carrier}}{{scope.row.flightno}}</span> 59 <span>{{scope.row.carrier}}{{scope.row.flightno}}</span>
60 </template> 60 </template>
61 </el-table-column> 61 </el-table-column>
62 - <el-table-column label="运单号" width="120" align="center"> 62 + <el-table-column label="运单号" width="110" align="center">
63 <template slot-scope="scope"> 63 <template slot-scope="scope">
64 <span>{{scope.row.awba}}</span> 64 <span>{{scope.row.awba}}</span>
65 </template> 65 </template>
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 <span>{{scope.row.weight}}</span> 79 <span>{{scope.row.weight}}</span>
80 </template> 80 </template>
81 </el-table-column> 81 </el-table-column>
82 - <el-table-column label="货物描述" width="100" align="center"> 82 + <el-table-column label="货物描述" width="120" align="center">
83 <template slot-scope="scope"> 83 <template slot-scope="scope">
84 <span>{{scope.row.goodsname}}</span> 84 <span>{{scope.row.goodsname}}</span>
85 </template> 85 </template>
@@ -113,24 +113,30 @@ @@ -113,24 +113,30 @@
113 <span v-if="scope.row.status ==='25'">已发送修改报</span> 113 <span v-if="scope.row.status ==='25'">已发送修改报</span>
114 </template> 114 </template>
115 </el-table-column> 115 </el-table-column>
116 - <el-table-column prop="receipt" label="回执信息" width="180" align="center"> 116 + <el-table-column prop="receipt" label="回执信息" align="center">
117 <template slot-scope="scope"> 117 <template slot-scope="scope">
118 <span>{{scope.row.ext5}}</span> 118 <span>{{scope.row.ext5}}</span>
119 </template> 119 </template>
120 </el-table-column> 120 </el-table-column>
121 - <el-table-column prop="operation" label="操作" align="center"> 121 + <el-table-column prop="operation" label="操作" align="center" width="400">
122 <template slot-scope="scope"> 122 <template slot-scope="scope">
123 <el-button size="mini" @click="handleSendDesc(scope.row)">收发明细</el-button> 123 <el-button size="mini" @click="handleSendDesc(scope.row)">收发明细</el-button>
124 - <el-button size="mini" type="success" @click="handleEdit(scope.row)" :disabled="scope.row.status !=='22'">编辑</el-button> 124 + <el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button>
125 <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)" 125 <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)"
126 - :disabled="scope.row.status !=='22'">发送舱单报</el-button>  
127 - <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> 126 + :disabled="scope.row.status ==='23'">发送舱单报
  127 + </el-button>
  128 + <p></p>
  129 + <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
  130 + </el-button>
128 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)" 131 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
129 - :disabled="scope.row.status ==='22'">更改状态</el-button>  
130 - <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)">发删除报</el-button> 132 + :disabled="scope.row.status ==='22'">更改状态
  133 + </el-button>
  134 + <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
  135 + :disabled="scope.row.status ==='24'">发删除报
  136 + </el-button>
131 </template> 137 </template>
132 </el-table-column> 138 </el-table-column>
133 - </el-table> 139 + </tree-table>
134 <div class="btnFoot"> 140 <div class="btnFoot">
135 <el-row> 141 <el-row>
136 <el-button type="primary" size="mini" v-if="arriveQuery.flightno !==undefined || arriveData.length>0" 142 <el-button type="primary" size="mini" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"
@@ -247,7 +253,8 @@ @@ -247,7 +253,8 @@
247 <el-select v-model="arriveModel.customcode" placeholder="请选择关区代码" :loading="customLoading" 253 <el-select v-model="arriveModel.customcode" placeholder="请选择关区代码" :loading="customLoading"
248 filterable clearable remote :remote-method="remoteMethodCustomCode" 254 filterable clearable remote :remote-method="remoteMethodCustomCode"
249 :disabled="dialogStatus === 'addAwbh'"> 255 :disabled="dialogStatus === 'addAwbh'">
250 - <el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode" 256 + <el-option v-for="item in customCodeList" :key="item.customcode"
  257 + :label="item.customcode"
251 :value="item.customcode"> 258 :value="item.customcode">
252 <span style="float: left">{{ item.customcode }}</span> 259 <span style="float: left">{{ item.customcode }}</span>
253 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span> 260 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span>
@@ -264,7 +271,7 @@ @@ -264,7 +271,7 @@
264 </el-dialog> 271 </el-dialog>
265 <el-dialog title="收发明细" :visible.sync="dialogTableVisible"> 272 <el-dialog title="收发明细" :visible.sync="dialogTableVisible">
266 <el-table :data="detailData" border> 273 <el-table :data="detailData" border>
267 - <el-table-column label="操作时间" width="150"> 274 + <el-table-column label="操作时间" width="180">
268 <template slot-scope="scope"> 275 <template slot-scope="scope">
269 {{scope.row.busdate}} 276 {{scope.row.busdate}}
270 </template> 277 </template>
@@ -328,7 +335,7 @@ @@ -328,7 +335,7 @@
328 import treeTable from '@/components/TreeTable' 335 import treeTable from '@/components/TreeTable'
329 import treeToArray from '@/utils/customEval' 336 import treeToArray from '@/utils/customEval'
330 import Pagination from '@/components/Pagination' 337 import Pagination from '@/components/Pagination'
331 - import {getCustomCode,getAirportCode} from "@/api/country"; 338 + import {getCustomCode, getAirportCode} from "@/api/country";
332 import { 339 import {
333 getMt3201ListForParam, 340 getMt3201ListForParam,
334 deleteByIsDelete, 341 deleteByIsDelete,
@@ -406,7 +413,7 @@ @@ -406,7 +413,7 @@
406 dialogTableVisible: false, 413 dialogTableVisible: false,
407 multipleSelection: [], 414 multipleSelection: [],
408 customCodeList: [], 415 customCodeList: [],
409 - airportCode:[], 416 + airportCode: [],
410 dialogStatus: undefined, 417 dialogStatus: undefined,
411 awbhStatus: false, 418 awbhStatus: false,
412 dialogFormVisible: false, 419 dialogFormVisible: false,
@@ -659,9 +666,11 @@ @@ -659,9 +666,11 @@
659 confirmButtonText: '发送', 666 confirmButtonText: '发送',
660 cancelButtonText: '取消' 667 cancelButtonText: '取消'
661 }).then(() => { 668 }).then(() => {
662 - if(row.awbh ===null){ 669 + if (row.awbh === null) {
663 row.awbh = '' 670 row.awbh = ''
664 } 671 }
  672 + delete row.parent
  673 + delete row.children
665 sendCreateMt3201(row).then(res => { 674 sendCreateMt3201(row).then(res => {
666 if (res.data.count > 0) { 675 if (res.data.count > 0) {
667 Message.success(res.data.respMessage) 676 Message.success(res.data.respMessage)
@@ -678,7 +687,7 @@ @@ -678,7 +687,7 @@
678 // 发送删除报 687 // 发送删除报
679 handleSendDelete(row) { 688 handleSendDelete(row) {
680 this.respModel = { 689 this.respModel = {
681 - uuid: undefined, 690 + carrier: undefined,
682 reason: undefined, 691 reason: undefined,
683 contactName: undefined, 692 contactName: undefined,
684 contactTel: undefined, 693 contactTel: undefined,
@@ -690,12 +699,12 @@ @@ -690,12 +699,12 @@
690 awbh: undefined 699 awbh: undefined
691 } 700 }
692 this.dialogDeleteVisible = true 701 this.dialogDeleteVisible = true
693 - this.respModel.flightNo = row.carrier + row.flightno 702 + this.respModel.flightNo = row.flightno
694 this.respModel.awba = row.awba 703 this.respModel.awba = row.awba
695 - this.respModel.uuid = row.uuid  
696 - if(row.awbh ===null){ 704 + this.respModel.carrier = row.carrier
  705 + if (row.awbh === null) {
697 this.respModel.awbh = '' 706 this.respModel.awbh = ''
698 - }else { 707 + } else {
699 this.respModel.awbh = row.awbh 708 this.respModel.awbh = row.awbh
700 } 709 }
701 this.respModel.customCode = row.customcode 710 this.respModel.customCode = row.customcode
@@ -767,25 +776,29 @@ @@ -767,25 +776,29 @@
767 }, 776 },
768 //更改状态 777 //更改状态
769 handleAwbStatus(row) { 778 handleAwbStatus(row) {
  779 +
770 this.$confirm("是否发送更改状态", "确认消息", { 780 this.$confirm("是否发送更改状态", "确认消息", {
771 distinguishCancelAndClose: true, 781 distinguishCancelAndClose: true,
772 confirmButtonText: '确认更改', 782 confirmButtonText: '确认更改',
773 cancelButtonText: '取消更改' 783 cancelButtonText: '取消更改'
774 }).then(() => { 784 }).then(() => {
775 - updateStatus(row).then(res => {  
776 - if (res.data.count > 0) {  
777 - this.$message({  
778 - type: 'success',  
779 - message: '当前运单状态已更改'  
780 - })  
781 - this.getList()  
782 - } else {  
783 - this.$message({  
784 - type: 'error',  
785 - message: '状态更改失败，请稍后重试'  
786 - })  
787 - }  
788 - }) 785 + if (row.status!==22){
  786 + row.status =22;
  787 + }
  788 + // updateStatus(row).then(res => {
  789 + // if (res.data.count > 0) {
  790 + // this.$message({
  791 + // type: 'success',
  792 + // message: '当前运单状态已更改'
  793 + // })
  794 + // this.getList()
  795 + // } else {
  796 + // this.$message({
  797 + // type: 'error',
  798 + // message: '状态更改失败，请稍后重试'
  799 + // })
  800 + // }
  801 + // })
789 802
790 }).catch(action => { 803 }).catch(action => {
791 this.$message({ 804 this.$message({
@@ -797,12 +810,12 @@ @@ -797,12 +810,12 @@
797 }) 810 })
798 }, 811 },
799 //获取机场三字码 812 //获取机场三字码
800 - remoteMethodAirport(query){ 813 + remoteMethodAirport(query) {
801 this.airportCode = [] 814 this.airportCode = []
802 if (query !== '') { 815 if (query !== '') {
803 this.listLoading = true 816 this.listLoading = true
804 getAirportCode({airportid: query}).then(res => { 817 getAirportCode({airportid: query}).then(res => {
805 - if(res !== null){ 818 + if (res !== null) {
806 setTimeout(() => { 819 setTimeout(() => {
807 this.listLoading = false 820 this.listLoading = false
808 this.airportCode = res.data.data 821 this.airportCode = res.data.data
@@ -814,12 +827,12 @@ @@ -814,12 +827,12 @@
814 } 827 }
815 }, 828 },
816 //关区代码 829 //关区代码
817 - remoteMethodCustomCode(query){ 830 + remoteMethodCustomCode(query) {
818 this.customCodeList = [] 831 this.customCodeList = []
819 if (query !== '') { 832 if (query !== '') {
820 this.customLoading = true 833 this.customLoading = true
821 getCustomCode({customcode: query}).then(res => { 834 getCustomCode({customcode: query}).then(res => {
822 - if(res !== null){ 835 + if (res !== null) {
823 setTimeout(() => { 836 setTimeout(() => {
824 this.customLoading = false 837 this.customLoading = false
825 this.customCodeList = res.data.data 838 this.customCodeList = res.data.data
@@ -109,17 +109,18 @@ @@ -109,17 +109,18 @@
109 <el-table-column label="操作" align="center"> 109 <el-table-column label="操作" align="center">
110 <template slot-scope="scope"> 110 <template slot-scope="scope">
111 <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button> 111 <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
112 - <el-button size="mini" type="success" @click="handleEdit(scope.row)" :disabled="scope.row.status !=='22'">编辑 112 + <el-button size="mini" type="success" @click="handleEdit(scope.row)" >编辑
113 </el-button> 113 </el-button>
114 <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)" 114 <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)"
115 - :disabled="scope.row.status !=='22'">发送舱单报 115 + :disabled="scope.row.status ==='23'">发送舱单报
116 </el-button> 116 </el-button>
117 <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单 117 <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
118 </el-button> 118 </el-button>
119 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)" 119 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
120 :disabled="scope.row.status ==='22'">更改状态 120 :disabled="scope.row.status ==='22'">更改状态
121 </el-button> 121 </el-button>
122 - <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)">发删除报</el-button> 122 + <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
  123 + :disabled="scope.row.status ==='24'">发删除报</el-button>
123 </template> 124 </template>
124 </el-table-column> 125 </el-table-column>
125 </el-table> 126 </el-table>
@@ -147,7 +148,7 @@ @@ -147,7 +148,7 @@
147 <el-row> 148 <el-row>
148 <el-col :span="7.5"> 149 <el-col :span="7.5">
149 <el-form-item label="主单号" prop="awba"> 150 <el-form-item label="主单号" prop="awba">
150 - <el-input v-model="loadingModel.awba"></el-input> 151 + <el-input v-model="loadingModel.awba" :disabled="dialogStatus ==='update'"></el-input>
151 </el-form-item> 152 </el-form-item>
152 </el-col> 153 </el-col>
153 <el-col :span="7.5"> 154 <el-col :span="7.5">
@@ -167,7 +168,7 @@ @@ -167,7 +168,7 @@
167 <el-col :span="7.5"> 168 <el-col :span="7.5">
168 <el-form-item label="起始站" prop="originstation"> 169 <el-form-item label="起始站" prop="originstation">
169 <el-select filterable clearable placeholder="请选择起始站" :remote-method="remoteMethodAirport" 170 <el-select filterable clearable placeholder="请选择起始站" :remote-method="remoteMethodAirport"
170 - allow-create v-model="originstation" remote> 171 + allow-create v-model="originstation" remote :disabled="dialogStatus ==='update'">
171 <el-option v-for="item in airportCode" 172 <el-option v-for="item in airportCode"
172 :key="item.airportid" :label="item.airportid" 173 :key="item.airportid" :label="item.airportid"
173 :value="item.airportid" :disabled="dialogStatus === 'update'"> 174 :value="item.airportid" :disabled="dialogStatus === 'update'">
@@ -180,7 +181,7 @@ @@ -180,7 +181,7 @@
180 <el-col :span="7.5"> 181 <el-col :span="7.5">
181 <el-form-item label="目的站" prop="originstation"> 182 <el-form-item label="目的站" prop="originstation">
182 <el-select filterable clearable placeholder="请选择起始站" :remote-method="remoteMethodAirport" 183 <el-select filterable clearable placeholder="请选择起始站" :remote-method="remoteMethodAirport"
183 - allow-create v-model="destinationstation" remote> 184 + allow-create v-model="destinationstation" remote :disabled="dialogStatus ==='update'">
184 <el-option v-for="item in airportCode" 185 <el-option v-for="item in airportCode"
185 :key="item.airportid" :label="item.airportid" 186 :key="item.airportid" :label="item.airportid"
186 :value="item.airportid" :disabled="dialogStatus === 'update'"> 187 :value="item.airportid" :disabled="dialogStatus === 'update'">
@@ -264,7 +265,7 @@ @@ -264,7 +265,7 @@
264 </el-dialog> 265 </el-dialog>
265 <el-dialog title="收发明细" :visible.sync="dialogTableVisible"> 266 <el-dialog title="收发明细" :visible.sync="dialogTableVisible">
266 <el-table :data="detailData" border> 267 <el-table :data="detailData" border>
267 - <el-table-column label="操作时间" width="150"> 268 + <el-table-column label="操作时间" width="180">
268 <template slot-scope="scope"> 269 <template slot-scope="scope">
269 {{scope.row.busdate}} 270 {{scope.row.busdate}}
270 </template> 271 </template>
@@ -628,7 +629,7 @@ @@ -628,7 +629,7 @@
628 // 发送删除报 629 // 发送删除报
629 handleSendDelete(row) { 630 handleSendDelete(row) {
630 this.respModel = { 631 this.respModel = {
631 - uuid: undefined, 632 + carrier: undefined,
632 reason: undefined, 633 reason: undefined,
633 contactName: undefined, 634 contactName: undefined,
634 contactTel: undefined, 635 contactTel: undefined,
@@ -640,8 +641,8 @@ @@ -640,8 +641,8 @@
640 awbh: '' 641 awbh: ''
641 } 642 }
642 this.dialogDeleteVisible = true 643 this.dialogDeleteVisible = true
643 - this.respModel.uuid = row.uuid  
644 - this.respModel.flightNo = row.carrier + row.flightno 644 + this.respModel.carrier = row.carrier
  645 + this.respModel.flightNo = row.flightno
645 this.respModel.awba = row.awba 646 this.respModel.awba = row.awba
646 this.respModel.customCode = row.customcode 647 this.respModel.customCode = row.customcode
647 this.respModel.flightDate = row.flightdate 648 this.respModel.flightDate = row.flightdate
@@ -707,20 +708,23 @@ @@ -707,20 +708,23 @@
707 confirmButtonText: '确认更改', 708 confirmButtonText: '确认更改',
708 cancelButtonText: '取消更改' 709 cancelButtonText: '取消更改'
709 }).then(() => { 710 }).then(() => {
710 - updateStatus(row).then(res => {  
711 - if (res.data.count > 0) {  
712 - this.$message({  
713 - type: 'success',  
714 - message: '当前运单状态已更改'  
715 - })  
716 - this.getList()  
717 - } else {  
718 - this.$message({  
719 - type: 'error',  
720 - message: '状态更改失败，请稍后重试'  
721 - })  
722 - }  
723 - }) 711 + if (row.status!==22){
  712 + row.status =22;
  713 + }
  714 + // updateStatus(row).then(res => {
  715 + // if (res.data.count > 0) {
  716 + // this.$message({
  717 + // type: 'success',
  718 + // message: '当前运单状态已更改'
  719 + // })
  720 + // this.getList()
  721 + // } else {
  722 + // this.$message({
  723 + // type: 'error',
  724 + // message: '状态更改失败，请稍后重试'
  725 + // })
  726 + // }
  727 + // })
724 728
725 }).catch(action => { 729 }).catch(action => {
726 this.$message({ 730 this.$message({
@@ -124,20 +124,22 @@ @@ -124,20 +124,22 @@
124 </el-table-column> 124 </el-table-column>
125 <el-table-column label="操作" width="450"> 125 <el-table-column label="操作" width="450">
126 <template slot-scope="scope"> 126 <template slot-scope="scope">
127 - <el-button size="mini" type="success" @click="handleEdit(scope.row)" :disabled="scope.row.status !=='22'">编辑</el-button> 127 + <el-button size="mini" type="success" @click="handleEdit(scope.row)" >编辑</el-button>
128 <el-button size="mini" type="success" v-if="scope.row.awbh ===null" 128 <el-button size="mini" type="success" v-if="scope.row.awbh ===null"
129 @click="handleAddAwbh(scope.row)">新增分单 129 @click="handleAddAwbh(scope.row)">新增分单
130 </el-button> 130 </el-button>
131 <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)" 131 <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)"
132 - :disabled="scope.row.status !== '22'">发舱单报 132 + :disabled="scope.row.status === '23'">发舱单报
133 </el-button> 133 </el-button>
134 <p></p> 134 <p></p>
135 - <el-button size="mini" type="primary" @click="handleAwbEdit(scope.row)">发修改报</el-button> 135 + <el-button size="mini" type="primary" @click="handleAwbEdit(scope.row)"
  136 + :disabled="scope.row.status ==='25'">发修改报</el-button>
136 <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> 137 <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
137 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)" 138 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
138 :disabled="scope.row.status === '22'">更改状态 139 :disabled="scope.row.status === '22'">更改状态
139 </el-button> 140 </el-button>
140 - <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)">发删除报</el-button> 141 + <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
  142 + :disabled="scope.row.status ==='24'">发删除报</el-button>
141 </template> 143 </template>
142 </el-table-column> 144 </el-table-column>
143 </tree-table> 145 </tree-table>
@@ -552,7 +554,7 @@ @@ -552,7 +554,7 @@
552 <!--</el-form-item>--> 554 <!--</el-form-item>-->
553 <!--</el-col>--> 555 <!--</el-col>-->
554 </el-row> 556 </el-row>
555 - <div v-show="dialogStatus === 'sendUpdate'"> 557 + <div v-if="dialogStatus === 'sendUpdate'">
556 <div class="grid-content content"> 558 <div class="grid-content content">
557 运单信息 559 运单信息
558 </div> 560 </div>
@@ -585,7 +587,7 @@ @@ -585,7 +587,7 @@
585 </el-dialog> 587 </el-dialog>
586 <el-dialog title="收发明细" :visible.sync="dialogTableVisible"> 588 <el-dialog title="收发明细" :visible.sync="dialogTableVisible">
587 <el-table :data="detailData" border> 589 <el-table :data="detailData" border>
588 - <el-table-column label="操作时间" width="150"> 590 + <el-table-column label="操作时间" width="180">
589 <template slot-scope="scope"> 591 <template slot-scope="scope">
590 {{scope.row.busdate}} 592 {{scope.row.busdate}}
591 </template> 593 </template>
@@ -1252,8 +1254,10 @@ @@ -1252,8 +1254,10 @@
1252 confirmButtonText: '发送', 1254 confirmButtonText: '发送',
1253 cancelButtonText: '取消' 1255 cancelButtonText: '取消'
1254 }).then(() => { 1256 }).then(() => {
  1257 + if (row.awbh === null) {
  1258 + row.awbh = ''
  1259 + }
1255 sendCreateMt2201(row).then(res => { 1260 sendCreateMt2201(row).then(res => {
1256 - console.log(res)  
1257 if (res.data.count > 0) { 1261 if (res.data.count > 0) {
1258 Message.success(res.data.respMessage) 1262 Message.success(res.data.respMessage)
1259 this.getList() 1263 this.getList()
@@ -1304,14 +1308,28 @@ @@ -1304,14 +1308,28 @@
1304 this.respModel.reason = this.preModel.reason 1308 this.respModel.reason = this.preModel.reason
1305 this.respModel.contactName = this.preModel.contactName 1309 this.respModel.contactName = this.preModel.contactName
1306 this.respModel.contactTel = this.preModel.contactTel 1310 this.respModel.contactTel = this.preModel.contactTel
  1311 + //
  1312 + delete this.preModel._expanded
  1313 + delete this.preModel._level
  1314 + delete this.preModel._marginLeft
  1315 + delete this.preModel._show
  1316 + delete this.preModel._width
  1317 +
  1318 + const reason = this.preModel.reason
  1319 + const contactName = this.preModel.contactName
  1320 + const contactTel = this.preModel.contactTel
  1321 +
  1322 + this.$refs.preFormData.validate(valid =>{
  1323 + if(valid){
  1324 + delete this.preModel.reason
  1325 + delete this.preModel.contactName
  1326 + delete this.preModel.contactTel
1307 const map = { 1327 const map = {
1308 'mt2201': this.preModel, 1328 'mt2201': this.preModel,
1309 - 'reason' : this.preModel.reason,  
1310 - 'contactName':this.preModel.contactName,  
1311 - 'contactTel': this.preModel.contactTel, 1329 + 'reason' : reason,
  1330 + 'contactName': contactName,
  1331 + 'contactTel': contactTel,
1312 } 1332 }
1313 - this.$refs.preFormData.validate(valid =>{  
1314 - if(valid){  
1315 sendUpdateMt2201(map).then(res =>{ 1333 sendUpdateMt2201(map).then(res =>{
1316 if(res.data.count >0){ 1334 if(res.data.count >0){
1317 Message.success(res.data.respMessage) 1335 Message.success(res.data.respMessage)
@@ -1328,7 +1346,7 @@ @@ -1328,7 +1346,7 @@
1328 // >>>>>>>>>>>>>>>>发送删除报<<<<<<<<<<<<<<<<<< 1346 // >>>>>>>>>>>>>>>>发送删除报<<<<<<<<<<<<<<<<<<
1329 handleSendDelete(row) { 1347 handleSendDelete(row) {
1330 this.respModel = { 1348 this.respModel = {
1331 - uuid: undefined, 1349 + carrier: undefined,
1332 reason: undefined, 1350 reason: undefined,
1333 contactName: undefined, 1351 contactName: undefined,
1334 contactTel: undefined, 1352 contactTel: undefined,
@@ -1341,11 +1359,11 @@ @@ -1341,11 +1359,11 @@
1341 } 1359 }
1342 this.dialogDeleteVisble = true 1360 this.dialogDeleteVisble = true
1343 this.respModel.awba = row.awba 1361 this.respModel.awba = row.awba
1344 - this.respModel.flightNo = row.carrier + row.flightno 1362 + this.respModel.flightNo = row.flightno
1345 this.respModel.customCode = row.customcode 1363 this.respModel.customCode = row.customcode
1346 this.respModel.awbh = row.awbh 1364 this.respModel.awbh = row.awbh
1347 this.respModel.flightDate = row.flightdate 1365 this.respModel.flightDate = row.flightdate
1348 - this.respModel.uuid = row.uuid 1366 + this.respModel.carrier = row.carrier
1349 this.$nextTick(()=>{ 1367 this.$nextTick(()=>{
1350 this.$refs.sendDeleteForm.clearValidate() 1368 this.$refs.sendDeleteForm.clearValidate()
1351 }) 1369 })
@@ -1399,27 +1417,28 @@ @@ -1399,27 +1417,28 @@
1399 }, 1417 },
1400 // >>>>>>>>>>>>>>>>更改运单状态<<<<<<<<<<<<<<<<<< 1418 // >>>>>>>>>>>>>>>>更改运单状态<<<<<<<<<<<<<<<<<<
1401 handleAwbStatus(row) { 1419 handleAwbStatus(row) {
1402 - delete row.parent  
1403 - delete row.children  
1404 this.$confirm("是否发送更改状态", "确认消息", { 1420 this.$confirm("是否发送更改状态", "确认消息", {
1405 distinguishCancelAndClose: true, 1421 distinguishCancelAndClose: true,
1406 confirmButtonText: '确认更改', 1422 confirmButtonText: '确认更改',
1407 cancelButtonText: '取消更改' 1423 cancelButtonText: '取消更改'
1408 }).then(() => { 1424 }).then(() => {
1409 - updateStatus(row).then(res => {  
1410 - if (res.data.count > 0) {  
1411 - this.$message({  
1412 - type: 'success',  
1413 - message: '当前运单状态已更改'  
1414 - })  
1415 - this.getList()  
1416 - } else {  
1417 - this.$message({  
1418 - type: 'error',  
1419 - message: '状态更改失败，请稍后重试'  
1420 - })  
1421 - }  
1422 - }) 1425 + if (row.status!==22){
  1426 + row.status =22;
  1427 + }
  1428 + // updateStatus(row).then(res => {
  1429 + // if (res.data.count > 0) {
  1430 + // this.$message({
  1431 + // type: 'success',
  1432 + // message: '当前运单状态已更改'
  1433 + // })
  1434 + // this.getList()
  1435 + // } else {
  1436 + // this.$message({
  1437 + // type: 'error',
  1438 + // message: '状态更改失败，请稍后重试'
  1439 + // })
  1440 + // }
  1441 + // })
1423 1442
1424 }).catch(action => { 1443 }).catch(action => {
1425 this.$message({ 1444 this.$message({
@@ -109,16 +109,17 @@ @@ -109,16 +109,17 @@
109 <el-table-column prop="operation" label="操作" align="center"> 109 <el-table-column prop="operation" label="操作" align="center">
110 <template slot-scope="scope"> 110 <template slot-scope="scope">
111 <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button> 111 <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
112 - <el-button size="mini" type="success" @click="handleEdit(scope.row)" :disabled="scope.row.status !=='22'">编辑</el-button> 112 + <el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button>
113 <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)" 113 <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)"
114 - :disabled="scope.row.status !=='22'">发舱单报</el-button> 114 + :disabled="scope.row.status ==='23'">发舱单报</el-button>
115 <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> 115 <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
116 <p></p> 116 <p></p>
117 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)" 117 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
118 :disabled="scope.row.status ==='22'">更改状态</el-button> 118 :disabled="scope.row.status ==='22'">更改状态</el-button>
119 <el-button size="mini" type="primary" v-if="scope.row.awbh ===null" 119 <el-button size="mini" type="primary" v-if="scope.row.awbh ===null"
120 @click="handleAddAwbh(scope.row)">新增分单</el-button> 120 @click="handleAddAwbh(scope.row)">新增分单</el-button>
121 - <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)">发删除报</el-button> 121 + <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
  122 + :disabled="scope.row.status ==='24'">发删除报</el-button>
122 </template> 123 </template>
123 </el-table-column> 124 </el-table-column>
124 </tree-table> 125 </tree-table>
@@ -275,7 +276,7 @@ @@ -275,7 +276,7 @@
275 </el-dialog> 276 </el-dialog>
276 <el-dialog title="收发明细" :visible.sync="dialogTableVisible"> 277 <el-dialog title="收发明细" :visible.sync="dialogTableVisible">
277 <el-table :data="detailData" border> 278 <el-table :data="detailData" border>
278 - <el-table-column label="操作时间" width="150"> 279 + <el-table-column label="操作时间" width="180">
279 <template slot-scope="scope"> 280 <template slot-scope="scope">
280 {{scope.row.busdate}} 281 {{scope.row.busdate}}
281 </template> 282 </template>
@@ -556,7 +557,7 @@ @@ -556,7 +557,7 @@
556 getList() { 557 getList() {
557 this.listLoading = true 558 this.listLoading = true
558 //根据是否有主单号 来给查询条件赋值 559 //根据是否有主单号 来给查询条件赋值
559 - if (this.tidyQuery.awba != undefined && this.tidyQuery.awba != '') { 560 + if (this.tidyQuery.awba !== undefined && this.tidyQuery.awba !== '') {
560 getMt520XListForParam(this.tidyQuery).then(res => { 561 getMt520XListForParam(this.tidyQuery).then(res => {
561 this.tidyData = res.data.dataList 562 this.tidyData = res.data.dataList
562 this.total = res.data.count 563 this.total = res.data.count
@@ -621,6 +622,7 @@ @@ -621,6 +622,7 @@
621 confirmButtonText: '发送', 622 confirmButtonText: '发送',
622 cancelButtonText: '取消' 623 cancelButtonText: '取消'
623 }).then(() => { 624 }).then(() => {
  625 + delete row.messageType
624 console.log(row) 626 console.log(row)
625 sendCreateMt5202(row).then(res => { 627 sendCreateMt5202(row).then(res => {
626 if (res.data.count > 0) { 628 if (res.data.count > 0) {
@@ -652,7 +654,7 @@ @@ -652,7 +654,7 @@
652 // 发删除报 654 // 发删除报
653 handleSendDelete(row){ 655 handleSendDelete(row){
654 this.respModel = { 656 this.respModel = {
655 - uuid: undefined, 657 + carrier: undefined,
656 reason: undefined, 658 reason: undefined,
657 contactName: undefined, 659 contactName: undefined,
658 contactTel: undefined, 660 contactTel: undefined,
@@ -665,8 +667,8 @@ @@ -665,8 +667,8 @@
665 rcfdep: 'MT5202', 667 rcfdep: 'MT5202',
666 } 668 }
667 this.dialogDeleteVisible = true 669 this.dialogDeleteVisible = true
668 - this.respModel.uuid = row.uuid  
669 - this.respModel.flightNo = row.carrier + row.flightno 670 + this.respModel.carrier = row.carrier
  671 + this.respModel.flightNo = row.flightno
670 this.respModel.awba = row.awba 672 this.respModel.awba = row.awba
671 this.respModel.customCode = row.customcode 673 this.respModel.customCode = row.customcode
672 this.respModel.flightDate = row.flightdate 674 this.respModel.flightDate = row.flightdate
@@ -724,21 +726,23 @@ @@ -724,21 +726,23 @@
724 }, 726 },
725 // 更新运单为可发送状态 727 // 更新运单为可发送状态
726 handleAwbStatus(row) { 728 handleAwbStatus(row) {
727 - delete row.parent  
728 - delete row.children 729 +
729 this.$confirm("是否发送更改状态", "确认消息", { 730 this.$confirm("是否发送更改状态", "确认消息", {
730 distinguishCancelAndClose: true, 731 distinguishCancelAndClose: true,
731 confirmButtonText: '确认更改', 732 confirmButtonText: '确认更改',
732 cancelButtonText: '取消更改' 733 cancelButtonText: '取消更改'
733 }).then(() => { 734 }).then(() => {
734 - updateStatus(row).then(res => {  
735 - if (res.data.count > 0) {  
736 - Message.success(res.data.respMessage)  
737 - this.getList()  
738 - } else {  
739 - Message.error(res.data.respMessage)  
740 - }  
741 - }) 735 + if (row.status!==22){
  736 + row.status =22;
  737 + }
  738 + // updateStatus(row).then(res => {
  739 + // if (res.data.count > 0) {
  740 + // Message.success(res.data.respMessage)
  741 + // this.getList()
  742 + // } else {
  743 + // Message.error(res.data.respMessage)
  744 + // }
  745 + // })
742 }).catch(action => { 746 }).catch(action => {
743 this.$message({ 747 this.$message({
744 type: 'info', 748 type: 'info',
@@ -867,10 +871,10 @@ @@ -867,10 +871,10 @@
867 }, 871 },
868 // 新增理货弹框 872 // 新增理货弹框
869 handleAddTidy() { 873 handleAddTidy() {
870 - const row = { 874 + const query = {
871 'messageType': 'MT5202' 875 'messageType': 'MT5202'
872 } 876 }
873 - this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 877 + this.$router.push({name: '出港航班信息', params: {scopeRow: query}})
874 }, 878 },
875 // 返回 879 // 返回
876 handelBackStep() { 880 handelBackStep() {