Commit f757259f7ff659f5ffeaceada64196a2c1dcd51a
1 parent
765c5344
feat：增加是否冻结-草稿要车单的编辑、取消、审核（freeze ）+ 展示该字段&订货单-申请发货（freeze ）+ 展示该字段
Showing
2 changed files
with
6 additions
and
4 deletions
| @@ -16,6 +16,7 @@ | @@ -16,6 +16,7 @@ | ||
| 16 | <view class="row"><text class="label">回货计划安排</text><text class="value">{{ form.returnPlanArrangement }}</text></view> | 16 | <view class="row"><text class="label">回货计划安排</text><text class="value">{{ form.returnPlanArrangement }}</text></view> |
| 17 | <view class="row"><text class="label">特殊需求、其他等</text><text class="value">{{ form.other }}</text></view> | 17 | <view class="row"><text class="label">特殊需求、其他等</text><text class="value">{{ form.other }}</text></view> |
| 18 | <view class="row"><text class="label">装货特别要求/需求</text><text class="value">{{ form.specialLoadingRequirement }}</text></view> | 18 | <view class="row"><text class="label">装货特别要求/需求</text><text class="value">{{ form.specialLoadingRequirement }}</text></view> |
| 19 | + <view class="row"><text class="label">是否冻结</text><text class="value">{{ form.freeze ? '是' : '否' }}</text></view> | ||
| 19 | </view> | 20 | </view> |
| 20 | </view> | 21 | </view> |
| 21 | </scroll-view> | 22 | </scroll-view> |
| @@ -46,9 +47,9 @@ export default { | @@ -46,9 +47,9 @@ export default { | ||
| 46 | const m = this.form || {} | 47 | const m = this.form || {} |
| 47 | const e = String(m.status || '') | 48 | const e = String(m.status || '') |
| 48 | return { | 49 | return { |
| 49 | - canEdit: (e === 'REFUSE' || e === '' || !e) && m.draftCreateBy || false, | ||
| 50 | - canAudit: e === 'AUDIT' && m.showExamine || false, | ||
| 51 | - canCancel: e === 'REFUSE' && m.draftCreateBy || false, | 50 | + canEdit: (e === 'REFUSE' || e === '' || !e) && (m.draftCreateBy || false) && (!this.form.freeze || false), |
| 51 | + canAudit: e === 'AUDIT' && (m.showExamine || false) && (!this.form.freeze || false), | ||
| 52 | + canCancel: e === 'REFUSE' && (m.draftCreateBy || false) && (!this.form.freeze || false), | ||
| 52 | } | 53 | } |
| 53 | }, | 54 | }, |
| 54 | displayButtons() { | 55 | displayButtons() { |
| @@ -26,6 +26,7 @@ | @@ -26,6 +26,7 @@ | ||
| 26 | <view class="row"><text class="label">结算方式或期限</text><text class="value">{{ form.settlementTerms }}</text> | 26 | <view class="row"><text class="label">结算方式或期限</text><text class="value">{{ form.settlementTerms }}</text> |
| 27 | </view> | 27 | </view> |
| 28 | <view class="row"><text class="label">交货方式</text><text class="value">{{ form.deliveryMethod }}</text></view> | 28 | <view class="row"><text class="label">交货方式</text><text class="value">{{ form.deliveryMethod }}</text></view> |
| 29 | + <view class="row"><text class="label">是否冻结</text><text class="value">{{ form.freeze ? '是' : '否' }}</text></view> | ||
| 29 | </view> | 30 | </view> |
| 30 | 31 | ||
| 31 | <!-- 产品 --> | 32 | <!-- 产品 --> |
| @@ -107,7 +108,7 @@ export default { | @@ -107,7 +108,7 @@ export default { | ||
| 107 | isRefuse: e === 'REFUSE', | 108 | isRefuse: e === 'REFUSE', |
| 108 | isAudit: e === 'AUDIT', | 109 | isAudit: e === 'AUDIT', |
| 109 | canExamine: d, | 110 | canExamine: d, |
| 110 | - canDeliveryApply: s === 'ISSUED', | 111 | + canDeliveryApply: s === 'ISSUED' && (!this.form.freeze || false), |
| 111 | contractCreateBy: this.form.contractCreateBy | 112 | contractCreateBy: this.form.contractCreateBy |
| 112 | } | 113 | } |
| 113 | }, | 114 | }, |