朱园亮 / erp-mobile · Commits

Commit 11e3a55fbb9a075186eba8998bacecbba7ec4b10

Authored by gesilong
2 parents 7b58cc8d ae3cd638

Merge branch 'cjerp-2.0-price' into test_cjerp

Inline Side-by-side
Showing 6 changed files with 51 additions and 12 deletions
... ... @@ -78,8 +78,8 @@
78 78 </template>
79 79 </uni-list-item>
80 80
81   - <!-- 点价截止日期 - 仅在 是否未点价 = 否 时显示且必填 -->
82   - <uni-list-item v-if="form.priced === false" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
  81 + <!-- 点价截止日期 - 仅在 是否未点价 = 是 时显示且必填 -->
  82 + <uni-list-item v-if="form.priced === true" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
83 83 <template v-slot:body>
84 84 <view class="item-title"><text class="required">*</text><text>点价截止日期</text></view>
85 85 </template>
... ... @@ -88,6 +88,14 @@
88 88 </template>
89 89 </uni-list-item>
90 90
  91 + <!-- 是否暂定价 - 仅在 是否未点价 = 是 时显示 -->
  92 + <uni-list-item v-if="form.priced === true" class="select-item" :class="typeof form.temporaryPrice === 'boolean' ? 'is-filled' : 'is-empty'" clickable
  93 + @click="openSheet('temporaryPrice')" :rightText="boolText(form.temporaryPrice)" showArrow>
  94 + <template v-slot:body>
  95 + <view class="item-title"><text>是否暂定价</text></view>
  96 + </template>
  97 + </uni-list-item>
  98 +
