代码合并

src/views/profile/business/index.vue

@@ -82,29 +82,38 @@
   </div>
 
   <!-- dialog -->
-  <MarketDialog
-    :visible="dialogVisible"
+  <el-drawer
+    class="my-drawer"
+    :append-to-body="false"
+    v-model="dialogVisible"
     :title="dialogTitle"
-    :type="dialogType"
-    :fullscreen="dialogFullscreen"
-    :show-footer="dialogType !== 'view'"
-    @confirm="handleSubmit"
-    @cancel="handleCancel"
-    @close="handleClose"
+    :size="dialogType === 'view' ? '60%' : '50%'"
+    :destroy-on-close="true"
   >
     <!-- 表单 -->
     <div v-if="dialogType !== 'view'" class="drawer-form">
-      <MarketForm :form-data="marketForm" :form-rules="marketFormRules" :form-items="marketFormItemOptions"
-        :options-map="marketFormOptionsMap" ref="marketFormRef">
+      <MarketForm
+        :form-data="marketForm"
+        :form-rules="marketFormRules"
+        :form-items="marketFormItemOptions"
+        :options-map="marketFormOptionsMap"
+        ref="marketFormRef"
+      >
         <template #phoneOrEmail="{ formData }" v-if="dialogType === 'add'">
           <div class="phone-email">
             <div class="tab-btn">
-              <el-button :type="activeTab === 'email' ? 'primary' : 'default'" size="small"
-                @click="activeTab = 'email'">
+              <el-button
+                :type="activeTab === 'email' ? 'primary' : 'default'"
+                size="small"
+                @click="activeTab = 'email'"
+              >
                 邮箱
               </el-button>
-              <el-button :type="activeTab === 'phone' ? 'primary' : 'default'" size="small"
-                @click="activeTab = 'phone'">
+              <el-button
+                :type="activeTab === 'phone' ? 'primary' : 'default'"
+                size="small"
+                @click="activeTab = 'phone'"
+              >
                 手机号
               </el-button>
             </div>
@@ -114,7 +123,12 @@
               </el-form-item>
               <el-form-item prop="phone" class="phone-item" v-if="activeTab === 'phone'">
                 <el-select v-model="marketForm.countryCode" placeholder="请选择国家区号">
-                  <el-option v-for="item in countryOptions" :key="item.code" :label="item.code" :value="item.code">
+                  <el-option
+                    v-for="item in countryOptions"
+                    :key="item.code"
+                    :label="item.code"
+                    :value="item.code"
+                  >
                     <div class="country-option">
                       <span class="country-name">{{ item.name }}</span>
                       <span class="country-code">{{ item.code }}</span>
@@ -133,7 +147,11 @@
     <div class="drawer-table">
       <div class="table-header" v-if="dialogType !== 'view'">点差配置</div>
       <div class="table-wrapper">
-        <MarketTable :table-data="marketPointTree" :columns="marketPointTableColumnsOptions" row-key="id">
+        <MarketTable
+          :table-data="marketPointTree"
+          :columns="marketPointTableColumnsOptions"
+          row-key="id"
+        >
           <template #assignedPointDiff="{ row }">
             <el-form :model="row" :rules="rules(marketForm, row)">
               <el-form-item prop="pointDifference">
@@ -154,8 +172,13 @@
     </template>
   </el-drawer>
 
-  <MarketDialog :visible="rightClickDialogVisible" :title="rightClickDialogTitleEnum[rightClickDialogType]"
-    @confirm="handleRightClickDialogSubmit" @cancel="handleRightClickDialogCancel" @close="handleRightClickDialogClose">
+  <MarketDialog
+    :visible="rightClickDialogVisible"
+    :title="rightClickDialogTitleEnum[rightClickDialogType]"
+    @confirm="handleRightClickDialogSubmit"
+    @cancel="handleRightClickDialogCancel"
+    @close="handleRightClickDialogClose"
+  >
     <!--   'account' | 'acceptOrders' | 'transfer' | 'deposit' | 'withdraw'   -->
     <MarketForm
       :form-data="rightClickMarketForm"
@@ -166,7 +189,6 @@
 </template>
 
 <script setup lang="ts">
-
 defineOptions({
   name: 'Business',
 })
@@ -472,17 +494,12 @@ const handleMarketFormLinkage = async (type: 'level' | 'parentAccountName', valu
 
       // 调用获取上级账户列表接口
       let flag = null
-      if (
-        (selectedRow.value?.role_id * 1 === 5 || marketForm.value?.level * 1 === 5) &&
-        selectedRow.value?.type * 1 === 1
-      )
-        flag = 1
-      if (
-        (selectedRow.value?.role_id * 1 === 6 || marketForm.value?.level * 1 === 6) &&
-        selectedRow.value?.type * 1 === 2
-      )
-        flag = 2
-      const data = await getParAgentListApi({ role_id: value, flag: flag })
+      if (marketForm.value?.level * 1 === 5) flag = 1
+      if (marketForm.value?.level * 1 === 6) flag = 2
+      const data = await getParAgentListApi({
+        role_id: value * 1 === 6 ? 5 : value * 1,
+        flag: flag,
+      })
       console.log('datasssssssssssss', data)
       // 格式化下拉选项
       marketFormOptionsMap.value.parentAccountName = data.map((item: any) => ({