Merge branch 'cjerp-2.0-price' into test_cjerp

gesilong
2 parents 7b58cc8d ae3cd638
Showing 6 changed files with 51 additions and 12 deletions
pages/sales-price/add.vue
pages/sales-price/copy.vue
pages/sales-price/detail.vue
pages/sales-price/modify.vue
pages/sales-price/productRel.vue
pages/sales-price/salesmanQuotationViewer.vue
--- a/pages/sales-price/add.vue
View file @11e3a55
+++ b/pages/sales-price/add.vue
View file @11e3a55
@@ -78,8 +78,8 @@
                     </template>
                 </uni-list-item>
-                <!-- 点价截止日期 - 仅在 是否未点价 = 否 时显示且必填 -->
-                <uni-list-item v-if="form.priced === false" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
+                <!-- 点价截止日期 - 仅在 是否未点价 = 是 时显示且必填 -->
+                <uni-list-item v-if="form.priced === true" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
                     <template v-slot:body>
                         <view class="item-title"><text class="required">*</text><text>点价截止日期</text></view>
                     </template>
@@ -88,6 +88,14 @@
                     </template>
                 </uni-list-item>
+                <!-- 是否暂定价 - 仅在 是否未点价 = 是 时显示 -->
+                <uni-list-item v-if="form.priced === true" class="select-item" :class="typeof form.temporaryPrice === 'boolean' ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('temporaryPrice')" :rightText="boolText(form.temporaryPrice)" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>是否暂定价</text></view>
+                    </template>
+                </uni-list-item>
+
                 <!-- 其他费用凭票到厂另行结算 -->
                 <uni-list-item class="select-item" :class="typeof form.otherExpenseSettlement === 'boolean' ? 'is-filled' : 'is-empty'" clickable
                     @click="openSheet('otherExpenseSettlement')" :rightText="boolText(form.otherExpenseSettlement)" showArrow>
