朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 c14ac4f500b41f4ef068ab08ec7ee4dc55c66e1f 1 个父辈 dacfe41e

进港业务申报各界面优化

内嵌 并排对比
正在显示 7 个修改的文件 包含 315 行增加 和 292 行删除
@@ -5,70 +5,76 @@ @@ -5,70 +5,76 @@
5 <el-col :span="24"><div class="grid-content content co">进港运单分拨申报</div></el-col> 5 <el-col :span="24"><div class="grid-content content co">进港运单分拨申报</div></el-col>
6 </el-row> 6 </el-row>
7 <!--查询条件--> 7 <!--查询条件-->
8 - <el-row>  
9 - <el-col :span="6">  
10 - <div class="grid-content">  
11 - <el-input placeholder="" v-model="defaultQuery.awba">  
12 - <template slot="prepend">主单号</template>  
13 - </el-input>  
14 - </div>  
15 - </el-col>  
16 - <el-col :span="5">  
17 - <div class="grid-content">  
18 - <el-input placeholder="" v-model="defaultQuery.carrier">  
19 - <template slot="prepend">承运人</template>  
20 - </el-input>  
21 - </div>  
22 - </el-col>  
23 - <el-col :span="5">  
24 - <div class="grid-content">  
25 - <el-input placeholder="" v-model="defaultQuery.flightno">  
26 - <template slot="prepend">航班号</template>  
27 - </el-input>  
28 - </div>  
29 - </el-col>  
30 - <el-col :span="5">  
31 - <div class="grid-content">  
32 - <div class="block">  
33 - <el-date-picker  
34 - v-model="defaultQuery.flightdate"  
35 - value-format="yyyy-MM-dd"  
36 - type="date"  
37 - placeholder="航班日期">  
38 - </el-date-picker>  
39 - </div>  
40 - </div>  
41 - </el-col>  
42 - </el-row>  
43 - <el-row>  
44 - <el-col :span="6">  
45 - <div class="grid-content">  
46 - <el-select v-model="defaultQuery.status" placeholder="选择状态" class="sel"> 8 + <el-row style="display: block;background-color: white;padding-left: 5px">
  9 + <el-row>
  10 + <el-col :span="6">
  11 + <span>
  12 + 主单号
  13 + </span>
  14 + <el-input placeholder="" v-model="defaultQuery.awba" style="width: 150px">
  15 + </el-input>
  16 + </el-col>
  17 + <el-col :span="6">
  18 + <span>
  19 + 承运人
  20 + </span>
  21 + <el-input placeholder="" v-model="defaultQuery.carrier" style="width: 150px">
  22 + </el-input>
  23 + </el-col>
  24 + <el-col :span="6">
  25 + <span>
  26 + 航班号
  27 + </span>
  28 + <el-input placeholder="" v-model="defaultQuery.flightno" style="width: 150px">
  29 + </el-input>
  30 + </el-col>
  31 + <el-col :span="6">
  32 + <span>
  33 + 航班日期
  34 + </span>
  35 + <el-date-picker
  36 + v-model="defaultQuery.flightdate"
  37 + value-format="yyyy-MM-dd"
  38 + type="date" style="width: 150px"
  39 + placeholder="航班日期">
  40 + </el-date-picker>
  41 + </el-col>
  42 + </el-row>
  43 + <el-row>
  44 + <el-col :span="6">
  45 + <span>
  46 + 业务状态
  47 + </span>
  48 + <el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 150px">
  49 + <el-option
  50 + v-for="item in options"
  51 + :key="item.value"
  52 + :label="item.label"
  53 + :value="item.value">
  54 + </el-option>
  55 + </el-select>
  56 + </el-col>
  57 + <el-col :span="6">
  58 + <span>
  59 + 报文类型
  60 + </span>
  61 + <el-select v-model="defaultQuery.turntype" placeholder="报文类型" style="width: 150px">
47 <el-option 62 <el-option
48 - v-for="item in options" 63 + v-for="item in options2"
49 :key="item.value" 64 :key="item.value"
50 :label="item.label" 65 :label="item.label"
51 :value="item.value"> 66 :value="item.value">
52 </el-option> 67 </el-option>
53 </el-select> 68 </el-select>
54 - </div>  
55 - </el-col>  
56 - <el-col :span="5">  
57 - <el-select v-model="defaultQuery.turntype" placeholder="报文类型" class="sel">  
58 - <el-option  
59 - v-for="item in options2"  
60 - :key="item.value"  
61 - :label="item.label"  
62 - :value="item.value">  
63 - </el-option>  
64 - </el-select>  
65 - </el-col>  
66 - <el-col :span="5">  
67 - <el-col :span="8" style="margin-right: 0px">  
68 - <el-button v-on:click="Query" type="primary">查询</el-button>  
69 </el-col> 69 </el-col>
70 - </el-col> 70 + <el-col :span="6">
  71 + <el-col :span="8" style="margin-right: 0px">
  72 + <el-button v-on:click="Query" type="primary">查询</el-button>
  73 + </el-col>
  74 + </el-col>
  75 + </el-row>
71 </el-row> 76 </el-row>
  77 +
