fix: 客户人员-客户人员所属

fix: 主归属人变更-变更审核

src/api/crm/customer/getCustomer.js

@@ -3,7 +3,7 @@ import request from "@/utils/request"
 // 查询客户人员列表
 export function getCustomerList(params){
     return request.get({
-        url: '/app/appCustomerIfno/pageList',
+        url: '/crm/app/appCustomerIfno/pageList',
         data: params
     },{isTransformResponse: false})
 }
@@ -11,35 +11,35 @@ export function getCustomerList(params){
 // 查询系统推荐等级
 export function getCustomerLevel(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/queryCustomerLevel',
+        url: '/crm/app/appCrmCusUserNewController/queryCustomerLevel',
         data: params
     },{isTransformResponse: false})
 }
 // 客户人员新增
 export function saveappCrmCusUserNew(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/add',
+        url: '/crm/app/appCrmCusUserNewController/add',
         data: params
     },{isTransformResponse: false})
 }
 // 查询业务员名下所有的客户
 export function SearchForAllCustomersSalesperson(params){
     return request.get({
-        url: 'app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
+        url: '/crm/app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
         data: params
     },{isTransformResponse: false})
 }
 // 客户人员归属审核详情
 export function getCusUserApprovalListDetail(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/getCusUserApprovalListDetail',
+        url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalListDetail',
         data: params
     },{isTransformResponse: false})
 }
 // 查询主归属人列表
 export function SearchForAllPerson(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/SearchForAllPerson',
+        url: '/crm/app/appCrmCusUserNewController/SearchForAllPerson',
         data: params
     },{isTransformResponse: false})
 }
@@ -47,8 +47,8 @@ export function SearchForAllPerson(params){
 // 客户人员新增审核列表
 export　function　getCusUserApprovalList(params) {
     return request.get({
-        url: '/app/appCrmCusUserNewController/getCusUserApprovalList',
+            url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalList',
-        data: params
+            data: params
         }, {isTransformResponse: false}
     )
 }

src/api/crm/customer/updateCustomer.js

@@ -2,35 +2,35 @@ import request from "@/utils/request"
 // 删除客户人员归属消息
 export function removeVisit(params){
     return request.get({
-        url: '/app/appVisistReport/remove',
+        url: '/crm/app/appVisistReport/remove',
         data: params
     },{isTransformResponse: false})
 }
 // 更新客户人员
 export function upadateappCrmCusUserNew (data){
     return request.post({
-        url: '/app/appCrmCusUserNewController/update',
+        url: '/crm/app/appCrmCusUserNewController/update',
         data
     },{isTransformResponse: false})
 }
 // 客户人员审核通过
 export function clientPersonnelsApproval(data) {
     return request.get({
-        url: '/app/appCrmCusUserNewController/clientPersonnelsApproval',
+        url: '/crm/app/appCrmCusUserNewController/clientPersonnelsApproval',
         data
     }, {isTransformResponse: false});
 }
 //客户人员驳回
 export function customerPersonnelsRejectio(data) {
     return request.get({
-        url: '/app/appCrmCusUserNewController/customerPersonnelsRejectio',
+        url: '/crm/app/appCrmCusUserNewController/customerPersonnelsRejectio',
         data
     }, {isTransformResponse: false});
 }
 //主归属人变更提交
 export function submissionOfChangeOfMainOwner (data){
     return request.get({
-        url: '/app/appCrmCusUserNewController/submissionOfChangeOfMainOwner',
+        url: '/crm/app/appCrmCusUserNewController/submissionOfChangeOfMainOwner',
         data
     },{isTransformResponse: false})
 }

src/api/crm/mainOwner/mainOwner.js

@@ -4,7 +4,7 @@ import request from "@/utils/request";
 //主归属人变更信息查看（列表）
 export function queryViewMainOwnerList(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/viewInformationChangesInprimaryOwnership',
+        url: '/crm/app/appCrmCusUserNewController/viewInformationChangesInprimaryOwnership',
         data: params
     },{isTransformResponse: false})
 }
