朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 e5a1d77e8571e588da42109ca53b77934fa187d6 1 个父辈 c104a0c4

完善前端细节问题

内嵌 并排对比
正在显示 3 个修改的文件 包含 22 行增加 和 20 行删除
@@ -53,7 +53,6 @@ @@ -53,7 +53,6 @@
53 </div> 53 </div>
54 <tree-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>  
57 <el-table-column label="航班号" width="60" align="center"> 56 <el-table-column label="航班号" width="60" align="center">
58 <template slot-scope="scope"> 57 <template slot-scope="scope">
59 <span>{{scope.row.carrier}}{{scope.row.flightno}}</span> 58 <span>{{scope.row.carrier}}{{scope.row.flightno}}</span>
@@ -131,17 +131,17 @@ @@ -131,17 +131,17 @@
131 @click="handleAddAwbh(scope.row)">新增分单 131 @click="handleAddAwbh(scope.row)">新增分单
132 </el-button> 132 </el-button>
133 <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)" 133 <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)"
134 - :disabled="addStatus(scope.row.status)">发舱单报 134 + :disabled="addStatus(scope.row.status)">发送预配舱单报
135 </el-button> 135 </el-button>
136 <p></p> 136 <p></p>
137 <el-button size="mini" type="primary" @click="handleAwbEdit(scope.row)" 137 <el-button size="mini" type="primary" @click="handleAwbEdit(scope.row)"
138 - :disabled="editStatus(scope.row.status)">发修改报</el-button>  
139 - <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> 138 + :disabled="editStatus(scope.row.status)">发送预配修改报</el-button>
  139 +<!-- <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>-->
140 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)" 140 <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
141 :disabled="scope.row.status === '22'">更改状态 141 :disabled="scope.row.status === '22'">更改状态
142 </el-button> 142 </el-button>
143 <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)" 143 <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
144 - :disabled="deleteStatus(scope.row.status)">发删除报</el-button> 144 + :disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button>
145 </template> 145 </template>
146 </el-table-column> 146 </el-table-column>
147 </tree-table> 147 </tree-table>
@@ -866,7 +866,8 @@ @@ -866,7 +866,8 @@
866 contactTel:[{required:true,message:'操作人联系方式不能为空',trigger:'blur'}] 866 contactTel:[{required:true,message:'操作人联系方式不能为空',trigger:'blur'}]
867 }, 867 },
868 preData: [], 868 preData: [],
869 - detailData: [] 869 + detailData: [],
  870 + rows:[]
870 } 871 }
871 }, 872 },
872 mounted() { 873 mounted() {
@@ -895,6 +896,8 @@ @@ -895,6 +896,8 @@
895 this.isAdmin = true 896 this.isAdmin = true
896 } 897 }
897 }, 898 },
  899 +
  900 + // 验证
