朱兆平 / vue_cli · 提交

转到一个项目

作者 zhuzhaoping
提交 69e2ff993277a1b577ec7a2f4983fcab23df1f8c 2 个父辈 3538a17d a3a5d390

合并分支 'nmms-import-dev' 到 'master' 

申报状态更新



查看合并请求 !11
内嵌 并排对比
正在显示 5 个修改的文件 包含 43 行增加 和 17 行删除
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 <el-table-column 131 <el-table-column
132 prop="status" 132 prop="status"
133 label="状态" 133 label="状态"
134 - width="100"> 134 + width="100" :formatter="formatStatus">
135 </el-table-column> 135 </el-table-column>
136 <el-table-column 136 <el-table-column
137 prop="repick" 137 prop="repick"
@@ -204,7 +204,7 @@ @@ -204,7 +204,7 @@
204 @size-change="handleSizeChange" 204 @size-change="handleSizeChange"
205 @current-change="handleCurrentChange" 205 @current-change="handleCurrentChange"
206 :current-page="currentPage" 206 :current-page="currentPage"
207 - :page-sizes="[100, 200, 300, 400]" 207 + :page-sizes="[10, 20, 300, 400]"
208 :page-size="pageSize" 208 :page-size="pageSize"
209 layout="total, sizes, prev, pager, next, jumper" 209 layout="total, sizes, prev, pager, next, jumper"
210 :total="total"> 210 :total="total">
@@ -534,7 +534,8 @@ @@ -534,7 +534,8 @@
534 }, { 534 }, {
535 value: '08', 535 value: '08',
536 label: '舱单删除报转人工' 536 label: '舱单删除报转人工'
537 - }], 537 + }
  538 + ],
538 options2: [ 539 options2: [
539 { 540 {
540 value: '', 541 value: '',
@@ -545,7 +546,8 @@ @@ -545,7 +546,8 @@
545 }, { 546 }, {
546 value: 'MT3202', 547 value: 'MT3202',
547 label: '分拨运抵' 548 label: '分拨运抵'
548 - }], 549 + }
  550 + ],
