Răsfoiți Sursa

feat: 销售费用合计计算逻辑

cuiyalong 2 luni în urmă
părinte
comite
67a05090c8

+ 5 - 2
src/views/create-order/components/baseInfoModule.vue

@@ -72,7 +72,7 @@ import { selectorVModelMixin } from '@/utils/mixins/selector-v-model'
 import { checkPhonePass } from '@/utils/utils'
 import { phoneRegExp } from '@/utils/data'
 import { createNoPhoneNumber } from '@/views/create-order/hooks/utils'
-import { mapState, mapMutations, mapActions } from 'vuex'
+import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
 
 export default {
   name: 'OrderBaseInfo',
@@ -103,6 +103,9 @@ export default {
     ...mapState({
       form: state => state.order.pageForm,
     }),
+    ...mapGetters('order', [
+      'showOnlineContractForm'
+    ]),
     requiredList() {
       return [
         {
@@ -153,7 +156,7 @@ export default {
       }
     },
     companyRequired() {
-      return this.form.buySubject === 2
+      return this.form.buySubject === 2 || (this.showOnlineContractForm && this.form.e_contract_userA_type === 2) // 协议公司必填
     },
   },
   watch: {

+ 5 - 4
src/views/create-order/components/productInfoModule.vue

@@ -17,12 +17,13 @@
         />
         <el-row :gutter="2">
           <el-col :span="12">
-            <el-form-item label="销售费用" prop="channelCommission" :required="required.channelCommission">
+            <el-form-item label="销售费用合计" prop="channelCommission" :required="required.channelCommission">
               <number-input
                 :value="channelCommission"
                 @input="onChannelCommissionChange"
                 placeholder="请填写销售费用"
                 :decimal="2"
+                disabled
               >
                 <template #append>元</template>
               </number-input>
@@ -93,12 +94,12 @@ export default {
   computed: {
     ...mapState({
       pageForm: state => state.order.pageForm,
-      channelCommission: state => state.order.pageForm.channelCommission
+      // channelCommission: state => state.order.pageForm.channelCommission,
     }),
     buySubject() {
       return this.pageForm.buySubject
     },
-    ...mapGetters('order', ['pageTotalMoney', 'orderMoney0Type', 'pureAmountMoney']),
+    ...mapGetters('order', ['pageTotalMoney', 'orderMoney0Type', 'pureAmountMoney', 'channelCommission']),
     rules() {
       const channelCommissionRequired = this.required.channelCommission
 
@@ -114,7 +115,7 @@ export default {
   },
   watch: {
     buySubject() {
-      this.onChannelCommissionChange(0)
+      // this.onChannelCommissionChange(0)
     }
   },
   methods: {