朱园亮 / erp-mobile · Commits

Commit ee8da534b3fdc59965b4436db1d29b5d658a1e62

Authored by 史婷婷
2 parents 8a7dcc1b cbfbe623

Merge remote-tracking branch 'origin/cjerp-1.0' into publish_cjerp

Inline Side-by-side
Showing 52 changed files with 78 additions and 77 deletions
@@ -493,7 +493,7 @@ export default { @@ -493,7 +493,7 @@ export default {
493 } 493 }
494 494
495 .label { 495 .label {
496 - width: 120rpx; 496 + width: 210rpx;
497 color: rgba(0, 0, 0, 0.6); 497 color: rgba(0, 0, 0, 0.6);
498 font-size: 28rpx; 498 font-size: 28rpx;
499 } 499 }
@@ -262,7 +262,7 @@ export default { @@ -262,7 +262,7 @@ export default {
262 line-height: 48rpx; 262 line-height: 48rpx;
263 font-size: 32rpx; 263 font-size: 32rpx;
264 position: relative; 264 position: relative;
265 - width: 162rpx; 265 + width: 210rpx;
266 margin-right: 32rpx; 266 margin-right: 32rpx;
267 color: rgba(0, 0, 0, 0.9); 267 color: rgba(0, 0, 0, 0.9);
268 268
@@ -127,7 +127,9 @@ export default { @@ -127,7 +127,9 @@ export default {
127 try { 127 try {
128 // 客户池 128 // 客户池
129 if (this.source === 'customer') { 129 if (this.source === 'customer') {
130 - const params = { pageIndex, pageSize, name } 130 + console.log('customer_extra', extra)
  131 + const source = (extra && extra.source) || '';
  132 + const params = { pageIndex, pageSize, name, source }
131 return customerQueryApi(params).then(res => { 133 return customerQueryApi(params).then(res => {
132 const _data = res.data || {} 134 const _data = res.data || {}
133 const records = _data.datas || [] 135 const records = _data.datas || []
@@ -146,6 +148,7 @@ export default { @@ -146,6 +148,7 @@ export default {
146 return { records, totalCount, hasNext } 148 return { records, totalCount, hasNext }
147 }) 149 })
148 } else if (this.source === 'orderAssoc') { 150 } else if (this.source === 'orderAssoc') {
  151 + console.log('orderAssoc_extra', extra)
149 // 订单关联表（可撤销/变更的订货单） 152 // 订单关联表（可撤销/变更的订货单）
150 const queryType = (extra && extra.queryType) || '' 153 const queryType = (extra && extra.queryType) || ''
151 const params = { pageIndex, pageSize, orderNo: name, queryType } 154 const params = { pageIndex, pageSize, orderNo: name, queryType }
@@ -338,7 +338,6 @@ export default { @@ -338,7 +338,6 @@ export default {
338 { key: 'quality', label: '品质' }, 338 { key: 'quality', label: '品质' },
339 { key: 'brand', label: '牌号' }, 339 { key: 'brand', label: '牌号' },
340 { key: 'quantity', label: '数量' }, 340 { key: 'quantity', label: '数量' },
341 - { key: 'salesPrice', label: '销售价格' },  
342 { key: 'deliveryDate', label: '发货日期' }, 341 { key: 'deliveryDate', label: '发货日期' },
343 ] 342 ]
344 for (let i = 0; i < list.length; i++) { 343 for (let i = 0; i < list.length; i++) {
@@ -491,7 +490,7 @@ export default { @@ -491,7 +490,7 @@ export default {
491 line-height: 48rpx; 490 line-height: 48rpx;
492 font-size: 32rpx; 491 font-size: 32rpx;
493 position: relative; 492 position: relative;
494 - width: 162rpx; 493 + width: 210rpx;
495 margin-right: 32rpx; 494 margin-right: 32rpx;
496 color: rgba(0, 0, 0, 0.9); 495 color: rgba(0, 0, 0, 0.9);
497 padding-right: 0; 496 padding-right: 0;
@@ -564,7 +563,7 @@ export default { @@ -564,7 +563,7 @@ export default {
564 .readonly-text { 563 .readonly-text {
565 color: rgba(0, 0, 0, 0.9); 564 color: rgba(0, 0, 0, 0.9);
566 font-size: 32rpx; 565 font-size: 32rpx;
567 - line-height: 44rpx; 566 + line-height: 48rpx;
568 text-align: right; 567 text-align: right;
569 white-space: pre-wrap; 568 white-space: pre-wrap;
570 word-break: break-all; 569 word-break: break-all;
@@ -258,7 +258,6 @@ export default { @@ -258,7 +258,6 @@ export default {
258 { key: 'quality', label: '品质' }, 258 { key: 'quality', label: '品质' },
259 { key: 'brand', label: '牌号' }, 259 { key: 'brand', label: '牌号' },
260 { key: 'quantity', label: '数量' }, 260 { key: 'quantity', label: '数量' },
261 - { key: 'salesPrice', label: '销售价格' },  
262 { key: 'deliveryDate', label: '发货日期' }, 261 { key: 'deliveryDate', label: '发货日期' },
263 ] 262 ]
264 for (let i = 0; i < list.length; i++) { 263 for (let i = 0; i < list.length; i++) {
@@ -410,7 +409,7 @@ export default { @@ -410,7 +409,7 @@ export default {
410 line-height: 48rpx; 409 line-height: 48rpx;
411 font-size: 32rpx; 410 font-size: 32rpx;
412 position: relative; 411 position: relative;
413 - width: 162rpx; 412 + width: 210rpx;
414 margin-right: 32rpx; 413 margin-right: 32rpx;
415 color: rgba(0, 0, 0, 0.9); 414 color: rgba(0, 0, 0, 0.9);
416 padding-right: 0; 415 padding-right: 0;
@@ -483,7 +482,7 @@ export default { @@ -483,7 +482,7 @@ export default {
483 .readonly-text { 482 .readonly-text {
484 color: rgba(0, 0, 0, 0.9); 483 color: rgba(0, 0, 0, 0.9);
485 font-size: 32rpx; 484 font-size: 32rpx;
486 - line-height: 44rpx; 485 + line-height: 48rpx;
487 text-align: right; 486 text-align: right;
488 white-space: pre-wrap; 487 white-space: pre-wrap;
489 word-break: break-all; 488 word-break: break-all;
@@ -434,7 +434,7 @@ export default { @@ -434,7 +434,7 @@ export default {
434 line-height: 48rpx; 434 line-height: 48rpx;
435 font-size: 32rpx; 435 font-size: 32rpx;
436 position: relative; 436 position: relative;
437 - width: 162rpx; 437 + width: 210rpx;
438 margin-right: 32rpx; 438 margin-right: 32rpx;
439 color: rgba(0, 0, 0, 0.9); 439 color: rgba(0, 0, 0, 0.9);
440 padding-right: 0; 440 padding-right: 0;
@@ -570,7 +570,7 @@ export default { @@ -570,7 +570,7 @@ export default {
570 } 570 }
571 571
572 .label { 572 .label {
573 - width: 162rpx; 573 + width: 210rpx;
574 margin-right: 32rpx; 574 margin-right: 32rpx;
575 color: rgba(0, 0, 0, 0.9); 575 color: rgba(0, 0, 0, 0.9);
576 font-size: 32rpx; 576 font-size: 32rpx;
@@ -760,7 +760,7 @@ export default { @@ -760,7 +760,7 @@ export default {
760 line-height: 48rpx; 760 line-height: 48rpx;
761 font-size: 32rpx; 761 font-size: 32rpx;
762 position: relative; 762 position: relative;
763 - width: 162rpx; 763 + width: 210rpx;
764 margin-right: 32rpx; 764 margin-right: 32rpx;
765 color: rgba(0, 0, 0, 0.9); 765 color: rgba(0, 0, 0, 0.9);
766 766
@@ -699,7 +699,7 @@ export default { @@ -699,7 +699,7 @@ export default {
699 line-height: 48rpx; 699 line-height: 48rpx;
700 font-size: 32rpx; 700 font-size: 32rpx;
701 position: relative; 701 position: relative;
702 - width: 162rpx; 702 + width: 210rpx;
703 margin-right: 32rpx; 703 margin-right: 32rpx;
704 color: rgba(0, 0, 0, 0.9); 704 color: rgba(0, 0, 0, 0.9);
705 } 705 }
@@ -497,7 +497,7 @@ export default { @@ -497,7 +497,7 @@ export default {
497 } 497 }
498 498
499 .label { 499 .label {
500 - width: 120rpx; 500 + width: 210rpx;
501 color: rgba(0, 0, 0, 0.6); 501 color: rgba(0, 0, 0, 0.6);
502 font-size: 28rpx; 502 font-size: 28rpx;
503 } 503 }
@@ -762,7 +762,7 @@ export default { @@ -762,7 +762,7 @@ export default {
762 line-height: 48rpx; 762 line-height: 48rpx;
763 font-size: 32rpx; 763 font-size: 32rpx;
764 position: relative; 764 position: relative;
765 - width: 162rpx; 765 + width: 210rpx;
766 margin-right: 32rpx; 766 margin-right: 32rpx;
767 color: rgba(0, 0, 0, 0.9); 767 color: rgba(0, 0, 0, 0.9);
768 768
@@ -493,7 +493,7 @@ export default { @@ -493,7 +493,7 @@ export default {
493 line-height: 48rpx; 493 line-height: 48rpx;
494 font-size: 32rpx; 494 font-size: 32rpx;
495 position: relative; 495 position: relative;
496 - width: 162rpx; 496 + width: 210rpx;
497 margin-right: 32rpx; 497 margin-right: 32rpx;
498 color: rgba(0, 0, 0, 0.9); 498 color: rgba(0, 0, 0, 0.9);
499 499
@@ -699,7 +699,7 @@ export default { @@ -699,7 +699,7 @@ export default {
699 line-height: 48rpx; 699 line-height: 48rpx;
700 font-size: 32rpx; 700 font-size: 32rpx;
701 position: relative; 701 position: relative;
702 - width: 162rpx; 702 + width: 210rpx;
703 margin-right: 32rpx; 703 margin-right: 32rpx;
704 color: rgba(0, 0, 0, 0.9); 704 color: rgba(0, 0, 0, 0.9);
705 } 705 }
@@ -498,7 +498,7 @@ export default { @@ -498,7 +498,7 @@ export default {
498 } 498 }
499 499
500 .label { 500 .label {
501 - width: 120rpx; 501 + width: 210rpx;
502 color: rgba(0, 0, 0, 0.6); 502 color: rgba(0, 0, 0, 0.6);
503 font-size: 28rpx; 503 font-size: 28rpx;
504 } 504 }
@@ -761,7 +761,7 @@ export default { @@ -761,7 +761,7 @@ export default {
761 line-height: 48rpx; 761 line-height: 48rpx;
762 font-size: 32rpx; 762 font-size: 32rpx;
763 position: relative; 763 position: relative;
764 - width: 162rpx; 764 + width: 210rpx;
765 margin-right: 32rpx; 765 margin-right: 32rpx;
766 color: rgba(0, 0, 0, 0.9); 766 color: rgba(0, 0, 0, 0.9);
767 767
@@ -493,7 +493,7 @@ export default { @@ -493,7 +493,7 @@ export default {
493 line-height: 48rpx; 493 line-height: 48rpx;
494 font-size: 32rpx; 494 font-size: 32rpx;
495 position: relative; 495 position: relative;
496 - width: 162rpx; 496 + width: 210rpx;
497 margin-right: 32rpx; 497 margin-right: 32rpx;
498 color: rgba(0, 0, 0, 0.9); 498 color: rgba(0, 0, 0, 0.9);
499 499
@@ -286,7 +286,7 @@ export default { @@ -286,7 +286,7 @@ export default {
286 line-height: 48rpx; 286 line-height: 48rpx;
287 font-size: 32rpx; 287 font-size: 32rpx;
288 position: relative; 288 position: relative;
289 - width: 162rpx; 289 + width: 210rpx;
290 margin-right: 32rpx; 290 margin-right: 32rpx;
291 color: rgba(0, 0, 0, 0.9); 291 color: rgba(0, 0, 0, 0.9);
292 292
@@ -699,7 +699,7 @@ export default { @@ -699,7 +699,7 @@ export default {
699 line-height: 48rpx; 699 line-height: 48rpx;
700 font-size: 32rpx; 700 font-size: 32rpx;
701 position: relative; 701 position: relative;
702 - width: 162rpx; 702 + width: 210rpx;
703 margin-right: 32rpx; 703 margin-right: 32rpx;
704 color: rgba(0, 0, 0, 0.9); 704 color: rgba(0, 0, 0, 0.9);
705 } 705 }
@@ -493,7 +493,7 @@ export default { @@ -493,7 +493,7 @@ export default {
493 } 493 }
494 494
495 .label { 495 .label {
496 - width: 120rpx; 496 + width: 210rpx;
497 color: rgba(0, 0, 0, 0.6); 497 color: rgba(0, 0, 0, 0.6);
498 font-size: 28rpx; 498 font-size: 28rpx;
499 } 499 }
@@ -318,7 +318,7 @@ export default { @@ -318,7 +318,7 @@ export default {
318 line-height: 48rpx; 318 line-height: 48rpx;
319 font-size: 32rpx; 319 font-size: 32rpx;
320 position: relative; 320 position: relative;
321 - width: 162rpx; 321 + width: 210rpx;
322 margin-right: 32rpx; 322 margin-right: 32rpx;
323 color: rgba(0, 0, 0, 0.9); 323 color: rgba(0, 0, 0, 0.9);
324 324
@@ -266,7 +266,7 @@ export default { @@ -266,7 +266,7 @@ export default {
266 line-height: 48rpx; 266 line-height: 48rpx;
267 font-size: 32rpx; 267 font-size: 32rpx;
268 position: relative; 268 position: relative;
269 - width: 162rpx; 269 + width: 210rpx;
270 margin-right: 32rpx; 270 margin-right: 32rpx;
271 color: rgba(0, 0, 0, 0.9); 271 color: rgba(0, 0, 0, 0.9);
272 272
@@ -765,7 +765,7 @@ export default { @@ -765,7 +765,7 @@ export default {
765 line-height: 48rpx; 765 line-height: 48rpx;
766 font-size: 32rpx; 766 font-size: 32rpx;
767 position: relative; 767 position: relative;
768 - width: 162rpx; 768 + width: 210rpx;
769 margin-right: 32rpx; 769 margin-right: 32rpx;
770 color: rgba(0, 0, 0, 0.9); 770 color: rgba(0, 0, 0, 0.9);
771 771
@@ -703,7 +703,7 @@ export default { @@ -703,7 +703,7 @@ export default {
703 line-height: 48rpx; 703 line-height: 48rpx;
704 font-size: 32rpx; 704 font-size: 32rpx;
705 position: relative; 705 position: relative;
706 - width: 162rpx; 706 + width: 210rpx;
707 margin-right: 32rpx; 707 margin-right: 32rpx;
708 color: rgba(0, 0, 0, 0.9); 708 color: rgba(0, 0, 0, 0.9);
709 } 709 }
@@ -525,7 +525,7 @@ export default { @@ -525,7 +525,7 @@ export default {
525 } 525 }
526 526
527 .label { 527 .label {
528 - width: 120rpx; 528 + width: 210rpx;
529 color: rgba(0, 0, 0, 0.6); 529 color: rgba(0, 0, 0, 0.6);
530 font-size: 28rpx; 530 font-size: 28rpx;
531 } 531 }
@@ -762,7 +762,7 @@ export default { @@ -762,7 +762,7 @@ export default {
762 line-height: 48rpx; 762 line-height: 48rpx;
763 font-size: 32rpx; 763 font-size: 32rpx;
764 position: relative; 764 position: relative;
765 - width: 162rpx; 765 + width: 210rpx;
766 margin-right: 32rpx; 766 margin-right: 32rpx;
767 color: rgba(0, 0, 0, 0.9); 767 color: rgba(0, 0, 0, 0.9);
768 768
@@ -699,7 +699,7 @@ export default { @@ -699,7 +699,7 @@ export default {
699 line-height: 48rpx; 699 line-height: 48rpx;
700 font-size: 32rpx; 700 font-size: 32rpx;
701 position: relative; 701 position: relative;
702 - width: 162rpx; 702 + width: 210rpx;
703 margin-right: 32rpx; 703 margin-right: 32rpx;
704 color: rgba(0, 0, 0, 0.9); 704 color: rgba(0, 0, 0, 0.9);
705 } 705 }
@@ -493,7 +493,7 @@ export default { @@ -493,7 +493,7 @@ export default {
493 } 493 }
494 494
495 .label { 495 .label {
496 - width: 120rpx; 496 + width: 210rpx;
497 color: rgba(0, 0, 0, 0.6); 497 color: rgba(0, 0, 0, 0.6);
498 font-size: 28rpx; 498 font-size: 28rpx;
499 } 499 }
@@ -761,7 +761,7 @@ export default { @@ -761,7 +761,7 @@ export default {
761 line-height: 48rpx; 761 line-height: 48rpx;
762 font-size: 32rpx; 762 font-size: 32rpx;
763 position: relative; 763 position: relative;
764 - width: 162rpx; 764 + width: 210rpx;
765 margin-right: 32rpx; 765 margin-right: 32rpx;
766 color: rgba(0, 0, 0, 0.9); 766 color: rgba(0, 0, 0, 0.9);
767 767
@@ -493,7 +493,7 @@ export default { @@ -493,7 +493,7 @@ export default {
493 line-height: 48rpx; 493 line-height: 48rpx;
494 font-size: 32rpx; 494 font-size: 32rpx;
495 position: relative; 495 position: relative;
496 - width: 162rpx; 496 + width: 210rpx;
497 margin-right: 32rpx; 497 margin-right: 32rpx;
498 color: rgba(0, 0, 0, 0.9); 498 color: rgba(0, 0, 0, 0.9);
499 499
@@ -699,7 +699,7 @@ export default { @@ -699,7 +699,7 @@ export default {
699 line-height: 48rpx; 699 line-height: 48rpx;
700 font-size: 32rpx; 700 font-size: 32rpx;
701 position: relative; 701 position: relative;
702 - width: 162rpx; 702 + width: 210rpx;
703 margin-right: 32rpx; 703 margin-right: 32rpx;
704 color: rgba(0, 0, 0, 0.9); 704 color: rgba(0, 0, 0, 0.9);
705 } 705 }
@@ -493,7 +493,7 @@ export default { @@ -493,7 +493,7 @@ export default {
493 } 493 }
494 494
495 .label { 495 .label {
496 - width: 120rpx; 496 + width: 210rpx;
497 color: rgba(0, 0, 0, 0.6); 497 color: rgba(0, 0, 0, 0.6);
498 font-size: 28rpx; 498 font-size: 28rpx;
499 } 499 }
@@ -287,7 +287,7 @@ export default { @@ -287,7 +287,7 @@ export default {
287 line-height: 48rpx; 287 line-height: 48rpx;
288 font-size: 32rpx; 288 font-size: 32rpx;
289 position: relative; 289 position: relative;
290 - width: 162rpx; 290 + width: 210rpx;
291 margin-right: 32rpx; 291 margin-right: 32rpx;
292 color: rgba(0, 0, 0, 0.9); 292 color: rgba(0, 0, 0, 0.9);
293 293
@@ -761,7 +761,7 @@ export default { @@ -761,7 +761,7 @@ export default {
761 line-height: 48rpx; 761 line-height: 48rpx;
762 font-size: 32rpx; 762 font-size: 32rpx;
763 position: relative; 763 position: relative;
764 - width: 162rpx; 764 + width: 210rpx;
765 margin-right: 32rpx; 765 margin-right: 32rpx;
766 color: rgba(0, 0, 0, 0.9); 766 color: rgba(0, 0, 0, 0.9);
767 767
@@ -493,7 +493,7 @@ export default { @@ -493,7 +493,7 @@ export default {
493 line-height: 48rpx; 493 line-height: 48rpx;
494 font-size: 32rpx; 494 font-size: 32rpx;
495 position: relative; 495 position: relative;
496 - width: 162rpx; 496 + width: 210rpx;
497 margin-right: 32rpx; 497 margin-right: 32rpx;
498 color: rgba(0, 0, 0, 0.9); 498 color: rgba(0, 0, 0, 0.9);
499 499
@@ -286,7 +286,7 @@ export default { @@ -286,7 +286,7 @@ export default {
286 line-height: 48rpx; 286 line-height: 48rpx;
287 font-size: 32rpx; 287 font-size: 32rpx;
288 position: relative; 288 position: relative;
289 - width: 162rpx; 289 + width: 210rpx;
290 margin-right: 32rpx; 290 margin-right: 32rpx;
291 color: rgba(0, 0, 0, 0.9); 291 color: rgba(0, 0, 0, 0.9);
292 292
@@ -699,7 +699,7 @@ export default { @@ -699,7 +699,7 @@ export default {
699 line-height: 48rpx; 699 line-height: 48rpx;
700 font-size: 32rpx; 700 font-size: 32rpx;
701 position: relative; 701 position: relative;
702 - width: 162rpx; 702 + width: 210rpx;
703 margin-right: 32rpx; 703 margin-right: 32rpx;
704 color: rgba(0, 0, 0, 0.9); 704 color: rgba(0, 0, 0, 0.9);
705 } 705 }
@@ -493,7 +493,7 @@ export default { @@ -493,7 +493,7 @@ export default {
493 } 493 }
494 494
495 .label { 495 .label {
496 - width: 120rpx; 496 + width: 210rpx;
497 color: rgba(0, 0, 0, 0.6); 497 color: rgba(0, 0, 0, 0.6);
498 font-size: 28rpx; 498 font-size: 28rpx;
499 } 499 }
@@ -308,7 +308,7 @@ @@ -308,7 +308,7 @@
308 @confirm="onSheetConfirm" /> 308 @confirm="onSheetConfirm" />
309 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 309 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
310 :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey" 310 :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
311 - :selectedKeys.sync="relate.selectedKeys" @confirm="onRelateConfirm" /> 311 + :selectedKeys.sync="relate.selectedKeys" :source-extra="{ source: 'CUSTOMER_CREDIT' }" @confirm="onRelateConfirm" />
312 </view> 312 </view>
313 313
314 </template> 314 </template>
@@ -444,7 +444,7 @@ export default { @@ -444,7 +444,7 @@ export default {
444 rowKey: 'id', 444 rowKey: 'id',
445 multiple: false, 445 multiple: false,
446 display: [ 446 display: [
447 - { label: '姓名', field: 'name' }, 447 + { label: '名称', field: 'name' },
448 { label: '编号', field: 'code' }, 448 { label: '编号', field: 'code' },
449 { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') } 449 { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }
450 ] 450 ]
@@ -669,7 +669,7 @@ export default { @@ -669,7 +669,7 @@ export default {
669 line-height: 48rpx; 669 line-height: 48rpx;
670 font-size: 32rpx; 670 font-size: 32rpx;
671 position: relative; 671 position: relative;
672 - width: 162rpx; 672 + width: 210rpx;
673 margin-right: 32rpx; 673 margin-right: 32rpx;
674 color: rgba(0, 0, 0, 0.9); 674 color: rgba(0, 0, 0, 0.9);
675 padding-right: 0; 675 padding-right: 0;
@@ -675,7 +675,7 @@ export default { @@ -675,7 +675,7 @@ export default {
675 line-height: 48rpx; 675 line-height: 48rpx;
676 font-size: 32rpx; 676 font-size: 32rpx;
677 position: relative; 677 position: relative;
678 - width: 162rpx; 678 + width: 210rpx;
679 margin-right: 32rpx; 679 margin-right: 32rpx;
680 color: rgba(0, 0, 0, 0.9); 680 color: rgba(0, 0, 0, 0.9);
681 padding-right: 0; 681 padding-right: 0;
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <view class="page"> 2 <view class="page">
3 <view class="dev-list-fixed"> 3 <view class="dev-list-fixed">
4 <view class="search-row"> 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 cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="search" 6 cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="search"
7 @input="onSearchInput" /> 7 @input="onSearchInput" />
8 <view class="tool-icons"> 8 <view class="tool-icons">
@@ -306,7 +306,7 @@ @@ -306,7 +306,7 @@
306 @confirm="onSheetConfirm" /> 306 @confirm="onSheetConfirm" />
307 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 307 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
308 :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey" 308 :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
309 - :selectedKeys.sync="relate.selectedKeys" @confirm="onRelateConfirm" /> 309 + :selectedKeys.sync="relate.selectedKeys" :source-extra="{ source: 'CUSTOMER_CREDIT' }" @confirm="onRelateConfirm" />
310 </view> 310 </view>
311 311
312 </template> 312 </template>
@@ -469,7 +469,7 @@ export default { @@ -469,7 +469,7 @@ export default {
469 rowKey: 'id', 469 rowKey: 'id',
470 multiple: false, 470 multiple: false,
471 display: [ 471 display: [
472 - { label: '姓名', field: 'name' }, 472 + { label: '名称', field: 'name' },
473 { label: '编号', field: 'code' }, 473 { label: '编号', field: 'code' },
474 { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') } 474 { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }
475 ] 475 ]
@@ -676,7 +676,7 @@ export default { @@ -676,7 +676,7 @@ export default {
676 line-height: 48rpx; 676 line-height: 48rpx;
677 font-size: 32rpx; 677 font-size: 32rpx;
678 position: relative; 678 position: relative;
679 - width: 162rpx; 679 + width: 210rpx;
680 margin-right: 32rpx; 680 margin-right: 32rpx;
681 color: rgba(0, 0, 0, 0.9); 681 color: rgba(0, 0, 0, 0.9);
682 padding-right: 0; 682 padding-right: 0;
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 <!-- 关联选择弹框：客户名称、责任人 --> 114 <!-- 关联选择弹框：客户名称、责任人 -->
115 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 115 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
116 :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey" 116 :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
117 - :selectedKeys.sync="relate.selectedKeys" @confirm="onRelateConfirm" /> 117 + :selectedKeys.sync="relate.selectedKeys" :source-extra="{ source: 'CUSTOMER_DEVELOP' }" @confirm="onRelateConfirm" />
118 </view> 118 </view>
119 </template> 119 </template>
120 120
@@ -315,7 +315,7 @@ @@ -315,7 +315,7 @@
315 rowKey: 'id', 315 rowKey: 'id',
316 multiple: false, 316 multiple: false,
317 display: [{ 317 display: [{
318 - label: '姓名', 318 + label: '名称',
319 field: 'name' 319 field: 'name'
320 }, 320 },
321 { 321 {
@@ -513,7 +513,7 @@ @@ -513,7 +513,7 @@
513 line-height: 48rpx; 513 line-height: 48rpx;
514 font-size: 32rpx; 514 font-size: 32rpx;
515 position: relative; 515 position: relative;
516 - width: 162rpx; 516 + width: 210rpx;
517 margin-right: 32rpx; 517 margin-right: 32rpx;
518 color: rgba(0, 0, 0, 0.9); 518 color: rgba(0, 0, 0, 0.9);
519 519
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 <!-- 关联选择弹框：客户名称、责任人 --> 114 <!-- 关联选择弹框：客户名称、责任人 -->
115 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source" 115 <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
116 :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey" 116 :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
117 - :selectedKeys.sync="relate.selectedKeys" @confirm="onRelateConfirm" /> 117 + :selectedKeys.sync="relate.selectedKeys" :source-extra="{ source: 'CUSTOMER_DEVELOP' }" @confirm="onRelateConfirm" />
118 </view> 118 </view>
119 </template> 119 </template>
120 120
@@ -360,7 +360,7 @@ @@ -360,7 +360,7 @@
360 rowKey: 'id', 360 rowKey: 'id',
361 multiple: false, 361 multiple: false,
362 display: [{ 362 display: [{
363 - label: '姓名', 363 + label: '名称',
364 field: 'name' 364 field: 'name'
365 }, 365 },
366 { 366 {
@@ -566,7 +566,7 @@ @@ -566,7 +566,7 @@
566 line-height: 48rpx; 566 line-height: 48rpx;
567 font-size: 32rpx; 567 font-size: 32rpx;
568 position: relative; 568 position: relative;
569 - width: 162rpx; 569 + width: 210rpx;
570 margin-right: 32rpx; 570 margin-right: 32rpx;
571 color: rgba(0, 0, 0, 0.9); 571 color: rgba(0, 0, 0, 0.9);
572 572
@@ -684,7 +684,7 @@ export default { @@ -684,7 +684,7 @@ export default {
684 line-height: 48rpx; 684 line-height: 48rpx;
685 font-size: 32rpx; 685 font-size: 32rpx;
686 position: relative; 686 position: relative;
687 - width: 162rpx; 687 + width: 210rpx;
688 margin-right: 32rpx; 688 margin-right: 32rpx;
689 color: rgba(0,0,0,0.9); 689 color: rgba(0,0,0,0.9);
690 padding-right: 0; 690 padding-right: 0;
@@ -462,7 +462,7 @@ export default { @@ -462,7 +462,7 @@ export default {
462 line-height: 48rpx; 462 line-height: 48rpx;
463 font-size: 32rpx; 463 font-size: 32rpx;
464 position: relative; 464 position: relative;
465 - width: 162rpx; 465 + width: 210rpx;
466 margin-right: 32rpx; 466 margin-right: 32rpx;
467 color: rgba(0, 0, 0, 0.9); 467 color: rgba(0, 0, 0, 0.9);
468 padding-right: 0; 468 padding-right: 0;
@@ -530,7 +530,7 @@ export default { @@ -530,7 +530,7 @@ export default {
530 .readonly-text { 530 .readonly-text {
531 color: rgba(0, 0, 0, 0.9); 531 color: rgba(0, 0, 0, 0.9);
532 font-size: 32rpx; 532 font-size: 32rpx;
533 - line-height: 44rpx; 533 + line-height: 48rpx;
534 text-align: right; 534 text-align: right;
535 white-space: pre-wrap; 535 white-space: pre-wrap;
536 word-break: break-all; 536 word-break: break-all;
@@ -376,12 +376,12 @@ export default { @@ -376,12 +376,12 @@ export default {
376 } 376 }
377 377
378 text { 378 text {
379 - width: 60%; 379 + width: 50%;
380 line-height: 32rpx; 380 line-height: 32rpx;
  381 + word-wrap: break-word;
381 382
382 &:last-child { 383 &:last-child {
383 color: rgba(0, 0, 0, 0.9); 384 color: rgba(0, 0, 0, 0.9);
384 - width: 40%;  
385 } 385 }
386 } 386 }
387 } 387 }
@@ -393,7 +393,7 @@ export default { @@ -393,7 +393,7 @@ export default {
393 line-height: 48rpx; 393 line-height: 48rpx;
394 font-size: 32rpx; 394 font-size: 32rpx;
395 position: relative; 395 position: relative;
396 - width: 162rpx; 396 + width: 210rpx;
397 margin-right: 32rpx; 397 margin-right: 32rpx;
398 color: rgba(0, 0, 0, 0.9); 398 color: rgba(0, 0, 0, 0.9);
399 padding-right: 0; 399 padding-right: 0;
@@ -466,7 +466,7 @@ export default { @@ -466,7 +466,7 @@ export default {
466 .readonly-text { 466 .readonly-text {
467 color: rgba(0, 0, 0, 0.9); 467 color: rgba(0, 0, 0, 0.9);
468 font-size: 32rpx; 468 font-size: 32rpx;
469 - line-height: 44rpx; 469 + line-height: 48rpx;
470 text-align: right; 470 text-align: right;
471 white-space: pre-wrap; 471 white-space: pre-wrap;
472 word-break: break-all; 472 word-break: break-all;
@@ -308,7 +308,7 @@ export default { @@ -308,7 +308,7 @@ export default {
308 line-height: 48rpx; 308 line-height: 48rpx;
309 font-size: 32rpx; 309 font-size: 32rpx;
310 position: relative; 310 position: relative;
311 - width: 162rpx; 311 + width: 210rpx;
312 margin-right: 32rpx; 312 margin-right: 32rpx;
313 color: rgba(0, 0, 0, 0.9); 313 color: rgba(0, 0, 0, 0.9);
314 padding-right: 0; 314 padding-right: 0;
@@ -444,7 +444,7 @@ export default { @@ -444,7 +444,7 @@ export default {
444 } 444 }
445 445
446 .label { 446 .label {
447 - width: 162rpx; 447 + width: 210rpx;
448 margin-right: 32rpx; 448 margin-right: 32rpx;
449 color: rgba(0, 0, 0, 0.9); 449 color: rgba(0, 0, 0, 0.9);
450 font-size: 32rpx; 450 font-size: 32rpx;
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <view class="readonly-text">{{ form.workshopName }}</view> 23 <view class="readonly-text">{{ form.workshopName }}</view>
24 </template> 24 </template>
25 </uni-list-item> 25 </uni-list-item>
26 - <uni-list-item title="计划吨位(t)"> 26 + <uni-list-item title="计划吨位(kg)">
27 <template v-slot:footer> 27 <template v-slot:footer>
28 <view class="readonly-text">{{ form.quantity }}</view> 28 <view class="readonly-text">{{ form.quantity }}</view>
29 </template> 29 </template>
@@ -138,7 +138,7 @@ export default { @@ -138,7 +138,7 @@ export default {
138 deptId: response?.deptId || '', 138 deptId: response?.deptId || '',
139 workshopName: response?.workshopName || '', 139 workshopName: response?.workshopName || '',
140 workshopId: response?.workshopId || '', 140 workshopId: response?.workshopId || '',
141 - quantity: response?.totalQuantity / 1000 || '', 141 + quantity: response?.totalQuantity || '',
142 deliveryDate: response?.deliveryDate || '', 142 deliveryDate: response?.deliveryDate || '',
143 destination: response?.destination || '', 143 destination: response?.destination || '',
144 consignee: response?.consignee || '', 144 consignee: response?.consignee || '',
@@ -270,7 +270,7 @@ export default { @@ -270,7 +270,7 @@ export default {
270 line-height: 48rpx; 270 line-height: 48rpx;
271 font-size: 32rpx; 271 font-size: 32rpx;
272 position: relative; 272 position: relative;
273 - width: 162rpx; 273 + width: 210rpx;
274 margin-right: 32rpx; 274 margin-right: 32rpx;
275 color: rgba(0, 0, 0, 0.9); 275 color: rgba(0, 0, 0, 0.9);
276 padding-right: 0; 276 padding-right: 0;
@@ -324,7 +324,7 @@ export default { @@ -324,7 +324,7 @@ export default {
324 .readonly-text { 324 .readonly-text {
325 color: rgba(0, 0, 0, 0.9); 325 color: rgba(0, 0, 0, 0.9);
326 font-size: 32rpx; 326 font-size: 32rpx;
327 - line-height: 44rpx; 327 + line-height: 48rpx;
328 text-align: right; 328 text-align: right;
329 white-space: pre-wrap; 329 white-space: pre-wrap;
330 word-break: break-all; 330 word-break: break-all;
@@ -388,7 +388,7 @@ export default { @@ -388,7 +388,7 @@ export default {
388 line-height: 48rpx; 388 line-height: 48rpx;
389 font-size: 32rpx; 389 font-size: 32rpx;
390 position: relative; 390 position: relative;
391 - width: 162rpx; 391 + width: 210rpx;
392 margin-right: 32rpx; 392 margin-right: 32rpx;
393 color: rgba(0, 0, 0, 0.9); 393 color: rgba(0, 0, 0, 0.9);
394 padding-right: 0; 394 padding-right: 0;
@@ -461,7 +461,7 @@ export default { @@ -461,7 +461,7 @@ export default {
461 .readonly-text { 461 .readonly-text {
462 color: rgba(0, 0, 0, 0.9); 462 color: rgba(0, 0, 0, 0.9);
463 font-size: 32rpx; 463 font-size: 32rpx;
464 - line-height: 44rpx; 464 + line-height: 48rpx;
465 text-align: right; 465 text-align: right;
466 white-space: pre-wrap; 466 white-space: pre-wrap;
467 word-break: break-all; 467 word-break: break-all;
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <view class="card-header"> 18 <view class="card-header">
19 <text class="title omit2">{{ item.orderingUnitName }}</text> 19 <text class="title omit2">{{ item.orderingUnitName }}</text>
20 <text v-if="item.status" :class="['status', `status_${item.status}`]">{{ filterStatus(item.status) 20 <text v-if="item.status" :class="['status', `status_${item.status}`]">{{ filterStatus(item.status)
21 - }}</text> 21 + }}</text>
22 </view> 22 </view>
23 <view class="info-row"><text>订单编号</text><text>{{ item.orderNo }}</text></view> 23 <view class="info-row"><text>订单编号</text><text>{{ item.orderNo }}</text></view>
24 <view class="info-row"><text>订货日期</text><text>{{ item.orderDate }}</text></view> 24 <view class="info-row"><text>订货日期</text><text>{{ item.orderDate }}</text></view>
@@ -291,12 +291,12 @@ export default { @@ -291,12 +291,12 @@ export default {
291 } 291 }
292 292
293 text { 293 text {
294 - width: 60%; 294 + width: 50%;
295 line-height: 32rpx; 295 line-height: 32rpx;
  296 + word-wrap: break-word;
296 297
297 &:last-child { 298 &:last-child {
298 color: rgba(0, 0, 0, 0.9); 299 color: rgba(0, 0, 0, 0.9);
299 - width: 40%;  
300 } 300 }
301 } 301 }
302 } 302 }
@@ -311,7 +311,7 @@ export default { @@ -311,7 +311,7 @@ export default {
311 line-height: 48rpx; 311 line-height: 48rpx;
312 font-size: 32rpx; 312 font-size: 32rpx;
313 position: relative; 313 position: relative;
314 - width: 162rpx; 314 + width: 210rpx;
315 margin-right: 32rpx; 315 margin-right: 32rpx;
316 color: rgba(0, 0, 0, 0.9); 316 color: rgba(0, 0, 0, 0.9);
317 padding-right: 0; 317 padding-right: 0;
@@ -384,7 +384,7 @@ export default { @@ -384,7 +384,7 @@ export default {
384 .readonly-text { 384 .readonly-text {
385 color: rgba(0, 0, 0, 0.9); 385 color: rgba(0, 0, 0, 0.9);
386 font-size: 32rpx; 386 font-size: 32rpx;
387 - line-height: 44rpx; 387 + line-height: 48rpx;
388 text-align: right; 388 text-align: right;
389 white-space: pre-wrap; 389 white-space: pre-wrap;
390 word-break: break-all; 390 word-break: break-all;
@@ -337,7 +337,7 @@ export default { @@ -337,7 +337,7 @@ export default {
337 line-height: 48rpx; 337 line-height: 48rpx;
338 font-size: 32rpx; 338 font-size: 32rpx;
339 position: relative; 339 position: relative;
340 - width: 162rpx; 340 + width: 210rpx;
341 margin-right: 32rpx; 341 margin-right: 32rpx;
342 color: rgba(0, 0, 0, 0.9); 342 color: rgba(0, 0, 0, 0.9);
343 padding-right: 0; 343 padding-right: 0;
@@ -475,7 +475,7 @@ export default { @@ -475,7 +475,7 @@ export default {
475 } 475 }
476 476
477 .label { 477 .label {
478 - width: 162rpx; 478 + width: 210rpx;
479 margin-right: 32rpx; 479 margin-right: 32rpx;
480 color: rgba(0, 0, 0, 0.9); 480 color: rgba(0, 0, 0, 0.9);
481 font-size: 32rpx; 481 font-size: 32rpx;