898 computed: { 901 computed: {
899 awba: { 902 awba: {
900 get: function () { 903 get: function () {
@@ -1255,6 +1258,7 @@ @@ -1255,6 +1258,7 @@
1255 handleAwbSend(row) { 1258 handleAwbSend(row) {
1256 delete row.parent 1259 delete row.parent
1257 delete row.children 1260 delete row.children
  1261 + this.rows = row;
1258 this.$confirm("是否发送", "确认消息", { 1262 this.$confirm("是否发送", "确认消息", {
1259 distinguishCancelAndClose: true, 1263 distinguishCancelAndClose: true,
1260 confirmButtonText: '发送', 1264 confirmButtonText: '发送',
@@ -1266,7 +1270,8 @@ @@ -1266,7 +1270,8 @@
1266 sendCreateMt2201(row).then(res => { 1270 sendCreateMt2201(row).then(res => {
1267 if (res.data.count > 0) { 1271 if (res.data.count > 0) {
1268 Message.success(res.data.respMessage) 1272 Message.success(res.data.respMessage)
1269 - this.getList() 1273 + this.rows.status="23";
  1274 + this.rows.ext5="新增报发送成功";
1270 } else { 1275 } else {
1271 Message.error(res.data.respMessage) 1276 Message.error(res.data.respMessage)
1272 } 1277 }
@@ -1281,11 +1286,11 @@ @@ -1281,11 +1286,11 @@
1281 return false; 1286 return false;
1282 } 1287 }
1283 }, 1288 },
1284 -  
1285 // >>>>>>>>>>>>>>>>更新运单数据<<<<<<<<<<<<<<<<<< 1289 // >>>>>>>>>>>>>>>>更新运单数据<<<<<<<<<<<<<<<<<<
1286 handleEdit(row) { 1290 handleEdit(row) {
1287 this.preModel = Object.assign({}, row) 1291 this.preModel = Object.assign({}, row)
1288 this.dialogStatus = 'update' 1292 this.dialogStatus = 'update'
  1293 + this.fenStatus = 'addAwbh'
1289 this.dialogFormVisible = true 1294 this.dialogFormVisible = true
1290 this.$nextTick(() => { 1295 this.$nextTick(() => {
1291 this.$refs.preFormData.clearValidate() 1296 this.$refs.preFormData.clearValidate()
@@ -1312,6 +1317,7 @@ @@ -1312,6 +1317,7 @@
1312 handleAwbEdit(row) { 1317 handleAwbEdit(row) {
1313 delete row.parent 1318 delete row.parent
1314 delete row.children 1319 delete row.children
  1320 + this.rows = row;
1315 this.preModel = Object.assign({}, row) 1321 this.preModel = Object.assign({}, row)
1316 this.dialogStatus = 'sendUpdate' 1322 this.dialogStatus = 'sendUpdate'
1317 this.dialogFormVisible = true 1323 this.dialogFormVisible = true
@@ -1319,7 +1325,6 @@ @@ -1319,7 +1325,6 @@
1319 this.$refs.preFormData.clearValidate() 1325 this.$refs.preFormData.clearValidate()
1320 }) 1326 })
1321 }, 1327 },
1322 -  
1323 // 发送修改报自灰 1328 // 发送修改报自灰
1324 editStatus(status){ 1329 editStatus(status){
1325 if(status=='23' || status=='24'||status=='25'){ 1330 if(status=='23' || status=='24'||status=='25'){
@@ -1328,7 +1333,6 @@ @@ -1328,7 +1333,6 @@
1328 return false; 1333 return false;
1329 } 1334 }
1330 }, 1335 },
1331 -  
1332 sendUpdate(){ 1336 sendUpdate(){
1333 this.respModel.reason = this.preModel.reason 1337 this.respModel.reason = this.preModel.reason
1334 this.respModel.contactName = this.preModel.contactName 1338 this.respModel.contactName = this.preModel.contactName
@@ -1358,7 +1362,8 @@ @@ -1358,7 +1362,8 @@
1358 sendUpdateMt2201(map).then(res =>{ 1362 sendUpdateMt2201(map).then(res =>{
1359 if(res.data.count >0){ 1363 if(res.data.count >0){
1360 Message.success(res.data.respMessage) 1364 Message.success(res.data.respMessage)
1361 - this.getList() 1365 + this.rows.status="25";
  1366 + this.rows.ext5="修改报发送成功";
1362 this.dialogFormVisible = false 1367 this.dialogFormVisible = false
1363 }else { 1368 }else {
1364 Message.error(res.data.respMessage) 1369 Message.error(res.data.respMessage)
@@ -1382,6 +1387,7 @@ @@ -1382,6 +1387,7 @@
1382 flightDate: undefined, 1387 flightDate: undefined,
1383 awbh: '' 1388 awbh: ''
1384 } 1389 }
  1390 + this.rows = row;
1385 this.dialogDeleteVisble = true 1391 this.dialogDeleteVisble = true
1386 this.respModel.awba = row.awba 1392 this.respModel.awba = row.awba
1387 this.respModel.flightNo = row.flightno 1393 this.respModel.flightNo = row.flightno
@@ -1393,7 +1399,6 @@ @@ -1393,7 +1399,6 @@
1393 this.$refs.sendDeleteForm.clearValidate() 1399 this.$refs.sendDeleteForm.clearValidate()
1394 }) 1400 })
1395 }, 1401 },
1396 -  
1397 // 发送删除报按钮自灰 1402 // 发送删除报按钮自灰
1398 deleteStatus(status){ 1403 deleteStatus(status){
1399 if(status=='23' || status=='24'||status=='25'){ 1404 if(status=='23' || status=='24'||status=='25'){
@@ -1409,7 +1414,8 @@ @@ -1409,7 +1414,8 @@
1409 if(res.data.count>0){ 1414 if(res.data.count>0){
1410 Message.success(res.data.respMessage) 1415 Message.success(res.data.respMessage)
1411 this.dialogDeleteVisble = false 1416 this.dialogDeleteVisble = false
1412 - this.getList() 1417 + this.rows.status="24";
  1418 + this.rows.ext5="删除报发送成功";
1413 }else { 1419 }else {
1414 Message.error(res.data.respMessage) 1420 Message.error(res.data.respMessage)
1415 } 1421 }
@@ -1532,7 +1538,6 @@ @@ -1532,7 +1538,6 @@
1532 this.$refs.preFormData.clearValidate() 1538 this.$refs.preFormData.clearValidate()
1533 }) 1539 })
1534 }, 1540 },
1535 -  
1536 //获取国家列表 1541 //获取国家列表
1537 getCountryList() { 1542 getCountryList() {
1538 getCountry().then(res => { 1543 getCountry().then(res => {
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button> 118 <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
119 <el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button> 119 <el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button>
120 <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)" 120 <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)"
121 - :disabled="addStatus(scope.row.status)">发舱单报</el-button> 121 + :disabled="addStatus(scope.row.status)">发送出港理货报</el-button>
122 <!-- :disabled="scope.row.status ==='23'">发舱单报</el-button>--> 122 <!-- :disabled="scope.row.status ==='23'">发舱单报</el-button>-->
123 <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> 123 <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
124 <p></p> 124 <p></p>
@@ -127,7 +127,7 @@ @@ -127,7 +127,7 @@
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 ===null"
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>
131 <!-- :disabled="scope.row.status ==='24'">发删除报</el-button>--> 131 <!-- :disabled="scope.row.status ==='24'">发删除报</el-button>-->
132 </template> 132 </template>
133 </el-table-column> 133 </el-table-column>
@@ -629,7 +629,6 @@ @@ -629,7 +629,6 @@
629 this.detailData = res.data 629 this.detailData = res.data
630 }) 630 })
631 }, 631 },
632 -  
633 //发送舱单报 632 //发送舱单报
634 handleAwbSend(row) { 633 handleAwbSend(row) {
635 delete row.children 634 delete row.children
@@ -741,7 +740,6 @@ @@ -741,7 +740,6 @@
741 } 740 }
742 }) 741 })
743 }, 742 },
744 -  
745 // 删除当前运单 743 // 删除当前运单
746 handleAwbDelete(row) { 744 handleAwbDelete(row) {
747 delete row.parent 745 delete row.parent
@@ -880,7 +878,7 @@ @@ -880,7 +878,7 @@
880 } 878 }
881 }) 879 })
882 }, 880 },
883 - //获取机场三字码 881 + // 获取机场三字码
884 remoteMethodAirport(query){ 882 remoteMethodAirport(query){
885 this.airportCode = [] 883 this.airportCode = []
886 if (query !== '') { 884 if (query !== '') {
@@ -897,7 +895,7 @@ @@ -897,7 +895,7 @@
897 this.airportCode = [] 895 this.airportCode = []
898 } 896 }
899 }, 897 },
900 - //关区代码 898 + // 关区代码
901 remoteMethodCustomCode(query){ 899 remoteMethodCustomCode(query){
902 this.customCodeList = [] 900 this.customCodeList = []
903 if (query !== '') { 901 if (query !== '') {