朱园亮 / erp-mobile · Commits

Commit 708bc4b55352ccfa948fe7fdf80ba4d159c3c7d5

Authored by 史婷婷
1 parent 2bcc5e5c

feat： 大部分详情页 样式优化（label）

Inline Side-by-side
Showing 13 changed files with 41 additions and 29 deletions
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <view class="mgb10"> 24 <view class="mgb10">
25 <Product title="变更后" mode="view" :list="form.afterChangeSpecList" :totalQuantity="form.afterTotalQuantity || 0" /> 25 <Product title="变更后" mode="view" :list="form.afterChangeSpecList" :totalQuantity="form.afterTotalQuantity || 0" />
26 </view> 26 </view>
27 - 27 +
28 <view class="section"> 28 <view class="section">
29 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view> 29 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
30 <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view> 30 <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view> 34 <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
35 <view class="row"><text class="label">变更说明</text><text class="value">{{ form.changeDescription }}</text></view> 35 <view class="row"><text class="label">变更说明</text><text class="value">{{ form.changeDescription }}</text></view>
36 </view> 36 </view>
37 - 37 +
38 <view class="title-header"> 38 <view class="title-header">
39 <image class="title-header_icon" src="/static/images/title.png" /> 39 <image class="title-header_icon" src="/static/images/title.png" />
40 <span>具体质量要求</span> 40 <span>具体质量要求</span>
@@ -171,7 +171,7 @@ export default { @@ -171,7 +171,7 @@ export default {
171 uni.showToast({ title: '已确认变更', icon: 'none' }) 171 uni.showToast({ title: '已确认变更', icon: 'none' })
172 setTimeout(() => { uni.redirectTo({ url: '/pages/change_list/index' }) }, 300) 172 setTimeout(() => { uni.redirectTo({ url: '/pages/change_list/index' }) }, 300)
173 }).catch(() => { 173 }).catch(() => {
174 - uni.showToast({ title: '确认变更失败', icon: 'none' }) 174 + uni.showToast({ title: '确认变更失败', icon: 'none' })
175 }) 175 })
176 } 176 }
177 } 177 }
@@ -289,6 +289,7 @@ export default { @@ -289,6 +289,7 @@ export default {
289 289
290 .label { 290 .label {
291 max-width: 420rpx; 291 max-width: 420rpx;
  292 + margin-right: 20rpx;
292 line-height: 32rpx; 293 line-height: 32rpx;
293 font-size: 28rpx; 294 font-size: 28rpx;
294 color: rgba(0, 0, 0, 0.6); 295 color: rgba(0, 0, 0, 0.6);
@@ -162,6 +162,7 @@ export default { @@ -162,6 +162,7 @@ export default {
162 162
163 .label { 163 .label {
164 max-width: 420rpx; 164 max-width: 420rpx;
  165 + margin-right: 20rpx;
165 line-height: 32rpx; 166 line-height: 32rpx;
166 font-size: 28rpx; 167 font-size: 28rpx;
167 color: rgba(0, 0, 0, 0.6); 168 color: rgba(0, 0, 0, 0.6);
@@ -473,7 +473,7 @@ export default { @@ -473,7 +473,7 @@ export default {
473 } 473 }
474 474
475 .label { 475 .label {
476 - width: 310rpx; 476 + max-width: 310rpx;
477 color: rgba(0, 0, 0, 0.6); 477 color: rgba(0, 0, 0, 0.6);
478 font-size: 28rpx; 478 font-size: 28rpx;
479 } 479 }
@@ -489,7 +489,8 @@ export default { @@ -489,7 +489,8 @@ export default {
489 } 489 }
490 490
491 .label1 { 491 .label1 {
492 - width: 310rpx; 492 + max-width: 310rpx;
  493 + margin-right: 20rpx;
493 color: rgba(0, 0, 0, 0.6); 494 color: rgba(0, 0, 0, 0.6);
494 font-size: 32rpx; 495 font-size: 32rpx;
495 } 496 }
@@ -15,24 +15,24 @@ @@ -15,24 +15,24 @@
15 <text class="value"> 15 <text class="value">
16 <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span> 16 <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
17 </text> 17 </text>
18 - </view>  
19 - <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" /> 18 + </view>
  19 + <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
20 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-' 20 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
21 }}</text></view> 21 }}</text></view>
22 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-' 22 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
23 }}</text></view> 23 }}</text></view>
24 <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-' 24 <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
25 }}</text></view> 25 }}</text></view>
26 - 26 +
27 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text> 27 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
28 </view> 28 </view>
29 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view> 29 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
30 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-' 30 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
31 - }}</text></view> 31 + }}</text></view>
32 <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-' 32 <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
33 }}</text></view> 33 }}</text></view>
34 <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-' 34 <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
35 - }}</text></view> 35 + }}</text></view>
36 </view> 36 </view>
37 37
38 <view class="section1"> 38 <view class="section1">
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 @click="downloadFile(detail.standardFileId, detail.standardFileName)" 76 @click="downloadFile(detail.standardFileId, detail.standardFileName)"
77 >{{ detail.standardFileName || '-' 77 >{{ detail.standardFileName || '-'
78 }}</text></view> 78 }}</text></view>
79 - <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.standardStandardized ? '是' : '否' 79 + <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.standardStandardized ? '是' : '否'
80 }}</text></view> 80 }}</text></view>
81 </view> 81 </view>
82 <view class="section" v-if="detail.status === 'FORMAL'"> 82 <view class="section" v-if="detail.status === 'FORMAL'">
@@ -238,7 +238,7 @@ export default { @@ -238,7 +238,7 @@ export default {
238 visible: true, 238 visible: true,
239 variant: 'primary', 239 variant: 'primary',
240 event: 'audit1' 240 event: 'audit1'
241 - }, 241 + },
242 { 242 {
243 text: '审核正式合同', 243 text: '审核正式合同',
244 visible: true, 244 visible: true,
@@ -448,9 +448,9 @@ export default { @@ -448,9 +448,9 @@ export default {
448 const data = res && res.data ? res.data : {} 448 const data = res && res.data ? res.data : {}
449 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否') 449 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
450 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否') 450 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
451 - this.detail = {  
452 - ...this.detail,  
453 - ...data, 451 + this.detail = {
  452 + ...this.detail,
  453 + ...data,
454 includesPackagingFeeName, includesTransportFeeName, 454 includesPackagingFeeName, includesTransportFeeName,
455 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '', 455 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
456 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 456 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
@@ -545,7 +545,8 @@ export default { @@ -545,7 +545,8 @@ export default {
545 } 545 }
546 546
547 .label { 547 .label {
548 - width: 310rpx; 548 + max-width: 310rpx;
  549 + margin-right: 20rpx;
549 color: rgba(0, 0, 0, 0.6); 550 color: rgba(0, 0, 0, 0.6);
550 font-size: 28rpx; 551 font-size: 28rpx;
551 } 552 }
@@ -585,8 +586,8 @@ export default { @@ -585,8 +586,8 @@ export default {
585 color: rgba(0, 0, 0, 0.9); 586 color: rgba(0, 0, 0, 0.9);
586 font-weight: 600; 587 font-weight: 600;
587 } 588 }
588 -.upload-body {  
589 - padding: 16rpx 32rpx; 589 +.upload-body {
  590 + padding: 16rpx 32rpx;
590 border-bottom: 1rpx solid #E7E7E7; 591 border-bottom: 1rpx solid #E7E7E7;
591 } 592 }
592 .upload-body .section-title { 593 .upload-body .section-title {
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span> 16 <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
17 </text> 17 </text>
18 </view> 18 </view>
19 - <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" /> 19 + <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
20 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-' 20 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
21 }}</text></view> 21 }}</text></view>
22 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-' 22 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
@@ -563,7 +563,8 @@ export default { @@ -563,7 +563,8 @@ export default {
563 } 563 }
564 564
565 .label { 565 .label {
566 - width: 310rpx; 566 + max-width: 310rpx;
  567 + margin-right: 20rpx;
567 color: rgba(0, 0, 0, 0.6); 568 color: rgba(0, 0, 0, 0.6);
568 font-size: 28rpx; 569 font-size: 28rpx;
569 } 570 }
@@ -645,4 +646,4 @@ export default { @@ -645,4 +646,4 @@ export default {
645 .upload-row { 646 .upload-row {
646 margin-top: 20rpx; 647 margin-top: 20rpx;
647 } 648 }
648 -</style>  
  649 +</style>
@@ -440,6 +440,7 @@ export default { @@ -440,6 +440,7 @@ export default {
440 440
441 .label { 441 .label {
442 max-width: 420rpx; 442 max-width: 420rpx;
  443 + margin-right: 20rpx;
443 line-height: 32rpx; 444 line-height: 32rpx;
444 font-size: 28rpx; 445 font-size: 28rpx;
445 color: rgba(0, 0, 0, 0.6); 446 color: rgba(0, 0, 0, 0.6);
@@ -324,6 +324,7 @@ export default { @@ -324,6 +324,7 @@ export default {
324 324
325 .label { 325 .label {
326 max-width: 420rpx; 326 max-width: 420rpx;
  327 + margin-right: 20rpx;
327 line-height: 32rpx; 328 line-height: 32rpx;
328 font-size: 28rpx; 329 font-size: 28rpx;
329 color: rgba(0, 0, 0, 0.6); 330 color: rgba(0, 0, 0, 0.6);
@@ -337,7 +338,7 @@ export default { @@ -337,7 +338,7 @@ export default {
337 text-align: right; 338 text-align: right;
338 white-space: pre-wrap; 339 white-space: pre-wrap;
339 word-break: break-all; 340 word-break: break-all;
340 - 341 +
341 .category { 342 .category {
342 display: inline-block; 343 display: inline-block;
343 padding: 4rpx 12rpx; 344 padding: 4rpx 12rpx;
@@ -437,7 +437,8 @@ export default { @@ -437,7 +437,8 @@ export default {
437 } 437 }
438 438
439 .label { 439 .label {
440 - width: 240rpx; 440 + max-width: 240rpx;
  441 + margin-right: 20rpx;
441 line-height: 32rpx; 442 line-height: 32rpx;
442 font-size: 28rpx; 443 font-size: 28rpx;
443 color: rgba(0, 0, 0, 0.6); 444 color: rgba(0, 0, 0, 0.6);
@@ -646,6 +646,7 @@ export default { @@ -646,6 +646,7 @@ export default {
646 646
647 .label { 647 .label {
648 max-width: 420rpx; 648 max-width: 420rpx;
  649 + margin-right: 20rpx;
649 line-height: 32rpx; 650 line-height: 32rpx;
650 font-size: 28rpx; 651 font-size: 28rpx;
651 color: rgba(0, 0, 0, 0.6); 652 color: rgba(0, 0, 0, 0.6);
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <view class="mgb10"> 22 <view class="mgb10">
23 <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0" /> 23 <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0" />
24 </view> 24 </view>
25 - 25 +
26 <view class="section"> 26 <view class="section">
27 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view> 27 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
28 <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view> 28 <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 31 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
32 <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view> 32 <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
33 </view> 33 </view>
34 - 34 +
35 <view class="title-header"> 35 <view class="title-header">
36 <image class="title-header_icon" src="/static/images/title.png" /> 36 <image class="title-header_icon" src="/static/images/title.png" />
37 <span>具体质量要求</span> 37 <span>具体质量要求</span>
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 50
51 </view> 51 </view>
52 </scroll-view> 52 </scroll-view>
53 - 53 +
54 </view> 54 </view>
55 </template> 55 </template>
56 56
@@ -142,7 +142,7 @@ export default { @@ -142,7 +142,7 @@ export default {
142 background: #fff; 142 background: #fff;
143 margin-bottom: 20rpx; 143 margin-bottom: 20rpx;
144 position: relative; 144 position: relative;
145 - 145 +
146 } 146 }
147 147
148 .mgb10 { 148 .mgb10 {
@@ -167,6 +167,7 @@ export default { @@ -167,6 +167,7 @@ export default {
167 167
168 .label { 168 .label {
169 max-width: 420rpx; 169 max-width: 420rpx;
  170 + margin-right: 20rpx;
170 line-height: 32rpx; 171 line-height: 32rpx;
171 font-size: 28rpx; 172 font-size: 28rpx;
172 color: rgba(0, 0, 0, 0.6); 173 color: rgba(0, 0, 0, 0.6);
@@ -16,11 +16,11 @@ @@ -16,11 +16,11 @@
16 <view class="mgb10"> 16 <view class="mgb10">
17 <Product mode="view" :list="form.purchaseOrderRevokeLineList" :totalQuantity="form.totalQuantity || 0" :totalRevokeQuantity="form.totalRevokeQuantity || 0"/> 17 <Product mode="view" :list="form.purchaseOrderRevokeLineList" :totalQuantity="form.totalQuantity || 0" :totalRevokeQuantity="form.totalRevokeQuantity || 0"/>
18 </view> 18 </view>
19 - 19 +
20 <view class="section"> 20 <view class="section">
21 <view class="row"><text class="label">撤销原因</text><text class="value">{{ form.revokeReason }}</text></view> 21 <view class="row"><text class="label">撤销原因</text><text class="value">{{ form.revokeReason }}</text></view>
22 </view> 22 </view>
23 - 23 +
24 <view class="section"> 24 <view class="section">
25 <view class="row"><text class="label">撤销确认凭证</text><text class="value act" @click="downloadFile(form.confirmationVoucherFileId, form.confirmationVoucherFileName)">{{ form.confirmationVoucherFileName }}</text></view> 25 <view class="row"><text class="label">撤销确认凭证</text><text class="value act" @click="downloadFile(form.confirmationVoucherFileId, form.confirmationVoucherFileName)">{{ form.confirmationVoucherFileName }}</text></view>
26 </view> 26 </view>
@@ -215,6 +215,7 @@ export default { @@ -215,6 +215,7 @@ export default {
215 215
216 .label { 216 .label {
217 max-width: 420rpx; 217 max-width: 420rpx;
  218 + margin-right: 20rpx;
218 line-height: 32rpx; 219 line-height: 32rpx;
219 font-size: 28rpx; 220 font-size: 28rpx;
220 color: rgba(0, 0, 0, 0.6); 221 color: rgba(0, 0, 0, 0.6);
@@ -105,6 +105,7 @@ export default { @@ -105,6 +105,7 @@ export default {
105 105
106 .label { 106 .label {
107 max-width: 420rpx; 107 max-width: 420rpx;
  108 + margin-right: 20rpx;
108 line-height: 32rpx; 109 line-height: 32rpx;
109 font-size: 28rpx; 110 font-size: 28rpx;
110 color: rgba(0, 0, 0, 0.6); 111 color: rgba(0, 0, 0, 0.6);