72 <!--查询列表--> 78 <!--查询列表-->
73 <el-row> 79 <el-row>
74 <el-col :span="24"> 80 <el-col :span="24">
@@ -153,65 +159,65 @@ @@ -153,65 +159,65 @@
153 </el-table-column> 159 </el-table-column>
154 <el-table-column 160 <el-table-column
155 label="修改状态" 161 label="修改状态"
156 - width="550"> 162 + width="480">
157 <template slot-scope="scope"> 163 <template slot-scope="scope">
158 - <el-button  
159 - v-if="scope.row.turntype=='MT6202'"  
160 - size="mini"  
161 - type="primary"  
162 - @click="handleDetail(scope.$index, scope.row)">收发明细  
163 - </el-button>  
164 - <el-button  
165 - v-else  
166 - size="mini"  
167 - type="primary"  
168 - @click="handleDetail(scope.$index, scope.row)">收发明细  
169 - </el-button>  
170 - <el-button  
171 - v-if="scope.row.turntype=='MT6202'"  
172 - size="mini"  
173 - type="primary"  
174 - :disabled="btSendStatusFormater(scope.row.status)"  
175 - @click="importSend(scope.$index, scope.row)">申请分拨  
176 - </el-button>  
177 - <el-button  
178 - v-else  
179 - size="mini"  
180 - type="primary"  
181 - :disabled="btSendStatusFormater(scope.row.status)"  
182 - @click="arriveSend(scope.$index, scope.row)">分拨运抵  
183 - </el-button>  
184 - <el-button  
185 - v-if="scope.row.turntype=='MT6202'"  
186 - size="mini"  
187 - type="primary"  
188 - @click="importEdit(scope.$index, scope.row)">编辑  
189 - </el-button>  
190 - <el-button  
191 - v-else  
192 - size="mini"  
193 - type="primary"  
194 - @click="arriveEdit(scope.$index, scope.row)">编辑  
195 - </el-button>  
196 - <el-button  
197 - v-if="scope.row.turntype=='MT6202'"  
198 - size="mini"  
199 - type="primary"  
200 - :disabled="btDeleStatusFormater(scope.row.status)"  
201 - @click="importDel(scope.$index, scope.row)">申请分拨删除  
202 - </el-button>  
203 - <el-button  
204 - v-else  
205 - size="mini"  
206 - type="primary"  
207 - :disabled="btDeleStatusFormater(scope.row.status)"  
208 - @click="arriveDel(scope.$index, scope.row)">分拨运抵删除  
209 - </el-button>  
210 - <el-button  
211 - size="mini"  
212 - type="primary"  
213 - @click="UpdateStatus(scope.$index, scope.row)">更改状态  
214 - </el-button> 164 + <el-button
  165 + v-if="scope.row.turntype=='MT6202'"
  166 + size="mini"
  167 + type="info"
  168 + @click="handleDetail(scope.$index, scope.row)">收发明细
  169 + </el-button>
  170 + <el-button
  171 + v-else
  172 + size="mini"
  173 + type="info"
  174 + @click="handleDetail(scope.$index, scope.row)">收发明细
  175 + </el-button>
  176 + <el-button
  177 + v-if="scope.row.turntype=='MT6202'"
  178 + size="mini"
  179 + type="success"
  180 + @click="importEdit(scope.$index, scope.row)">编辑
  181 + </el-button>
  182 + <el-button
  183 + v-else
  184 + size="mini"
  185 + type="success"
  186 + @click="arriveEdit(scope.$index, scope.row)">编辑
  187 + </el-button>
  188 + <el-button
  189 + v-if="scope.row.turntype=='MT6202'"
  190 + size="mini"
  191 + type="primary"
  192 + :disabled="btSendStatusFormater(scope.row.status)"
  193 + @click="importSend(scope.$index, scope.row)">申请分拨
  194 + </el-button>
  195 + <el-button
  196 + v-else
  197 + size="mini"
  198 + type="primary"
  199 + :disabled="btSendStatusFormater(scope.row.status)"
  200 + @click="arriveSend(scope.$index, scope.row)">分拨运抵
  201 + </el-button>
  202 + <el-button
  203 + size="mini"
  204 + type="warning"
  205 + @click="UpdateStatus(scope.$index, scope.row)">更改状态
  206 + </el-button>
  207 + <el-button
  208 + v-if="scope.row.turntype=='MT6202'"
  209 + size="mini"
  210 + type="danger"
  211 + :disabled="btDeleStatusFormater(scope.row.status)"
  212 + @click="importDel(scope.$index, scope.row)">申请分拨删除
  213 + </el-button>
  214 + <el-button
  215 + v-else
  216 + size="mini"
  217 + type="danger"
  218 + :disabled="btDeleStatusFormater(scope.row.status)"
  219 + @click="arriveDel(scope.$index, scope.row)">分拨运抵删除
  220 + </el-button>
