Showing
1 changed file
with
59 additions
and
22 deletions
| ... | @@ -246,7 +246,46 @@ | ... | @@ -246,7 +246,46 @@ |
| 246 | </el-button> | 246 | </el-button> |
| 247 | </div> | 247 | </div> |
| 248 | <div class="optionButton-right"> | 248 | <div class="optionButton-right"> |
| 249 | - <el-dropdown | 249 | + <el-button |
| 250 | + size="small" | ||
| 251 | + type="primary" | ||
| 252 | + class="dropdown-style-button" | ||
| 253 | + :loading="loadings.orderLoading" | ||
| 254 | + @click="declareData('orderLoading', '订单申报', 'order')" | ||
| 255 | + > | ||
| 256 | + <svg-icon | ||
| 257 | + class="el-icon-user-solid" | ||
| 258 | + icon-class="fedexDeclareIcon" | ||
| 259 | + ></svg-icon> | ||
| 260 | + 订单申报 | ||
| 261 | + </el-button> | ||
| 262 | + <el-button | ||
| 263 | + size="small" | ||
| 264 | + type="primary" | ||
| 265 | + class="dropdown-style-button" | ||
| 266 | + :loading="loadings.waybillLoading" | ||
| 267 | + @click="declareData('waybillLoading', '运单申报', 'waybill')" | ||
| 268 | + > | ||
| 269 | + <svg-icon | ||
| 270 | + class="el-icon-user-solid" | ||
| 271 | + icon-class="fedexDeclareIcon" | ||
| 272 | + ></svg-icon> | ||
| 273 | + 运单申报 | ||
| 274 | + </el-button> | ||
| 275 | + <el-button | ||
| 276 | + size="small" | ||
| 277 | + type="primary" | ||
| 278 | + class="dropdown-style-button" | ||
| 279 | + :loading="loadings.listLoading" | ||
| 280 | + @click="declareData('listLoading', '清单申报', 'list')" | ||
| 281 | + > | ||
| 282 | + <svg-icon | ||
| 283 | + class="el-icon-user-solid" | ||
| 284 | + icon-class="fedexDeclareIcon" | ||
| 285 | + ></svg-icon> | ||
| 286 | + 清单申报 | ||
| 287 | + </el-button> | ||
| 288 | + <!-- <el-dropdown | ||
| 250 | style="margin-right: 10px" | 289 | style="margin-right: 10px" |
| 251 | size="small" | 290 | size="small" |
| 252 | split-button | 291 | split-button |
| ... | @@ -273,12 +312,8 @@ | ... | @@ -273,12 +312,8 @@ |
| 273 | <el-dropdown-item :command="{ code: 'list', name: '清单申报' }" | 312 | <el-dropdown-item :command="{ code: 'list', name: '清单申报' }" |
| 274 | >清单申报</el-dropdown-item | 313 | >清单申报</el-dropdown-item |
| 275 | > | 314 | > |
| 276 | - <!-- <el-dropdown-item | ||
| 277 | - :command="{ code: 'totalScore', name: '清单总分单申报' }" | ||
| 278 | - >清单总分单申报</el-dropdown-item | ||
| 279 | - > --> | ||
| 280 | </el-dropdown-menu> | 315 | </el-dropdown-menu> |
| 281 | - </el-dropdown> | 316 | + </el-dropdown> --> |
| 282 | <!-- 运抵单申报按钮 --> | 317 | <!-- 运抵单申报按钮 --> |
| 283 | <!-- <el-button | 318 | <!-- <el-button |
| 284 | size="small" | 319 | size="small" |
| ... | @@ -842,6 +877,9 @@ export default { | ... | @@ -842,6 +877,9 @@ export default { |
| 842 | revokeLoading: false, // 撤销单申报加载状态 | 877 | revokeLoading: false, // 撤销单申报加载状态 |
| 843 | departureLoading: false, // 离境单申报加载状态 | 878 | departureLoading: false, // 离境单申报加载状态 |
| 844 | arrivalInLoading: false, // 运抵单申报加载状态 | 879 | arrivalInLoading: false, // 运抵单申报加载状态 |
| 880 | + orderLoading: false, // 订单申报加载状态 | ||
| 881 | + waybillLoading: false, // 运单申报加载状态 | ||
| 882 | + listLoading: false, // 撤销单申报加载状态 | ||
| 845 | }, | 883 | }, |
| 846 | textareaVisible: {}, | 884 | textareaVisible: {}, |
| 847 | tableMaxheight: null, | 885 | tableMaxheight: null, |
| ... | @@ -1221,15 +1259,14 @@ export default { | ... | @@ -1221,15 +1259,14 @@ export default { |
| 1221 | }, | 1259 | }, |
| 1222 | 1260 | ||
| 1223 | cancelDataPreview(val) { | 1261 | cancelDataPreview(val) { |
| 1224 | - this.dataPreviewVisible = false; | 1262 | + // this.dataPreviewVisible = false; |
| 1225 | - this.dataPreviewTitle = ""; | 1263 | + // this.dataPreviewTitle = ""; |
| 1226 | - | 1264 | + // if (val === 1) { |
| 1227 | - if (val === 1) { | 1265 | + // this.postDeclareData(this.paramsOjb, this.currentLoadingKey); |
| 1228 | - this.postDeclareData(this.paramsOjb, this.currentLoadingKey); | 1266 | + // } else { |
| 1229 | - } else { | 1267 | + // this.$set(this.loadings, this.currentLoadingKey, false); |
| 1230 | - this.$set(this.loadings, this.currentLoadingKey, false); | 1268 | + // this.paramsOjb = {}; |
| 1231 | - this.paramsOjb = {}; | 1269 | + // } |
| 1232 | - } | ||
| 1233 | }, | 1270 | }, |
| 1234 | 1271 | ||
| 1235 | /** | 1272 | /** |
| ... | @@ -1251,13 +1288,13 @@ export default { | ... | @@ -1251,13 +1288,13 @@ export default { |
| 1251 | declareIds: this.selected.map((item) => item.declareId), | 1288 | declareIds: this.selected.map((item) => item.declareId), |
| 1252 | type: dropdownCode, | 1289 | type: dropdownCode, |
| 1253 | }; | 1290 | }; |
| 1254 | - if (dropdownName === "清单总分单申报") { | 1291 | + // if (dropdownName === "清单总分单申报") { |
| 1255 | - this.dataPreviewVisible = true; | 1292 | + // this.dataPreviewVisible = true; |
| 1256 | - this.dataPreviewTitle = `预览-${dropdownName}`; | 1293 | + // this.dataPreviewTitle = `预览-${dropdownName}`; |
| 1257 | - this.currentLoadingKey = loadingKey; | 1294 | + // this.currentLoadingKey = loadingKey; |
| 1258 | - this.paramsOjb = obj; | 1295 | + // this.paramsOjb = obj; |
| 1259 | - return; | 1296 | + // return; |
| 1260 | - } | 1297 | + // } |
| 1261 | 1298 | ||
| 1262 | // 如果是撤销单申报,显示弹窗并返回 | 1299 | // 如果是撤销单申报,显示弹窗并返回 |
| 1263 | if (dropdownName === "撤销单申报") { | 1300 | if (dropdownName === "撤销单申报") { | ... | ... |
-
Please register or login to post a comment