@@ -286,6 +294,7 @@ export default {
                 terminalCustomer: false,
                 priced: true,
                 pricingDeadline: '',
+                temporaryPrice: null,
                 otherExpenseSettlement: false,
                 deliveryMode: '',
                 commodityBuyout: false,
@@ -455,6 +464,7 @@ export default {
                 longTermOperation: '是否长单操作',
                 terminalCustomer: '是否终端客户',
                 priced: '是否未点价',
+                temporaryPrice: '是否暂定价',
                 otherExpenseSettlement: '其他费用凭票到厂另行结算',
                 commodityBuyout: '是否通货买断',
                 qualityBuyout: '是否质量买断',
@@ -529,8 +539,8 @@ export default {
                     return false
                 }
             }
-            // 点价截止日期：是否未点价=否 时必填
-            if (this.form.priced === false && !this.form.pricingDeadline) {
+            // 点价截止日期：是否未点价=是 时必填
+            if (this.form.priced === true && !this.form.pricingDeadline) {
                 uni.showToast({ title: '请选择点价截止日期', icon: 'none' })
                 return false
             }
--- a/pages/sales-price/copy.vue
View file @11e3a55
+++ b/pages/sales-price/copy.vue
View file @11e3a55
@@ -78,8 +78,8 @@
                     </template>
                 </uni-list-item>
-                <!-- 点价截止日期 - 仅在 是否未点价 = 否 时显示且必填 -->
-                <uni-list-item v-if="form.priced === false" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
+                <!-- 点价截止日期 - 仅在 是否未点价 = 是 时显示且必填 -->
+                <uni-list-item v-if="form.priced === true" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
                     <template v-slot:body>
                         <view class="item-title"><text class="required">*</text><text>点价截止日期</text></view>
                     </template>
@@ -88,6 +88,14 @@
                     </template>
                 </uni-list-item>
+                <!-- 是否暂定价 - 仅在 是否未点价 = 是 时显示 -->
+                <uni-list-item v-if="form.priced === true" class="select-item" :class="typeof form.temporaryPrice === 'boolean' ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('temporaryPrice')" :rightText="boolText(form.temporaryPrice)" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>是否暂定价</text></view>
+                    </template>
+                </uni-list-item>
+
                 <!-- 其他费用凭票到厂另行结算 -->
                 <uni-list-item class="select-item" :class="typeof form.otherExpenseSettlement === 'boolean' ? 'is-filled' : 'is-empty'" clickable
                     @click="openSheet('otherExpenseSettlement')" :rightText="boolText(form.otherExpenseSettlement)" showArrow>
@@ -286,6 +294,7 @@ export default {
                 terminalCustomer: false,
                 priced: true,
                 pricingDeadline: '',
+                temporaryPrice: null,
                 otherExpenseSettlement: false,
                 deliveryMode: '',
                 commodityBuyout: false,
@@ -465,6 +474,7 @@ export default {
                 longTermOperation: '是否长单操作',
                 terminalCustomer: '是否终端客户',
                 priced: '是否未点价',
+                temporaryPrice: '是否暂定价',
                 otherExpenseSettlement: '其他费用凭票到厂另行结算',
                 commodityBuyout: '是否通货买断',
                 qualityBuyout: '是否质量买断',
@@ -538,7 +548,7 @@ export default {
                     return false
                 }
             }
-            if (this.form.priced === false && !this.form.pricingDeadline) {
+            if (this.form.priced === true && !this.form.pricingDeadline) {
                 uni.showToast({ title: '请选择点价截止日期', icon: 'none' })
                 return false
             }
--- a/pages/sales-price/detail.vue
View file @11e3a55
+++ b/pages/sales-price/detail.vue
View file @11e3a55
@@ -13,7 +13,8 @@
                     <view class="row"><text class="label">是否长单操作</text><text class="value">{{ boolText(form.longTermOperation) }}</text></view>
                     <view class="row"><text class="label">是否终端客户</text><text class="value">{{ boolText(form.terminalCustomer) }}</text></view>
                     <view class="row"><text class="label">是否未点价</text><text class="value">{{ boolText(form.priced) }}</text></view>
-                    <view v-if="form.priced === false" class="row"><text class="label">点价截止日期</text><text class="value">{{ formatDateOnly(form.pricingDeadline) }}</text></view>
+                    <view v-if="form.priced === true" class="row"><text class="label">点价截止日期</text><text class="value">{{ formatDateOnly(form.pricingDeadline) }}</text></view>
+                    <view v-if="form.priced === true" class="row"><text class="label">是否暂定价</text><text class="value">{{ boolText(form.temporaryPrice) }}</text></view>
                     <view class="row"><text class="label">其他费用凭票到厂另行结算</text><text class="value">{{ boolText(form.otherExpenseSettlement) }}</text></view>
                     <view class="row"><text class="label">交提货方式</text><text class="value">{{ getDeliveryMethodLabel() }}</text></view>
                     <view class="row"><text class="label">是否通货买断</text><text class="value">{{ boolText(form.commodityBuyout) }}</text></view>
--- a/pages/sales-price/modify.vue
View file @11e3a55
+++ b/pages/sales-price/modify.vue
View file @11e3a55
@@ -77,8 +77,8 @@
                     </template>
                 </uni-list-item>
-                <!-- 点价截止日期 - 仅在 是否未点价 = 否 时显示且必填 -->
-                <uni-list-item v-if="form.priced === false" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
+                <!-- 点价截止日期 - 仅在 是否未点价 = 是 时显示且必填 -->
+                <uni-list-item v-if="form.priced === true" class="select-item" :class="form.pricingDeadline ? 'is-filled' : 'is-empty'">
                     <template v-slot:body>
                         <view class="item-title"><text class="required">*</text><text>点价截止日期</text></view>
                     </template>
@@ -87,6 +87,14 @@
                     </template>
                 </uni-list-item>
+                <!-- 是否暂定价 - 仅在 是否未点价 = 是 时显示 -->
+                <uni-list-item v-if="form.priced === true" class="select-item" :class="typeof form.temporaryPrice === 'boolean' ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('temporaryPrice')" :rightText="boolText(form.temporaryPrice)" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>是否暂定价</text></view>
+                    </template>
+                </uni-list-item>
+
                 <!-- 其他费用凭票到厂另行结算 -->
                 <uni-list-item class="select-item" :class="typeof form.otherExpenseSettlement === 'boolean' ? 'is-filled' : 'is-empty'" clickable
                     @click="openSheet('otherExpenseSettlement')" :rightText="boolText(form.otherExpenseSettlement)" showArrow>
@@ -285,6 +293,7 @@ export default {
                 terminalCustomer: false,
                 priced: true,
                 pricingDeadline: '',
+                temporaryPrice: null,
                 otherExpenseSettlement: false,
                 deliveryMode: '',
                 commodityBuyout: false,
@@ -446,6 +455,7 @@ export default {
                 longTermOperation: '是否长单操作',
                 terminalCustomer: '是否终端客户',
                 priced: '是否未点价',
+                temporaryPrice: '是否暂定价',
                 otherExpenseSettlement: '其他费用凭票到厂另行结算',
                 commodityBuyout: '是否通货买断',
                 qualityBuyout: '是否质量买断',
@@ -519,7 +529,7 @@ export default {
                     return false
                 }
             }
-            if (this.form.priced === false && !this.form.pricingDeadline) {
+            if (this.form.priced === true && !this.form.pricingDeadline) {
                 uni.showToast({ title: '请选择点价截止日期', icon: 'none' })
                 return false
             }
--- a/pages/sales-price/productRel.vue
View file @11e3a55
+++ b/pages/sales-price/productRel.vue
View file @11e3a55
@@ -45,6 +45,11 @@
                             <uni-easyinput v-model="item.applicationAttrition" type="digit" :inputBorder="false" placeholder="请输入申请损耗" @input="onNonNegativeInput(idx, 'applicationAttrition')" @blur="onNonNegativeBlur(idx, 'applicationAttrition', 2)" @change="recalcEstimatedLoss(idx)" />
                         </template>
                     </uni-list-item>
+                    <uni-list-item title="漆损率（%）">
+                        <template v-slot:footer>
+                            <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)" />
+                        </template>
+                    </uni-list-item>
                 </uni-list>
                 <uni-list v-show="item.collapsed">
                     <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 @@
                 <view class="row"><text class="label">采购价</text><text class="value">{{ item.purchasePrice }}</text></view>
                 <view class="row"><text class="label">买断料预计损耗</text><text class="value">{{ item.estimatedLoss }}</text></view>
                 <view class="row"><text class="label">申请损耗(%)</text><text class="value">{{ item.applicationAttrition }}</text></view>
+                <view class="row"><text class="label">漆损率（%）</text><text class="value">{{ item.paint_damage_ratio }}</text></view>
             </view>
         </view>
@@ -163,6 +169,7 @@ export default {
                 purchasePrice: '',
                 estimatedLoss: '',
                 applicationAttrition: '',
+                paint_damage_ratio: '',
                 attritionRate: ''
             }
         },
--- a/pages/sales-price/salesmanQuotationViewer.vue
View file @11e3a55
+++ b/pages/sales-price/salesmanQuotationViewer.vue
View file @11e3a55
@@ -12,7 +12,8 @@
                 <view class="row"><text class="label">是否长单操作</text><text class="value">{{ boolText(form.longTermOperation) }}</text></view>
                 <view class="row"><text class="label">是否终端客户</text><text class="value">{{ boolText(form.terminalCustomer) }}</text></view>
                 <view class="row"><text class="label">是否未点价</text><text class="value">{{ boolText(form.priced) }}</text></view>
-                <view v-if="form.priced === false" class="row"><text class="label">点价截止日期</text><text class="value">{{ formatDateOnly(form.pricingDeadline) }}</text></view>
+                <view v-if="form.priced === true" class="row"><text class="label">点价截止日期</text><text class="value">{{ formatDateOnly(form.pricingDeadline) }}</text></view>
+                <view v-if="form.priced === true" class="row"><text class="label">是否暂定价</text><text class="value">{{ boolText(form.temporaryPrice) }}</text></view>
                 <view class="row"><text class="label">其他费用凭票到厂另行结算</text><text class="value">{{ boolText(form.otherExpenseSettlement) }}</text></view>
                 <view class="row"><text class="label">交提货方式</text><text class="value">{{ getDeliveryMethodLabel() }}</text></view>
                 <view class="row"><text class="label">是否通货买断</text><text class="value">{{ boolText(form.commodityBuyout) }}</text></view>