215 </template> 221 </template>
216 </el-table-column> 222 </el-table-column>
217 </el-table> 223 </el-table>
@@ -226,7 +232,7 @@ @@ -226,7 +232,7 @@
226 @size-change="handleSizeChange" 232 @size-change="handleSizeChange"
227 @current-change="handleCurrentChange" 233 @current-change="handleCurrentChange"
228 :current-page="currentPage" 234 :current-page="currentPage"
229 - :page-sizes="[100, 200, 300, 400]" 235 + :page-sizes="[10, 200, 300, 400]"
230 :page-size="pageSize" 236 :page-size="pageSize"
231 layout="total, sizes, prev, pager, next, jumper" 237 layout="total, sizes, prev, pager, next, jumper"
232 :total="total"> 238 :total="total">
@@ -602,7 +608,7 @@ @@ -602,7 +608,7 @@
602 multipleSelection: [], 608 multipleSelection: [],
603 labelPosition:'left', 609 labelPosition:'left',
604 currentPage:1, 610 currentPage:1,
605 - pageSize:100, 611 + pageSize:10,
606 total:0, 612 total:0,
607 dialogStatus:'', 613 dialogStatus:'',
608 IouterVisible: false, 614 IouterVisible: false,
@@ -1037,4 +1043,4 @@ @@ -1037,4 +1043,4 @@
1037 this.getList(); 1043 this.getList();
1038 } 1044 }
1039 } 1045 }
1040 -</script>  
  1046 +</script>
@@ -9,13 +9,13 @@ @@ -9,13 +9,13 @@
9 <el-row> 9 <el-row>
10 <el-col :span="24"><div class="grid-content"><h1>Please Enter The Flight Information：</h1></div></el-col> 10 <el-col :span="24"><div class="grid-content"><h1>Please Enter The Flight Information：</h1></div></el-col>
11 </el-row> 11 </el-row>
12 - <el-row type="flex" class="row-bg" justify="center"> 12 + <el-row type="flex" class="row-bg" justify="center" style="margin-top: 30px">
13 <el-col :span="5"> 13 <el-col :span="5">
14 <el-form-item label="航班号" prop="flightno"> 14 <el-form-item label="航班号" prop="flightno">
15 <el-input placeholder="" v-model="flightno" style="width:100%"></el-input> 15 <el-input placeholder="" v-model="flightno" style="width:100%"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 - <el-col :span="5"> 18 + <el-col :span="6">
19 <el-form-item label="航班日期" required> 19 <el-form-item label="航班日期" required>
20 <el-col :span="24"> 20 <el-col :span="24">
21 <el-form-item prop="flightdate"> 21 <el-form-item prop="flightdate">
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 </el-form-item> 65 </el-form-item>
66 </el-col> 66 </el-col>
67 </el-row> 67 </el-row>
68 - <el-row> 68 + <el-row class="row-bg">
69 <el-col :span="4" :offset="10"> 69 <el-col :span="4" :offset="10">
70 <div class="grid-content"> 70 <div class="grid-content">
71 <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button> 71 <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button>
@@ -9,13 +9,13 @@ @@ -9,13 +9,13 @@
9 <el-row> 9 <el-row>
10 <el-col :span="24"><div class="grid-content"><h1>Please Enter The Flight Information：</h1></div></el-col> 10 <el-col :span="24"><div class="grid-content"><h1>Please Enter The Flight Information：</h1></div></el-col>
11 </el-row> 11 </el-row>
12 - <el-row type="flex" class="row-bg" justify="center"> 12 + <el-row type="flex" class="row-bg" justify="center" style="margin-top: 30px">
13 <el-col :span="5"> 13 <el-col :span="5">
14 <el-form-item label="航班号" prop="flightno"> 14 <el-form-item label="航班号" prop="flightno">
15 <el-input onkeyup="value=value.replace(/[\u4e00-\u9fa5]/ig,'')" placeholder="" v-model="flightno" style="width:100%"></el-input> 15 <el-input onkeyup="value=value.replace(/[\u4e00-\u9fa5]/ig,'')" placeholder="" v-model="flightno" style="width:100%"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 - <el-col :span="5"> 18 + <el-col :span="6">
19 <el-form-item label="航班日期" required> 19 <el-form-item label="航班日期" required>
20 <el-col :span="24"> 20 <el-col :span="24">
21 <el-form-item prop="flightdate"> 21 <el-form-item prop="flightdate">
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 </el-form-item> 72 </el-form-item>
73 </el-col> 73 </el-col>
74 </el-row> 74 </el-row>
75 - <el-row> 75 + <el-row class="row-bg">
76 <el-col :span="4" :offset="10"> 76 <el-col :span="4" :offset="10">
77 <div class="grid-content"> 77 <div class="grid-content">
78 <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button> 78 <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button>
@@ -2,28 +2,27 @@ @@ -2,28 +2,27 @@
2 <el-container> 2 <el-container>
3 <el-main > 3 <el-main >
4 <!--检索条件--> 4 <!--检索条件-->
5 - <el-row>  
6 - <el-col :span="5">  
7 - <div class="block">  
8 - <el-input v-model="vcarrier" placeholder="">  
9 - <template slot="prepend">航班号</template> 5 + <el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
  6 + <el-col :span="6">
  7 + <template>
  8 + 航班号
  9 + </template>
  10 + <el-input v-model="vcarrier" placeholder="航班号" style="width: 150px">
10 </el-input> 11 </el-input>
11 - </div>  
12 </el-col> 12 </el-col>
13 - <el-col :span="5">  
14 - <div class="block"> 13 + <el-col :span="6">
  14 + <template>
  15 + 航班日期
  16 + </template>
