Showing
51 changed files
with
70 additions
and
72 deletions
| ... | ... | @@ -338,7 +338,6 @@ export default { |
| 338 | 338 | { key: 'quality', label: '品质' }, |
| 339 | 339 | { key: 'brand', label: '牌号' }, |
| 340 | 340 | { key: 'quantity', label: '数量' }, |
| 341 | - { key: 'salesPrice', label: '销售价格' }, | |
| 342 | 341 | { key: 'deliveryDate', label: '发货日期' }, |
| 343 | 342 | ] |
| 344 | 343 | for (let i = 0; i < list.length; i++) { |
| ... | ... | @@ -491,7 +490,7 @@ export default { |
| 491 | 490 | line-height: 48rpx; |
| 492 | 491 | font-size: 32rpx; |
| 493 | 492 | position: relative; |
| 494 | - width: 162rpx; | |
| 493 | + width: 210rpx; | |
| 495 | 494 | margin-right: 32rpx; |
| 496 | 495 | color: rgba(0, 0, 0, 0.9); |
| 497 | 496 | padding-right: 0; |
| ... | ... | @@ -564,7 +563,7 @@ export default { |
| 564 | 563 | .readonly-text { |
| 565 | 564 | color: rgba(0, 0, 0, 0.9); |
| 566 | 565 | font-size: 32rpx; |
| 567 | - line-height: 44rpx; | |
| 566 | + line-height: 48rpx; | |
| 568 | 567 | text-align: right; |
| 569 | 568 | white-space: pre-wrap; |
| 570 | 569 | word-break: break-all; | ... | ... |
| ... | ... | @@ -258,7 +258,6 @@ export default { |
| 258 | 258 | { key: 'quality', label: '品质' }, |
| 259 | 259 | { key: 'brand', label: '牌号' }, |
| 260 | 260 | { key: 'quantity', label: '数量' }, |
| 261 | - { key: 'salesPrice', label: '销售价格' }, | |
| 262 | 261 | { key: 'deliveryDate', label: '发货日期' }, |
| 263 | 262 | ] |
| 264 | 263 | for (let i = 0; i < list.length; i++) { |
| ... | ... | @@ -410,7 +409,7 @@ export default { |
| 410 | 409 | line-height: 48rpx; |
| 411 | 410 | font-size: 32rpx; |
| 412 | 411 | position: relative; |
| 413 | - width: 162rpx; | |
| 412 | + width: 210rpx; | |
| 414 | 413 | margin-right: 32rpx; |
| 415 | 414 | color: rgba(0, 0, 0, 0.9); |
| 416 | 415 | padding-right: 0; |
| ... | ... | @@ -483,7 +482,7 @@ export default { |
| 483 | 482 | .readonly-text { |
| 484 | 483 | color: rgba(0, 0, 0, 0.9); |
| 485 | 484 | font-size: 32rpx; |
| 486 | - line-height: 44rpx; | |
| 485 | + line-height: 48rpx; | |
| 487 | 486 | text-align: right; |
| 488 | 487 | white-space: pre-wrap; |
| 489 | 488 | word-break: break-all; | ... | ... |
| ... | ... | @@ -434,7 +434,7 @@ export default { |
| 434 | 434 | line-height: 48rpx; |
| 435 | 435 | font-size: 32rpx; |
| 436 | 436 | position: relative; |
| 437 | - width: 162rpx; | |
| 437 | + width: 210rpx; | |
| 438 | 438 | margin-right: 32rpx; |
| 439 | 439 | color: rgba(0, 0, 0, 0.9); |
| 440 | 440 | padding-right: 0; |
| ... | ... | @@ -570,7 +570,7 @@ export default { |
| 570 | 570 | } |
| 571 | 571 | |
| 572 | 572 | .label { |
| 573 | - width: 162rpx; | |
| 573 | + width: 210rpx; | |
| 574 | 574 | margin-right: 32rpx; |
| 575 | 575 | color: rgba(0, 0, 0, 0.9); |
| 576 | 576 | font-size: 32rpx; | ... | ... |
| ... | ... | @@ -444,7 +444,7 @@ export default { |
| 444 | 444 | rowKey: 'id', |
| 445 | 445 | multiple: false, |
| 446 | 446 | display: [ |
| 447 | - { label: '姓名', field: 'name' }, | |
| 447 | + { label: '名称', field: 'name' }, | |
| 448 | 448 | { label: '编号', field: 'code' }, |
| 449 | 449 | { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') } |
| 450 | 450 | ] |
| ... | ... | @@ -669,7 +669,7 @@ export default { |
| 669 | 669 | line-height: 48rpx; |
| 670 | 670 | font-size: 32rpx; |
| 671 | 671 | position: relative; |
| 672 | - width: 162rpx; | |
| 672 | + width: 210rpx; | |
| 673 | 673 | margin-right: 32rpx; |
| 674 | 674 | color: rgba(0, 0, 0, 0.9); |
| 675 | 675 | padding-right: 0; | ... | ... |
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | <view class="page"> |
| 3 | 3 | <view class="dev-list-fixed"> |
| 4 | 4 | <view class="search-row"> |
| 5 | - <uni-search-bar v-model="searchKeyword" radius="6" placeholder="请输入简写名称" clearButton="auto" | |
| 5 | + <uni-search-bar v-model="searchKeyword" radius="6" placeholder="请输入单位名称" clearButton="auto" | |
| 6 | 6 | cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="search" |
| 7 | 7 | @input="onSearchInput" /> |
| 8 | 8 | <view class="tool-icons"> | ... | ... |
| ... | ... | @@ -469,7 +469,7 @@ export default { |
| 469 | 469 | rowKey: 'id', |
| 470 | 470 | multiple: false, |
| 471 | 471 | display: [ |
| 472 | - { label: '姓名', field: 'name' }, | |
| 472 | + { label: '名称', field: 'name' }, | |
| 473 | 473 | { label: '编号', field: 'code' }, |
| 474 | 474 | { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') } |
| 475 | 475 | ] |
| ... | ... | @@ -676,7 +676,7 @@ export default { |
| 676 | 676 | line-height: 48rpx; |
| 677 | 677 | font-size: 32rpx; |
| 678 | 678 | position: relative; |
| 679 | - width: 162rpx; | |
| 679 | + width: 210rpx; | |
| 680 | 680 | margin-right: 32rpx; |
| 681 | 681 | color: rgba(0, 0, 0, 0.9); |
| 682 | 682 | padding-right: 0; | ... | ... |
| ... | ... | @@ -315,7 +315,7 @@ |
| 315 | 315 | rowKey: 'id', |
| 316 | 316 | multiple: false, |
| 317 | 317 | display: [{ |
| 318 | - label: '姓名', | |
| 318 | + label: '名称', | |
| 319 | 319 | field: 'name' |
| 320 | 320 | }, |
| 321 | 321 | { |
| ... | ... | @@ -513,7 +513,7 @@ |
| 513 | 513 | line-height: 48rpx; |
| 514 | 514 | font-size: 32rpx; |
| 515 | 515 | position: relative; |
| 516 | - width: 162rpx; | |
| 516 | + width: 210rpx; | |
| 517 | 517 | margin-right: 32rpx; |
| 518 | 518 | color: rgba(0, 0, 0, 0.9); |
| 519 | 519 | ... | ... |
| ... | ... | @@ -360,7 +360,7 @@ |
| 360 | 360 | rowKey: 'id', |
| 361 | 361 | multiple: false, |
| 362 | 362 | display: [{ |
| 363 | - label: '姓名', | |
| 363 | + label: '名称', | |
| 364 | 364 | field: 'name' |
| 365 | 365 | }, |
| 366 | 366 | { |
| ... | ... | @@ -566,7 +566,7 @@ |
| 566 | 566 | line-height: 48rpx; |
| 567 | 567 | font-size: 32rpx; |
| 568 | 568 | position: relative; |
| 569 | - width: 162rpx; | |
| 569 | + width: 210rpx; | |
| 570 | 570 | margin-right: 32rpx; |
| 571 | 571 | color: rgba(0, 0, 0, 0.9); |
| 572 | 572 | ... | ... |
| ... | ... | @@ -462,7 +462,7 @@ export default { |
| 462 | 462 | line-height: 48rpx; |
| 463 | 463 | font-size: 32rpx; |
| 464 | 464 | position: relative; |
| 465 | - width: 162rpx; | |
| 465 | + width: 210rpx; | |
| 466 | 466 | margin-right: 32rpx; |
| 467 | 467 | color: rgba(0, 0, 0, 0.9); |
| 468 | 468 | padding-right: 0; |
| ... | ... | @@ -530,7 +530,7 @@ export default { |
| 530 | 530 | .readonly-text { |
| 531 | 531 | color: rgba(0, 0, 0, 0.9); |
| 532 | 532 | font-size: 32rpx; |
| 533 | - line-height: 44rpx; | |
| 533 | + line-height: 48rpx; | |
| 534 | 534 | text-align: right; |
| 535 | 535 | white-space: pre-wrap; |
| 536 | 536 | word-break: break-all; | ... | ... |
| ... | ... | @@ -393,7 +393,7 @@ export default { |
| 393 | 393 | line-height: 48rpx; |
| 394 | 394 | font-size: 32rpx; |
| 395 | 395 | position: relative; |
| 396 | - width: 162rpx; | |
| 396 | + width: 210rpx; | |
| 397 | 397 | margin-right: 32rpx; |
| 398 | 398 | color: rgba(0, 0, 0, 0.9); |
| 399 | 399 | padding-right: 0; |
| ... | ... | @@ -466,7 +466,7 @@ export default { |
| 466 | 466 | .readonly-text { |
| 467 | 467 | color: rgba(0, 0, 0, 0.9); |
| 468 | 468 | font-size: 32rpx; |
| 469 | - line-height: 44rpx; | |
| 469 | + line-height: 48rpx; | |
| 470 | 470 | text-align: right; |
| 471 | 471 | white-space: pre-wrap; |
| 472 | 472 | word-break: break-all; | ... | ... |
| ... | ... | @@ -308,7 +308,7 @@ export default { |
| 308 | 308 | line-height: 48rpx; |
| 309 | 309 | font-size: 32rpx; |
| 310 | 310 | position: relative; |
| 311 | - width: 162rpx; | |
| 311 | + width: 210rpx; | |
| 312 | 312 | margin-right: 32rpx; |
| 313 | 313 | color: rgba(0, 0, 0, 0.9); |
| 314 | 314 | padding-right: 0; |
| ... | ... | @@ -444,7 +444,7 @@ export default { |
| 444 | 444 | } |
| 445 | 445 | |
| 446 | 446 | .label { |
| 447 | - width: 162rpx; | |
| 447 | + width: 210rpx; | |
| 448 | 448 | margin-right: 32rpx; |
| 449 | 449 | color: rgba(0, 0, 0, 0.9); |
| 450 | 450 | font-size: 32rpx; | ... | ... |
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | <view class="readonly-text">{{ form.workshopName }}</view> |
| 24 | 24 | </template> |
| 25 | 25 | </uni-list-item> |
| 26 | - <uni-list-item title="计划吨位(t)"> | |
| 26 | + <uni-list-item title="计划吨位(kg)"> | |
| 27 | 27 | <template v-slot:footer> |
| 28 | 28 | <view class="readonly-text">{{ form.quantity }}</view> |
| 29 | 29 | </template> |
| ... | ... | @@ -138,7 +138,7 @@ export default { |
| 138 | 138 | deptId: response?.deptId || '', |
| 139 | 139 | workshopName: response?.workshopName || '', |
| 140 | 140 | workshopId: response?.workshopId || '', |
| 141 | - quantity: response?.totalQuantity / 1000 || '', | |
| 141 | + quantity: response?.totalQuantity || '', | |
| 142 | 142 | deliveryDate: response?.deliveryDate || '', |
| 143 | 143 | destination: response?.destination || '', |
| 144 | 144 | consignee: response?.consignee || '', |
| ... | ... | @@ -270,7 +270,7 @@ export default { |
| 270 | 270 | line-height: 48rpx; |
| 271 | 271 | font-size: 32rpx; |
| 272 | 272 | position: relative; |
| 273 | - width: 162rpx; | |
| 273 | + width: 210rpx; | |
| 274 | 274 | margin-right: 32rpx; |
| 275 | 275 | color: rgba(0, 0, 0, 0.9); |
| 276 | 276 | padding-right: 0; |
| ... | ... | @@ -324,7 +324,7 @@ export default { |
| 324 | 324 | .readonly-text { |
| 325 | 325 | color: rgba(0, 0, 0, 0.9); |
| 326 | 326 | font-size: 32rpx; |
| 327 | - line-height: 44rpx; | |
| 327 | + line-height: 48rpx; | |
| 328 | 328 | text-align: right; |
| 329 | 329 | white-space: pre-wrap; |
| 330 | 330 | word-break: break-all; | ... | ... |
| ... | ... | @@ -388,7 +388,7 @@ export default { |
| 388 | 388 | line-height: 48rpx; |
| 389 | 389 | font-size: 32rpx; |
| 390 | 390 | position: relative; |
| 391 | - width: 162rpx; | |
| 391 | + width: 210rpx; | |
| 392 | 392 | margin-right: 32rpx; |
| 393 | 393 | color: rgba(0, 0, 0, 0.9); |
| 394 | 394 | padding-right: 0; |
| ... | ... | @@ -461,7 +461,7 @@ export default { |
| 461 | 461 | .readonly-text { |
| 462 | 462 | color: rgba(0, 0, 0, 0.9); |
| 463 | 463 | font-size: 32rpx; |
| 464 | - line-height: 44rpx; | |
| 464 | + line-height: 48rpx; | |
| 465 | 465 | text-align: right; |
| 466 | 466 | white-space: pre-wrap; |
| 467 | 467 | word-break: break-all; | ... | ... |
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | <view class="card-header"> |
| 19 | 19 | <text class="title omit2">{{ item.orderingUnitName }}</text> |
| 20 | 20 | <text v-if="item.status" :class="['status', `status_${item.status}`]">{{ filterStatus(item.status) |
| 21 | - }}</text> | |
| 21 | + }}</text> | |
| 22 | 22 | </view> |
| 23 | 23 | <view class="info-row"><text>订单编号</text><text>{{ item.orderNo }}</text></view> |
| 24 | 24 | <view class="info-row"><text>订货日期</text><text>{{ item.orderDate }}</text></view> |
| ... | ... | @@ -291,12 +291,12 @@ export default { |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | text { |
| 294 | - width: 60%; | |
| 294 | + width: 50%; | |
| 295 | 295 | line-height: 32rpx; |
| 296 | + word-wrap: break-word; | |
| 296 | 297 | |
| 297 | 298 | &:last-child { |
| 298 | 299 | color: rgba(0, 0, 0, 0.9); |
| 299 | - width: 40%; | |
| 300 | 300 | } |
| 301 | 301 | } |
| 302 | 302 | } | ... | ... |
| ... | ... | @@ -311,7 +311,7 @@ export default { |
| 311 | 311 | line-height: 48rpx; |
| 312 | 312 | font-size: 32rpx; |
| 313 | 313 | position: relative; |
| 314 | - width: 162rpx; | |
| 314 | + width: 210rpx; | |
| 315 | 315 | margin-right: 32rpx; |
| 316 | 316 | color: rgba(0, 0, 0, 0.9); |
| 317 | 317 | padding-right: 0; |
| ... | ... | @@ -384,7 +384,7 @@ export default { |
| 384 | 384 | .readonly-text { |
| 385 | 385 | color: rgba(0, 0, 0, 0.9); |
| 386 | 386 | font-size: 32rpx; |
| 387 | - line-height: 44rpx; | |
| 387 | + line-height: 48rpx; | |
| 388 | 388 | text-align: right; |
| 389 | 389 | white-space: pre-wrap; |
| 390 | 390 | word-break: break-all; | ... | ... |
| ... | ... | @@ -337,7 +337,7 @@ export default { |
| 337 | 337 | line-height: 48rpx; |
| 338 | 338 | font-size: 32rpx; |
| 339 | 339 | position: relative; |
| 340 | - width: 162rpx; | |
| 340 | + width: 210rpx; | |
| 341 | 341 | margin-right: 32rpx; |
| 342 | 342 | color: rgba(0, 0, 0, 0.9); |
| 343 | 343 | padding-right: 0; |
| ... | ... | @@ -475,7 +475,7 @@ export default { |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | 477 | .label { |
| 478 | - width: 162rpx; | |
| 478 | + width: 210rpx; | |
| 479 | 479 | margin-right: 32rpx; |
| 480 | 480 | color: rgba(0, 0, 0, 0.9); |
| 481 | 481 | font-size: 32rpx; | ... | ... |