Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app

pages/orderDetailNew/components/pageFour.vue

@@ -44,14 +44,14 @@
                 <!-- 查码费和表款同一行 -->
                 <u-row class="info-row" justify="space-between">
                     <u-col span="5.8">
-                        <u-form-item label="查码费">
-                            <u--input v-model="warehouseInfo.checkCodeFee" placeholder="请输入查码费" class="info-input"
+                        <u-form-item label="表款">
+                            <u--input v-model="warehouseInfo.watchPrice" placeholder="请输入表款" class="info-input"
                                 type="number" />
                         </u-form-item>
                     </u-col>
                     <u-col span="5.8">
-                        <u-form-item label="表款">
-                            <u--input v-model="warehouseInfo.watchPrice" placeholder="请输入表款" class="info-input"
+                        <u-form-item label="查码费">
+                            <u--input v-model="warehouseInfo.checkCodeFee" placeholder="请输入查码费" class="info-input"
                                 type="number" />
                         </u-form-item>
                     </u-col>
@@ -81,12 +81,27 @@
                         </u-form-item>
                     </u-col>
                     <u-col span="5.8">
-                        <u-form-item label="毛业绩">
-                            <u--input v-model="warehouseInfo.grossPerformance" placeholder="请输入毛业绩" class="info-input"
+                        <u-form-item label="分单比例（0~100）">
+                            <u--input v-model="warehouseInfo.splitRatio" placeholder="请输入分单比例(0~100)" class="info-input"
                                 type="number" />
                         </u-form-item>
                     </u-col>
                 </u-row>
+                <!-- 业绩 -->
+                <u-row class="info-row" justify="space-between">
+                    <u-col span="5.8">
+                        <u-form-item label="业绩">
+                            <u--input :disabled="true" :value="computedPerformance" placeholder="业绩自动计算"
+                                class="info-input" type="number" />
+                        </u-form-item>
+                    </u-col>
+                    <u-col span="5.8">
+                        <u-form-item label="毛业绩">
+                            <u--input :disabled="true" :value="computedGrossPerformance" placeholder="毛业绩自动计算"
+                                class="info-input" type="number" />
+                        </u-form-item>
+                    </u-col>
+                </u-row>
 
                 <!-- 收单备注 -->
                 <u-row class="info-row">
@@ -288,13 +303,33 @@ export default {
                         freight: data.freight || '',//运费
                         repairAmount: data.repairAmount || '',//维修金额
                         grossPerformance: data.grossPerformance || '',//毛业绩
+                        performance: data.performance || '',//业绩
                         remarks: data.receiptRemark?.split(';')[0] || '',//收单备注  截取备注第一部分
+                        splitRatio: data.splitRatio || '',//分单比例
                     }
                     this.getShareList()
                 }
             },
         }
     },
+    computed: {
+        computedPerformance() {
+            //业绩   //sellingPrice - (totalCost// 成本合计 =   运费1 + 好处费1 + 查码费1 + 表款(支付总额)1+ 维修费1。)
+            const sellingPrice = this.currentReceipt.sellingPrice || 0
+            const totalCost = Number(this.warehouseInfo.watchPrice) + Number(this.warehouseInfo.freight) + Number(this.warehouseInfo.benefitFee) + Number(this.warehouseInfo.checkCodeFee) + Number(this.warehouseInfo.repairAmount)
+
+            return sellingPrice - totalCost
+        },
+
+        computedGrossPerformance() {
+            // 毛业绩  //毛利 performance*splitRatio，分单比例
+            const performance = Number(this.computedPerformance) || 0
+            //保留小数点后两位
+            const p = performance * (Number(this.warehouseInfo.splitRatio) / 100 || 0)
+            return p.toFixed(2)
+        },
+
+    },
     data() {
         return {
             // 入库信息相关的数据
@@ -309,6 +344,8 @@ export default {
                 freight: '',//运费
                 repairAmount: '',//维修金额
                 grossPerformance: '',//毛业绩
+                performance: '',//业绩
+                splitRatio: '',//分单比例
                 remarks: '',//收单备注
             },
             // 分成信息相关的数据
@@ -431,10 +468,10 @@ export default {
                 success: async (res) => {
                     if (res.confirm) {
                         //修改状态
-                        await uni.$u.api.oderForm({
-                            status: "3",
-                            id: this.orderDetail.id,
-                        });
+                        // await uni.$u.api.oderForm({
+                        //     status: "3",
+                        //     id: this.orderDetail.id,
+                        // });
 
                         await uni.$u.api.updateReceiptForm({
                             id: this.currentReceipt.id,
@@ -446,7 +483,9 @@ export default {
                             benefitFee: this.warehouseInfo.benefitFee || '',//好处费
                             freight: this.warehouseInfo.freight || '',//运费
                             repairAmount: this.warehouseInfo.repairAmount || '',//维修金额
-                            grossPerformance: this.warehouseInfo.grossPerformance || '',//毛业绩
+                            grossPerformance: this.computedGrossPerformance || '',//毛业绩
+                            performance: this.computedPerformance || '',//毛业绩
+                            splitRatio: this.warehouseInfo.splitRatio || '',//分单比例
                             receiptRemark: this.warehouseInfo.remarks + ';' + this.warehouseInfo.uploadedImage || '',//收单备注
                         });
 

pages/orderDetailNew/index.vue

@@ -31,9 +31,12 @@
         <!-- 加一单选择模态窗 -->
         <u-modal :show="addOneModelShow" :title="'加一单'" showCancelButton @cancel="addOneModelShow = false"
             @confirm="handleAddOneConfirm">
+            <!-- 品牌选择按钮 -->
             <u-button type="primary" plain @click="showBrandSelector = true;"
                 :text="currentAddBrand.dictLabel || '点击请选择品牌'"></u-button>
+            <!-- 物品选择按钮 -->
         </u-modal>
+
         <!-- 加一单品牌选择器 -->
         <u-picker :show="showBrandSelector" @confirm="handleBrandConfirm" :columns="brandColumns"
             @cancel='showBrandSelector = false' keyName="dictLabel"></u-picker>