diff --git a/.env.base b/.env.base
index a5f94e7..d470c46 100644
--- a/.env.base
+++ b/.env.base
@@ -4,12 +4,12 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-# VITE_BASE_URL='http://118.31.23.45:48080'
-VITE_BASE_URL='http://114.55.169.15:48080'
+VITE_BASE_URL='http://118.31.23.45:48080'
+# VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径
-# VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
-VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+# VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/crm-api
diff --git a/src/views/SchoolManagement/Class/Comp/DialogClass.vue b/src/views/SchoolManagement/Class/Comp/DialogClass.vue
index 4059f54..c035206 100644
--- a/src/views/SchoolManagement/Class/Comp/DialogClass.vue
+++ b/src/views/SchoolManagement/Class/Comp/DialogClass.vue
@@ -60,14 +60,14 @@
       <el-tab-pane label="报价信息" name="price">
         <el-button type="primary" @click="handleAddPrice" class="mb-10px">新增报价</el-button>
         <el-table :data="formData.quotations">
-          <el-table-column width="160px">
+          <el-table-column>
             <template #header> <Tooltip message="市场价，给客户的报价" />指导价 </template>
             <template #default="{ row }">
               <el-input v-if="row.edit" v-model="row.guidingPrice" type="number" :min="0" />
               <span v-else>{{ row.guidingPrice }}</span>
             </template>
           </el-table-column>
-          <el-table-column width="160px">
+          <!-- <el-table-column width="160px">
             <template #header> <Tooltip message="员工底价，用于核算毛利及提成" />底价 </template>
             <template #default="{ row }">
               <el-input v-if="row.edit" v-model="row.minPrice" type="number" :min="0" />
@@ -80,7 +80,7 @@
               <el-input v-if="row.edit" v-model="row.costPrice" type="number" :min="0" />
               <span v-else>{{ row.costPrice }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="生效日期">
             <template #default="{ row }">
               <el-date-picker
@@ -108,7 +108,171 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="提成结算" name="comission">
+      <el-tab-pane label="公司利润" name="profitCompany">
+        <el-form
+          :model="profitCompanyForm"
+          ref="profitCompanyRef"
+          :rules="profitCompanyRules"
+          label-width="90px"
+        >
+          <el-form-item label="利润模式：">
+            <el-radio-group v-model="profitCompanyForm.profitType">
+              <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">
+              <span>公司利润 = （ 成交价 </span>
+              <el-select
+                v-model="profitCompanyForm.isPlus"
+                size="small"
+                placeholder="加/减"
+                class="ml-10px mr-10px"
+                style="width: 70px"
+              >
+                <el-option label="+" :value="1" />
+                <el-option label="-" :value="2" />
+              </el-select>
+              <el-input-number
+                v-model="profitCompanyForm.bianliang"
+                size="small"
+                placeholder="金额"
+                :min="0"
+                style="width: 80px"
+                :controls="false"
+              />
+              <span class="ml-10px mr-10px"> ） 乘以 </span>
+              <el-input-number
+                v-model="profitCompanyForm.bili"
+                size="small"
+                placeholder="比例"
+                :min="0"
+                :max="1"
+                :controls="false"
+              />
+            </div>
+            <div v-else-if="profitCompanyForm.profitType == 2">
+              <el-button
+                type="primary"
+                size="small"
+                @click="profitCompanyForm.dangwei.push({ dangweizhi: undefined, lirun: undefined })"
+                >添加利润档位</el-button
+              >
+              <div
+                class="flex items-center"
+                v-for="(item, index) in profitCompanyForm.dangwei"
+                :key="index"
+              >
+                <span>成交额满</span>
+                <el-input-number
+                  v-model="item.dangweizhi"
+                  size="small"
+                  placeholder="金额"
+                  :min="0"
+                  class="ml-10px mr-10px"
+                  style="width: 80px"
+                  :controls="false"
+                />
+                <span>，公司利润为</span>
+                <el-input-number
+                  v-model="item.lirun"
+                  size="small"
+                  placeholder="金额"
+                  :min="0"
+                  class="ml-10px"
+                  style="width: 80px"
+                  :controls="false"
+                />
+              </div>
+            </div>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane label="员工利润" name="profitEmployee">
+        <el-form
+          :model="profitEmployeeForm"
+          ref="profitEmployeeRef"
+          :rules="profitEmployeeRules"
+          label-width="90px"
+        >
+          <el-form-item label="利润模式：">
+            <el-radio-group v-model="profitEmployeeForm.profitType">
+              <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">
+              <span>公司利润 = （ 成交价 </span>
+              <el-select
+                v-model="profitEmployeeForm.isPlus"
+                size="small"
+                placeholder="加/减"
+                class="ml-10px mr-10px"
+                style="width: 70px"
+              >
+                <el-option label="+" :value="1" />
+                <el-option label="-" :value="2" />
+              </el-select>
+              <el-input-number
+                v-model="profitEmployeeForm.bianliang"
+                size="small"
+                placeholder="金额"
+                :min="0"
+                style="width: 80px"
+                :controls="false"
+              />
+              <span class="ml-10px mr-10px"> ） 乘以 </span>
+              <el-input-number
+                v-model="profitEmployeeForm.bili"
+                size="small"
+                placeholder="比例"
+                :min="0"
+                :max="1"
+                :controls="false"
+              />
+            </div>
+            <div v-else-if="profitEmployeeForm.profitType == 2">
+              <el-button
+                type="primary"
+                size="small"
+                @click="
+                  profitEmployeeForm.dangwei.push({ dangweizhi: undefined, lirun: undefined })
+                "
+                >添加利润档位</el-button
+              >
+              <div
+                class="flex items-center"
+                v-for="(item, index) in profitEmployeeForm.dangwei"
+                :key="index"
+              >
+                <span>成交额满</span>
+                <el-input-number
+                  v-model="item.dangweizhi"
+                  size="small"
+                  placeholder="金额"
+                  :min="0"
+                  class="ml-10px mr-10px"
+                  style="width: 80px"
+                  :controls="false"
+                />
+                <span>，公司利润为</span>
+                <el-input-number
+                  v-model="item.lirun"
+                  size="small"
+                  placeholder="金额"
+                  :min="0"
+                  class="ml-10px"
+                  style="width: 80px"
+                  :controls="false"
+                />
+              </div>
+            </div>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane v-if="false" label="提成结算" name="comission">
         <el-button v-if="!comissionShow" type="primary" @click="handleAddComission">
           新增提成结算规则
         </el-button>
@@ -286,6 +450,20 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const currentTab = ref('base')
 
+const profitCompanyForm = ref({
+  profitType: 1,
+  dangwei: []
+})
+const profitCompanyRules = {}
+const profitCompanyRef = ref()
+
+const profitEmployeeForm = ref({
+  profitType: 1,
+  dangwei: []
+})
+const profitEmployeeRules = {}
+const profitEmployeeRef = ref()
+
 const opts = ref({
   percentage_param1: [],
   percentage_param2: [],
@@ -339,8 +517,8 @@ function handleAddPrice() {
   formData.value.quotations.push({
     edit: true,
     guidingPrice: undefined,
-    minPrice: undefined,
-    costPrice: undefined,
+    // minPrice: undefined,
+    // costPrice: undefined,
     validTime: undefined,
     quotationTime: formatDate(new Date(), 'YYYY-MM-DD')
   })