@@ -12,7 +12,7 @@ export function queryViewMainOwnerList(params){
 //主归属人变更信息查看（详情）
 export function queryViewMainOwnerDetail(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/getCrmCusUserNewChangeOwnerList',
+        url: '/crm/app/appCrmCusUserNewController/getCrmCusUserNewChangeOwnerList',
         data: params
     },{isTransformResponse: false})
 }
@@ -20,7 +20,7 @@ export function queryViewMainOwnerDetail(params){
 //查询主归属人变更人员的列表数据
 export function personnelAwaitingReviewForChange(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/personnelAwaitingReviewForChange',
+        url: '/crm/app/appCrmCusUserNewController/personnelAwaitingReviewForChange',
         data: params
     },{isTransformResponse: false})
 }
@@ -28,14 +28,14 @@ export function personnelAwaitingReviewForChange(params){
 //主归属人变更驳回
 export function changeOfPrimaryOwnershipNoApproved(params) {
     return request.get({
-        url:'/app/appCrmCusUserNewController/changeOfPrimaryOwnershipNoApproved',
+        url:'/crm/app/appCrmCusUserNewController/changeOfPrimaryOwnershipNoApproved',
         data: params
     }, {isTransformResponse: false});
 }
 //主归属人变更通过
 export function changeOfPrimaryOwnershipApproved (params) {
     return request.get({
-        url: '/app/appCrmCusUserNewController/changeOfPrimaryOwnershipApproved',
+        url: '/crm/app/appCrmCusUserNewController/changeOfPrimaryOwnershipApproved',
         data: params
     }, {isTransformResponse: false});
 }

src/api/crm/plan/getPlan.js

@@ -1,36 +1,29 @@
 import request from "@/utils/request"
-
+// 获取用户信息
-export function getPersonalPlanList(params) {
+/*export function getUserInfo(data) {
-    return request.post({
-        url: '/getPersonalPlanList',
-        params
-    })
-}
-
-export function getUserInfo(data) {
     return request.get({
         url: '/app/user/getUserInfo',
         data
     }, {isTransformResponse: false})
+}*/
+//获取个人周计划列表
+export function getWeeklyPlanList(data) {
+    return request.get({
+        url: '/crm/app/appWeeklyPlan/getWeeklyListByUser',
+        data
+    }, {isTransformResponse: false})
 }
 //获取所有人周计划列表
 export function getAllWeekPlanList(params){
     return request.get({
-        url: '/app/appWeeklyPlan/list',
+        url: '/crm/app/appWeeklyPlan/list',
         data: params
     },{isTransformResponse: false})
 }
-//获取个人周计划列表
-export function getWeeklyPlanList(data) {
-    return request.get({
-        url: '/app/appWeeklyPlan/getWeeklyListByUser',
-        data
-    }, {isTransformResponse: false})
-}
 // 组合查询计划列表
 export function getWeekPlanListByDate(params){
     return request.get({
-        url: '/app/appWeeklyPlan/weeklyListByDate',
+        url: '/crm/app/appWeeklyPlan/weeklyListByDate',
         data: params
     },{isTransformResponse: false})
 }

src/api/crm/plan/updatePlan.js

@@ -2,7 +2,7 @@ import request from "@/utils/request"
 
 export function updateWeekPlanList(data){
     return request.post({
-        url: '/app/appWeeklyPlan/updateWeekly',
+        url: '/crm/app/appWeeklyPlan/updateWeekly',
         data: data,
         header: {
             'Content-Type': 'application/json;charset=UTF-8'
@@ -12,7 +12,7 @@ export function updateWeekPlanList(data){
 // 判断本周是否写过计划
 export function judgeThisWeek (data){
     return request.post({
-        url: '/app/appWeeklyPlan/Judgethisweek',
+        url: '/crm/app/appWeeklyPlan/Judgethisweek',
         data,
         header: {'Content-Type': 'application/json;charset=UTF-8'}
     })
@@ -21,7 +21,7 @@ export function judgeThisWeek (data){
 // 新增周计划
 export function addPlan(data){
     return request.post({
-        url: '/app/appWeeklyPlan/addComment',
+        url: '/crm/app/appWeeklyPlan/addComment',
         data,
         header:{'Content-Type': 'application/json;charset=UTF-8'}
     })

src/components/multipleSelect.vue

@@ -43,8 +43,7 @@
 </template>
 
 <script setup>
-import { onMounted, reactive, ref } from "vue";
+import { onMounted, reactive, ref, defineExpose} from "vue";
-
 const props = defineProps({
     // 是否显示全部清空按钮
     showClearIcon: {
@@ -175,6 +174,14 @@ const handleChange = (index, item) => {
     // 触发回调函数
     emit("change", changevalue, realValue);
 };
+// 失去焦点时关闭选项列表
+const handleBlur = () => {
+  active.value = false;
+};
+// 定义组件实例暴露的方法
+defineExpose({
+  handleBlur
+});
 </script>
 
 <style lang="scss" scoped>

src/pages/business/CRM/customer/components/confirmForm.vue

@@ -168,8 +168,8 @@
             <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
               <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
               <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" :disabled="!editable"/>
-              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
-                              @change="handleHobbyChange"  :slabel="'name'"
+                              @change="handleHobbyChange" :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
             </uni-forms-item>
@@ -467,20 +467,29 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate && formData.value.functionalRequirements) {
+  if (formData.value.cusEstate) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param).catch(err => {
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })
+    })*/
-    if (!res.systemRecommendationLevel) {
+    try{
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      if(res.data.systemRecommendationLevel){
-      console.log(formData.value.systemThinkLevel + "???")
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
     }
-    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -509,8 +518,7 @@ let handleUserTypeChange = (e) => {
 
 // 选择日期
 function handleTenureTimeChange(e) {
-  let {value} = e.detail;
+  formData.value.tenureTime = e;
-  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -533,16 +541,17 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  let{value} = e.detail
+  formData.value.birthday = e;
-  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
+const handleHobbyChange = (items, ids) => {
-  // console.log("爱好", item, value);
+  console.log('选择爱好', items, ids);
-  hobbyIndex = value;
+  hobbyIds.value = [];
+  hobbies.value = items;
 };
 // 选择
 const handleNativeChange = (e) => {

src/pages/business/CRM/customer/components/customerUserEdit.vue

@@ -168,8 +168,8 @@
             <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
               <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
               <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好"/>
-              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
-                              @change="handleHobbyChange"  :slabel="'name'"
+                              @change="handleHobbyChange" :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
             </uni-forms-item>
@@ -468,20 +468,29 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate && formData.value.functionalRequirements) {
+  if (formData.value.cusEstate) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param).catch(err => {
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })
+    })*/
-    if (!res.systemRecommendationLevel) {
+    try{
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      if(res.data.systemRecommendationLevel){
-      console.log(formData.value.systemThinkLevel + "???")
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
     }
-    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -510,8 +519,7 @@ let handleUserTypeChange = (e) => {
 
 // 选择日期
 function handleTenureTimeChange(e) {
-  let {value} = e.detail;
+  formData.value.tenureTime = e;
-  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -534,17 +542,19 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  let{value} = e.detail
+  formData.value.birthday = e;
-  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
+const handleHobbyChange = (items, ids) => {
-  // console.log("爱好", item, value);
+  console.log('选择爱好', items, ids);
-  hobbyIndex = value;
+  hobbyIds.value = [];
+  hobbies.value = items;
 };
+
 // 选择
 const handleNativeChange = (e) => {
   formData.value.nativec = (e.detail.value.map(item => {
@@ -568,16 +578,16 @@ let handleWorkingStatusChange = e => {
 }
 
 let submitForm = async () => {
-  let hobbyTags = hobbyIndex.map(it => {
+  let hobbyTags = hobbies.value.map(it => {
-    let {name} = hobbyList[it];
+    let {name} = it;
     return name;
   })
-  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
   const hobbyTagString = hobbyTags.join('，');
   console.log(hobbyTagString);
   if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
   }
+  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
   // console.log(formData.value, "校验表单数据")
   // console.log(recommendLevel);
   formData.value.cusName = customerUser.value.cusName;

src/pages/business/CRM/customer/customerAdd.vue

@@ -21,7 +21,7 @@
 
       <!-- 正文内容 -->
       <view class="white-bg">
-        <view class="form-con">
+        <view class="form-con" @click="handleBlur">
           <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="40%">
             <!-- 选择客户 -->
             <uni-forms-item label="客户名称" name="cusName" required class="f-c-right">
@@ -178,7 +178,7 @@
             <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
               <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
               <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好"/>
-              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
                               @change="handleHobbyChange" :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
@@ -271,7 +271,7 @@
 </template>
 
 <script setup>
-import {ref, onMounted, computed, reactive} from 'vue'
+import {ref, reactive} from 'vue'
 import customHeader from '@/components/customHeader.vue'
 import multipleSelect from '@/components/multipleSelect.vue'
 import {
@@ -284,7 +284,8 @@ import {
 } from "./dataMap";
 import city from "@/utils/area";
 import {getCustomerLevel, saveappCrmCusUserNew} from "@/api/crm/customer/getCustomer";
-
+// 对 multipleSelect 组件的引用
+const hobbySelectRef = ref(null);
 // 表单引用
 const formRef = ref({});
 // 表单数据
@@ -412,7 +413,7 @@ let handleCustomerClick = () => {
         let {
           cusName, // 公司名称
           cusEstate, // 等级
-            cusId,
+          cusId,
         } = data;
         customerUser.value.cusName = cusName;
         if (!cusEstate) customerUser.value.sysThinkLevel = "该客户暂无等级信息，无法进行系统推荐"
@@ -448,20 +449,29 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate && formData.value.functionalRequirements) {
+  if (formData.value.cusEstate) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param).catch(err => {
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })
+    })*/
-    if (!res.systemRecommendationLevel) {
+    try{
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      if(res.data.systemRecommendationLevel){
-      console.log(formData.value.systemThinkLevel + "???")
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
     }
-    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -489,9 +499,9 @@ let handleUserTypeChange = (e) => {
 }
 
 // 选择日期
-function handleTenureTimeChange(e) {
+function handleTenureTimeChange(val) {
-  let {value} = e.detail;
+  console.log(val)
-  formData.value.tenureTime = value;
+  formData.value.tenureTime = val;
 }
 
 // 需求层次索引
@@ -513,18 +523,20 @@ let handleDevelopChange = e => {
 }
 
 // 选择生日
-function handleBirthdayChange(e) {
+function handleBirthdayChange(val) {
-  let{value} = e.detail
+  formData.value.birthday = val;
-  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
+const handleHobbyChange = (items, ids) => {
-  // console.log("爱好", item, value);
+  console.log('选择爱好', items, ids);
-  hobbyIndex = value;
+  hobbyIds.value = [];
+  hobbies.value = items;
 };
+
 // 选择
 const handleNativeChange = (e) => {
   formData.value.nativec = (e.detail.value.map(item => {
@@ -546,16 +558,93 @@ let handleWorkingStatusChange = e => {
   workingStatusIndex.value = 0;
   formData.value.workingStatus = workingStatusList[value].name;
 }
-
+// 多选组件失去焦点关闭
-let submitForm = async () => {
+let handleBlur = () => {
-  let hobbyTags = hobbyIndex.map(it => {
+  if (hobbySelectRef.value) hobbySelectRef.value.handleBlur();
-    let {name} = hobbyList[it];
+}
+// 提取爱好标签处理逻辑
+const processHobbyTags = () => {
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
     return name;
   })
   const hobbyTagString = hobbyTags.join('，');
   console.log(hobbyTagString);
   if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+  }
+};
+
+// 提取表单验证逻辑
+const validateForm = async () => {
+  formData.value.cusName = customerUser.value.cusName;
+  await formRef.value.validate();
+  console.log(formData.value, "提交表单数据");
+};
+
+// 提取API调用逻辑
+const saveCustomerUser = async () => {
+  uni.showLoading();
+  try {
+    const res = await saveappCrmCusUserNew(formData.value);
+    if(res.code === 200){
+      uni.showToast({
+        title: "保存成功"
+      });
+    } else {
+      uni.showToast({
+        title: "操作失败",
+        icon: "error"
+      });
+    }
+    setTimeout(() => uni.navigateBack(), 1500);
+  } catch(err) {
+    uni.showToast({
+      icon: 'none',
+      title: "保存失败"
+    });
+  }
+  finally{
+    uni.hideLoading()
+  }
+};
+
+// 简化后的 submitForm 方法
+let submitForm = async () => {
+  console.log(formData.value);
+  try {
+    if(formData.value.iphone){
+      formData.value.mobilePhone = formData.value.iphone;
+    }
+    // 处理爱好标签
+    processHobbyTags();
+
+    // 表单验证
+    await validateForm();
+
+    // 保存客户人员信息
+    await saveCustomerUser();
+  } catch (err) {
+    uni.showToast({
+      icon: 'none',
+      title: '请检查并完善信息'
+    });
+    console.warn(err);
+  }
+};
+
+/*let submitForm = async () => {
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
+    return name;
+  })
+  const hobbyTagString = hobbyTags.join('，');
+  console.log(hobbyTagString);
+  if (hobbyTagString || formData.value.hobby) {
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+  }
+  if(formData.value.iphone){
+    formData.value.mobilePhone = formData.value.iphone;
   }
   // console.log(formData.value, "校验表单数据")
   // console.log(recommendLevel);
@@ -565,19 +654,19 @@ let submitForm = async () => {
     console.log(formData.value, "提交表单数据")
     // 请求保存
     uni.showLoading()
-    saveappCrmCusUserNew(formData.value).then(res=>{
+    saveappCrmCusUserNew(formData.value).then(res => {
       uni.hideLoading();
-      if(res.code === 200){
+      if (res.code === 200) {
         uni.showToast({
           title: "保存成功"
         })
-      }else{
+      } else {
         uni.showToast({
           title: "操作失败"
         })
       }
-      setTimeout(()=>uni.navigateBack(), 1500);
+      setTimeout(() => uni.navigateBack(), 1500);
-    }).catch(err=>{
+    }).catch(() => {
       uni.showToast({
         icon: 'none',
         title: "保存失败"
@@ -593,7 +682,7 @@ let submitForm = async () => {
     })
     console.warn(err);
   }
-}
+}*/
 
 
 </script>

src/pages/business/CRM/customer/customerUserBelong.vue

@@ -17,7 +17,7 @@
       <view class="all-body">
         <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
         <view class="search">
-          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"
                           cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
                           @clear="clearSearchValue"
                           v-model="searchValue"
@@ -132,7 +132,10 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../static/images/mescroll-empty.png"
+  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });

src/pages/business/CRM/mainOwner/audit/confirmForm.vue

@@ -168,8 +168,8 @@
             <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
               <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
               <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" :disabled="!editable"/>
-              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
-                              @change="handleHobbyChange"  :slabel="'name'"
+                              @change="handleHobbyChange" :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
             </uni-forms-item>
@@ -439,20 +439,29 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate && formData.value.functionalRequirements) {
+  if (formData.value.cusEstate) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param).catch(err => {
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })
+    })*/
-    if (!res.systemRecommendationLevel) {
+    try{
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      if(res.data.systemRecommendationLevel){
-      console.log(formData.value.systemThinkLevel + "???")
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
     }
-    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -481,8 +490,7 @@ let handleUserTypeChange = (e) => {
 
 // 选择日期
 function handleTenureTimeChange(e) {
-  let {value} = e.detail;
+  formData.value.tenureTime = e;
-  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -505,17 +513,19 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  let{value} = e.detail
+  formData.value.birthday = e;
-  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
+const handleHobbyChange = (items, ids) => {
-  // console.log("爱好", item, value);
+  console.log('选择爱好', items, ids);
-  hobbyIndex = value;
+  hobbyIds.value = [];
+  hobbies.value = items;
 };
+
 // 选择
 const handleNativeChange = (e) => {
   formData.value.nativec = (e.detail.value.map(item => {
@@ -539,16 +549,18 @@ let handleWorkingStatusChange = e => {
 }
 
 let submitForm = async () => {
-  let hobbyTags = hobbyIndex.map(it => {
+  let hobbyTags = hobbies.value.map(it => {
-    let {name} = hobbyList[it];
+    let {name} = it;
     return name;
   })
-  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
   const hobbyTagString = hobbyTags.join('，');
   console.log(hobbyTagString);
   if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
   }
+
+  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
+
   // console.log(formData.value, "校验表单数据")
   // console.log(recommendLevel);
   formData.value.cusName = customerUser.value.cusName;

src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue

@@ -11,7 +11,7 @@
       </customHeader>
 
       <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+      <view class="top-height"></view>
 
       <!-- 正文内容 -->
       <view class="all-body">

src/pages/business/CRM/plan/index.vue

@@ -8,7 +8,7 @@
       <!-- #endif -->
 
       <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+      <view class="top-height"></view>
 
       <view class="white-bg">
         <navigator url="/pages/business/CRM/plan/myPlan">

src/pages/business/CRM/plan/myPlan.vue

@@ -17,7 +17,7 @@
       <view class="top-height"></view>
 
       <view class="week-plan-title">
-        <view>姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
         <view v-if="weekNum">
           {{ yearMonth }}
           <view v-if="isThisWeek" style=" display: inline-block;">
@@ -28,9 +28,9 @@
       </view>
 
       <view class="nav-list">
-          <view class="nav-item" :class="{active:index==activeTab}"
+        <view class="nav-item" :class="{active:index==activeTab}"
-                    v-for="(item,index) in allPlans" :key="index"
+              v-for="(item,index) in allPlans" :key="index"
-                    @click="handleNav(index)"
+              @click="handleNav(index)"
         >{{ getTapLabel(item) }}
         </view>
       </view>
@@ -54,10 +54,11 @@
             </view>
           </view>
         </view>
+        <view class='bottom-spliter bg-gray'></view>
       </block>
 
       <!-- 底部加高度来避免tabbar遮挡 -->
-      <view class="bottom-height"></view>
+      <!-- <view class="bottom-height bg-gray"></view> -->
     </view>
 
 
@@ -106,12 +107,12 @@ let getWorkEvent = (index) => {
 const refreshPlanList = () => {
   message.showLoading();
   // 获取用户信息
-  getUserInfo().then(res => {
+  // getUserInfo().then(res => {
-    userInfo.value = res.user;
+  //   userInfo.value = res.user;
-    console.log(route.path, "：用户信息获取成功");
+  //   console.log(route.path, "：用户信息获取成功");
-  }).catch(err => {
+  // }).catch(err => {
-    console.warn(err, "用户信息获取失败")
+  //   console.warn(err, "用户信息获取失败")
-  });
+  // });
   // 获取周计划列表
   getWeeklyPlanList(queryParams.value).then(res => {
     const {rows} = res;
@@ -180,11 +181,11 @@ function handleCreate() {
         handlePlanEdit({itemList, selectIndex: result.tapIndex}, true);
       }).catch((err) => {
         console.warn(err, "已存在周计划")
-        uni.showToast({
+        // uni.showToast({
-          icon: 'error',
+        //   icon: 'error',
-          title: '已有本周或下周计划',
+        //   title: '已有本周或下周计划',
-          duration: 2000
+        //   duration: 2000
-        })
+        // })
       })
       // }else{ // 创建下周计划
       // }
@@ -234,7 +235,7 @@ function handleEdit(index) {
   // console.log(JSON.stringify(formData))
   console.log(route.path, formData, "前往修改页面");
   const editFields = [OrdinalDate[index], WorkType[index], WorkEvent[index]];
-  let userName = userInfo.value.nickName || userInfo.value.userName;
+  let userName = null; // userInfo.value.userName || userInfo.value.nickName;
   handlePlanEdit({userName, formData, editFields}, false);
 }
 
@@ -268,9 +269,14 @@ function handleEdit(index) {
 }
 
 .white-bg.white-bg-2 {
-  margin-bottom: 20rpx;
+  /*  margin-bottom: 20rpx; */
+}
+.bottom-spliter{
+  height: 20rpx;
+}
+.bg-gray{
+  background-color: #f0f0f0;
 }
-
 .report-list .w-b-title .btn-edit {
   background-color: #5C96F7;
 }
@@ -280,14 +286,14 @@ function handleEdit(index) {
 }
 
 .nav-list {
-/*  display: flex;*/
+  /*  display: flex;*/
-/*  width: 690rpx;*/
+  /*  width: 690rpx;*/
   overflow-x: auto;   /* 允许横向滚动 */
   /*overflow-y: hidden;  隐藏垂直滚动 */
   /*-ms-overflow-style: none;   IE 隐藏滚动条 */
- /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
+  /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
   /* 添加高度以确保有足够的空间 */
-/*  height: 80rpx;*/
+  /*  height: 80rpx;*/
   white-space: nowrap; /* 保持子元素在同一行显示 */
   /* 添加这些属性确保滚动正常工作 */
   scroll-behavior: smooth;
@@ -304,7 +310,7 @@ function handleEdit(index) {
 }
 .nav-list .nav-item {
   /*  flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */
-/*  width: 200rpx;*/
+  /*  width: 200rpx;*/
   display: inline-block;
   background-color: #05A3F4;
   border-radius: 10rpx;

src/pages/business/CRM/plan/planEdit.vue

@@ -4,7 +4,7 @@
       <!-- 头部 -->
       <customHeader ref="customHeaderRef" :title="title" :leftFlag="true" :rightFlag="true">
         <template #right>
-          <view class="head-right" @click="submitForm" v-if="userInfo.nickName || userInfo.userName">
+          <view class="head-right" @click="submitForm">
             <uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
                        color="#B7D2FF"></uni-icons>
             保存
@@ -16,7 +16,7 @@
 
       <!-- 正文内容 -->
       <view class="week-plan-title">
-        <view>姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
         <view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view>
       </view>
       <uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top">

src/pages/business/CRM/plan/planView.vue

@@ -11,8 +11,7 @@
       </customHeader>
 
       <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+      <view class="top-height"></view>
-
       <!-- 正文内容 -->
       <view>
 

src/utils/formatter.js

@@ -45,3 +45,23 @@ export function formatMoney(num, decimals,units){
 
     return units+retVal;
 }
+
+export function dateFormat(fmt, date) {
+    let ret;
+    const opt = {
+        "Y+": date.getFullYear().toString(),        // 年
+        "m+": (date.getMonth() + 1).toString(),     // 月
+        "d+": date.getDate().toString(),            // 日
+        "H+": date.getHours().toString(),           // 时
+        "M+": date.getMinutes().toString(),         // 分
+        "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    };
+    for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+            fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+        };
+    };
+    return fmt;
+}