91 99 <!-- 其他费用凭票到厂另行结算 -->
92 100 <uni-list-item class="select-item" :class="typeof form.otherExpenseSettlement === 'boolean' ? 'is-filled' : 'is-empty'" clickable
93 101 @click="openSheet('otherExpenseSettlement')" :rightText="boolText(form.otherExpenseSettlement)" showArrow>
... ... @@ -286,6 +294,7 @@ export default {
286 294 terminalCustomer: false,
287 295 priced: true,
288 296 pricingDeadline: '',
  297 + temporaryPrice: null,
289 298 otherExpenseSettlement: false,
290 299 deliveryMode: '',
291 300 commodityBuyout: false,
... ... @@ -455,6 +464,7 @@ export default {
455 464 longTermOperation: '是否长单操作',
456 465 terminalCustomer: '是否终端客户',
457 466 priced: '是否未点价',
  467 + temporaryPrice: '是否暂定价',
458 468 otherExpenseSettlement: '其他费用凭票到厂另行结算',
459 469 commodityBuyout: '是否通货买断',
460 470 qualityBuyout: '是否质量买断',
... ... @@ -529,8 +539,8 @@ export default {
529 539 return false
530 540 }
531 541 }
532   - // 点价截止日期：是否未点价=否 时必填
533   - if (this.form.priced === false && !this.form.pricingDeadline) {
  542 + // 点价截止日期：是否未点价=是 时必填
  543 + if (this.form.priced === true && !this.form.pricingDeadline) {
534 544 uni.showToast({ title: '请选择点价截止日期', icon: 'none' })
535 545 return false
536 546 }
... ...
... ... @@ -78,8 +78,8 @@
78 78 </template>
79 79 </uni-list-item>
80 80
81   - <!-- 点价截止日期 - 仅在 是否未点价 = 否 时显示且必填 -->
82   - <uni-list-item v-if="form.priced === false" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
  81 + <!-- 点价截止日期 - 仅在 是否未点价 = 是 时显示且必填 -->
  82 + <uni-list-item v-if="form.priced === true" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
83 83 <template v-slot:body>
84 84 <view class="item-title"><text class="required">*</text><text>点价截止日期</text></view>
85 85 </template>
... ... @@ -88,6 +88,14 @@
88 88 </template>
89 89 </uni-list-item>
90 90
  91 + <!-- 是否暂定价 - 仅在 是否未点价 = 是 时显示 -->
  92 + <uni-list-item v-if="form.priced === true" class="select-item" :class="typeof form.temporaryPrice === 'boolean' ? 'is-filled' : 'is-empty'" clickable
  93 + @click="openSheet('temporaryPrice')" :rightText="boolText(form.temporaryPrice)" showArrow>
  94 + <template v-slot:body>
  95 + <view class="item-title"><text>是否暂定价</text></view>
  96 + </template>
  97 + </uni-list-item>
  98 +
91 99 <!-- 其他费用凭票到厂另行结算 -->
92 100 <uni-list-item class="select-item" :class="typeof form.otherExpenseSettlement === 'boolean' ? 'is-filled' : 'is-empty'" clickable
93 101 @click="openSheet('otherExpenseSettlement')" :rightText="boolText(form.otherExpenseSettlement)" showArrow>
... ... @@ -286,6 +294,7 @@ export default {
286 294 terminalCustomer: false,
287 295 priced: true,
288 296 pricingDeadline: '',
  297 + temporaryPrice: null,
289 298 otherExpenseSettlement: false,
290 299 deliveryMode: '',
291 300 commodityBuyout: false,
... ... @@ -465,6 +474,7 @@ export default {
465 474 longTermOperation: '是否长单操作',
466 475 terminalCustomer: '是否终端客户',
467 476 priced: '是否未点价',
  477 + temporaryPrice: '是否暂定价',
468 478 otherExpenseSettlement: '其他费用凭票到厂另行结算',
469 479 commodityBuyout: '是否通货买断',
470 480 qualityBuyout: '是否质量买断',
... ... @@ -538,7 +548,7 @@ export default {
538 548 return false
539 549 }
540 550 }
541   - if (this.form.priced === false && !this.form.pricingDeadline) {
  551 + if (this.form.priced === true && !this.form.pricingDeadline) {
542 552 uni.showToast({ title: '请选择点价截止日期', icon: 'none' })
543 553 return false
544 554 }
... ...
... ... @@ -13,7 +13,8 @@
13 13 <view class="row"><text class="label">是否长单操作</text><text class="value">{{ boolText(form.longTermOperation) }}</text></view>
14 14 <view class="row"><text class="label">是否终端客户</text><text class="value">{{ boolText(form.terminalCustomer) }}</text></view>
15 15 <view class="row"><text class="label">是否未点价</text><text class="value">{{ boolText(form.priced) }}</text></view>
16   - <view v-if="form.priced === false" class="row"><text class="label">点价截止日期</text><text class="value">{{ formatDateOnly(form.pricingDeadline) }}</text></view>
  16 + <view v-if="form.priced === true" class="row"><text class="label">点价截止日期</text><text class="value">{{ formatDateOnly(form.pricingDeadline) }}</text></view>
  17 + <view v-if="form.priced === true" class="row"><text class="label">是否暂定价</text><text class="value">{{ boolText(form.temporaryPrice) }}</text></view>
17 18 <view class="row"><text class="label">其他费用凭票到厂另行结算</text><text class="value">{{ boolText(form.otherExpenseSettlement) }}</text></view>
18 19 <view class="row"><text class="label">交提货方式</text><text class="value">{{ getDeliveryMethodLabel() }}</text></view>
19 20 <view class="row"><text class="label">是否通货买断</text><text class="value">{{ boolText(form.commodityBuyout) }}</text></view>
... ...
... ... @@ -77,8 +77,8 @@
77 77 </template>
78 78 </uni-list-item>
79 79
80   - <!-- 点价截止日期 - 仅在 是否未点价 = 否 时显示且必填 -->
81   - <uni-list-item v-if="form.priced === false" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
  80 + <!-- 点价截止日期 - 仅在 是否未点价 = 是 时显示且必填 -->
  81 + <uni-list-item v-if="form.priced === true" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
82 82 <template v-slot:body>
83 83 <view class="item-title"><text class="required">*</text><text>点价截止日期</text></view>
84 84 </template>
... ... @@ -87,6 +87,14 @@
87 87 </template>
88 88 </uni-list-item>
89 89
  90 + <!-- 是否暂定价 - 仅在 是否未点价 = 是 时显示 -->
  91 + <uni-list-item v-if="form.priced === true" class="select-item" :class="typeof form.temporaryPrice === 'boolean' ? 'is-filled' : 'is-empty'" clickable
  92 + @click="openSheet('temporaryPrice')" :rightText="boolText(form.temporaryPrice)" showArrow>
  93 + <template v-slot:body>
  94 + <view class="item-title"><text>是否暂定价</text></view>
  95 + </template>
  96 + </uni-list-item>
  97 +
90 98 <!-- 其他费用凭票到厂另行结算 -->
91 99 <uni-list-item class="select-item" :class="typeof form.otherExpenseSettlement === 'boolean' ? 'is-filled' : 'is-empty'" clickable
92 100 @click="openSheet('otherExpenseSettlement')" :rightText="boolText(form.otherExpenseSettlement)" showArrow>
... ... @@ -285,6 +293,7 @@ export default {
285 293 terminalCustomer: false,
286 294 priced: true,
287 295 pricingDeadline: '',
  296 + temporaryPrice: null,
288 297 otherExpenseSettlement: false,
289 298 deliveryMode: '',
290 299 commodityBuyout: false,
... ... @@ -446,6 +455,7 @@ export default {
446 455 longTermOperation: '是否长单操作',
447 456 terminalCustomer: '是否终端客户',
448 457 priced: '是否未点价',
  458 + temporaryPrice: '是否暂定价',
449 459 otherExpenseSettlement: '其他费用凭票到厂另行结算',
450 460 commodityBuyout: '是否通货买断',
451 461 qualityBuyout: '是否质量买断',
... ... @@ -519,7 +529,7 @@ export default {
519 529 return false
520 530 }
521 531 }
522   - if (this.form.priced === false && !this.form.pricingDeadline) {
  532 + if (this.form.priced === true && !this.form.pricingDeadline) {
523 533 uni.showToast({ title: '请选择点价截止日期', icon: 'none' })
524 534 return false
525 535 }
... ...
... ... @@ -45,6 +45,11 @@
45 45 <uni-easyinput v-model="item.applicationAttrition" type="digit" :inputBorder="false" placeholder="请输入申请损耗" @input="onNonNegativeInput(idx, 'applicationAttrition')" @blur="onNonNegativeBlur(idx, 'applicationAttrition', 2)" @change="recalcEstimatedLoss(idx)" />
46 46 </template>
47 47 </uni-list-item>
  48 + <uni-list-item title="漆损率（%）">
  49 + <template v-slot:footer>
  50 + <uni-easyinput v-model="item.paint_damage_ratio" type="digit" :inputBorder="false" placeholder="请输入漆损率" @input="onNonNegativeInput(idx, 'paint_damage_ratio')" @blur="onNonNegativeBlur(idx, 'paint_damage_ratio', 2)" />
  51 + </template>
  52 + </uni-list-item>
48 53 </uni-list>
49 54 <uni-list v-show="item.collapsed">
50 55 <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductSheet(idx)" :rightText="item.productName || '请选择品种'" showArrow>
... ... @@ -73,6 +78,7 @@
73 78 <view class="row"><text class="label">采购价</text><text class="value">{{ item.purchasePrice }}</text></view>
74 79 <view class="row"><text class="label">买断料预计损耗</text><text class="value">{{ item.estimatedLoss }}</text></view>
75 80 <view class="row"><text class="label">申请损耗(%)</text><text class="value">{{ item.applicationAttrition }}</text></view>
  81 + <view class="row"><text class="label">漆损率（%）</text><text class="value">{{ item.paint_damage_ratio }}</text></view>
76 82 </view>
77 83 </view>
78 84
... ... @@ -163,6 +169,7 @@ export default {
163 169 purchasePrice: '',
164 170 estimatedLoss: '',
165 171 applicationAttrition: '',
  172 + paint_damage_ratio: '',
166 173 attritionRate: ''
167 174 }
168 175 },
... ...
... ... @@ -12,7 +12,8 @@
12 12 <view class="row"><text class="label">是否长单操作</text><text class="value">{{ boolText(form.longTermOperation) }}</text></view>
13 13 <view class="row"><text class="label">是否终端客户</text><text class="value">{{ boolText(form.terminalCustomer) }}</text></view>
14 14 <view class="row"><text class="label">是否未点价</text><text class="value">{{ boolText(form.priced) }}</text></view>
15   - <view v-if="form.priced === false" class="row"><text class="label">点价截止日期</text><text class="value">{{ formatDateOnly(form.pricingDeadline) }}</text></view>
  15 + <view v-if="form.priced === true" class="row"><text class="label">点价截止日期</text><text class="value">{{ formatDateOnly(form.pricingDeadline) }}</text></view>
  16 + <view v-if="form.priced === true" class="row"><text class="label">是否暂定价</text><text class="value">{{ boolText(form.temporaryPrice) }}</text></view>
16 17 <view class="row"><text class="label">其他费用凭票到厂另行结算</text><text class="value">{{ boolText(form.otherExpenseSettlement) }}</text></view>
17 18 <view class="row"><text class="label">交提货方式</text><text class="value">{{ getDeliveryMethodLabel() }}</text></view>
18 19 <view class="row"><text class="label">是否通货买断</text><text class="value">{{ boolText(form.commodityBuyout) }}</text></view>
... ...