Showing
9 changed files
with
88 additions
and
40 deletions
| ... | @@ -438,8 +438,6 @@ export default { | ... | @@ -438,8 +438,6 @@ export default { |
| 438 | } | 438 | } |
| 439 | this.$nextTick(() => { | 439 | this.$nextTick(() => { |
| 440 | if (table) { | 440 | if (table) { |
| 441 | - console.log('debug==',tableBody.clientHeight,this.maxHeight); | ||
| 442 | - | ||
| 443 | table.style.maxHeight = this.maxHeight; | 441 | table.style.maxHeight = this.maxHeight; |
| 444 | tableBody.clientHeight >= parseInt(this.maxHeight) | 442 | tableBody.clientHeight >= parseInt(this.maxHeight) |
| 445 | ? (table.style.height = this.maxHeight - 40 + "px") | 443 | ? (table.style.height = this.maxHeight - 40 + "px") | ... | ... |
| ... | @@ -31,7 +31,7 @@ | ... | @@ -31,7 +31,7 @@ |
| 31 | :pageSizes="[20, 30, 50, 100]" | 31 | :pageSizes="[20, 30, 50, 100]" |
| 32 | :totalCount="0" | 32 | :totalCount="0" |
| 33 | :loading="tableLoading" | 33 | :loading="tableLoading" |
| 34 | - :emptyText="$t('portEntry.emptyText')" | 34 | + :emptyText="(loadingDatas && !rowData.popoverData.length) ? '数据加载中' : $t('portEntry.emptyText')" |
| 35 | height="350px" | 35 | height="350px" |
| 36 | maxHeight="500px" | 36 | maxHeight="500px" |
| 37 | rowKey="id" | 37 | rowKey="id" |
| ... | @@ -82,14 +82,20 @@ export default { | ... | @@ -82,14 +82,20 @@ export default { |
| 82 | }, | 82 | }, |
| 83 | data() { | 83 | data() { |
| 84 | return { | 84 | return { |
| 85 | - tableLoading: false, | 85 | + tableLoading: false |
| 86 | }; | 86 | }; |
| 87 | }, | 87 | }, |
| 88 | + computed:{ | ||
| 89 | + loadingDatas(){ | ||
| 90 | + return this.$store.state.viewOption.loadingDatas | ||
| 91 | + } | ||
| 92 | + }, | ||
| 88 | methods: { | 93 | methods: { |
| 89 | //弹框关闭 | 94 | //弹框关闭 |
| 90 | popoverClose() { | 95 | popoverClose() { |
| 91 | this.$emit("popoverClose"); | 96 | this.$emit("popoverClose"); |
| 92 | this.parentDom.$refs.tables.$refs.bodyWrapper.style.overflowY = "auto"; | 97 | this.parentDom.$refs.tables.$refs.bodyWrapper.style.overflowY = "auto"; |
| 98 | + this.$store.dispatch('setLoadingState', true) | ||
| 93 | }, | 99 | }, |
| 94 | //弹框状态改版 | 100 | //弹框状态改版 |
| 95 | popoverChange(data, type) { | 101 | popoverChange(data, type) { | ... | ... |
| ... | @@ -7,13 +7,17 @@ const viewOption = { | ... | @@ -7,13 +7,17 @@ const viewOption = { |
| 7 | tab: '', | 7 | tab: '', |
| 8 | submitType: false, | 8 | submitType: false, |
| 9 | updateType: false, | 9 | updateType: false, |
| 10 | - } | 10 | + }, |
| 11 | + loadingDatas:true | ||
| 11 | }, | 12 | }, |
| 12 | 13 | ||
| 13 | mutations: { | 14 | mutations: { |
| 14 | SET_ENTRYDATA(state, entryData) { | 15 | SET_ENTRYDATA(state, entryData) { |
| 15 | state.entryEdit = entryData | 16 | state.entryEdit = entryData |
| 16 | - } | 17 | + }, |
| 18 | + SET_LOADINGDATA(state, isLoading) { | ||
| 19 | + state.loadingDatas = isLoading | ||
| 20 | + }, | ||
| 17 | }, | 21 | }, |
| 18 | 22 | ||
| 19 | actions: { | 23 | actions: { |
| ... | @@ -28,7 +32,10 @@ const viewOption = { | ... | @@ -28,7 +32,10 @@ const viewOption = { |
| 28 | submitType: false, | 32 | submitType: false, |
| 29 | updateType: false, | 33 | updateType: false, |
| 30 | }) | 34 | }) |
| 31 | - } | 35 | + }, |
| 36 | + setLoadingState({ commit, state }, data) { | ||
| 37 | + commit('SET_LOADINGDATA', data) | ||
| 38 | + }, | ||
| 32 | } | 39 | } |
| 33 | } | 40 | } |
| 34 | 41 | ... | ... |
| ... | @@ -272,7 +272,7 @@ export default { | ... | @@ -272,7 +272,7 @@ export default { |
| 272 | if (val == 0) { | 272 | if (val == 0) { |
| 273 | this.page.pageIndex = 1; | 273 | this.page.pageIndex = 1; |
| 274 | } | 274 | } |
| 275 | - let obj = this.sreachFormData; | 275 | + let obj = {...this.sreachFormData}; |
| 276 | obj.pageIndex = this.page.pageIndex; | 276 | obj.pageIndex = this.page.pageIndex; |
| 277 | obj.pageSize = this.page.pageSize; | 277 | obj.pageSize = this.page.pageSize; |
| 278 | obj.endCreationTime = ""; | 278 | obj.endCreationTime = ""; |
| ... | @@ -312,10 +312,7 @@ export default { | ... | @@ -312,10 +312,7 @@ export default { |
| 312 | }); | 312 | }); |
| 313 | }, | 313 | }, |
| 314 | clear() { | 314 | clear() { |
| 315 | - this.sreachFormData = { | 315 | + this.$refs.sreachForm.resetFields(); |
| 316 | - portCode: "", | ||
| 317 | - dxpid: "", | ||
| 318 | - }; | ||
| 319 | }, | 316 | }, |
| 320 | //下载证书 | 317 | //下载证书 |
| 321 | downloadFile(val) { | 318 | downloadFile(val) { | ... | ... |
| ... | @@ -38,7 +38,7 @@ | ... | @@ -38,7 +38,7 @@ |
| 38 | <el-col :span="4"> | 38 | <el-col :span="4"> |
| 39 | <Formitem label="企业商品描述" prop="enterpriseProductDescribe"> | 39 | <Formitem label="企业商品描述" prop="enterpriseProductDescribe"> |
| 40 | <el-input | 40 | <el-input |
| 41 | - type="text" | 41 | + type="textarea" |
| 42 | class="inputShadow" | 42 | class="inputShadow" |
| 43 | id="inputInner--enterpriseProductDescribe" | 43 | id="inputInner--enterpriseProductDescribe" |
| 44 | resize="none" | 44 | resize="none" |
| ... | @@ -77,7 +77,7 @@ | ... | @@ -77,7 +77,7 @@ |
| 77 | <el-col :span="4"> | 77 | <el-col :span="4"> |
| 78 | <Formitem label="规格型号" prop="model"> | 78 | <Formitem label="规格型号" prop="model"> |
| 79 | <el-input | 79 | <el-input |
| 80 | - type="text" | 80 | + type="textarea" |
| 81 | class="inputShadow" | 81 | class="inputShadow" |
| 82 | id="inputInner--model" | 82 | id="inputInner--model" |
| 83 | resize="none" | 83 | resize="none" |
| ... | @@ -122,6 +122,7 @@ | ... | @@ -122,6 +122,7 @@ |
| 122 | id="inputInner--destinationCountryRegionCode" | 122 | id="inputInner--destinationCountryRegionCode" |
| 123 | v-model="tableRowformData.destinationCountryRegionCode" | 123 | v-model="tableRowformData.destinationCountryRegionCode" |
| 124 | clearable | 124 | clearable |
| 125 | + filterable | ||
| 125 | placeholder="" | 126 | placeholder="" |
| 126 | > | 127 | > |
| 127 | <el-option | 128 | <el-option |
| ... | @@ -140,6 +141,7 @@ | ... | @@ -140,6 +141,7 @@ |
| 140 | id="inputInner--unit" | 141 | id="inputInner--unit" |
| 141 | v-model="tableRowformData.unit" | 142 | v-model="tableRowformData.unit" |
| 142 | clearable | 143 | clearable |
| 144 | + filterable | ||
| 143 | placeholder="" | 145 | placeholder="" |
| 144 | > | 146 | > |
| 145 | <el-option | 147 | <el-option |
| ... | @@ -154,7 +156,7 @@ | ... | @@ -154,7 +156,7 @@ |
| 154 | <el-col :span="4"> | 156 | <el-col :span="4"> |
| 155 | <Formitem label="数量" prop="qty"> | 157 | <Formitem label="数量" prop="qty"> |
| 156 | <el-input | 158 | <el-input |
| 157 | - type="text" | 159 | + type="number" |
| 158 | class="inputShadow" | 160 | class="inputShadow" |
| 159 | id="inputInner--qty" | 161 | id="inputInner--qty" |
| 160 | resize="none" | 162 | resize="none" |
| ... | @@ -167,7 +169,7 @@ | ... | @@ -167,7 +169,7 @@ |
| 167 | <el-col :span="4"> | 169 | <el-col :span="4"> |
| 168 | <Formitem label="法定数量" prop="legalQty"> | 170 | <Formitem label="法定数量" prop="legalQty"> |
| 169 | <el-input | 171 | <el-input |
| 170 | - type="text" | 172 | + type="number" |
| 171 | class="inputShadow" | 173 | class="inputShadow" |
| 172 | id="inputInner--legalQty" | 174 | id="inputInner--legalQty" |
| 173 | resize="none" | 175 | resize="none" |
| ... | @@ -186,6 +188,7 @@ | ... | @@ -186,6 +188,7 @@ |
| 186 | id="inputInner--currency" | 188 | id="inputInner--currency" |
| 187 | v-model="tableRowformData.currency" | 189 | v-model="tableRowformData.currency" |
| 188 | clearable | 190 | clearable |
| 191 | + filterable | ||
| 189 | placeholder="" | 192 | placeholder="" |
| 190 | > | 193 | > |
| 191 | <el-option | 194 | <el-option |
| ... | @@ -200,7 +203,7 @@ | ... | @@ -200,7 +203,7 @@ |
| 200 | <el-col :span="4"> | 203 | <el-col :span="4"> |
| 201 | <Formitem label="单价" prop="price"> | 204 | <Formitem label="单价" prop="price"> |
| 202 | <el-input | 205 | <el-input |
| 203 | - type="text" | 206 | + type="number" |
| 204 | class="inputShadow" | 207 | class="inputShadow" |
| 205 | id="inputInner--price" | 208 | id="inputInner--price" |
| 206 | resize="none" | 209 | resize="none" |
| ... | @@ -213,7 +216,7 @@ | ... | @@ -213,7 +216,7 @@ |
| 213 | <el-col :span="4"> | 216 | <el-col :span="4"> |
| 214 | <Formitem label="总价" prop="totalPrice"> | 217 | <Formitem label="总价" prop="totalPrice"> |
| 215 | <el-input | 218 | <el-input |
| 216 | - type="text" | 219 | + type="number" |
| 217 | class="inputShadow" | 220 | class="inputShadow" |
| 218 | id="inputInner--totalPrice" | 221 | id="inputInner--totalPrice" |
| 219 | resize="none" | 222 | resize="none" |
| ... | @@ -226,7 +229,7 @@ | ... | @@ -226,7 +229,7 @@ |
| 226 | <el-col :span="4"> | 229 | <el-col :span="4"> |
| 227 | <Formitem label="净重" prop="netWeight"> | 230 | <Formitem label="净重" prop="netWeight"> |
| 228 | <el-input | 231 | <el-input |
| 229 | - type="text" | 232 | + type="number" |
| 230 | class="inputShadow" | 233 | class="inputShadow" |
| 231 | id="inputInner--netWeight" | 234 | id="inputInner--netWeight" |
| 232 | resize="none" | 235 | resize="none" |
| ... | @@ -239,7 +242,7 @@ | ... | @@ -239,7 +242,7 @@ |
| 239 | <el-col :span="8"> | 242 | <el-col :span="8"> |
| 240 | <Formitem label="备注" prop="remark"> | 243 | <Formitem label="备注" prop="remark"> |
| 241 | <el-input | 244 | <el-input |
| 242 | - type="text" | 245 | + type="textarea" |
| 243 | class="inputShadow" | 246 | class="inputShadow" |
| 244 | id="inputInner--remark" | 247 | id="inputInner--remark" |
| 245 | resize="none" | 248 | resize="none" |
| ... | @@ -270,18 +273,32 @@ | ... | @@ -270,18 +273,32 @@ |
| 270 | tableRowFormRules:{ | 273 | tableRowFormRules:{ |
| 271 | enterpriseProductCode: [ | 274 | enterpriseProductCode: [ |
| 272 | { required: true, message: '请输入企业商品货号', trigger: 'blur' }, | 275 | { required: true, message: '请输入企业商品货号', trigger: 'blur' }, |
| 276 | + { max: 30, message: '长度不能超过30个字符', trigger: 'blur' } | ||
| 273 | ], | 277 | ], |
| 274 | enterpriseProductName: [ | 278 | enterpriseProductName: [ |
| 275 | - { required: true, message: '请输入企业商品名称', trigger: 'blur' } | 279 | + { required: true, message: '请输入企业商品名称', trigger: 'blur' }, |
| 280 | + { max: 250, message: '长度不能超过250个字符', trigger: 'blur' } | ||
| 281 | + ], | ||
| 282 | + enterpriseProductDescribe: [ | ||
| 283 | + { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' } | ||
| 276 | ], | 284 | ], |
| 277 | productName: [ | 285 | productName: [ |
| 278 | - { required: true, message: '请输入商品名称', trigger: 'blur' } | 286 | + { required: true, message: '请输入商品名称', trigger: 'blur' }, |
| 287 | + { max: 250, message: '长度不能超过250个字符', trigger: 'blur' } | ||
| 279 | ], | 288 | ], |
| 280 | productCode: [ | 289 | productCode: [ |
| 281 | - { required: true, message: '请输入商品编码', trigger: 'blur' } | 290 | + { required: true, message: '请输入商品编码', trigger: 'blur' }, |
| 291 | + { max: 10, message: '长度不能超过10个字符', trigger: 'blur' } | ||
| 282 | ], | 292 | ], |
| 283 | model: [ | 293 | model: [ |
| 284 | - { required: true, message: '请输入规格型号', trigger: 'blur' } | 294 | + { required: true, message: '请输入规格型号', trigger: 'blur' }, |
| 295 | + { max: 250, message: '长度不能超过250个字符', trigger: 'blur' } | ||
| 296 | + ], | ||
| 297 | + accountBookMaterialNumber: [ | ||
| 298 | + { max: 30, message: '长度不能超过30个字符', trigger: 'blur' } | ||
| 299 | + ], | ||
| 300 | + barCode: [ | ||
| 301 | + { max: 50, message: '长度不能超过50个字符', trigger: 'blur' } | ||
| 285 | ], | 302 | ], |
| 286 | destinationCountryRegionCode: [ | 303 | destinationCountryRegionCode: [ |
| 287 | { required: true, message: '请选择目的国(地区)代码', trigger: 'change' } | 304 | { required: true, message: '请选择目的国(地区)代码', trigger: 'change' } |
| ... | @@ -307,6 +324,9 @@ | ... | @@ -307,6 +324,9 @@ |
| 307 | netWeight: [ | 324 | netWeight: [ |
| 308 | { required: true, message: '请输入净重', trigger: 'blur' } | 325 | { required: true, message: '请输入净重', trigger: 'blur' } |
| 309 | ], | 326 | ], |
| 327 | + remark: [ | ||
| 328 | + { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' } | ||
| 329 | + ], | ||
| 310 | } | 330 | } |
| 311 | }; | 331 | }; |
| 312 | }, | 332 | }, | ... | ... |
| ... | @@ -116,7 +116,7 @@ | ... | @@ -116,7 +116,7 @@ |
| 116 | <el-col :span="3"> | 116 | <el-col :span="3"> |
| 117 | <Formitem label="商品金额" prop="goodsValue"> | 117 | <Formitem label="商品金额" prop="goodsValue"> |
| 118 | <el-input | 118 | <el-input |
| 119 | - type="text" | 119 | + type="number" |
| 120 | class="inputShadow" | 120 | class="inputShadow" |
| 121 | id="inputInner--goodsValue" | 121 | id="inputInner--goodsValue" |
| 122 | resize="none" | 122 | resize="none" |
| ... | @@ -130,7 +130,7 @@ | ... | @@ -130,7 +130,7 @@ |
| 130 | <el-col :span="3"> | 130 | <el-col :span="3"> |
| 131 | <Formitem label="运杂费" prop="miscellaneousFreight"> | 131 | <Formitem label="运杂费" prop="miscellaneousFreight"> |
| 132 | <el-input | 132 | <el-input |
| 133 | - type="text" | 133 | + type="number" |
| 134 | class="inputShadow" | 134 | class="inputShadow" |
| 135 | id="inputInner--miscellaneousFreight" | 135 | id="inputInner--miscellaneousFreight" |
| 136 | resize="none" | 136 | resize="none" |
| ... | @@ -150,6 +150,7 @@ | ... | @@ -150,6 +150,7 @@ |
| 150 | type="text" | 150 | type="text" |
| 151 | id="inputInner--currency" | 151 | id="inputInner--currency" |
| 152 | v-model="formData.currency" | 152 | v-model="formData.currency" |
| 153 | + filterable | ||
| 153 | clearable | 154 | clearable |
| 154 | placeholder="" | 155 | placeholder="" |
| 155 | > | 156 | > |
| ... | @@ -166,7 +167,7 @@ | ... | @@ -166,7 +167,7 @@ |
| 166 | <el-col :span="3"> | 167 | <el-col :span="3"> |
| 167 | <Formitem label="主要货物信息" prop="mainGoodsInfo"> | 168 | <Formitem label="主要货物信息" prop="mainGoodsInfo"> |
| 168 | <el-input | 169 | <el-input |
| 169 | - type="text" | 170 | + type="textarea" |
| 170 | class="inputShadow" | 171 | class="inputShadow" |
| 171 | id="inputInner--mainGoodsInfo" | 172 | id="inputInner--mainGoodsInfo" |
| 172 | resize="none" | 173 | resize="none" |
| ... | @@ -267,6 +268,7 @@ | ... | @@ -267,6 +268,7 @@ |
| 267 | id="inputInner--destinationCountryRegion" | 268 | id="inputInner--destinationCountryRegion" |
| 268 | v-model="formData.destinationCountryRegion" | 269 | v-model="formData.destinationCountryRegion" |
| 269 | clearable | 270 | clearable |
| 271 | + filterable | ||
| 270 | placeholder="" | 272 | placeholder="" |
| 271 | > | 273 | > |
| 272 | <el-option | 274 | <el-option |
| ... | @@ -287,6 +289,7 @@ | ... | @@ -287,6 +289,7 @@ |
| 287 | resize="none" | 289 | resize="none" |
| 288 | v-model="formData.portCode" | 290 | v-model="formData.portCode" |
| 289 | clearable | 291 | clearable |
| 292 | + filterable | ||
| 290 | placeholder="" | 293 | placeholder="" |
| 291 | ></el-input> | 294 | ></el-input> |
| 292 | </Formitem> | 295 | </Formitem> |
| ... | @@ -294,7 +297,7 @@ | ... | @@ -294,7 +297,7 @@ |
| 294 | <el-col :span="3"> | 297 | <el-col :span="3"> |
| 295 | <Formitem label="运费" prop="freight"> | 298 | <Formitem label="运费" prop="freight"> |
| 296 | <el-input | 299 | <el-input |
| 297 | - type="text" | 300 | + type="number" |
| 298 | class="inputShadow" | 301 | class="inputShadow" |
| 299 | id="inputInner--freight" | 302 | id="inputInner--freight" |
| 300 | resize="none" | 303 | resize="none" |
| ... | @@ -311,6 +314,7 @@ | ... | @@ -311,6 +314,7 @@ |
| 311 | id="inputInner--freightCurrency" | 314 | id="inputInner--freightCurrency" |
| 312 | v-model="formData.freightCurrency" | 315 | v-model="formData.freightCurrency" |
| 313 | clearable | 316 | clearable |
| 317 | + filterable | ||
| 314 | placeholder="" | 318 | placeholder="" |
| 315 | > | 319 | > |
| 316 | <el-option | 320 | <el-option |
| ... | @@ -343,7 +347,7 @@ | ... | @@ -343,7 +347,7 @@ |
| 343 | <el-col :span="3"> | 347 | <el-col :span="3"> |
| 344 | <Formitem label="保费" prop="insuredfee"> | 348 | <Formitem label="保费" prop="insuredfee"> |
| 345 | <el-input | 349 | <el-input |
| 346 | - type="text" | 350 | + type="number" |
| 347 | class="inputShadow" | 351 | class="inputShadow" |
| 348 | id="inputInner--insuredfee" | 352 | id="inputInner--insuredfee" |
| 349 | resize="none" | 353 | resize="none" |
| ... | @@ -360,6 +364,7 @@ | ... | @@ -360,6 +364,7 @@ |
| 360 | id="inputInner--insuredfeeCurrency" | 364 | id="inputInner--insuredfeeCurrency" |
| 361 | v-model="formData.insuredfeeCurrency" | 365 | v-model="formData.insuredfeeCurrency" |
| 362 | clearable | 366 | clearable |
| 367 | + filterable | ||
| 363 | placeholder="" | 368 | placeholder="" |
| 364 | > | 369 | > |
| 365 | <el-option | 370 | <el-option |
| ... | @@ -412,7 +417,7 @@ | ... | @@ -412,7 +417,7 @@ |
| 412 | <el-col :span="3"> | 417 | <el-col :span="3"> |
| 413 | <Formitem label="件数" prop="packNo"> | 418 | <Formitem label="件数" prop="packNo"> |
| 414 | <el-input | 419 | <el-input |
| 415 | - type="text" | 420 | + type="number" |
| 416 | class="inputShadow" | 421 | class="inputShadow" |
| 417 | id="inputInner--packNo" | 422 | id="inputInner--packNo" |
| 418 | resize="none" | 423 | resize="none" |
| ... | @@ -425,7 +430,7 @@ | ... | @@ -425,7 +430,7 @@ |
| 425 | <el-col :span="3"> | 430 | <el-col :span="3"> |
| 426 | <Formitem label="毛重(公斤)" prop="weight"> | 431 | <Formitem label="毛重(公斤)" prop="weight"> |
| 427 | <el-input | 432 | <el-input |
| 428 | - type="text" | 433 | + type="number" |
| 429 | class="inputShadow" | 434 | class="inputShadow" |
| 430 | id="inputInner--weight" | 435 | id="inputInner--weight" |
| 431 | resize="none" | 436 | resize="none" |
| ... | @@ -438,7 +443,7 @@ | ... | @@ -438,7 +443,7 @@ |
| 438 | <el-col :span="3"> | 443 | <el-col :span="3"> |
| 439 | <Formitem label="净重(公斤)" prop="netWeight"> | 444 | <Formitem label="净重(公斤)" prop="netWeight"> |
| 440 | <el-input | 445 | <el-input |
| 441 | - type="text" | 446 | + type="number" |
| 442 | class="inputShadow" | 447 | class="inputShadow" |
| 443 | id="inputInner--netWeight" | 448 | id="inputInner--netWeight" |
| 444 | resize="none" | 449 | resize="none" |
| ... | @@ -543,9 +548,11 @@ | ... | @@ -543,9 +548,11 @@ |
| 543 | ], | 548 | ], |
| 544 | orderNo: [ | 549 | orderNo: [ |
| 545 | { required: true, message: '请输入订单编号', trigger: 'blur' }, | 550 | { required: true, message: '请输入订单编号', trigger: 'blur' }, |
| 551 | + { max: 60, message: '长度不能超过60个字符', trigger: 'blur' } | ||
| 546 | ], | 552 | ], |
| 547 | logisticsNo: [ | 553 | logisticsNo: [ |
| 548 | { required: true, message: '请输入物流运单编号', trigger: 'blur' }, | 554 | { required: true, message: '请输入物流运单编号', trigger: 'blur' }, |
| 555 | + { max: 80, message: '长度不能超过80个字符', trigger: 'blur' } | ||
| 549 | ], | 556 | ], |
| 550 | declareCustomsCode: [ | 557 | declareCustomsCode: [ |
| 551 | { required: true, message: '请选择申报地海关', trigger: 'change' } | 558 | { required: true, message: '请选择申报地海关', trigger: 'change' } |
| ... | @@ -563,16 +570,26 @@ | ... | @@ -563,16 +570,26 @@ |
| 563 | { required: true, message: '请选择币制', trigger: 'change' } | 570 | { required: true, message: '请选择币制', trigger: 'change' } |
| 564 | ], | 571 | ], |
| 565 | mainGoodsInfo: [ | 572 | mainGoodsInfo: [ |
| 566 | - { required: true, message: '请输入主要物品信息', trigger: 'blur' } | 573 | + { required: true, message: '请输入主要物品信息', trigger: 'blur' }, |
| 574 | + { max: 200, message: '长度不能超过200个字符', trigger: 'blur' } | ||
| 567 | ], | 575 | ], |
| 568 | flightNumber: [ | 576 | flightNumber: [ |
| 569 | - { required: true, message: '请输入航班号', trigger: 'blur' } | 577 | + { required: true, message: '请输入航班号', trigger: 'blur' }, |
| 578 | + { max: 32, message: '长度不能超过32个字符', trigger: 'blur' } | ||
| 570 | ], | 579 | ], |
| 571 | billno: [ | 580 | billno: [ |
| 572 | - { required: true, message: '请输入提运单号', trigger: 'blur' } | 581 | + { required: true, message: '请输入提运单号', trigger: 'blur' }, |
| 582 | + { max: 37, message: '长度不能超过37个字符', trigger: 'blur' } | ||
| 573 | ], | 583 | ], |
| 574 | totalPackageNo: [ | 584 | totalPackageNo: [ |
| 575 | - { required: true, message: '请输入总包号', trigger: 'blur' } | 585 | + { required: true, message: '请输入总包号', trigger: 'blur' }, |
| 586 | + { max: 37, message: '长度不能超过37个字符', trigger: 'blur' } | ||
| 587 | + ], | ||
| 588 | + regulatoryVenueCode: [ | ||
| 589 | + { max: 10, message: '长度不能超过10个字符', trigger: 'blur' } | ||
| 590 | + ], | ||
| 591 | + licenseKey: [ | ||
| 592 | + { max: 19, message: '长度不能超过19个字符', trigger: 'blur' } | ||
| 576 | ], | 593 | ], |
| 577 | destinationCountryRegion: [ | 594 | destinationCountryRegion: [ |
| 578 | { required: true, message: '请选择运抵国', trigger: 'change' } | 595 | { required: true, message: '请选择运抵国', trigger: 'change' } |
| ... | @@ -611,7 +628,8 @@ | ... | @@ -611,7 +628,8 @@ |
| 611 | { required: true, message: '请输入净重', trigger: 'blur' } | 628 | { required: true, message: '请输入净重', trigger: 'blur' } |
| 612 | ], | 629 | ], |
| 613 | remark: [ | 630 | remark: [ |
| 614 | - { required: true, message: '请输入备注', trigger: 'blur' } | 631 | + { required: true, message: '请输入备注', trigger: 'blur' }, |
| 632 | + { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' } | ||
| 615 | ] | 633 | ] |
| 616 | }, | 634 | }, |
| 617 | detailData: [], | 635 | detailData: [], | ... | ... |
| ... | @@ -663,7 +663,7 @@ | ... | @@ -663,7 +663,7 @@ |
| 663 | </Formitem> | 663 | </Formitem> |
| 664 | </el-col> | 664 | </el-col> |
| 665 | <!-- 申报时间 --> | 665 | <!-- 申报时间 --> |
| 666 | - <el-col :span="3"> | 666 | + <el-col :span="6"> |
| 667 | <Formitem label="报送时间" prop="appTime"> | 667 | <Formitem label="报送时间" prop="appTime"> |
| 668 | <el-input | 668 | <el-input |
| 669 | type="text" | 669 | type="text" |
| ... | @@ -677,7 +677,7 @@ | ... | @@ -677,7 +677,7 @@ |
| 677 | </Formitem> | 677 | </Formitem> |
| 678 | </el-col> | 678 | </el-col> |
| 679 | <!-- 备注 --> | 679 | <!-- 备注 --> |
| 680 | - <el-col :span="9"> | 680 | + <el-col :span="6"> |
| 681 | <Formitem label="备注" prop="note"> | 681 | <Formitem label="备注" prop="note"> |
| 682 | <el-input | 682 | <el-input |
| 683 | type="text" | 683 | type="text" | ... | ... |
| ... | @@ -278,7 +278,7 @@ export default { | ... | @@ -278,7 +278,7 @@ export default { |
| 278 | if (val == 0) { | 278 | if (val == 0) { |
| 279 | this.page.pageIndex = 1; | 279 | this.page.pageIndex = 1; |
| 280 | } | 280 | } |
| 281 | - let obj = this.sreachFormData; | 281 | + let obj = {...this.sreachFormData}; |
| 282 | obj.pageIndex = this.page.pageIndex; | 282 | obj.pageIndex = this.page.pageIndex; |
| 283 | obj.pageSize = this.page.pageSize; | 283 | obj.pageSize = this.page.pageSize; |
| 284 | obj.createTimeStart = ""; | 284 | obj.createTimeStart = ""; | ... | ... |
| ... | @@ -696,6 +696,7 @@ export default { | ... | @@ -696,6 +696,7 @@ export default { |
| 696 | this.alertWarningMsg(res.message); | 696 | this.alertWarningMsg(res.message); |
| 697 | } | 697 | } |
| 698 | this.loadings.dropDownLoading = false; | 698 | this.loadings.dropDownLoading = false; |
| 699 | + this.search(0); | ||
| 699 | }) | 700 | }) |
| 700 | .catch((err) => { | 701 | .catch((err) => { |
| 701 | console.log(err); | 702 | console.log(err); |
| ... | @@ -735,6 +736,7 @@ export default { | ... | @@ -735,6 +736,7 @@ export default { |
| 735 | }) | 736 | }) |
| 736 | .finally(() => { | 737 | .finally(() => { |
| 737 | this.$nextTick(() => { | 738 | this.$nextTick(() => { |
| 739 | + this.$store.dispatch('setLoadingState', false) | ||
| 738 | this.$refs.orderReceiptStatusPopover.tableLoading = false; | 740 | this.$refs.orderReceiptStatusPopover.tableLoading = false; |
| 739 | this.$refs.wayBillReceiptPopover.tableLoading = false; | 741 | this.$refs.wayBillReceiptPopover.tableLoading = false; |
| 740 | this.$refs.listReceiptStatusPopover.tableLoading = false; | 742 | this.$refs.listReceiptStatusPopover.tableLoading = false; | ... | ... |
-
Please register or login to post a comment