Showing
9 changed files
with
114 additions
and
108 deletions
| 1 | NODE_ENV = production | 1 | NODE_ENV = production |
| 2 | 2 | ||
| 3 | -# uat环境配置 | 3 | +# 测试环境配置 |
| 4 | ENV = 'uat' | 4 | ENV = 'uat' |
| 5 | 5 | ||
| 6 | VUE_APP_BASE_ENV = "uat" | 6 | VUE_APP_BASE_ENV = "uat" |
| ... | @@ -8,21 +8,21 @@ VUE_APP_BASE_ENV = "uat" | ... | @@ -8,21 +8,21 @@ VUE_APP_BASE_ENV = "uat" |
| 8 | VUE_APP_Version = '1.0.0' | 8 | VUE_APP_Version = '1.0.0' |
| 9 | 9 | ||
| 10 | #测试环境 | 10 | #测试环境 |
| 11 | -VUE_APP_BASE_API = 'https://declarationuat.fedex.com.cn/Exp' | 11 | +VUE_APP_BASE_API = 'http://101.132.100.41:7023/Ecom' |
| 12 | 12 | ||
| 13 | -VUE_APP_BASE_ROUTE = '/Ecom' | 13 | +VUE_APP_BASE_ROUTE = '/EcomUat' |
| 14 | 14 | ||
| 15 | -VUE_APP_BASE_LOGINOUT = '/Ecom' | 15 | +VUE_APP_BASE_LOGINOUT = '/EcomUat' |
| 16 | 16 | ||
| 17 | #后端版本校验版本号 | 17 | #后端版本校验版本号 |
| 18 | -VUE_APP_APIVERSION = '19DD6C1CEC504AC854645F352EB03209.A3889C390C14952AD666ABC3BE46BE40' | 18 | +VUE_APP_APIVERSION = '033BD94B1168D7E4F0D644C3C95E35BF.A3889C390C14952AD666ABC3BE46BE40' |
| 19 | 19 | ||
| 20 | #iclearEmp系统地址 | 20 | #iclearEmp系统地址 |
| 21 | -VUE_APP_REDIRECT_EMP = 'https://declarationuat.fedex.com.cn/Emp/#/login' | 21 | +VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login' |
| 22 | #Fcl登录地址 | 22 | #Fcl登录地址 |
| 23 | VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward' | 23 | VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward' |
| 24 | #图文版使用指南 | 24 | #图文版使用指南 |
| 25 | -VUE_APP_FEDEX_HANDBOOK = 'https://declarationuat.fedex.com.cn/Exp/manager-server/FedEx.pdf' | 25 | +VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf' |
| 26 | #视频版使用指南 | 26 | #视频版使用指南 |
| 27 | VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4' | 27 | VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4' |
| 28 | #隐私政策 | 28 | #隐私政策 |
| ... | @@ -38,9 +38,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem | ... | @@ -38,9 +38,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem |
| 38 | #京ICP | 38 | #京ICP |
| 39 | VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery' | 39 | VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery' |
| 40 | 40 | ||
| 41 | -VUE_APP_BASE_API_dev = 'https://declarationuat.fedex.com.cn/Exp' | 41 | +VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp' |
| 42 | -VUE_APP_BASE_API_test = 'https://declarationuat.fedex.com.cn/Exp' | 42 | +VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp' |
| 43 | -VUE_APP_BASE_API_demo = 'https://declarationuat.fedex.com.cn/Exp' | 43 | +VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp' |
| 44 | VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp' | 44 | VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp' |
| 45 | VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp' | 45 | VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp' |
| 46 | VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp' | 46 | VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp' |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -91,9 +91,10 @@ export default { | ... | @@ -91,9 +91,10 @@ export default { |
| 91 | let str = value; | 91 | let str = value; |
| 92 | this.$store.getters.dict[dictkey].forEach((item) => { | 92 | this.$store.getters.dict[dictkey].forEach((item) => { |
| 93 | if (value == item[key]) { | 93 | if (value == item[key]) { |
| 94 | - str = item.name; | 94 | + str = item.itemChineseName; |
| 95 | } | 95 | } |
| 96 | }); | 96 | }); |
| 97 | + | ||
| 97 | return str; | 98 | return str; |
| 98 | }, | 99 | }, |
| 99 | }, | 100 | }, | ... | ... |
| ... | @@ -86,7 +86,7 @@ | ... | @@ -86,7 +86,7 @@ |
| 86 | </Formitem> | 86 | </Formitem> |
| 87 | </el-col> | 87 | </el-col> |
| 88 | <!-- 电商企业 --> | 88 | <!-- 电商企业 --> |
| 89 | - <el-col :span="3"> | 89 | + <el-col :span="6"> |
| 90 | <Formitem label="电商企业" prop="ebcname"> | 90 | <Formitem label="电商企业" prop="ebcname"> |
| 91 | <el-input | 91 | <el-input |
| 92 | type="text" | 92 | type="text" |
| ... | @@ -99,9 +99,11 @@ | ... | @@ -99,9 +99,11 @@ |
| 99 | ></el-input> | 99 | ></el-input> |
| 100 | </Formitem> | 100 | </Formitem> |
| 101 | </el-col> | 101 | </el-col> |
| 102 | - <!-- 货款金额 --> | 102 | + </el-row> |
| 103 | - <el-col :span="3"> | 103 | + <el-row :gutter="5"> |
| 104 | - <Formitem label="货款金额" prop="goodsValue"> | 104 | + <!-- 商品金额 --> |
| 105 | + <el-col :span="3"> | ||
| 106 | + <Formitem label="商品金额" prop="goodsValue"> | ||
| 105 | <el-input | 107 | <el-input |
| 106 | type="text" | 108 | type="text" |
| 107 | class="inputShadow" | 109 | class="inputShadow" |
| ... | @@ -113,8 +115,6 @@ | ... | @@ -113,8 +115,6 @@ |
| 113 | ></el-input> | 115 | ></el-input> |
| 114 | </Formitem> | 116 | </Formitem> |
| 115 | </el-col> | 117 | </el-col> |
| 116 | - </el-row> | ||
| 117 | - <el-row :gutter="5"> | ||
| 118 | <!-- 运杂费 --> | 118 | <!-- 运杂费 --> |
| 119 | <el-col :span="3"> | 119 | <el-col :span="3"> |
| 120 | <Formitem label="运杂费" prop="freight"> | 120 | <Formitem label="运杂费" prop="freight"> |
| ... | @@ -149,7 +149,7 @@ | ... | @@ -149,7 +149,7 @@ |
| 149 | </Formitem> | 149 | </Formitem> |
| 150 | </el-col> | 150 | </el-col> |
| 151 | <!-- 申报状态 --> | 151 | <!-- 申报状态 --> |
| 152 | - <el-col :span="3"> | 152 | + <el-col :span="6"> |
| 153 | <Formitem label="报送状态" prop="appStatus"> | 153 | <Formitem label="报送状态" prop="appStatus"> |
| 154 | <el-select | 154 | <el-select |
| 155 | type="text" | 155 | type="text" |
| ... | @@ -187,7 +187,7 @@ | ... | @@ -187,7 +187,7 @@ |
| 187 | </Formitem> | 187 | </Formitem> |
| 188 | </el-col> | 188 | </el-col> |
| 189 | <!-- 申报日期 --> | 189 | <!-- 申报日期 --> |
| 190 | - <el-col :span="3"> | 190 | + <el-col :span="6"> |
| 191 | <Formitem label="报送日期" prop="appTime"> | 191 | <Formitem label="报送日期" prop="appTime"> |
| 192 | <el-input | 192 | <el-input |
| 193 | type="text" | 193 | type="text" | ... | ... |
| ... | @@ -222,7 +222,7 @@ | ... | @@ -222,7 +222,7 @@ |
| 222 | </el-row> | 222 | </el-row> |
| 223 | <el-row :gutter="5"> | 223 | <el-row :gutter="5"> |
| 224 | <!-- 收发货人名称 --> | 224 | <!-- 收发货人名称 --> |
| 225 | - <el-col :span="3"> | 225 | + <el-col :span="6"> |
| 226 | <Formitem label="收发货人名称" prop="ebcname"> | 226 | <Formitem label="收发货人名称" prop="ebcname"> |
| 227 | <el-input | 227 | <el-input |
| 228 | type="text" | 228 | type="text" |
| ... | @@ -250,7 +250,7 @@ | ... | @@ -250,7 +250,7 @@ |
| 250 | </Formitem> | 250 | </Formitem> |
| 251 | </el-col> | 251 | </el-col> |
| 252 | <!-- 生产销售企业名称 --> | 252 | <!-- 生产销售企业名称 --> |
| 253 | - <el-col :span="3"> | 253 | + <el-col :span="6"> |
| 254 | <Formitem label="生产销售企业名称" prop="ownerName"> | 254 | <Formitem label="生产销售企业名称" prop="ownerName"> |
| 255 | <el-input | 255 | <el-input |
| 256 | type="text" | 256 | type="text" |
| ... | @@ -305,8 +305,11 @@ | ... | @@ -305,8 +305,11 @@ |
| 305 | ></el-input> | 305 | ></el-input> |
| 306 | </Formitem> | 306 | </Formitem> |
| 307 | </el-col> | 307 | </el-col> |
| 308 | - <!-- 贸易方式 --> | 308 | + |
| 309 | - <el-col :span="3"> | 309 | + </el-row> |
| 310 | + <el-row :gutter="5"> | ||
| 311 | + <!-- 贸易方式 --> | ||
| 312 | + <el-col :span="3"> | ||
| 310 | <Formitem label="贸易方式" prop="tradeMode"> | 313 | <Formitem label="贸易方式" prop="tradeMode"> |
| 311 | <el-select | 314 | <el-select |
| 312 | type="text" | 315 | type="text" |
| ... | @@ -343,8 +346,6 @@ | ... | @@ -343,8 +346,6 @@ |
| 343 | </el-select> | 346 | </el-select> |
| 344 | </Formitem> | 347 | </Formitem> |
| 345 | </el-col> | 348 | </el-col> |
| 346 | - </el-row> | ||
| 347 | - <el-row :gutter="5"> | ||
| 348 | <!-- 运输工具名称 --> | 349 | <!-- 运输工具名称 --> |
| 349 | <el-col :span="3"> | 350 | <el-col :span="3"> |
| 350 | <Formitem label="运输工具名称" prop="trafName"> | 351 | <Formitem label="运输工具名称" prop="trafName"> |
| ... | @@ -439,8 +440,11 @@ | ... | @@ -439,8 +440,11 @@ |
| 439 | </el-select> | 440 | </el-select> |
| 440 | </Formitem> | 441 | </Formitem> |
| 441 | </el-col> | 442 | </el-col> |
| 442 | - <!-- 运费 --> | 443 | + |
| 443 | - <el-col :span="3"> | 444 | + </el-row> |
| 445 | + <el-row :gutter="5"> | ||
| 446 | + <!-- 运费 --> | ||
| 447 | + <el-col :span="3"> | ||
| 444 | <Formitem label="运费" prop="freight"> | 448 | <Formitem label="运费" prop="freight"> |
| 445 | <el-input | 449 | <el-input |
| 446 | type="text" | 450 | type="text" |
| ... | @@ -472,8 +476,6 @@ | ... | @@ -472,8 +476,6 @@ |
| 472 | </el-select> | 476 | </el-select> |
| 473 | </Formitem> | 477 | </Formitem> |
| 474 | </el-col> | 478 | </el-col> |
| 475 | - </el-row> | ||
| 476 | - <el-row :gutter="5"> | ||
| 477 | <!-- 运费标志 --> | 479 | <!-- 运费标志 --> |
| 478 | <el-col :span="3"> | 480 | <el-col :span="3"> |
| 479 | <Formitem label="运费标志" prop="fflag"> | 481 | <Formitem label="运费标志" prop="fflag"> |
| ... | @@ -573,8 +575,11 @@ | ... | @@ -573,8 +575,11 @@ |
| 573 | ></el-input> | 575 | ></el-input> |
| 574 | </Formitem> | 576 | </Formitem> |
| 575 | </el-col> | 577 | </el-col> |
| 576 | - <!-- 净重(公斤) --> | 578 | + |
| 577 | - <el-col :span="3"> | 579 | + </el-row> |
| 580 | + <el-row :gutter="5"> | ||
| 581 | + <!-- 净重(公斤) --> | ||
| 582 | + <el-col :span="3"> | ||
| 578 | <Formitem label="净重(公斤)" prop="netWeight"> | 583 | <Formitem label="净重(公斤)" prop="netWeight"> |
| 579 | <el-input | 584 | <el-input |
| 580 | type="text" | 585 | type="text" |
| ... | @@ -601,8 +606,6 @@ | ... | @@ -601,8 +606,6 @@ |
| 601 | ></el-input> | 606 | ></el-input> |
| 602 | </Formitem> | 607 | </Formitem> |
| 603 | </el-col> | 608 | </el-col> |
| 604 | - </el-row> | ||
| 605 | - <el-row :gutter="5"> | ||
| 606 | <!-- 业务状态 --> | 609 | <!-- 业务状态 --> |
| 607 | <!-- <el-col :span="3"> | 610 | <!-- <el-col :span="3"> |
| 608 | <Formitem label="回执状态" prop="returnStatus"> | 611 | <Formitem label="回执状态" prop="returnStatus"> |
| ... | @@ -800,9 +803,10 @@ export default { | ... | @@ -800,9 +803,10 @@ export default { |
| 800 | }, | 803 | }, |
| 801 | { | 804 | { |
| 802 | name: "法定单位", | 805 | name: "法定单位", |
| 803 | - value: "unit1", | 806 | + value: "unit", |
| 804 | width: "", | 807 | width: "", |
| 805 | align: "left", | 808 | align: "left", |
| 809 | + slot: true, | ||
| 806 | }, | 810 | }, |
| 807 | { | 811 | { |
| 808 | name: "第二数量", | 812 | name: "第二数量", |
| ... | @@ -816,12 +820,12 @@ export default { | ... | @@ -816,12 +820,12 @@ export default { |
| 816 | width: "", | 820 | width: "", |
| 817 | align: "left", | 821 | align: "left", |
| 818 | }, | 822 | }, |
| 819 | - { | 823 | + // { |
| 820 | - name: "毛重(KG)", | 824 | + // name: "毛重(KG)", |
| 821 | - value: "", | 825 | + // value: "", |
| 822 | - width: "", | 826 | + // width: "", |
| 823 | - align: "left", | 827 | + // align: "left", |
| 824 | - }, | 828 | + // }, |
| 825 | ], | 829 | ], |
| 826 | loadings: { | 830 | loadings: { |
| 827 | entryLoading: false, | 831 | entryLoading: false, | ... | ... |
| ... | @@ -44,7 +44,7 @@ | ... | @@ -44,7 +44,7 @@ |
| 44 | </Formitem> | 44 | </Formitem> |
| 45 | </el-col> | 45 | </el-col> |
| 46 | <!-- 物流企业名称 --> | 46 | <!-- 物流企业名称 --> |
| 47 | - <el-col :span="3"> | 47 | + <el-col :span="6"> |
| 48 | <Formitem label="物流企业名称" prop="logisticsName"> | 48 | <Formitem label="物流企业名称" prop="logisticsName"> |
| 49 | <el-input | 49 | <el-input |
| 50 | type="text" | 50 | type="text" |
| ... | @@ -58,7 +58,7 @@ | ... | @@ -58,7 +58,7 @@ |
| 58 | </Formitem> | 58 | </Formitem> |
| 59 | </el-col> | 59 | </el-col> |
| 60 | <!-- 电商企业名称 --> | 60 | <!-- 电商企业名称 --> |
| 61 | - <el-col :span="3"> | 61 | + <el-col :span="6"> |
| 62 | <Formitem label="电商企业名称" prop="ebcname"> | 62 | <Formitem label="电商企业名称" prop="ebcname"> |
| 63 | <el-input | 63 | <el-input |
| 64 | type="text" | 64 | type="text" |
| ... | @@ -99,34 +99,7 @@ | ... | @@ -99,34 +99,7 @@ |
| 99 | ></el-input> | 99 | ></el-input> |
| 100 | </Formitem> | 100 | </Formitem> |
| 101 | </el-col> | 101 | </el-col> |
| 102 | - <!-- 运费 --> | 102 | + |
| 103 | - <el-col :span="3"> | ||
| 104 | - <Formitem label="运费" prop="freight"> | ||
| 105 | - <el-input | ||
| 106 | - type="text" | ||
| 107 | - class="inputShadow" | ||
| 108 | - id="inputInner--freight" | ||
| 109 | - resize="none" | ||
| 110 | - v-model="formData.freight" | ||
| 111 | - clearable | ||
| 112 | - placeholder="" | ||
| 113 | - ></el-input> | ||
| 114 | - </Formitem> | ||
| 115 | - </el-col> | ||
| 116 | - <!-- 保价费 --> | ||
| 117 | - <el-col :span="3"> | ||
| 118 | - <Formitem label="保价费" prop="insuredfee"> | ||
| 119 | - <el-input | ||
| 120 | - type="text" | ||
| 121 | - class="inputShadow" | ||
| 122 | - id="inputInner--insuredfee" | ||
| 123 | - resize="none" | ||
| 124 | - v-model="formData.insuredfee" | ||
| 125 | - clearable | ||
| 126 | - placeholder="" | ||
| 127 | - ></el-input> | ||
| 128 | - </Formitem> | ||
| 129 | - </el-col> | ||
| 130 | </el-row> | 103 | </el-row> |
| 131 | <el-row :gutter="5"> | 104 | <el-row :gutter="5"> |
| 132 | <!-- 币制 --> | 105 | <!-- 币制 --> |
| ... | @@ -162,22 +135,9 @@ | ... | @@ -162,22 +135,9 @@ |
| 162 | ></el-input> | 135 | ></el-input> |
| 163 | </Formitem> | 136 | </Formitem> |
| 164 | </el-col> | 137 | </el-col> |
| 165 | - <!-- 件数 --> | 138 | + |
| 166 | - <el-col :span="3"> | ||
| 167 | - <Formitem label="件数" prop="packNo"> | ||
| 168 | - <el-input | ||
| 169 | - type="text" | ||
| 170 | - class="inputShadow" | ||
| 171 | - id="inputInner--packNo" | ||
| 172 | - resize="none" | ||
| 173 | - v-model="formData.packNo" | ||
| 174 | - clearable | ||
| 175 | - placeholder="" | ||
| 176 | - ></el-input> | ||
| 177 | - </Formitem> | ||
| 178 | - </el-col> | ||
| 179 | <!-- 主要货物信息 --> | 139 | <!-- 主要货物信息 --> |
| 180 | - <el-col :span="3"> | 140 | + <el-col :span="6"> |
| 181 | <Formitem label="主要货物信息" prop="goodsInfo"> | 141 | <Formitem label="主要货物信息" prop="goodsInfo"> |
| 182 | <el-input | 142 | <el-input |
| 183 | type="text" | 143 | type="text" |
| ... | @@ -209,7 +169,7 @@ | ... | @@ -209,7 +169,7 @@ |
| 209 | </el-select> | 169 | </el-select> |
| 210 | </Formitem> | 170 | </Formitem> |
| 211 | </el-col> --> | 171 | </el-col> --> |
| 212 | - <el-col :span="3"> | 172 | + <el-col :span="6"> |
| 213 | <Formitem label="报送时间" prop="createTime"> | 173 | <Formitem label="报送时间" prop="createTime"> |
| 214 | <el-input | 174 | <el-input |
| 215 | type="text" | 175 | type="text" |
| ... | @@ -222,6 +182,20 @@ | ... | @@ -222,6 +182,20 @@ |
| 222 | ></el-input> | 182 | ></el-input> |
| 223 | </Formitem> | 183 | </Formitem> |
| 224 | </el-col> | 184 | </el-col> |
| 185 | + <!-- 件数 --> | ||
| 186 | + <el-col :span="3"> | ||
| 187 | + <Formitem label="件数" prop="packNo"> | ||
| 188 | + <el-input | ||
| 189 | + type="text" | ||
| 190 | + class="inputShadow" | ||
| 191 | + id="inputInner--packNo" | ||
| 192 | + resize="none" | ||
| 193 | + v-model="formData.packNo" | ||
| 194 | + clearable | ||
| 195 | + placeholder="" | ||
| 196 | + ></el-input> | ||
| 197 | + </Formitem> | ||
| 198 | + </el-col> | ||
| 225 | <el-col :span="3"> | 199 | <el-col :span="3"> |
| 226 | <Formitem label="报送状态" prop="appStatus"> | 200 | <Formitem label="报送状态" prop="appStatus"> |
| 227 | <el-select | 201 | <el-select |
| ... | @@ -240,6 +214,34 @@ | ... | @@ -240,6 +214,34 @@ |
| 240 | </el-select> | 214 | </el-select> |
| 241 | </Formitem> | 215 | </Formitem> |
| 242 | </el-col> | 216 | </el-col> |
| 217 | + <!-- 运费 --> | ||
| 218 | + <el-col :span="3"> | ||
| 219 | + <Formitem label="运费" prop="freight"> | ||
| 220 | + <el-input | ||
| 221 | + type="text" | ||
| 222 | + class="inputShadow" | ||
| 223 | + id="inputInner--freight" | ||
| 224 | + resize="none" | ||
| 225 | + v-model="formData.freight" | ||
| 226 | + clearable | ||
| 227 | + placeholder="" | ||
| 228 | + ></el-input> | ||
| 229 | + </Formitem> | ||
| 230 | + </el-col> | ||
| 231 | + <!-- 保价费 --> | ||
| 232 | + <el-col :span="3"> | ||
| 233 | + <Formitem label="保价费" prop="insuredfee"> | ||
| 234 | + <el-input | ||
| 235 | + type="text" | ||
| 236 | + class="inputShadow" | ||
| 237 | + id="inputInner--insuredfee" | ||
| 238 | + resize="none" | ||
| 239 | + v-model="formData.insuredfee" | ||
| 240 | + clearable | ||
| 241 | + placeholder="" | ||
| 242 | + ></el-input> | ||
| 243 | + </Formitem> | ||
| 244 | + </el-col> | ||
| 243 | <!-- 备注 --> | 245 | <!-- 备注 --> |
| 244 | <el-col :span="6"> | 246 | <el-col :span="6"> |
| 245 | <Formitem label="备注" prop="note"> | 247 | <Formitem label="备注" prop="note"> | ... | ... |
| ... | @@ -273,7 +273,7 @@ | ... | @@ -273,7 +273,7 @@ |
| 273 | </Formitem> | 273 | </Formitem> |
| 274 | </el-col> | 274 | </el-col> |
| 275 | <!-- 申报日期 --> | 275 | <!-- 申报日期 --> |
| 276 | - <el-col :span="3"> | 276 | + <el-col :span="6"> |
| 277 | <Formitem label="报送日期" prop="appTime"> | 277 | <Formitem label="报送日期" prop="appTime"> |
| 278 | <el-input | 278 | <el-input |
| 279 | type="text" | 279 | type="text" |
| ... | @@ -287,7 +287,7 @@ | ... | @@ -287,7 +287,7 @@ |
| 287 | </Formitem> | 287 | </Formitem> |
| 288 | </el-col> | 288 | </el-col> |
| 289 | <!-- 备注 --> | 289 | <!-- 备注 --> |
| 290 | - <el-col :span="12"> | 290 | + <el-col :span="9"> |
| 291 | <Formitem label="备注" prop="note"> | 291 | <Formitem label="备注" prop="note"> |
| 292 | <el-input | 292 | <el-input |
| 293 | type="text" | 293 | type="text" | ... | ... |
| ... | @@ -63,7 +63,7 @@ | ... | @@ -63,7 +63,7 @@ |
| 63 | </Formitem> | 63 | </Formitem> |
| 64 | </el-col> | 64 | </el-col> |
| 65 | <!-- 报送时间 --> | 65 | <!-- 报送时间 --> |
| 66 | - <el-col :span="3"> | 66 | + <el-col :span="6"> |
| 67 | <Formitem label="报送时间" prop="appTime"> | 67 | <Formitem label="报送时间" prop="appTime"> |
| 68 | <el-input | 68 | <el-input |
| 69 | type="text" | 69 | type="text" |
| ... | @@ -77,7 +77,7 @@ | ... | @@ -77,7 +77,7 @@ |
| 77 | </Formitem> | 77 | </Formitem> |
| 78 | </el-col> | 78 | </el-col> |
| 79 | <!-- 物流企业名称 --> | 79 | <!-- 物流企业名称 --> |
| 80 | - <el-col :span="3"> | 80 | + <el-col :span="6"> |
| 81 | <Formitem label="物流企业名称" prop="logisticsName"> | 81 | <Formitem label="物流企业名称" prop="logisticsName"> |
| 82 | <el-input | 82 | <el-input |
| 83 | type="text" | 83 | type="text" |
| ... | @@ -104,8 +104,11 @@ | ... | @@ -104,8 +104,11 @@ |
| 104 | ></el-input> | 104 | ></el-input> |
| 105 | </Formitem> | 105 | </Formitem> |
| 106 | </el-col> | 106 | </el-col> |
| 107 | - <!-- 申报地海关代码 --> | 107 | + |
| 108 | - <el-col :span="3"> | 108 | + </el-row> |
| 109 | + <el-row :gutter="5"> | ||
| 110 | + <!-- 申报地海关代码 --> | ||
| 111 | + <el-col :span="3"> | ||
| 109 | <Formitem label="申报地海关代码" prop="customsCode"> | 112 | <Formitem label="申报地海关代码" prop="customsCode"> |
| 110 | <el-input | 113 | <el-input |
| 111 | type="text" | 114 | type="text" |
| ... | @@ -137,8 +140,6 @@ | ... | @@ -137,8 +140,6 @@ |
| 137 | </el-select> | 140 | </el-select> |
| 138 | </Formitem> | 141 | </Formitem> |
| 139 | </el-col> | 142 | </el-col> |
| 140 | - </el-row> | ||
| 141 | - <el-row :gutter="5"> | ||
| 142 | <!-- 运输工具名称 --> | 143 | <!-- 运输工具名称 --> |
| 143 | <el-col :span="3"> | 144 | <el-col :span="3"> |
| 144 | <Formitem label="运输工具名称" prop="trafName"> | 145 | <Formitem label="运输工具名称" prop="trafName"> | ... | ... |
| ... | @@ -49,20 +49,11 @@ | ... | @@ -49,20 +49,11 @@ |
| 49 | <!-- 运单号 --> | 49 | <!-- 运单号 --> |
| 50 | <el-col :span="5"> | 50 | <el-col :span="5"> |
| 51 | <Formitem label="运单编号" prop="logisticsWaybillNumber"> | 51 | <Formitem label="运单编号" prop="logisticsWaybillNumber"> |
| 52 | - <el-input | 52 | + <FormTextareaInput |
| 53 | - type="text" | ||
| 54 | - class="inputShadow" | ||
| 55 | - id="inputInner--logisticsWaybillNumber" | ||
| 56 | - resize="none" | ||
| 57 | - v-model="sreachFormData.logisticsWaybillNumber" | ||
| 58 | - clearable | ||
| 59 | - placeholder="" | ||
| 60 | - ></el-input> | ||
| 61 | - <!-- <FormTextareaInput | ||
| 62 | :formData="sreachFormData" | 53 | :formData="sreachFormData" |
| 63 | dataKey="logisticsWaybillNumber" | 54 | dataKey="logisticsWaybillNumber" |
| 64 | @formChange="formChange" | 55 | @formChange="formChange" |
| 65 | - /> --> | 56 | + /> |
| 66 | </Formitem> | 57 | </Formitem> |
| 67 | </el-col> | 58 | </el-col> |
| 68 | <!-- 创建时间 --> | 59 | <!-- 创建时间 --> |
| ... | @@ -311,10 +302,16 @@ export default { | ... | @@ -311,10 +302,16 @@ export default { |
| 311 | obj.createTimeEnd = ""; | 302 | obj.createTimeEnd = ""; |
| 312 | obj.logisticsNo = obj.logisticsWaybillNumber | 303 | obj.logisticsNo = obj.logisticsWaybillNumber |
| 313 | delete obj.logisticsWaybillNumber | 304 | delete obj.logisticsWaybillNumber |
| 305 | + if (obj.logisticsNo != null && obj.logisticsNo != "") { | ||
| 306 | + obj.logisticsNo = obj.logisticsNo.split("\n"); | ||
| 307 | + } else { | ||
| 308 | + obj.logisticsNo = []; | ||
| 309 | + } | ||
| 314 | if (obj.createTime.length > 0) { | 310 | if (obj.createTime.length > 0) { |
| 315 | obj.createTimeStart = obj.createTime[0]; | 311 | obj.createTimeStart = obj.createTime[0]; |
| 316 | obj.createTimeEnd = obj.createTime[1]; | 312 | obj.createTimeEnd = obj.createTime[1]; |
| 317 | } | 313 | } |
| 314 | + delete obj.createTime | ||
| 318 | // if (obj.billNo != null && obj.billNo != "") { | 315 | // if (obj.billNo != null && obj.billNo != "") { |
| 319 | // obj.billNo = obj.billNo.split("\n"); | 316 | // obj.billNo = obj.billNo.split("\n"); |
| 320 | // } else { | 317 | // } else { | ... | ... |
| ... | @@ -634,9 +634,10 @@ export default { | ... | @@ -634,9 +634,10 @@ export default { |
| 634 | this.dropdownCode = val.code; | 634 | this.dropdownCode = val.code; |
| 635 | }, | 635 | }, |
| 636 | close(val) { | 636 | close(val) { |
| 637 | - if (val) { | 637 | + // if (val) { |
| 638 | - this.search(1); | 638 | + // this.search(1); |
| 639 | - } | 639 | + // } |
| 640 | + this.search(1); | ||
| 640 | this.outerVisible = false; | 641 | this.outerVisible = false; |
| 641 | }, | 642 | }, |
| 642 | popoverChange(val) { | 643 | popoverChange(val) { | ... | ... |
-
Please register or login to post a comment