上传

src/views/SchoolManagement/Class/Comp/DialogClass.vue

@@ -116,26 +116,26 @@
           label-width="90px"
         >
           <el-form-item label="利润模式：">
-            <el-radio-group v-model="profitCompanyForm.profitType">
+            <el-radio-group v-model="profitCompanyForm.profitMode">
               <el-radio :label="1">比例模式</el-radio>
               <el-radio :label="2">固定模式</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="计算规则：">
-            <div class="flex items-center" v-if="profitCompanyForm.profitType == 1">
+            <div class="flex items-center" v-if="profitCompanyForm.profitMode == 1">
               <span>公司利润 = （ 成交价 </span>
               <el-select
-                v-model="profitCompanyForm.isPlus"
+                v-model="profitCompanyForm.profitRule.mark"
                 size="small"
                 placeholder="加/减"
                 class="ml-10px mr-10px"
                 style="width: 70px"
               >
-                <el-option label="+" :value="1" />
-                <el-option label="-" :value="2" />
+                <el-option label="+" value="+" />
+                <el-option label="-" value="-" />
               </el-select>
               <el-input-number
-                v-model="profitCompanyForm.bianliang"
+                v-model="profitCompanyForm.profitRule.minPrice"
                 size="small"
                 placeholder="金额"
                 :min="0"
@@ -144,7 +144,7 @@
               />
               <span class="ml-10px mr-10px"> ） 乘以 </span>
               <el-input-number
-                v-model="profitCompanyForm.bili"
+                v-model="profitCompanyForm.profitRule.rate"
                 size="small"
                 placeholder="比例"
                 :min="0"
@@ -152,11 +152,11 @@
                 :controls="false"
               />
             </div>
-            <div v-else-if="profitCompanyForm.profitType == 2">
+            <div v-else-if="profitCompanyForm.profitMode == 2">
               <el-button
                 type="primary"
                 size="small"
-                @click="profitCompanyForm.dangwei.push({ dangweizhi: undefined, lirun: undefined })"
+                @click="profitCompanyForm.dangwei.push({ signPrice: undefined, profit: undefined })"
                 >添加利润档位</el-button
               >
               <div
@@ -166,7 +166,7 @@
               >
                 <span>成交额满</span>
                 <el-input-number
-                  v-model="item.dangweizhi"
+                  v-model="item.signPrice"
                   size="small"
                   placeholder="金额"
                   :min="0"
@@ -176,7 +176,7 @@
                 />
                 <span>，公司利润为</span>
                 <el-input-number
-                  v-model="item.lirun"
+                  v-model="item.profit"
                   size="small"
                   placeholder="金额"
                   :min="0"
@@ -197,16 +197,16 @@
           label-width="90px"
         >
           <el-form-item label="利润模式：">
-            <el-radio-group v-model="profitEmployeeForm.profitType">
+            <el-radio-group v-model="profitEmployeeForm.profitMode">
               <el-radio :label="1">比例模式</el-radio>
               <el-radio :label="2">固定模式</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="计算规则：">
-            <div class="flex items-center" v-if="profitEmployeeForm.profitType == 1">
+            <div class="flex items-center" v-if="profitEmployeeForm.profitMode == 1">
               <span>公司利润 = （ 成交价 </span>
               <el-select
-                v-model="profitEmployeeForm.isPlus"
+                v-model="profitEmployeeForm.profitRule.mark"
                 size="small"
                 placeholder="加/减"
                 class="ml-10px mr-10px"
@@ -216,7 +216,7 @@
                 <el-option label="-" :value="2" />
               </el-select>
               <el-input-number
-                v-model="profitEmployeeForm.bianliang"
+                v-model="profitEmployeeForm.profitRule.minPrice"
                 size="small"
                 placeholder="金额"
                 :min="0"
@@ -225,7 +225,7 @@
               />
               <span class="ml-10px mr-10px"> ） 乘以 </span>
               <el-input-number
-                v-model="profitEmployeeForm.bili"
+                v-model="profitEmployeeForm.profitRule.rate"
                 size="small"
                 placeholder="比例"
                 :min="0"
@@ -233,12 +233,12 @@
                 :controls="false"
               />
             </div>
-            <div v-else-if="profitEmployeeForm.profitType == 2">
+            <div v-else-if="profitEmployeeForm.profitMode == 2">
               <el-button
                 type="primary"
                 size="small"
                 @click="
-                  profitEmployeeForm.dangwei.push({ dangweizhi: undefined, lirun: undefined })
+                  profitEmployeeForm.dangwei.push({ signPrice: undefined, profit: undefined })
                 "
                 >添加利润档位</el-button
               >
@@ -249,7 +249,7 @@
               >
                 <span>成交额满</span>
                 <el-input-number
-                  v-model="item.dangweizhi"
+                  v-model="item.signPrice"
                   size="small"
                   placeholder="金额"
                   :min="0"
