Showing
3 changed files
with
100 additions
and
59 deletions
| ... | @@ -143,7 +143,6 @@ | ... | @@ -143,7 +143,6 @@ |
| 143 | ></el-input> | 143 | ></el-input> |
| 144 | </Formitem> | 144 | </Formitem> |
| 145 | </el-col> | 145 | </el-col> |
| 146 | - <!-- DXPID --> | ||
| 147 | <el-col :span="8"> | 146 | <el-col :span="8"> |
| 148 | <Formitem label="山电DXPID" prop="qingdaoDanyiUserDxpid" type="edit"> | 147 | <Formitem label="山电DXPID" prop="qingdaoDanyiUserDxpid" type="edit"> |
| 149 | <el-input | 148 | <el-input |
| ... | @@ -173,7 +172,6 @@ | ... | @@ -173,7 +172,6 @@ |
| 173 | ></el-input> | 172 | ></el-input> |
| 174 | </Formitem> | 173 | </Formitem> |
| 175 | </el-col> | 174 | </el-col> |
| 176 | - <!-- DXPID --> | ||
| 177 | <el-col :span="8"> | 175 | <el-col :span="8"> |
| 178 | <Formitem label="山电用户密码" prop="qingdaoUserPassword" type="edit"> | 176 | <Formitem label="山电用户密码" prop="qingdaoUserPassword" type="edit"> |
| 179 | <el-input | 177 | <el-input |
| ... | @@ -324,13 +322,13 @@ | ... | @@ -324,13 +322,13 @@ |
| 324 | </div> | 322 | </div> |
| 325 | </el-col> | 323 | </el-col> |
| 326 | <el-col :span="8"> | 324 | <el-col :span="8"> |
| 327 | - <Formitem label="证书序列号" prop="dxpid" type="edit"> | 325 | + <Formitem label="证书序列号" prop="certificateSerialNumber" type="edit"> |
| 328 | <el-input | 326 | <el-input |
| 329 | type="text" | 327 | type="text" |
| 330 | class="inputShadow" | 328 | class="inputShadow" |
| 331 | - id="inputInner-edit-dxpid" | 329 | + id="inputInner-edit-certificateSerialNumber" |
| 332 | resize="none" | 330 | resize="none" |
| 333 | - v-model="formData.dxpid" | 331 | + v-model="formData.certificateSerialNumber" |
| 334 | clearable | 332 | clearable |
| 335 | placeholder="" | 333 | placeholder="" |
| 336 | ></el-input> | 334 | ></el-input> |
| ... | @@ -403,7 +401,7 @@ export default { | ... | @@ -403,7 +401,7 @@ export default { |
| 403 | ecomEntEmail: "", | 401 | ecomEntEmail: "", |
| 404 | ecomEntName: "", | 402 | ecomEntName: "", |
| 405 | orderRequester: "", | 403 | orderRequester: "", |
| 406 | - dxpid: "", | 404 | + certificateSerialNumber: "", |
| 407 | qingdaoKey: "", | 405 | qingdaoKey: "", |
| 408 | qingdaoUserDxpid: "", | 406 | qingdaoUserDxpid: "", |
| 409 | qingdaoDanyiUserDxpid:"", | 407 | qingdaoDanyiUserDxpid:"", |
| ... | @@ -785,7 +783,7 @@ export default { | ... | @@ -785,7 +783,7 @@ export default { |
| 785 | ecomEntEmail: "", | 783 | ecomEntEmail: "", |
| 786 | ecomEntName: "", | 784 | ecomEntName: "", |
| 787 | orderRequester: "", | 785 | orderRequester: "", |
| 788 | - dxpid: "", | 786 | + certificateSerialNumber: "", |
| 789 | qingdaoKey: "", | 787 | qingdaoKey: "", |
| 790 | qingdaoUserDxpid: "", | 788 | qingdaoUserDxpid: "", |
| 791 | qingdaoDanyiUserDxpid:"", | 789 | qingdaoDanyiUserDxpid:"", | ... | ... |
| ... | @@ -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="textarea" | 80 | + type="text" |
| 81 | class="inputShadow" | 81 | class="inputShadow" |
| 82 | id="inputInner--model" | 82 | id="inputInner--model" |
| 83 | resize="none" | 83 | resize="none" |
| ... | @@ -156,11 +156,10 @@ | ... | @@ -156,11 +156,10 @@ |
| 156 | <el-col :span="4"> | 156 | <el-col :span="4"> |
| 157 | <Formitem label="数量" prop="qty"> | 157 | <Formitem label="数量" prop="qty"> |
| 158 | <el-input | 158 | <el-input |
| 159 | - type="number" | ||
| 160 | class="inputShadow" | 159 | class="inputShadow" |
| 161 | id="inputInner--qty" | 160 | id="inputInner--qty" |
| 162 | resize="none" | 161 | resize="none" |
| 163 | - v-model="tableRowformData.qty" | 162 | + v-model.number="tableRowformData.qty" |
| 164 | clearable | 163 | clearable |
| 165 | placeholder="" | 164 | placeholder="" |
| 166 | ></el-input> | 165 | ></el-input> |
| ... | @@ -169,11 +168,10 @@ | ... | @@ -169,11 +168,10 @@ |
| 169 | <el-col :span="4"> | 168 | <el-col :span="4"> |
| 170 | <Formitem label="法定数量" prop="legalQty"> | 169 | <Formitem label="法定数量" prop="legalQty"> |
| 171 | <el-input | 170 | <el-input |
| 172 | - type="number" | ||
| 173 | class="inputShadow" | 171 | class="inputShadow" |
| 174 | id="inputInner--legalQty" | 172 | id="inputInner--legalQty" |
| 175 | resize="none" | 173 | resize="none" |
| 176 | - v-model="tableRowformData.legalQty" | 174 | + v-model.number="tableRowformData.legalQty" |
| 177 | clearable | 175 | clearable |
| 178 | placeholder="" | 176 | placeholder="" |
| 179 | ></el-input> | 177 | ></el-input> |
| ... | @@ -242,7 +240,7 @@ | ... | @@ -242,7 +240,7 @@ |
| 242 | <el-col :span="8"> | 240 | <el-col :span="8"> |
| 243 | <Formitem label="备注" prop="remark"> | 241 | <Formitem label="备注" prop="remark"> |
| 244 | <el-input | 242 | <el-input |
| 245 | - type="textarea" | 243 | + type="text" |
| 246 | class="inputShadow" | 244 | class="inputShadow" |
| 247 | id="inputInner--remark" | 245 | id="inputInner--remark" |
| 248 | resize="none" | 246 | resize="none" |
| ... | @@ -268,6 +266,24 @@ | ... | @@ -268,6 +266,24 @@ |
| 268 | }, | 266 | }, |
| 269 | }, | 267 | }, |
| 270 | data() { | 268 | data() { |
| 269 | + var checkNegativeNum = (rule, value, callback) => { | ||
| 270 | + if (value < 0) { | ||
| 271 | + callback(new Error('数值不能为负')); | ||
| 272 | + } else { | ||
| 273 | + callback(); | ||
| 274 | + } | ||
| 275 | + }; | ||
| 276 | + var checkQty = (rule, value, callback) => { | ||
| 277 | + if (!Number.isInteger(value)) { | ||
| 278 | + callback(new Error('请输入整数值')); | ||
| 279 | + } else { | ||
| 280 | + if (value < 0) { | ||
| 281 | + callback(new Error('数值不能为负')); | ||
| 282 | + } else { | ||
| 283 | + callback(); | ||
| 284 | + } | ||
| 285 | + } | ||
| 286 | + }; | ||
| 271 | return { | 287 | return { |
| 272 | tableRowformData:{}, | 288 | tableRowformData:{}, |
| 273 | tableRowFormRules:{ | 289 | tableRowFormRules:{ |
| ... | @@ -307,22 +323,27 @@ | ... | @@ -307,22 +323,27 @@ |
| 307 | { required: true, message: '请选择计量单位', trigger: 'change' } | 323 | { required: true, message: '请选择计量单位', trigger: 'change' } |
| 308 | ], | 324 | ], |
| 309 | qty: [ | 325 | qty: [ |
| 310 | - { required: true, message: '请输入数量', trigger: 'blur' } | 326 | + { required: true, message: '请输入数量', trigger: 'blur' }, |
| 327 | + { validator: checkQty, trigger: 'blur' } | ||
| 311 | ], | 328 | ], |
| 312 | legalQty: [ | 329 | legalQty: [ |
| 313 | - { required: true, message: '请输入法定数量', trigger: 'blur' } | 330 | + { required: true, message: '请输入法定数量', trigger: 'blur' }, |
| 331 | + { validator: checkQty, trigger: 'blur' } | ||
| 314 | ], | 332 | ], |
| 315 | currency: [ | 333 | currency: [ |
| 316 | { required: true, message: '请选择币制', trigger: 'change' } | 334 | { required: true, message: '请选择币制', trigger: 'change' } |
| 317 | ], | 335 | ], |
| 318 | price: [ | 336 | price: [ |
| 319 | - { required: true, message: '请输入单价', trigger: 'blur' } | 337 | + { required: true, message: '请输入单价', trigger: 'blur' }, |
| 338 | + { validator: checkNegativeNum, trigger: 'blur' } | ||
| 320 | ], | 339 | ], |
| 321 | totalPrice: [ | 340 | totalPrice: [ |
| 322 | - { required: true, message: '请输入总价', trigger: 'blur' } | 341 | + { required: true, message: '请输入总价', trigger: 'blur' }, |
| 342 | + { validator: checkNegativeNum, trigger: 'blur' } | ||
| 323 | ], | 343 | ], |
| 324 | netWeight: [ | 344 | netWeight: [ |
| 325 | - { required: true, message: '请输入净重', trigger: 'blur' } | 345 | + { required: true, message: '请输入净重', trigger: 'blur' }, |
| 346 | + { validator: checkNegativeNum, trigger: 'blur' } | ||
| 326 | ], | 347 | ], |
| 327 | remark: [ | 348 | remark: [ |
| 328 | { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' } | 349 | { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' } |
| ... | @@ -369,7 +390,7 @@ | ... | @@ -369,7 +390,7 @@ |
| 369 | } | 390 | } |
| 370 | } | 391 | } |
| 371 | .formRowDataOperate{ | 392 | .formRowDataOperate{ |
| 372 | - text-align: right; | 393 | + text-align: center; |
| 373 | padding: 0 20px; | 394 | padding: 0 20px; |
| 374 | a{ | 395 | a{ |
| 375 | color: #007AB7; | 396 | color: #007AB7; | ... | ... |
| ... | @@ -78,7 +78,7 @@ | ... | @@ -78,7 +78,7 @@ |
| 78 | </Formitem> | 78 | </Formitem> |
| 79 | </el-col> | 79 | </el-col> |
| 80 | <!-- 电商企业代码 --> | 80 | <!-- 电商企业代码 --> |
| 81 | - <el-col :span="3"> | 81 | + <el-col :span="6"> |
| 82 | <Formitem label="申报地海关" prop="declareCustomsCode"> | 82 | <Formitem label="申报地海关" prop="declareCustomsCode"> |
| 83 | <el-select | 83 | <el-select |
| 84 | type="text" | 84 | type="text" |
| ... | @@ -92,14 +92,14 @@ | ... | @@ -92,14 +92,14 @@ |
| 92 | v-for="(item, index) in declareCustomsDataList" | 92 | v-for="(item, index) in declareCustomsDataList" |
| 93 | :key="index" | 93 | :key="index" |
| 94 | :label="item.declarationUnitCompanyName" | 94 | :label="item.declarationUnitCompanyName" |
| 95 | - :value="item.declarationUnit10" | 95 | + :value="item.declarationPortCode" |
| 96 | ></el-option> | 96 | ></el-option> |
| 97 | </el-select> | 97 | </el-select> |
| 98 | </Formitem> | 98 | </Formitem> |
| 99 | </el-col> | 99 | </el-col> |
| 100 | <!-- 电商企业 --> | 100 | <!-- 电商企业 --> |
| 101 | <el-col :span="3"> | 101 | <el-col :span="3"> |
| 102 | - <Formitem label="出生日期" prop="exportDate"> | 102 | + <Formitem label="出口日期" prop="exportDate"> |
| 103 | <el-date-picker | 103 | <el-date-picker |
| 104 | class="inputInner--createTime" | 104 | class="inputInner--createTime" |
| 105 | id="inputInner--exportDate" | 105 | id="inputInner--exportDate" |
| ... | @@ -126,6 +126,8 @@ | ... | @@ -126,6 +126,8 @@ |
| 126 | ></el-input> | 126 | ></el-input> |
| 127 | </Formitem> | 127 | </Formitem> |
| 128 | </el-col> | 128 | </el-col> |
| 129 | + </el-row> | ||
| 130 | + <el-row :gutter="5"> | ||
| 129 | <!-- 运杂费 --> | 131 | <!-- 运杂费 --> |
| 130 | <el-col :span="3"> | 132 | <el-col :span="3"> |
| 131 | <Formitem label="运杂费" prop="miscellaneousFreight"> | 133 | <Formitem label="运杂费" prop="miscellaneousFreight"> |
| ... | @@ -140,9 +142,6 @@ | ... | @@ -140,9 +142,6 @@ |
| 140 | ></el-input> | 142 | ></el-input> |
| 141 | </Formitem> | 143 | </Formitem> |
| 142 | </el-col> | 144 | </el-col> |
| 143 | - | ||
| 144 | - </el-row> | ||
| 145 | - <el-row :gutter="5"> | ||
| 146 | <!-- 币制 --> | 145 | <!-- 币制 --> |
| 147 | <el-col :span="3"> | 146 | <el-col :span="3"> |
| 148 | <Formitem label="币制" prop="currency"> | 147 | <Formitem label="币制" prop="currency"> |
| ... | @@ -164,10 +163,10 @@ | ... | @@ -164,10 +163,10 @@ |
| 164 | </Formitem> | 163 | </Formitem> |
| 165 | </el-col> | 164 | </el-col> |
| 166 | <!-- 申报状态 --> | 165 | <!-- 申报状态 --> |
| 167 | - <el-col :span="3"> | 166 | + <el-col :span="6"> |
| 168 | <Formitem label="主要货物信息" prop="mainGoodsInfo"> | 167 | <Formitem label="主要货物信息" prop="mainGoodsInfo"> |
| 169 | <el-input | 168 | <el-input |
| 170 | - type="textarea" | 169 | + type="text" |
| 171 | class="inputShadow" | 170 | class="inputShadow" |
| 172 | id="inputInner--mainGoodsInfo" | 171 | id="inputInner--mainGoodsInfo" |
| 173 | resize="none" | 172 | resize="none" |
| ... | @@ -233,6 +232,9 @@ | ... | @@ -233,6 +232,9 @@ |
| 233 | ></el-input> | 232 | ></el-input> |
| 234 | </Formitem> | 233 | </Formitem> |
| 235 | </el-col> | 234 | </el-col> |
| 235 | + | ||
| 236 | + </el-row> | ||
| 237 | + <el-row :gutter="5"> | ||
| 236 | <el-col :span="3"> | 238 | <el-col :span="3"> |
| 237 | <Formitem label="监管场所代码" prop="regulatoryVenueCode"> | 239 | <Formitem label="监管场所代码" prop="regulatoryVenueCode"> |
| 238 | <el-input | 240 | <el-input |
| ... | @@ -259,8 +261,6 @@ | ... | @@ -259,8 +261,6 @@ |
| 259 | ></el-input> | 261 | ></el-input> |
| 260 | </Formitem> | 262 | </Formitem> |
| 261 | </el-col> | 263 | </el-col> |
| 262 | - </el-row> | ||
| 263 | - <el-row :gutter="5"> | ||
| 264 | <el-col :span="3"> | 264 | <el-col :span="3"> |
| 265 | <Formitem label="运抵国(地区)" prop="destinationCountryRegion"> | 265 | <Formitem label="运抵国(地区)" prop="destinationCountryRegion"> |
| 266 | <el-select | 266 | <el-select |
| ... | @@ -275,23 +275,28 @@ | ... | @@ -275,23 +275,28 @@ |
| 275 | v-for="(item, index) in $store.getters.dict.COUNTRY_REGION_CODE" | 275 | v-for="(item, index) in $store.getters.dict.COUNTRY_REGION_CODE" |
| 276 | :key="index" | 276 | :key="index" |
| 277 | :label="item.itemChineseName" | 277 | :label="item.itemChineseName" |
| 278 | - :value="item.itemValue" | 278 | + :value="item.itemCode" |
| 279 | ></el-option> | 279 | ></el-option> |
| 280 | </el-select> | 280 | </el-select> |
| 281 | </Formitem> | 281 | </Formitem> |
| 282 | </el-col> | 282 | </el-col> |
| 283 | <el-col :span="3"> | 283 | <el-col :span="3"> |
| 284 | <Formitem label="运港代码" prop="portCode"> | 284 | <Formitem label="运港代码" prop="portCode"> |
| 285 | - <el-input | 285 | + <el-select |
| 286 | type="text" | 286 | type="text" |
| 287 | - class="inputShadow" | ||
| 288 | id="inputInner--portCode" | 287 | id="inputInner--portCode" |
| 289 | - resize="none" | ||
| 290 | v-model="formData.portCode" | 288 | v-model="formData.portCode" |
| 291 | clearable | 289 | clearable |
| 292 | filterable | 290 | filterable |
| 293 | placeholder="" | 291 | placeholder="" |
| 294 | - ></el-input> | 292 | + > |
| 293 | + <el-option | ||
| 294 | + v-for="(item, index) in $store.getters.dict.COUNTRY_REGION_CODE" | ||
| 295 | + :key="index" | ||
| 296 | + :label="item.itemChineseName" | ||
| 297 | + :value="item.itemCode" | ||
| 298 | + ></el-option> | ||
| 299 | + </el-select> | ||
| 295 | </Formitem> | 300 | </Formitem> |
| 296 | </el-col> | 301 | </el-col> |
| 297 | <el-col :span="3"> | 302 | <el-col :span="3"> |
| ... | @@ -302,6 +307,7 @@ | ... | @@ -302,6 +307,7 @@ |
| 302 | id="inputInner--freight" | 307 | id="inputInner--freight" |
| 303 | resize="none" | 308 | resize="none" |
| 304 | v-model="formData.freight" | 309 | v-model="formData.freight" |
| 310 | + :min="0" | ||
| 305 | clearable | 311 | clearable |
| 306 | placeholder="" | 312 | placeholder="" |
| 307 | ></el-input> | 313 | ></el-input> |
| ... | @@ -357,6 +363,9 @@ | ... | @@ -357,6 +363,9 @@ |
| 357 | ></el-input> | 363 | ></el-input> |
| 358 | </Formitem> | 364 | </Formitem> |
| 359 | </el-col> | 365 | </el-col> |
| 366 | + | ||
| 367 | + </el-row> | ||
| 368 | + <el-row :gutter="5"> | ||
| 360 | <el-col :span="3"> | 369 | <el-col :span="3"> |
| 361 | <Formitem label="保费币制" prop="insuredfeeCurrency"> | 370 | <Formitem label="保费币制" prop="insuredfeeCurrency"> |
| 362 | <el-select | 371 | <el-select |
| ... | @@ -394,8 +403,6 @@ | ... | @@ -394,8 +403,6 @@ |
| 394 | </el-select> | 403 | </el-select> |
| 395 | </Formitem> | 404 | </Formitem> |
| 396 | </el-col> | 405 | </el-col> |
| 397 | - </el-row> | ||
| 398 | - <el-row :gutter="5"> | ||
| 399 | <el-col :span="3"> | 406 | <el-col :span="3"> |
| 400 | <Formitem label="包装种类代码" prop="packageTypeCode"> | 407 | <Formitem label="包装种类代码" prop="packageTypeCode"> |
| 401 | <el-select | 408 | <el-select |
| ... | @@ -417,11 +424,10 @@ | ... | @@ -417,11 +424,10 @@ |
| 417 | <el-col :span="3"> | 424 | <el-col :span="3"> |
| 418 | <Formitem label="件数" prop="packNo"> | 425 | <Formitem label="件数" prop="packNo"> |
| 419 | <el-input | 426 | <el-input |
| 420 | - type="number" | ||
| 421 | class="inputShadow" | 427 | class="inputShadow" |
| 422 | id="inputInner--packNo" | 428 | id="inputInner--packNo" |
| 423 | resize="none" | 429 | resize="none" |
| 424 | - v-model="formData.packNo" | 430 | + v-model.number="formData.packNo" |
| 425 | clearable | 431 | clearable |
| 426 | placeholder="" | 432 | placeholder="" |
| 427 | ></el-input> | 433 | ></el-input> |
| ... | @@ -453,7 +459,7 @@ | ... | @@ -453,7 +459,7 @@ |
| 453 | ></el-input> | 459 | ></el-input> |
| 454 | </Formitem> | 460 | </Formitem> |
| 455 | </el-col> | 461 | </el-col> |
| 456 | - <el-col :span="9"> | 462 | + <el-col :span="6"> |
| 457 | <Formitem label="备注" prop="remark"> | 463 | <Formitem label="备注" prop="remark"> |
| 458 | <el-input | 464 | <el-input |
| 459 | type="textarea" | 465 | type="textarea" |
| ... | @@ -506,9 +512,9 @@ | ... | @@ -506,9 +512,9 @@ |
| 506 | </template> | 512 | </template> |
| 507 | </Table> | 513 | </Table> |
| 508 | </section> | 514 | </section> |
| 509 | - <div class="addNewItem" @click="addNewItem"> | 515 | + <div class="addNewItem"> |
| 510 | - <i class="el-icon-circle-plus-outline"></i> | 516 | + <i class="el-icon-circle-plus-outline" @click="addNewItem"></i> |
| 511 | - <span>添加新物品</span> | 517 | + <span @click="addNewItem">添加新物品</span> |
| 512 | </div> | 518 | </div> |
| 513 | <div style="margin-top: 20px; text-align: center"> | 519 | <div style="margin-top: 20px; text-align: center"> |
| 514 | <el-button | 520 | <el-button |
| ... | @@ -532,6 +538,24 @@ | ... | @@ -532,6 +538,24 @@ |
| 532 | name: "", | 538 | name: "", |
| 533 | components: { RowDataEditForm }, | 539 | components: { RowDataEditForm }, |
| 534 | data() { | 540 | data() { |
| 541 | + var checkNegativeNum = (rule, value, callback) => { | ||
| 542 | + if (value < 0) { | ||
| 543 | + callback(new Error('数值不能为负')); | ||
| 544 | + } else { | ||
| 545 | + callback(); | ||
| 546 | + } | ||
| 547 | + }; | ||
| 548 | + var checkPackNo = (rule, value, callback) => { | ||
| 549 | + if (!Number.isInteger(value)) { | ||
| 550 | + callback(new Error('请输入整数值')); | ||
| 551 | + } else { | ||
| 552 | + if (value < 0) { | ||
| 553 | + callback(new Error('数值不能为负')); | ||
| 554 | + } else { | ||
| 555 | + callback(); | ||
| 556 | + } | ||
| 557 | + } | ||
| 558 | + }; | ||
| 535 | return { | 559 | return { |
| 536 | ebcDataList:[], | 560 | ebcDataList:[], |
| 537 | declareCustomsDataList:[], | 561 | declareCustomsDataList:[], |
| ... | @@ -558,14 +582,11 @@ | ... | @@ -558,14 +582,11 @@ |
| 558 | { required: true, message: '请选择申报地海关', trigger: 'change' } | 582 | { required: true, message: '请选择申报地海关', trigger: 'change' } |
| 559 | ], | 583 | ], |
| 560 | exportDate: [ | 584 | exportDate: [ |
| 561 | - { required: true, message: '请选择出生日期', trigger: 'change' } | 585 | + { required: true, message: '请选择出口日期', trigger: 'change' } |
| 562 | ], | 586 | ], |
| 563 | goodsValue: [ | 587 | goodsValue: [ |
| 564 | { required: true, message: '请输入商品金额', trigger: 'blur' } | 588 | { required: true, message: '请输入商品金额', trigger: 'blur' } |
| 565 | ], | 589 | ], |
| 566 | - miscellaneousFreight: [ | ||
| 567 | - { required: true, message: '请输入运杂费', trigger: 'blur' } | ||
| 568 | - ], | ||
| 569 | currency: [ | 590 | currency: [ |
| 570 | { required: true, message: '请选择币制', trigger: 'change' } | 591 | { required: true, message: '请选择币制', trigger: 'change' } |
| 571 | ], | 592 | ], |
| ... | @@ -582,7 +603,6 @@ | ... | @@ -582,7 +603,6 @@ |
| 582 | { max: 37, message: '长度不能超过37个字符', trigger: 'blur' } | 603 | { max: 37, message: '长度不能超过37个字符', trigger: 'blur' } |
| 583 | ], | 604 | ], |
| 584 | totalPackageNo: [ | 605 | totalPackageNo: [ |
| 585 | - { required: true, message: '请输入总包号', trigger: 'blur' }, | ||
| 586 | { max: 37, message: '长度不能超过37个字符', trigger: 'blur' } | 606 | { max: 37, message: '长度不能超过37个字符', trigger: 'blur' } |
| 587 | ], | 607 | ], |
| 588 | regulatoryVenueCode: [ | 608 | regulatoryVenueCode: [ |
| ... | @@ -595,10 +615,11 @@ | ... | @@ -595,10 +615,11 @@ |
| 595 | { required: true, message: '请选择运抵国', trigger: 'change' } | 615 | { required: true, message: '请选择运抵国', trigger: 'change' } |
| 596 | ], | 616 | ], |
| 597 | portCode: [ | 617 | portCode: [ |
| 598 | - { required: true, message: '请输入运港代码', trigger: 'blur' } | 618 | + { required: true, message: '请选择运港代码', trigger: 'change' } |
| 599 | ], | 619 | ], |
| 600 | freight: [ | 620 | freight: [ |
| 601 | - { required: true, message: '请输入运费', trigger: 'blur' } | 621 | + { required: true, message: '请输入运费', trigger: 'blur' }, |
| 622 | + { validator: checkNegativeNum, trigger: 'blur' } | ||
| 602 | ], | 623 | ], |
| 603 | freightCurrency: [ | 624 | freightCurrency: [ |
| 604 | { required: true, message: '请选择运费币制', trigger: 'change' } | 625 | { required: true, message: '请选择运费币制', trigger: 'change' } |
| ... | @@ -607,7 +628,8 @@ | ... | @@ -607,7 +628,8 @@ |
| 607 | { required: true, message: '请选择运费标志', trigger: 'change' } | 628 | { required: true, message: '请选择运费标志', trigger: 'change' } |
| 608 | ], | 629 | ], |
| 609 | insuredfee: [ | 630 | insuredfee: [ |
| 610 | - { required: true, message: '请输入保费', trigger: 'blur' } | 631 | + { required: true, message: '请输入保费', trigger: 'blur' }, |
| 632 | + { validator: checkNegativeNum, trigger: 'blur' } | ||
| 611 | ], | 633 | ], |
| 612 | insuredfeeCurrency: [ | 634 | insuredfeeCurrency: [ |
| 613 | { required: true, message: '请输入保费币制', trigger: 'blur' } | 635 | { required: true, message: '请输入保费币制', trigger: 'blur' } |
| ... | @@ -619,7 +641,8 @@ | ... | @@ -619,7 +641,8 @@ |
| 619 | { required: true, message: '请选择包装种类代码', trigger: 'change' } | 641 | { required: true, message: '请选择包装种类代码', trigger: 'change' } |
| 620 | ], | 642 | ], |
| 621 | packNo: [ | 643 | packNo: [ |
| 622 | - { required: true, message: '请输入件数', trigger: 'blur' } | 644 | + { required: true, message: '请输入件数', trigger: 'blur' }, |
| 645 | + { validator: checkPackNo, trigger: 'blur' } | ||
| 623 | ], | 646 | ], |
| 624 | weight: [ | 647 | weight: [ |
| 625 | { required: true, message: '请输入毛重', trigger: 'blur' } | 648 | { required: true, message: '请输入毛重', trigger: 'blur' } |
| ... | @@ -628,7 +651,6 @@ | ... | @@ -628,7 +651,6 @@ |
| 628 | { required: true, message: '请输入净重', trigger: 'blur' } | 651 | { required: true, message: '请输入净重', trigger: 'blur' } |
| 629 | ], | 652 | ], |
| 630 | remark: [ | 653 | remark: [ |
| 631 | - { required: true, message: '请输入备注', trigger: 'blur' }, | ||
| 632 | { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' } | 654 | { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' } |
| 633 | ] | 655 | ] |
| 634 | }, | 656 | }, |
| ... | @@ -668,14 +690,14 @@ | ... | @@ -668,14 +690,14 @@ |
| 668 | value: "productCode", | 690 | value: "productCode", |
| 669 | width: "", | 691 | width: "", |
| 670 | align: "left", | 692 | align: "left", |
| 671 | - slot: true, | 693 | + |
| 672 | }, | 694 | }, |
| 673 | { | 695 | { |
| 674 | name: "规格型号", | 696 | name: "规格型号", |
| 675 | value: "model", | 697 | value: "model", |
| 676 | width: "", | 698 | width: "", |
| 677 | align: "left", | 699 | align: "left", |
| 678 | - slot: true, | 700 | + |
| 679 | }, | 701 | }, |
| 680 | { | 702 | { |
| 681 | name: "账册备案料号", | 703 | name: "账册备案料号", |
| ... | @@ -795,9 +817,9 @@ | ... | @@ -795,9 +817,9 @@ |
| 795 | getDeclareData({declareId}).then(res =>{ | 817 | getDeclareData({declareId}).then(res =>{ |
| 796 | console.log(1111, res) | 818 | console.log(1111, res) |
| 797 | if (res.code == 200) { | 819 | if (res.code == 200) { |
| 820 | + res.data.declare.orderNo = res.data.declare.orderno | ||
| 798 | this.formData = res.data.declare | 821 | this.formData = res.data.declare |
| 799 | this.formData.appType=9610 | 822 | this.formData.appType=9610 |
| 800 | - this.formData.orderNo = this.formData.orderno | ||
| 801 | this.detailData = res.data.product.length ? res.data.product.map((item, index) =>{ | 823 | this.detailData = res.data.product.length ? res.data.product.map((item, index) =>{ |
| 802 | item.gnum = index+1 | 824 | item.gnum = index+1 |
| 803 | return item | 825 | return item |
| ... | @@ -840,8 +862,6 @@ | ... | @@ -840,8 +862,6 @@ |
| 840 | "totalPrice": 0, | 862 | "totalPrice": 0, |
| 841 | "unit": "" | 863 | "unit": "" |
| 842 | }) | 864 | }) |
| 843 | - | ||
| 844 | - console.log(this.detailData) | ||
| 845 | }, | 865 | }, |
| 846 | updateRow(row){ | 866 | updateRow(row){ |
| 847 | this.expandRowKeys = [row.gnum] | 867 | this.expandRowKeys = [row.gnum] |
| ... | @@ -851,7 +871,9 @@ | ... | @@ -851,7 +871,9 @@ |
| 851 | } | 871 | } |
| 852 | 872 | ||
| 853 | this.$nextTick(()=>{ | 873 | this.$nextTick(()=>{ |
| 854 | - this.$refs.rowEditForm.tableRowformData = obj | 874 | + this.$refs.rowEditForm.tableRowformData = obj |
| 875 | + const table = this.$refs.entryTable.$el.querySelector('.el-table__body-wrapper'); | ||
| 876 | + table.scrollTop = row.gnum*51+10 | ||
| 855 | }) | 877 | }) |
| 856 | }, | 878 | }, |
| 857 | deleteRow(row){ | 879 | deleteRow(row){ |
| ... | @@ -937,13 +959,13 @@ | ... | @@ -937,13 +959,13 @@ |
| 937 | align-items: center; | 959 | align-items: center; |
| 938 | color:#007AB7; | 960 | color:#007AB7; |
| 939 | line-height: 38px; | 961 | line-height: 38px; |
| 940 | - cursor: pointer; | ||
| 941 | i{ | 962 | i{ |
| 942 | margin-right: 3px; | 963 | margin-right: 3px; |
| 943 | } | 964 | } |
| 944 | span{ | 965 | span{ |
| 945 | font-size: 13px; | 966 | font-size: 13px; |
| 946 | font-weight: 500; | 967 | font-weight: 500; |
| 968 | + cursor: pointer; | ||
| 947 | } | 969 | } |
| 948 | } | 970 | } |
| 949 | .formRowDataOperate{ | 971 | .formRowDataOperate{ | ... | ... |
-
Please register or login to post a comment