15 <el-date-picker 17 <el-date-picker
16 v-model="flighttime" 18 v-model="flighttime"
17 type="date" 19 type="date"
18 value-format="yyyy-MM-dd" 20 value-format="yyyy-MM-dd"
19 - placeholder="航班日期"> 21 + placeholder="航班日期" style="width: 150px">
20 </el-date-picker> 22 </el-date-picker>
21 - </div>  
22 </el-col> 23 </el-col>
23 - <el-col :span="2">  
24 - <div class="grid-content">  
25 - <el-button type="primary" v-on:click="getFlightList">航班查询</el-button>  
26 - </div> 24 + <el-col :span="3">
  25 + <el-button type="primary" v-on:click="getFlightList">查询</el-button>
27 </el-col> 26 </el-col>
28 </el-row> 27 </el-row>
29 <!--TableList--> 28 <!--TableList-->
@@ -66,7 +65,7 @@ @@ -66,7 +65,7 @@
66 @click="handleEdit(scope.$index, scope.row)">原始舱单</el-button> 65 @click="handleEdit(scope.$index, scope.row)">原始舱单</el-button>
67 <el-button 66 <el-button
68 size="mini" 67 size="mini"
69 - type="primary" 68 + type="success"
70 @click="handleDelete(scope.$index, scope.row)">进港理货</el-button> 69 @click="handleDelete(scope.$index, scope.row)">进港理货</el-button>
71 </template> 70 </template>
72 </el-table-column> 71 </el-table-column>
@@ -74,7 +73,7 @@ @@ -74,7 +73,7 @@
74 </template> 73 </template>
75 </el-row> 74 </el-row>
76 <!--分页模块--> 75 <!--分页模块-->
77 - <el-row style="float: right"> 76 + <el-row style="float: right;margin-top: 20px">
78 <div class="block"> 77 <div class="block">
79 <el-pagination 78 <el-pagination
80 @size-change="handleSizeChange" 79 @size-change="handleSizeChange"
@@ -169,4 +168,4 @@ @@ -169,4 +168,4 @@
169 <style> 168 <style>
170 .el-main{padding: 10px 0px 10px 0px; } 169 .el-main{padding: 10px 0px 10px 0px; }
171 .el-col{margin-right: 10px;} 170 .el-col{margin-right: 10px;}
172 -</style>  
  171 +</style>
@@ -30,12 +30,15 @@ @@ -30,12 +30,15 @@
30 </el-col> 30 </el-col>
31 <el-col :span="22"> 31 <el-col :span="22">
32 <div class="grid-content"> 32 <div class="grid-content">
33 - <el-col :span="4.5" class="pub"> 33 + <el-col :span="9" class="pub">
34 <div class="grid-content"> 34 <div class="grid-content">
35 - <el-input v-model="defaultQuery.awba" placeholder="请输入主单号"></el-input> 35 + <span>
  36 + 主单号:
  37 + </span>
  38 + <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 180px"></el-input>
