fix: 回款计划/销售业绩总计不计算佣金

src/store/order.js

@@ -487,6 +487,8 @@ export default {
       commit('resetLoading')
       commit('resetOrderInfo')
       commit('refreshSchema')
+      // 新建默认产品信息卡片
+      commit('addOrderProductItem')
     },
     // 获取备选项
     async getSelectOptions({ commit }) {
@@ -539,6 +541,7 @@ export default {
         productInfoList: state.orderInfo.productInfoList,
         pageTotalMoney: getters.pageTotalMoney,
         orderMoney0Type: getters.orderMoney0Type,
+        salesMoneyTotal: getters.salesMoneyTotal,
       })
       if (!pass) {
         throw new Error("必填字段校验未通过")
@@ -557,10 +560,11 @@ export default {
           if (msg) {
             showMessage(msg)
           }
+          throw new Error(msg || '请求异常')
         }
       } catch (error) {
         commit('setLoadingState', { key: 'create', value: false })
-        console.log(error)
+        throw new Error(error)
       }
     },
   },

src/views/create-order/components/otherInfoModule.vue

@@ -3,7 +3,7 @@
   <el-form ref="form" :model="pageForm" :rules="rules" label-width="126px" class="order-other-info-container">
     <el-row :gutter="2">
       <el-col :span="12">
-        <el-form-item label="约定支付方式" required prop="reservationPayWay">
+        <el-form-item label="约定支付方式" required>
           <el-select
             :value="pageForm.reservationPayWay"
             @input="setPageFormData('reservationPayWay', $event)"

src/views/create-order/components/product-info-submodule/ServiceList.vue

@@ -770,7 +770,7 @@ export default {
   color: $gray_10;
   font-size: 14px;
   .service-list-content {
-    padding: 8px;
+    padding-top: 8px;
   }
   .service-list-item {
     display: flex;
@@ -789,4 +789,7 @@ export default {
     }
   }
 }
+.already-buy-text {
+  line-height: 32px;
+}
 </style>

src/views/create-order/components/schema-form/params.js

@@ -7,7 +7,7 @@ export function orderParams(type) {
 }
 
 // 获取回款计划
-function getReturnPlant(pageForm, contractMoney) {
+function getReturnPlant(pageForm, totalMoney) {
   let planList = undefined
   if (Array.isArray(pageForm.paybackTableData) && pageForm.paybackTableData.length > 0) {
     planList = pageForm.paybackTableData.map((p, index) => {
@@ -21,7 +21,7 @@ function getReturnPlant(pageForm, contractMoney) {
       planList.push({
         code: '合计',
         time: '-',
-        money: contractMoney
+        money: mul(totalMoney, 100) || 0
       })
     }
   }
@@ -31,7 +31,7 @@ function getReturnPlant(pageForm, contractMoney) {
     plant_list: planList,
   }
 }
-function getSaleMoney(pageForm, contractMoney) {
+function getSaleMoney(pageForm, totalMoney) {
   let arr = []
   const salePerson = pageForm.salePerson
   const salePersonTableList = pageForm.salePersonTableList
@@ -40,7 +40,7 @@ function getSaleMoney(pageForm, contractMoney) {
       arr = salePerson.map(s => {
         return {
           id: s,
-          money: mul(contractMoney, 100),
+          money: mul(totalMoney, 100),
           channel: pageForm.saleWay[1]
         }
       })
@@ -48,7 +48,7 @@ function getSaleMoney(pageForm, contractMoney) {
       arr = salePersonTableList.filter(r => r.id).map(r => {
         return {
           id: r.id,
-          money: r.money - 0,
+          money: mul(r.money, 100) || 0,
           channel: r.saleWay[1]
         }
       })
@@ -129,10 +129,10 @@ function getSaleMoney(pageForm, contractMoney) {
 }
 */
 export function createOrderParams(payload = {}) {
-  const { pageForm, productInfoList, pageTotalMoney, orderMoney0Type } = payload
+  const { pageForm, productInfoList, pageTotalMoney, orderMoney0Type, salesMoneyTotal } = payload
 
-  const returnPlant = getReturnPlant(pageForm, pageTotalMoney.contract)
-  const saleMoney = getSaleMoney(pageForm, pageTotalMoney.contract)
+  const returnPlant = getReturnPlant(pageForm, salesMoneyTotal)
+  const saleMoney = getSaleMoney(pageForm, salesMoneyTotal)
 
   let productArr = []
   if (Array.isArray(productInfoList) && productInfoList.length > 0) {