Showing
12 changed files
with
64 additions
and
292 deletions
| ... | @@ -2,8 +2,7 @@ | ... | @@ -2,8 +2,7 @@ |
| 2 | 2 | ||
| 3 | ```bash | 3 | ```bash |
| 4 | # 克隆项目 | 4 | # 克隆项目 |
| 5 | -git clone https://gitee.com/y_project/RuoYi-Vue | 5 | +git clone http://118.178.128.178/Fedex/iClear-Connect-Pre-Clearance.git |
| 6 | - | ||
| 7 | # 进入项目目录 | 6 | # 进入项目目录 |
| 8 | cd IMAC-ui | 7 | cd IMAC-ui |
| 9 | 8 | ||
| ... | @@ -27,4 +26,4 @@ npm run build:stage | ... | @@ -27,4 +26,4 @@ npm run build:stage |
| 27 | 26 | ||
| 28 | # 构建生产环境 | 27 | # 构建生产环境 |
| 29 | npm run build:prod | 28 | npm run build:prod |
| 30 | -``` | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 29 | +``` | ... | ... |
web/src/assets/icons/svg/downIcon.svg
0 → 100644
| ... | @@ -2,9 +2,9 @@ | ... | @@ -2,9 +2,9 @@ |
| 2 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | 2 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> |
| 3 | <svg class="icon" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> | 3 | <svg class="icon" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> |
| 4 | <defs><style type="text/css"></style></defs> | 4 | <defs><style type="text/css"></style></defs> |
| 5 | -<circle cx="16.5" cy="16.4" r="4" stroke-width="2" stroke-linejoin="round"/> | 5 | +<circle cx="16.5" cy="16.4" r="4" stroke-width="2" stroke-linejoin="round" stroke="currentColor"/> |
| 6 | -<path d="M19 19L23 23" stroke-width="2" stroke-linejoin="round"/> | 6 | +<path d="M19 19L23 23" stroke-width="2" stroke-linejoin="round" stroke="currentColor"/> |
| 7 | -<path d="M19 10V5L14 1H9.8H6L1 5V18H10" stroke-width="2" stroke-linejoin="round"/> | 7 | +<path d="M19 10V5L14 1H9.8H6L1 5V18H10" stroke-width="2" stroke-linejoin="round" stroke="currentColor"/> |
| 8 | -<path d="M10 6V1" stroke-width="2" stroke-linejoin="round"/> | 8 | +<path d="M10 6V1" stroke-width="2" stroke-linejoin="round" stroke="currentColor"/> |
| 9 | -<path d="M1 6H19" stroke-width="2" stroke-linejoin="round"/> | 9 | +<path d="M1 6H19" stroke-width="2" stroke-linejoin="round" stroke="currentColor"/> |
| 10 | </svg> | 10 | </svg> | ... | ... |
web/src/assets/icons/svg/fedexQuestion.svg
0 → 100644
| 1 | +<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg"> | ||
| 2 | +<path d="M8.5 1C4.4 1 1 4.4 1 8.5C1 12.6 4.4 16 8.5 16C12.6 16 16 12.6 16 8.5C16 4.4 12.6 1 8.5 1Z" stroke="#007AB7" stroke-miterlimit="10"/> | ||
| 3 | +<path d="M8.5 13.5C9.05228 13.5 9.5 13.0523 9.5 12.5C9.5 11.9477 9.05228 11.5 8.5 11.5C7.94772 11.5 7.5 11.9477 7.5 12.5C7.5 13.0523 7.94772 13.5 8.5 13.5Z" fill="#007AB7"/> | ||
| 4 | +<path d="M6.5 6.5C6.5 5 7.5 4 8.5 4C9.5 4 10.5 4.5 10.5 6C10.5 6.9 10 7.6 9.5 8C8.6 8.7 8.5 8.6 8.5 9.5V10.5" stroke="#007AB7" stroke-miterlimit="10"/> | ||
| 5 | +</svg> |
web/src/assets/icons/svg/upIcon.svg
0 → 100644
| ... | @@ -346,6 +346,7 @@ input:disabled { | ... | @@ -346,6 +346,7 @@ input:disabled { |
| 346 | /*标题平移至合适位置*/ | 346 | /*标题平移至合适位置*/ |
| 347 | transition: all 0.2s ease; | 347 | transition: all 0.2s ease; |
| 348 | cursor: text; | 348 | cursor: text; |
| 349 | + z-index: 99; | ||
| 349 | } | 350 | } |
| 350 | 351 | ||
| 351 | .el-form-item__content { | 352 | .el-form-item__content { |
| ... | @@ -1062,4 +1063,47 @@ input:disabled { | ... | @@ -1062,4 +1063,47 @@ input:disabled { |
| 1062 | input::placeholder { | 1063 | input::placeholder { |
| 1063 | color: #409EFF | 1064 | color: #409EFF |
| 1064 | } | 1065 | } |
| 1066 | +} | ||
| 1067 | + | ||
| 1068 | +.el-range-editor { | ||
| 1069 | + width: 100%; | ||
| 1070 | + height: 100%; | ||
| 1071 | + | ||
| 1072 | + .el-range-input { | ||
| 1073 | + padding: 0px; | ||
| 1074 | + } | ||
| 1075 | + | ||
| 1076 | + .el-range-separator { | ||
| 1077 | + line-height: 50px; | ||
| 1078 | + } | ||
| 1079 | + | ||
| 1080 | + input { | ||
| 1081 | + width: 100%; | ||
| 1082 | + height: 100% !important; | ||
| 1083 | + border: none !important; | ||
| 1084 | + background-color: transparent; | ||
| 1085 | + padding-top: 0.775rem; | ||
| 1086 | + // padding-right: 1.15rem; | ||
| 1087 | + padding-left: calc(.6rem + .1875rem); | ||
| 1088 | + font-size: 0.875rem !important; | ||
| 1089 | + } | ||
| 1090 | + | ||
| 1091 | +} | ||
| 1092 | + | ||
| 1093 | +.el-range-editor.el-input__inner { | ||
| 1094 | + padding: 15px 10px 0px 10px; | ||
| 1095 | +} | ||
| 1096 | + | ||
| 1097 | +.el-range-editor { | ||
| 1098 | + .el-range-separator { | ||
| 1099 | + line-height: 35px; | ||
| 1100 | + } | ||
| 1101 | +} | ||
| 1102 | + | ||
| 1103 | +.el-input__inner { | ||
| 1104 | + background-color: transparent !important; | ||
| 1105 | +} | ||
| 1106 | + | ||
| 1107 | +.questionIcon { | ||
| 1108 | + color: $fedexColor; | ||
| 1065 | } | 1109 | } |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| 1 | -<template> | ||
| 2 | - <el-dialog | ||
| 3 | - class="entryDialog systemDialog" | ||
| 4 | - :title="title" | ||
| 5 | - :visible.sync="outerVisible" | ||
| 6 | - :show-close="false" | ||
| 7 | - :close-on-click-modal="false" | ||
| 8 | - v-loading="loadings.editLoading" | ||
| 9 | - width="25%" | ||
| 10 | - @close="close" | ||
| 11 | - ></el-dialog> | ||
| 12 | -</template> | ||
| 13 | - | ||
| 14 | -<script> | ||
| 15 | -export default { | ||
| 16 | - data() { | ||
| 17 | - return {}; | ||
| 18 | - }, | ||
| 19 | -}; | ||
| 20 | -</script> | ||
| 21 | - | ||
| 22 | -<style lang="scss" scoped> | ||
| 23 | -@import "@/assets/styles/variables.scss"; | ||
| 24 | -</style> |
This diff is collapsed. Click to expand it.
| 1 | -<template> | ||
| 2 | - <el-dialog | ||
| 3 | - title="下載附件" | ||
| 4 | - :visible.sync="dialogVisible" | ||
| 5 | - width="50%" | ||
| 6 | - :show-close="true" | ||
| 7 | - class="detail-dialog" | ||
| 8 | - > | ||
| 9 | - <Table | ||
| 10 | - class="fedexDetialTable mt20" | ||
| 11 | - :data="tableData" | ||
| 12 | - :headerData="headerData" | ||
| 13 | - :selection="false" | ||
| 14 | - height="400px" | ||
| 15 | - :order="false" | ||
| 16 | - :border="false" | ||
| 17 | - :pagination="false" | ||
| 18 | - :selectFixed="false" | ||
| 19 | - :pageSizes="[20, 30, 50, 100]" | ||
| 20 | - @selectionChange="handleSelectionChange" | ||
| 21 | - :loading="tableLodaing" | ||
| 22 | - > | ||
| 23 | - <template v-slot:name="scope"> | ||
| 24 | - <p> {{ scope.row.name }}{{ scope.row.type }}</p> | ||
| 25 | - </template> | ||
| 26 | - <template v-slot:down="scope"> | ||
| 27 | - <el-button | ||
| 28 | - class="plain" | ||
| 29 | - size="mini" | ||
| 30 | - @click.native.stop="downLoadOneFile(scope.row)" | ||
| 31 | - :loading="scope.row.downloadLoading" | ||
| 32 | - >下載</el-button | ||
| 33 | - > | ||
| 34 | - </template> | ||
| 35 | - </Table> | ||
| 36 | - <div class="width-btn-box"> | ||
| 37 | - <el-button | ||
| 38 | - class="entrySaveButton entrySaveButton-background" | ||
| 39 | - @click="batchDownloadBtn" | ||
| 40 | - style="margin-right: 30px;width: 110px;" | ||
| 41 | - :loading="allDownload" | ||
| 42 | - :disabled="this.tableData<=0" | ||
| 43 | - > | ||
| 44 | - 下載全部 | ||
| 45 | - </el-button> | ||
| 46 | - <el-button class="entrySaveButton" style="width: 110px;" @click="closeDialog">取消</el-button> | ||
| 47 | - </div> | ||
| 48 | - </el-dialog> | ||
| 49 | -</template> | ||
| 50 | -<script> | ||
| 51 | -import { getFindSysByDeclareId } from "@/api/fillForm.js"; | ||
| 52 | -import { downLoadZip,downLoadFile } from "@/utils/zipdownload"; | ||
| 53 | -export default { | ||
| 54 | - components: {}, | ||
| 55 | - props: {}, | ||
| 56 | - data() { | ||
| 57 | - return { | ||
| 58 | - tableLodaing:false, | ||
| 59 | - allDownload:false, | ||
| 60 | - dialogVisible: false, | ||
| 61 | - declareId: null, | ||
| 62 | - tableData: [], | ||
| 63 | - headerData: [ | ||
| 64 | - { | ||
| 65 | - name: "附件名稱", | ||
| 66 | - value: "name", | ||
| 67 | - width: "", | ||
| 68 | - align: "left", | ||
| 69 | - slot: true, | ||
| 70 | - }, | ||
| 71 | - { | ||
| 72 | - name: "操作", | ||
| 73 | - value: "down", | ||
| 74 | - width: "100", | ||
| 75 | - align: "center", | ||
| 76 | - slot: true, | ||
| 77 | - }, | ||
| 78 | - ], | ||
| 79 | - selectCheckList: [], | ||
| 80 | - customsFileId: null, | ||
| 81 | - }; | ||
| 82 | - }, | ||
| 83 | - methods: { | ||
| 84 | - // 打开弹窗 | ||
| 85 | - openDialog(row) { | ||
| 86 | - this.dialogVisible = true; | ||
| 87 | - this.declareId = row.id; | ||
| 88 | - this.customsFileId = row.customsFileId; | ||
| 89 | - this.getUploadFileList(); | ||
| 90 | - }, | ||
| 91 | - // 关闭弹窗 | ||
| 92 | - closeDialog() { | ||
| 93 | - this.dialogVisible = false; | ||
| 94 | - }, | ||
| 95 | - // 选择下载的附件 | ||
| 96 | - handleSelectionChange(val) { | ||
| 97 | - this.selectCheckList = val; | ||
| 98 | - }, | ||
| 99 | - // 下载 | ||
| 100 | - downLoadOneFile(fileRow) { | ||
| 101 | - fileRow.downloadLoading=true; | ||
| 102 | - downLoadFile( | ||
| 103 | - "/icleartw/cusFile/downLoadFile", | ||
| 104 | - fileRow.id, | ||
| 105 | - fileRow.name+ fileRow.type | ||
| 106 | - ).then(() => { | ||
| 107 | - | ||
| 108 | - this.$message.success("下載成功"); | ||
| 109 | - this.exportLoading = false; | ||
| 110 | - }) | ||
| 111 | - .catch(() => { | ||
| 112 | - this.exportLoading = false; | ||
| 113 | - }).finally(()=>{ | ||
| 114 | - fileRow.downloadLoading = false; | ||
| 115 | - }) | ||
| 116 | - | ||
| 117 | - }, | ||
| 118 | - // 批量下载 | ||
| 119 | - batchDownloadBtn() { | ||
| 120 | - this.allDownload=true; | ||
| 121 | - downLoadZip( | ||
| 122 | - "/icleartw/cusFile/downLoadCusFileAll", | ||
| 123 | - this.customsFileId, | ||
| 124 | - "附件" | ||
| 125 | - ) | ||
| 126 | - .then(() => { | ||
| 127 | - this.allDownload = false; | ||
| 128 | - this.exportLoading = false; | ||
| 129 | - }) | ||
| 130 | - .catch(() => { | ||
| 131 | - this.exportLoading = false; | ||
| 132 | - }); | ||
| 133 | - }, | ||
| 134 | - // 获取文件列表 | ||
| 135 | - getUploadFileList() { | ||
| 136 | - this.tableData=[]; | ||
| 137 | - this.tableLodaing=true; | ||
| 138 | - getFindSysByDeclareId(this.declareId).then((res) => { | ||
| 139 | - if (res.code == 200) { | ||
| 140 | - this.tableData = res.data; | ||
| 141 | - if (this.tableData != null) { | ||
| 142 | - this.tableData = this.tableData.map(item => { | ||
| 143 | - return { | ||
| 144 | - ...item, | ||
| 145 | - downloadLoading: false | ||
| 146 | - }; | ||
| 147 | - }); | ||
| 148 | - } | ||
| 149 | - }else{ | ||
| 150 | - this.$message.error(res.msg); | ||
| 151 | - } | ||
| 152 | - }).catch((res)=>{ | ||
| 153 | - this.$message.error(res.msg); | ||
| 154 | - }).finally(()=>{ | ||
| 155 | - this.tableLodaing = false; | ||
| 156 | - }) | ||
| 157 | - }, | ||
| 158 | - }, | ||
| 159 | -}; | ||
| 160 | -</script> | ||
| 161 | - | ||
| 162 | -<style lang="scss" scoped> | ||
| 163 | -.detail-dialog { | ||
| 164 | - .title-box { | ||
| 165 | - font-size: 16px; | ||
| 166 | - font-weight: 600; | ||
| 167 | - // line-height: 22px; | ||
| 168 | - color: #000000; | ||
| 169 | - display: flex; | ||
| 170 | - justify-content: space-between; | ||
| 171 | - .el-button { | ||
| 172 | - padding: 0; | ||
| 173 | - font-size: 12px; | ||
| 174 | - } | ||
| 175 | - } | ||
| 176 | - .content { | ||
| 177 | - color: #333; | ||
| 178 | - font-size: 12px; | ||
| 179 | - .small-title { | ||
| 180 | - margin: 12px 0 4px 0; | ||
| 181 | - font-size: 14px; | ||
| 182 | - } | ||
| 183 | - .info-box { | ||
| 184 | - width: 100%; | ||
| 185 | - height: 50px; | ||
| 186 | - line-height: 17px; | ||
| 187 | - background: #f2f2f2; | ||
| 188 | - padding: 8px; | ||
| 189 | - margin-bottom: 4px; | ||
| 190 | - } | ||
| 191 | - } | ||
| 192 | - .download { | ||
| 193 | - .el-button { | ||
| 194 | - padding: 0; | ||
| 195 | - font-size: 12px; | ||
| 196 | - } | ||
| 197 | - img { | ||
| 198 | - vertical-align: -4px; | ||
| 199 | - } | ||
| 200 | - } | ||
| 201 | - ::v-deep .el-dialog { | ||
| 202 | - padding: 20px 100px; | ||
| 203 | - } | ||
| 204 | - ::v-deep .el-dialog__header { | ||
| 205 | - text-align: center; | ||
| 206 | - } | ||
| 207 | - .width-btn-box { | ||
| 208 | - width: 100%; | ||
| 209 | - text-align: center; | ||
| 210 | - margin-top: 16px; | ||
| 211 | - .el-button { | ||
| 212 | - width: 100px; | ||
| 213 | - } | ||
| 214 | - } | ||
| 215 | - ::v-deep .el-table__body-wrapper .el-table__body tbody tr { | ||
| 216 | - height: 50px; | ||
| 217 | - } | ||
| 218 | -} | ||
| 219 | -</style> |
web/test/declareQuery/index.vue
deleted
100644 → 0
This diff is collapsed. Click to expand it.
| 1 | -export const tableHeaderKeys = [ | ||
| 2 | - { | ||
| 3 | - label: "提單號碼", | ||
| 4 | - prop: "deliveryNo", | ||
| 5 | - width: 150, | ||
| 6 | - align: "left", | ||
| 7 | - sort: false, | ||
| 8 | - }, | ||
| 9 | - { | ||
| 10 | - label: "報單類別", | ||
| 11 | - prop: "customsDeclarationType", | ||
| 12 | - width: 150, | ||
| 13 | - align: "left", | ||
| 14 | - sort: false, | ||
| 15 | - }, | ||
| 16 | - { | ||
| 17 | - label: "操作狀態/時間", | ||
| 18 | - prop: "operStatusAndTime1", | ||
| 19 | - width: 150, | ||
| 20 | - align: "left", | ||
| 21 | - tem:"operStatusAndTime1", | ||
| 22 | - sort: "custom", | ||
| 23 | - }, | ||
| 24 | - { | ||
| 25 | - label: "傳送狀態/時間", | ||
| 26 | - prop: "delStatus", | ||
| 27 | - width: 150, | ||
| 28 | - align: "left", | ||
| 29 | - tem: "delStatus", | ||
| 30 | - sort:"custom", | ||
| 31 | - | ||
| 32 | - }, | ||
| 33 | - { | ||
| 34 | - label: "操作", | ||
| 35 | - prop: "opt", | ||
| 36 | - width: 150, | ||
| 37 | - align: "center", | ||
| 38 | - tem: "opt", | ||
| 39 | - sort: false, | ||
| 40 | - }, | ||
| 41 | -]; |
web/test/fedex.scss
deleted
100644 → 0
This diff is collapsed. Click to expand it.
-
Please register or login to post a comment