@@ -259,7 +259,7 @@
                 />
                 <span>，公司利润为</span>
                 <el-input-number
-                  v-model="item.lirun"
+                  v-model="item.profit"
                   size="small"
                   placeholder="金额"
                   :min="0"
@@ -451,15 +451,17 @@ const formRef = ref() // 表单 Ref
 const currentTab = ref('base')
 
 const profitCompanyForm = ref({
-  profitType: 1,
-  dangwei: []
+  profitMode: 1,
+  dangwei: [],
+  profitRule: {}
 })
 const profitCompanyRules = {}
 const profitCompanyRef = ref()
 
 const profitEmployeeForm = ref({
-  profitType: 1,
-  dangwei: []
+  profitMode: 1,
+  dangwei: [],
+  profitRule: {}
 })
 const profitEmployeeRules = {}
 const profitEmployeeRef = ref()
@@ -476,6 +478,7 @@ const open = async (type, id) => {
   dialogVisible.value = true
   dialogTitle.value = type == 'create' ? '新增班型' : '修改班型'
   formType.value = type
+  currentTab.value = 'base'
   resetForm()
   if (!opts.value.length) {
     const arr = await ClassApi.getCommissionParams()
@@ -489,6 +492,37 @@ const open = async (type, id) => {
     try {
       formData.value = await ClassApi.getClassType(id)
       formData.value.schPlace = [formData.value.schoolId, formData.value.placeId]
+      if (!formData.value.companyProfitVO) {
+        profitCompanyForm.value = {
+          profitMode: 1,
+          dangwei: [],
+          profitRule: {}
+        }
+      } else if (formData.value.companyProfitVO.profitMode == 1) {
+        profitCompanyForm.value = { ...formData.value.companyProfitVO, dangwei: [] }
+      } else {
+        profitCompanyForm.value = {
+          ...formData.value.companyProfitVO,
+          dangwei: formData.value.companyProfitVO.profitRule
+        }
+        profitCompanyForm.value.profitRule = {}
+      }
+
+      if (!formData.value.personProfitVO) {
+        profitEmployeeForm.value = {
+          profitMode: 1,
+          dangwei: [],
+          profitRule: {}
+        }
+      } else if (formData.value.personProfitVO.profitMode == 1) {
+        profitEmployeeForm.value = { ...formData.value.personProfitVO, dangwei: [] }
+      } else {
+        profitEmployeeForm.value = {
+          ...formData.value.personProfitVO,
+          dangwei: formData.value.personProfitVO.profitRule
+        }
+        profitEmployeeForm.value.profitRule = {}
+      }
     } finally {
       formLoading.value = false
     }
@@ -579,6 +613,51 @@ async function submitForm() {
     delete data.schPlace
     delete data.percentages
     data.percentages = { ...comissionForm.value }
+    data.companyProfitVO = { ...profitCompanyForm.value }
+    data.personProfitVO = { ...profitEmployeeForm.value }
+    if (data.companyProfitVO.profitMode == 1) {
+      data.companyProfitVO.profitRule.minPrice = data.companyProfitVO.profitRule.minPrice || 0
+      if (!data.companyProfitVO.profitRule.mark || !data.companyProfitVO.profitRule.rate) {
+        message.info('请将公司利润计算规则填写完整！')
+        return
+      }
+    } else {
+      data.companyProfitVO.profitRule = data.companyProfitVO?.dangwei || []
+      delete data.companyProfitVO.dangwei
+      if (data.companyProfitVO.profitRule.length == 0) {
+        message.info('请添加公司利润计算规则！')
+        return
+      } else if (
+        data.companyProfitVO.profitRule.some(
+          (it) => it.signPrice == undefined || it.profit == undefined
+        )
+      ) {
+        message.info('请将公司利润计算规则填写完整！')
+        return
+      }
+    }
+
+    if (data.personProfitVO.profitMode == 1) {
+      data.personProfitVO.profitRule.minPrice = data.personProfitVO.profitRule.minPrice || 0
+      if (!data.personProfitVO.profitRule.mark || !data.personProfitVO.profitRule.rate) {
+        message.info('请将员工利润计算规则填写完整！')
+        return
+      }
+    } else {
+      data.personProfitVO.profitRule = data.personProfitVO?.dangwei || []
+      delete data.personProfitVO.dangwei
+      if (data.personProfitVO.profitRule.length == 0) {
+        message.info('请添加员工利润计算规则！')
+        return
+      } else if (
+        data.personProfitVO.profitRule.some(
+          (it) => it.signPrice == undefined || it.profit == undefined
+        )
+      ) {
+        message.info('请将员工利润计算规则填写完整！')
+        return
+      }
+    }
     if (formType.value === 'create') {
       await ClassApi.createClassType(data)
       message.success(t('common.createSuccess'))