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