549 options3: [ 551 options3: [
550 { 552 {
551 value: '4604', 553 value: '4604',
@@ -561,7 +563,7 @@ @@ -561,7 +563,7 @@
561 multipleSelection: [], 563 multipleSelection: [],
562 labelPosition:'left', 564 labelPosition:'left',
563 currentPage:1, 565 currentPage:1,
564 - pageSize:10, 566 + pageSize:100,
565 total:0, 567 total:0,
566 dialogStatus:'', 568 dialogStatus:'',
567 IouterVisible: false, 569 IouterVisible: false,
@@ -694,6 +696,13 @@ @@ -694,6 +696,13 @@
694 } 696 }
695 }, 697 },
696 methods:{ 698 methods:{
  699 + //状态适配
  700 + formatStatus:function (row,column) {
  701 + return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
  702 + :row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
  703 + :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
  704 + :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
  705 + },
697 //发送分拨申请报 706 //发送分拨申请报
698 importSend(index,row){ 707 importSend(index,row){
699 const map = {'mt6202':row} 708 const map = {'mt6202':row}
@@ -125,6 +125,7 @@ @@ -125,6 +125,7 @@
125 this.listLoading = true; 125 this.listLoading = true;
126 selectFlightLists(params).then(res=>{ 126 selectFlightLists(params).then(res=>{
127 let response=res.data.data; 127 let response=res.data.data;
  128 + console.log(response)
128 this.tableData=response.list; 129 this.tableData=response.list;
129 this.total=response.total; 130 this.total=response.total;
130 this.listLoading = false; 131 this.listLoading = false;
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 <el-table-column 109 <el-table-column
110 prop="status" 110 prop="status"
111 label="状态" 111 label="状态"
112 - width="100"> 112 + width="100" :formatter="formatStatus">
113 </el-table-column> 113 </el-table-column>
114 <el-table-column 114 <el-table-column
115 prop="customText" 115 prop="customText"
@@ -401,12 +401,6 @@ @@ -401,12 +401,6 @@
401 </el-form-item> 401 </el-form-item>
402 </el-col> 402 </el-col>
403 <el-col :span="6"> 403 <el-col :span="6">
404 - <!--<el-form-item label="国家代码" prop="awbinfo.shprcountyr">  
405 - <el-select v-model="ruleForm.awbinfo.shprcountyr" placeholder="" style="display:inline">  
406 - <el-option v-for="item in shprcountyrs" :key="item" :label="item"  
407 - :value="item"></el-option>  
408 - </el-select>  
409 - </el-form-item>-->  
410 <el-form-item label="国家代码" prop="awbinfo.shprcountyr"> 404 <el-form-item label="国家代码" prop="awbinfo.shprcountyr">
411 <el-select v-model="ruleForm.awbinfo.shprcountyr" 405 <el-select v-model="ruleForm.awbinfo.shprcountyr"
412 filterable 406 filterable
@@ -713,7 +707,7 @@ @@ -713,7 +707,7 @@
713 splitcode: 'T', 707 splitcode: 'T',
714 uldType: undefined, 708 uldType: undefined,
715 uldNo: undefined, 709 uldNo: undefined,
716 - status: undefined, 710 + status: '22',
717 awbinfo: { 711 awbinfo: {
718 specopeid: undefined, 712 specopeid: undefined,
719 shprname: undefined, 713 shprname: undefined,
@@ -826,12 +820,20 @@ @@ -826,12 +820,20 @@
826 } 820 }
827 }, 821 },
828 methods: { 822 methods: {
  823 + //状态识别
  824 + formatStatus: function(row,column){
  825 + return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
  826 + :row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
  827 + :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
  828 + :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
  829 + },
829 /*多选框功能*/ 830 /*多选框功能*/
830 handleSelectionChange(val) { 831 handleSelectionChange(val) {
831 this.multipleSelection = val; 832 this.multipleSelection = val;
832 }, 833 },
833 /*编辑主单信息*/ 834 /*编辑主单信息*/
834 handleEdit(index, row){ 835 handleEdit(index, row){
  836 + console.log(row)
835 this.outerVisible = true; 837 this.outerVisible = true;
836 this.dialogStatus='update'; 838 this.dialogStatus='update';
837 this.FenStatus='ediAwbh'; 839 this.FenStatus='ediAwbh';
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 <el-table-column 90 <el-table-column
91 prop="status" 91 prop="status"
92 label="状态" 92 label="状态"
93 - width="100"> 93 + width="100" :formatter="formatStatus">
94 </el-table-column> 94 </el-table-column>
95 <el-table-column 95 <el-table-column
96 prop="receipt" 96 prop="receipt"
@@ -490,7 +490,13 @@ @@ -490,7 +490,13 @@
490 } 490 }
491 }, 491 },
492 methods: { 492 methods: {
493 - //获取关区代码 493 + //状态适配
  494 + formatStatus:function (row,column) {
  495 + return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
  496 + :row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
  497 + :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
  498 + :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
  499 + },
494 //获取关区代码 500 //获取关区代码
495 remoteMethod2:function(query){ 501 remoteMethod2:function(query){
496 this.customcodes=[]; 502 this.customcodes=[];
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 <el-table-column 162 <el-table-column
163 prop="status" 163 prop="status"
164 label="状态" 164 label="状态"
165 - width="90"> 165 + width="90" :formatter="formatStatus">
166 </el-table-column> 166 </el-table-column>
167 <el-table-column 167 <el-table-column
168 prop="repick" 168 prop="repick"
@@ -249,13 +249,14 @@ @@ -249,13 +249,14 @@
249 tableData: [], 249 tableData: [],
250 multipleSelection: [], 250 multipleSelection: [],
251 currentPage:1, 251 currentPage:1,
252 - pageSize:10, 252 + pageSize:100,
253 total:0 253 total:0
254 } 254 }
255 }, 255 },
256 methods:{ 256 methods:{
257 handleSelectionChange(val) { 257 handleSelectionChange(val) {
258 this.multipleSelection = val; 258 this.multipleSelection = val;
  259 + console.log(val)
259 }, 260 },
260 handleClick(row) { 261 handleClick(row) {
261 console.log(row); 262 console.log(row);
@@ -268,6 +269,13 @@ @@ -268,6 +269,13 @@
268 this.currentPage=val; 269 this.currentPage=val;
269 this.QueryData(); 270 this.QueryData();
270 }, 271 },
  272 + //状态适配
  273 + formatStatus:function (row,column) {
  274 + return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
  275 + :row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
  276 + :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
  277 + :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
  278 + },
271 //修改状态 279 //修改状态
272 handleStuts(){}, 280 handleStuts(){},
273 //条件查询方法 281 //条件查询方法