Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/quoteConfig/agreement/agreementCopy.vue

@@ -17,13 +17,13 @@
           </el-descriptions-item>
         </el-descriptions>
       </div>
-      <div class="content m-top-20 flex a-c">
+      <div class="content m-top-20 flex a-c mb-10px">
         <span>出单费用{{ feeData.length }}条</span>
         <div class="grayBlock m-right-10 m-left-20 flex a-c j-s">
           <span class="m-right-20" style="line-height: 14px;">有效状态</span>
           <el-dropdown trigger="click" @command="validStateCommand">
             <el-button link style="font-size: 14px;color: #333;"> {{ valid_statusName ? valid_statusName : '全部'
-              }}<el-icon>
+            }}<el-icon>
                 <arrow-down />
               </el-icon>
             </el-button>
@@ -45,7 +45,7 @@
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item :command="item.label" v-for="(item, index) in is_enable" :key="index">{{ item.label
-                  }}</el-dropdown-item>
+                }}</el-dropdown-item>
               </el-dropdown-menu>
             </template>
           </el-dropdown>
@@ -53,6 +53,9 @@
       </div>
       <ComplexTable :tableData="feeData" :columns="columns" :showIndex="false" :columnwidth="200" :showOperation="false"
         :showSelect="true" uniqueIdName="costId" @selectionChange="selectionChange">
+        <template #costRules="{ data, bodyCell }">
+          <div class="whitespace-normal">{{ data.costRules }}</div>
+        </template>
       </ComplexTable>
 
     </PageMain>
@@ -96,7 +99,7 @@ const formInline = reactive({
 const columns = [
 
   {
-    prop: "costRules", label: "规则明细", width: '500',
+    prop: "costRules", label: "规则明细", width: '500', component: 'customSlot',
   },
   {
     prop: "productName", label: "保险产品", width: '120',

src/views/sale/settings.vue

@@ -412,7 +412,6 @@ const handleSubmit = async () => {
   try {
     await formRef.value.validate();
 
-    console.log("🚀 ~ handleSubmit ~ allDeptTreeData.value:", selectData.value)
     const formData = {
       ...form,
       commissionRatioLevel1: form.commissionRatioLevel1 || 0,
@@ -426,7 +425,6 @@ const handleSubmit = async () => {
     ElMessage.success('保存成功');
     getDetail()
   } catch (error) {
-    console.log("🚀 ~ handleSubmit ~ error:", error)
   }
 };
 const handleUpdate = async () => {