36 </div> 39 </div>
37 </el-col> 40 </el-col>
38 - <el-col :span="1.5" class="pub"> 41 + <el-col :span="2" class="pub">
39 <div class="grid-content"> 42 <div class="grid-content">
40 <el-button type="primary" size="mini" v-on:click="getList">查询</el-button> 43 <el-button type="primary" size="mini" v-on:click="getList">查询</el-button>
41 </div> 44 </div>
@@ -43,7 +46,7 @@ @@ -43,7 +46,7 @@
43 <el-col :span="4" class="pub"> 46 <el-col :span="4" class="pub">
44 <div class="grid-content"> 47 <div class="grid-content">
45 <el-dropdown @command="handleCommand"> 48 <el-dropdown @command="handleCommand">
46 - <el-button size="mini" type="primary"> 49 + <el-button size="mini" type="success">
47 导出文件<i class="el-icon-arrow-down el-icon--right"></i> 50 导出文件<i class="el-icon-arrow-down el-icon--right"></i>
48 </el-button> 51 </el-button>
49 <el-dropdown-menu slot="dropdown"> 52 <el-dropdown-menu slot="dropdown">
@@ -131,7 +134,7 @@ @@ -131,7 +134,7 @@
131 </el-table-column> 134 </el-table-column>
132 <el-table-column 135 <el-table-column
133 label="回执内容" 136 label="回执内容"
134 - width="250"> 137 + width="260">
135 <template slot-scope="scope"> 138 <template slot-scope="scope">
136 <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> 139 <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
137 {{scope.row.ext5}} 140 {{scope.row.ext5}}
@@ -150,75 +153,81 @@ @@ -150,75 +153,81 @@
150 <el-table-column 153 <el-table-column
151 prop="operation" 154 prop="operation"
152 label="操作" 155 label="操作"
153 - width="850" 156 + width="450"
154 show-overflow-tooltip> 157 show-overflow-tooltip>
155 <template slot-scope="scope"> 158 <template slot-scope="scope">
156 - <el-button  
157 - size="mini"  
158 - type="primary"  
159 - @click="handleDetail(scope.$index, scope.row)">收发明细  
160 - </el-button>  
161 - <el-button  
162 - v-if="scope.row.awbh==''||scope.row.awbh==null"  
163 - size="mini"  
164 - type="primary"  
165 - @click="handleEdit(scope.$index, scope.row)">编辑主单  
166 - </el-button>  
167 - <el-button  
168 - v-else  
169 - size="mini"  
170 - type="primary"  
171 - @click="handleFen(scope.$index, scope.row)">编辑分单  
172 - </el-button>  
173 - <el-button  
174 - size="mini"  
175 - type="primary"  
176 - @click="handleSend(scope.$index, scope.row)"  
177 - :disabled="btSendStatusFormater(scope.row.status)">发送舱单报  
178 - </el-button>  
179 - <el-button  
180 - size="mini"  
181 - type="primary"  
182 - @click="handleUpdate(scope.$index, scope.row)"  
183 - :disabled="btEditStatusFormater(scope.row.status)">发送舱单修改报  
184 - </el-button>  
185 - <el-button  
186 - size="mini"  
187 - type="primary"  
188 - @click="handleDelete(scope.$index, scope.row)"  
189 - :disabled="btDeleStatusFormater(scope.row.status)">发送舱单删除报  
190 - </el-button>  
191 - <el-button  
192 - v-if="scope.row.awbh==''||scope.row.awbh==null"  
193 - size="mini"  
194 - type="primary"  
195 - @click="Importallocation(scope.$index, scope.row)">分拨申请  
196 - </el-button>  
197 - <el-button  
198 - v-else  
199 - disabled=""  
200 - size="mini"  
201 - type="primary"  
202 - @click="Importallocation(scope.$index, scope.row)">分拨申请  
203 - </el-button>  
204 - <el-button  
205 - v-if="scope.row.awbh==''||scope.row.awbh==null"  
206 - size="mini"  
207 - type="primary"  
208 - @click="Allocatearrive(scope.$index, scope.row)">分拨运抵  
209 - </el-button>  
210 - <el-button  
211 - v-else  
212 - disabled=""  
213 - size="mini"  
214 - type="primary"  
215 - @click="Allocatearrive(scope.$index, scope.row)">分拨运抵  
216 - </el-button>  
217 - <el-button  
218 - size="mini"  
219 - type="primary"  
220 - @click="UpdateStatus(scope.$index, scope.row)">更改状态  
221 - </el-button> 159 + <el-row>
  160 + <el-button
  161 + size="mini"
  162 + type="info"
  163 + @click="handleDetail(scope.$index, scope.row)">收发明细
  164 + </el-button>
  165 + <el-button
  166 + v-if="scope.row.awbh==''||scope.row.awbh==null"
  167 + size="mini"
  168 + type="success"
  169 + @click="handleEdit(scope.$index, scope.row)">编辑主单
  170 + </el-button>
  171 + <el-button
  172 + v-else
  173 + size="mini"
  174 + type="success"
  175 + @click="handleFen(scope.$index, scope.row)">编辑分单
  176 + </el-button>
  177 + <el-button
  178 + size="mini"
  179 + type="primary"
  180 + @click="handleSend(scope.$index, scope.row)"
  181 + :disabled="btSendStatusFormater(scope.row.status)">发送舱单报
  182 + </el-button>
  183 + <el-button
  184 + size="mini"
  185 + type="warning"
  186 + @click="UpdateStatus(scope.$index, scope.row)">更改状态
  187 + </el-button>
  188 + </el-row>
  189 + <el-row style="margin-bottom: 5px;margin-top: 30px">
  190 +
  191 + <el-button
  192 + v-if="scope.row.awbh==''||scope.row.awbh==null"
  193 + size="mini"
  194 + type="success"
  195 + @click="Importallocation(scope.$index, scope.row)">分拨申请
  196 + </el-button>
  197 + <el-button
  198 + v-else
  199 + disabled=""
  200 + size="mini" type="success"
  201 + @click="Importallocation(scope.$index, scope.row)">分拨申请
  202 + </el-button>
  203 +<!-- style="background-color: #63cdda;color: white"-->
  204 + <el-button
  205 + v-if="scope.row.awbh==''||scope.row.awbh==null"
  206 + size="mini"
  207 + type="primary"
  208 + @click="Allocatearrive(scope.$index, scope.row)">分拨运抵
  209 + </el-button>
  210 + <el-button
  211 + v-else
  212 + disabled=""
  213 + size="mini" type="primary"
  214 + @click="Allocatearrive(scope.$index, scope.row)">分拨运抵
  215 + </el-button>
  216 +<!-- style="background-color:#778beb;color: white"-->
  217 + <el-button
  218 + size="mini"
  219 + style="background-color:#f19066;color: white"
  220 + @click="handleUpdate(scope.$index, scope.row)"
  221 + :disabled="btEditStatusFormater(scope.row.status)">发送舱单修改报
  222 + </el-button>
  223 + <el-button
  224 + size="mini"
  225 + type="danger"
  226 + @click="handleDelete(scope.$index, scope.row)"
  227 + :disabled="btDeleStatusFormater(scope.row.status)">发送舱单删除报
  228 + </el-button>
  229 + </el-row>
  230 +
