业务员编辑数据回显bug

src/views/operationManagement/modules/addOperation.vue

@@ -17,14 +17,6 @@
                     <el-option key="7" value="7" label="渠道"></el-option>
                     <el-option key="5" value="5" label="团队"></el-option>
                     <el-option key="8" value="8" label="电销组"></el-option>
-                    <!--<el-option key="1" value="1" label="前线人员"></el-option>
-                    <el-option key="2" value="2" label="后线人员"></el-option>
-                    <el-option key="3" value="3" label="合伙人"></el-option>
-                    <el-option key="4" value="4" label="工作室管理员"></el-option>
-                    <el-option key="5" value="5" label="团队"></el-option>
-                    <el-option key="6" value="6" label="个代"></el-option>
-                    <el-option key="7" value="7" label="电销"></el-option>
-                    <el-option key="8" value="8" label="渠道"></el-option>-->
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -50,9 +42,8 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="10">
-                <el-form-item prop="organization" label="所属机构">
-                  <el-input v-if="operationForm.typeAttr!='6'" disabled v-model="operationForm.organization"></el-input>
-                  <el-cascader v-else style="width: 100%" v-model="operationForm.organization" placeholder="请选择所属机构" :options="deptOption" :props="optionProps" @change="deptIdChange"></el-cascader>
+                <el-form-item prop="deptId" label="所属机构">
+                  <el-cascader :disabled="operationForm.typeAttr!='6'" style="width: 100%" v-model="operationForm.deptId" placeholder="请选择所属机构" :options="deptOption" :props="optionProps" @change="deptIdChange"></el-cascader>
                 </el-form-item>
               </el-col>
               <el-col :span="10">
@@ -532,7 +523,6 @@ import pdf from '@/assets/images/pdf.png'
 const fileViewer = ref(null)
 
 interface OperationFormProps extends AddOperation {
-  organization: string
   organizationId: string,
   leaderNumber: string,
   referrerNumber: string,
@@ -585,7 +575,6 @@ let operationForm = ref<OperationFormProps>({
   salaryTable: '',
   leaveTable: '',
   organizationId: '',
-  organization: '',
   leaderNumber: '',
   referrerNumber: '',
   address: [],
@@ -615,7 +604,7 @@ const operationRules = ref<FormRules>({
       trigger: 'blur'
     }
   ],
-  organization: [
+  deptId: [
     { required: true, trigger: "change", message: "请选择所属机构" }
   ],
   identity: [
@@ -708,6 +697,14 @@ const disabledDateEnd = (time: Date) => {
   return time.getTime() < new Date(operationForm.value.identityTimeStart)
 }
 
+// 处理partnerTypeAttr字段，转为数组并过滤掉1-4的数据
+const processPartnerTypeAttr = (partnerTypeAttr: string) => {
+  // 将字符串转为数组
+  const arr = partnerTypeAttr.split(',').map(item => item.trim());
+  // 过滤掉等于1、2、3、4的数据
+  const filteredArr = arr.filter(item => !['1', '2', '3', '4'].includes(item));
+  return filteredArr.join(',');
+}
 // 编辑时初始化数据
 // 编辑的id
 let editId = ref('')
@@ -717,11 +714,13 @@ const initEditData = (id, ids) => {
     editId.value = id
     api.operationApi.operationDetail(id).then(res => {
       if(res?.code == 200) {
+        if(res.data?.partnerTypeAttr){
+          res.data.typeAttr = processPartnerTypeAttr(res.data?.partnerTypeAttr);//过滤合伙人身份
+        }
         let formData = res.data
         console.log('edittype',formData?.typeAttr,formData?.typeAttr==='5'?'1':formData?.typeAttr==='8'?'3':formData?.typeAttr==='7'?'2':'')
         initTeamData(formData?.typeAttr==='5'?'1':formData?.typeAttr==='8'?'3':formData?.typeAttr==='7'?'2':'')
         operationForm.value = formData
-        operationForm.value.organization = formData.deptId
         operationForm.value.deptId = formData.deptId
         operationForm.value.leaderNumber = formData.leaderId
         operationForm.value.referrerNumber = formData.referrerId
@@ -831,7 +830,6 @@ const initAddData = () => {
     salaryTable: '',
     leaveTable: '',
     organizationId: '',
-    organization: '',
     leaderNumber: '',
     referrerNumber: '',
     address: [],
@@ -1300,7 +1298,7 @@ const initTeamData = async (e) => {
 
 let teamList = ref([])
 const typeAttrChange = async (e) => {
-  operationForm.value.organization = ''
+  operationForm.value.deptId = ''
   operationForm.value.leaderId = ''
   operationForm.value.leaderNumber = ''
   operationForm.value.referrerId = ''
@@ -1316,7 +1314,6 @@ const typeAttrChange = async (e) => {
 // 团队切换
 const deptChange = (e) => {
   const obj = teamList.value.find(item => item.id == e)
-  operationForm.value.organization = obj.deptName
   operationForm.value.deptId = obj.deptId
   getUser(obj.deptId)
   getRecommend(obj.deptId)