222 </template> 231 </template>
223 </el-table-column> 232 </el-table-column>
224 </el-table> 233 </el-table>
@@ -580,7 +589,7 @@ @@ -580,7 +589,7 @@
580 </el-form> 589 </el-form>
581 </el-dialog> 590 </el-dialog>
582 <!--footer部分--> 591 <!--footer部分-->
583 - <el-row> 592 + <el-row style="margin-top: 20px">
584 <el-col :span="2.5" class="pub"> 593 <el-col :span="2.5" class="pub">
585 <div class="grid-content"> 594 <div class="grid-content">
586 <el-button type="primary" size="mini" v-on:click="addOrig">新增原始舱单</el-button> 595 <el-button type="primary" size="mini" v-on:click="addOrig">新增原始舱单</el-button>
@@ -602,7 +611,7 @@ @@ -602,7 +611,7 @@
602 <el-col :span="3.5" class="pub"> 611 <el-col :span="3.5" class="pub">
603 <div class="grid-content"><span>舱单总件数：{{sumNmmsPrice}}</span></div> 612 <div class="grid-content"><span>舱单总件数：{{sumNmmsPrice}}</span></div>
604 </el-col> 613 </el-col>
605 - <el-col :span="4" class="pub"> 614 + <el-col :span="7" class="pub">
606 <div class="grid-content"><span>舱单总重量：{{sumNmmsWeight}}</span></div> 615 <div class="grid-content"><span>舱单总重量：{{sumNmmsWeight}}</span></div>
607 </el-col> 616 </el-col>
608 </el-row> 617 </el-row>
@@ -1332,4 +1341,4 @@ @@ -1332,4 +1341,4 @@
1332 this.getList(); 1341 this.getList();
1333 } 1342 }
1334 } 1343 }
1335 -</script>  
  1344 +</script>
@@ -22,12 +22,15 @@ @@ -22,12 +22,15 @@
22 <el-col :span="1"><div class="grid-content"></div></el-col> 22 <el-col :span="1"><div class="grid-content"></div></el-col>
23 <el-col :span="22"> 23 <el-col :span="22">
24 <div class="grid-content"> 24 <div class="grid-content">
25 - <el-col :span="4.5"> 25 + <el-col :span="9">
26 <div class="grid-content"> 26 <div class="grid-content">
27 - <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" ></el-input> 27 + <span>
  28 + 主单号:
  29 + </span>
  30 + <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 180px"></el-input>
28 </div> 31 </div>
29 </el-col> 32 </el-col>
30 - <el-col :span="1.5"><div class="grid-content"><el-button type="primary" v-on:click="getMt5201List" size="mini">查询</el-button></div></el-col> 33 + <el-col :span="2"><div class="grid-content"><el-button type="primary" v-on:click="getMt5201List" size="mini">查询</el-button></div></el-col>
31 </div> 34 </div>
32 </el-col> 35 </el-col>
33 </div> 36 </div>
@@ -127,17 +130,17 @@ @@ -127,17 +130,17 @@
127 <template slot-scope="scope"> 130 <template slot-scope="scope">
128 <el-button 131 <el-button
129 size="mini" 132 size="mini"
130 - type="primary" 133 + type="info"
131 @click="handleDetail(scope.$index, scope.row)">收发明细</el-button> 134 @click="handleDetail(scope.$index, scope.row)">收发明细</el-button>
132 <el-button 135 <el-button
133 v-if="scope.row.awbh==''||scope.row.awbh==null" 136 v-if="scope.row.awbh==''||scope.row.awbh==null"
134 size="mini" 137 size="mini"
135 - type="primary" 138 + type="success"
136 @click="handleMain(scope.$index, scope.row)">编辑主单</el-button> 139 @click="handleMain(scope.$index, scope.row)">编辑主单</el-button>
137 <el-button 140 <el-button
138 v-else 141 v-else
139 size="mini" 142 size="mini"
140 - type="primary" 143 + type="success"
141 @click="handleFen(scope.$index, scope.row)">编辑分单 144 @click="handleFen(scope.$index, scope.row)">编辑分单
142 </el-button> 145 </el-button>
143 <el-button 146 <el-button
@@ -147,12 +150,12 @@ @@ -147,12 +150,12 @@
147 @click="handleCreate(scope.$index, scope.row)">发送理货报</el-button> 150 @click="handleCreate(scope.$index, scope.row)">发送理货报</el-button>
148 <el-button 151 <el-button
149 size="mini" 152 size="mini"
150 - type="primary" 153 + type="danger"
151 :disabled="btDeleStatusFormater(scope.row.status)" 154 :disabled="btDeleStatusFormater(scope.row.status)"
152 @click="handleDelete(scope.$index, scope.row)">发送理货删除报</el-button> 155 @click="handleDelete(scope.$index, scope.row)">发送理货删除报</el-button>
153 <el-button 156 <el-button
154 size="mini" 157 size="mini"
155 - type="primary" 158 + type="warning"
156 @click="UpdateStatus(scope.$index, scope.row)">更改状态 159 @click="UpdateStatus(scope.$index, scope.row)">更改状态
157 </el-button> 160 </el-button>
158 </template> 161 </template>
@@ -347,13 +350,13 @@ @@ -347,13 +350,13 @@
347 </el-form> 350 </el-form>
348 </el-dialog> 351 </el-dialog>
349 <!--底部按钮及理货信息--> 352 <!--底部按钮及理货信息-->
350 - <el-row> 353 + <el-row style="margin-top: 20px">
351 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" v-on:click="addTally" size="mini">新增进港理货</el-button></div></el-col> 354 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" v-on:click="addTally" size="mini">新增进港理货</el-button></div></el-col>
352 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini">批量发送删除报</el-button></div></el-col> 355 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini">批量发送删除报</el-button></div></el-col>
353 <el-col :span="2"><div class="grid-content"><el-button type="primary" @click="back" size="mini">返回</el-button></div></el-col> 356 <el-col :span="2"><div class="grid-content"><el-button type="primary" @click="back" size="mini">返回</el-button></div></el-col>
354 <el-col :span="2.5"><div class="grid-content"><span>主单数：{{sumNmmsCount}}</span></div></el-col> 357 <el-col :span="2.5"><div class="grid-content"><span>主单数：{{sumNmmsCount}}</span></div></el-col>
355 <el-col :span="3.5"><div class="grid-content"><span>理货总件数：{{sumNmmsPrice}}</span></div></el-col> 358 <el-col :span="3.5"><div class="grid-content"><span>理货总件数：{{sumNmmsPrice}}</span></div></el-col>
356 - <el-col :span="4"><div class="grid-content"><span>理货总重量：{{sumNmmsWeight}}</span></div></el-col> 359 + <el-col :span="7"><div class="grid-content"><span>理货总重量：{{sumNmmsWeight}}</span></div></el-col>
357 </el-row> 360 </el-row>
358 <!--对话提示框--> 361 <!--对话提示框-->
359 <el-row> 362 <el-row>
@@ -833,4 +836,4 @@ @@ -833,4 +836,4 @@
833 this.getMt5201List(); 836 this.getMt5201List();
834 } 837 }
835 } 838 }
836 -</script>  
  839 +</script>
@@ -5,80 +5,86 @@ @@ -5,80 +5,86 @@
5 <el-col :span="24"><div class="grid-content content co">进港运单申报</div></el-col> 5 <el-col :span="24"><div class="grid-content content co">进港运单申报</div></el-col>
6 </el-row> 6 </el-row>
7 <!--查询条件--> 7 <!--查询条件-->
8 - <el-row>  
9 - <el-col :span="6">  
10 - <div class="grid-content">  
11 - <el-input placeholder="" v-model="defaultQuery.awba">  
12 - <template slot="prepend">主单号</template> 8 + <el-row style="display: block;background-color: white">
  9 + <el-row>
  10 + <el-col :span="6">
  11 + <span>
  12 + 主单号:
  13 + </span>
  14 + <el-input placeholder="" v-model="defaultQuery.awba" style="width: 150px">
13 </el-input> 15 </el-input>
14 - </div>  
15 - </el-col>  
16 - <el-col :span="5">  
17 - <div class="grid-content">  
18 - <el-input placeholder="" v-model="vcarrier">  
19 - <template slot="prepend">承运人</template>  
20 - </el-input>  
21 - </div>  
22 - </el-col>  
23 - <el-col :span="5">  
24 - <div class="grid-content">  
25 - <el-input placeholder="" v-model="defaultQuery.flightno">  
26 - <template slot="prepend">航班号</template> 16 + </el-col>
  17 + <el-col :span="6">
  18 + <span>
  19 + 承运人:
  20 + </span>
  21 + <el-input placeholder="" v-model="vcarrier" style="width: 150px">
27 </el-input> 22 </el-input>
28 - </div>  
29 - </el-col>  
30 - <el-col :span="5">  
31 - <div class="grid-content">  
32 - <div class="block">  
33 - <el-date-picker  
34 - v-model="defaultQuery.flightdate"  
35 - type="date"  
36 - value-format="yyyy-MM-dd"  
37 - placeholder="航班日期">  
38 - </el-date-picker>  
39 - </div>  
40 - </div>  
41 - </el-col>  
42 - </el-row>  
43 - <el-row>  
44 - <el-col :span="6">  
45 - <div class="grid-content">  
46 - <el-select v-model="defaultQuery.status" placeholder="选择状态" class="sel"> 23 + </el-col>
  24 + <el-col :span="6">
  25 + <span>
  26 + 航班号:
  27 + </span>
  28 + <el-input placeholder="" v-model="defaultQuery.flightno" style="width: 150px">
  29 + </el-input>
  30 + </el-col>
  31 + <el-col :span="6">
  32 + <span>
  33 + 航班日期:
  34 + </span>
  35 + <el-date-picker
  36 + v-model="defaultQuery.flightdate"
  37 + type="date"
  38 + value-format="yyyy-MM-dd" style="width: 150px"
  39 + placeholder="航班日期">
  40 + </el-date-picker>
  41 + </el-col>
  42 + </el-row>
  43 + <el-row >
  44 + <el-col :span="6">
  45 + <span>
  46 + 业务状态:
  47 + </span>
  48 + <el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 140px">
47 <el-option 49 <el-option
48 v-for="item in options" 50 v-for="item in options"
49 :key="item.value" 51 :key="item.value"
  52 + :label="item.label" style="width: 140px"
  53 + :value="item.value">
  54 + </el-option>
  55 + </el-select>
  56 + </el-col>
  57 + <el-col :span="6">
  58 + <span>
  59 + 报文类型:
  60 + </span>
  61 + <el-select v-model="defaultQuery.messageType" placeholder="报文类型" style="width: 140px">
  62 + <el-option
  63 + v-for="item in options2"
  64 + :key="item.value"
50 :label="item.label" 65 :label="item.label"
51 :value="item.value"> 66 :value="item.value">
52 </el-option> 67 </el-option>
53 </el-select> 68 </el-select>
54 - </div>  
55 - </el-col>  
56 - <el-col :span="5">  
57 - <el-select v-model="defaultQuery.messageType" placeholder="报文类型" class="sel">  
58 - <el-option  
59 - v-for="item in options2"  
60 - :key="item.value"  
61 - :label="item.label"  
62 - :value="item.value">  
63 - </el-option>  
64 - </el-select>  
65 - </el-col>  
66 - <el-col :span="5">  
67 - <el-col :span="8" style="margin-right: 0px">  
68 - <el-button type="primary" v-on:click="QueryData">查询</el-button>  
69 </el-col> 69 </el-col>
70 - <!--<el-col :span="16" style="margin-right: 0px">  
71 - <el-button type="primary">批量修改状态</el-button>  
72 - </el-col>-->  
73 - </el-col> 70 + <el-col :span="6">
  71 + <el-col :span="8" style="margin-right: 0px">
  72 + <el-button type="primary" v-on:click="QueryData">查询</el-button>
  73 + </el-col>
  74 + <!--<el-col :span="16" style="margin-right: 0px">
  75 + <el-button type="primary">批量修改状态</el-button>
  76 + </el-col>-->
  77 + </el-col>
  78 + </el-row>
  79 +
74 </el-row> 80 </el-row>
75 <!--查询结果样式--> 81 <!--查询结果样式-->
76 - <el-row> 82 + <el-row style="font-size: xx-small">
77 <el-col :span="1" class="mark"><div class="grid-content bg" style="color: red"><span>注：</span></div></el-col> 83 <el-col :span="1" class="mark"><div class="grid-content bg" style="color: red"><span>注：</span></div></el-col>
78 - <el-col :span="2" class="mark"><div class="grid-content bg mainse" ><span>主单原始舱单</span></div></el-col>  
79 - <el-col :span="2" class="mark"><div class="grid-content bg fense" ><span>分单原始舱单</span></div></el-col>  
80 - <el-col :span="2" class="mark"><div class="grid-content bg tallse" ><span>主单理货报告</span></div></el-col>  
81 - <el-col :span="2" class="mark"><div class="grid-content bg tallfense" ><span>分单理货报告</span></div></el-col> 84 + <el-col :span="3" class="mark"><div class="grid-content bg mainse" style="border-radius: 5px;margin-right: 5px;background-color: #63cdda" ><span>主单原始舱单</span></div></el-col>
  85 + <el-col :span="3" class="mark"><div class="grid-content bg fense" style="border-radius: 5px;margin-right: 5px;background-color: #778beb"><span>分单原始舱单</span></div></el-col>
  86 + <el-col :span="3" class="mark"><div class="grid-content bg tallse" style="border-radius: 5px;margin-right: 5px;background-color: #f3a683"><span>主单理货报告</span></div></el-col>
  87 + <el-col :span="3" class="mark"><div class="grid-content bg tallfense" style="border-radius: 5px;margin-right: 5px;background-color: #f7d794"><span>分单理货报告</span></div></el-col>
82 </el-row> 88 </el-row>
83 <!--查询列表--> 89 <!--查询列表-->
84 <el-row> 90 <el-row>
@@ -133,16 +139,16 @@ @@ -133,16 +139,16 @@
133 width="115" 139 width="115"
134 > 140 >
135 <template slot-scope="scope"> 141 <template slot-scope="scope">
136 - <span v-if="scope.row.stype=='MT1201'&&scope.row.awbh==''" style="background-color:#67C23A;width: 100%;height:100%;display:block"> 142 + <span v-if="scope.row.stype=='MT1201'&&scope.row.awbh==''" style="background-color:#63cdda;width: 100%;height:100%;display:block">
137 {{scope.row.awba}} 143 {{scope.row.awba}}
138 </span> 144 </span>
139 - <span v-else-if="scope.row.stype=='MT1201'&&scope.row.awbh!=''" style="background-color:#409eff;width: 100%;height:100%;display:block;"> 145 + <span v-else-if="scope.row.stype=='MT1201'&&scope.row.awbh!=''" style="background-color:#778beb;width: 100%;height:100%;display:block;">
140 {{scope.row.awba}} 146 {{scope.row.awba}}
141 </span> 147 </span>
142 - <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh==''" style="background-color:#FF8C00;width: 100%;height:100%;display:block;"> 148 + <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh==''" style="background-color:#f3a683;width: 100%;height:100%;display:block;">
143 {{scope.row.awba}} 149 {{scope.row.awba}}
144 </span> 150 </span>
145 - <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh!=''" style="background-color:#e6a23c;width: 100%;height:100%;display:block;"> 151 + <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh!=''" style="background-color:#f7d794;width: 100%;height:100%;display:block;">
146 {{scope.row.awba}} 152 {{scope.row.awba}}
147 </span> 153 </span>
148 </template> 154 </template>
@@ -351,4 +357,4 @@ @@ -351,4 +357,4 @@
351 }, 357 },
352 358
353 } 359 }
354 -</script>  
  360 +</script>