Merge branch 'ch/jinrui1.0' of eta_mini/eta_mini_crm_front into debug_jr

src/views/customer/UserList.vue

@@ -159,7 +159,7 @@ function handleTableSort(e) {
   // 设置排序字段
   filterState.SortField = sortFieldMap[e.prop] || 0;
   // 设置排序规则
-  filterState.SortRule = e.order ? (e.order === 'descending' ? 1 : 2) : 0;
+  filterState.SortRule = e.order ? (e.order === 'descending' ? 2 : 1) : 0;
   handleFilterList()
 }
 function handleFilterList() {

src/views/customer/components/AddContact.vue

@@ -73,20 +73,23 @@ async function handleSubmitForm() {
   await formRef.value.validate();
   const { RealName, CompanyId, UserId, areaCode, Mobile } = formData.value;
 
-  // 新增用户时进行校验
-  const checkRes = await apiCustomerUser.userAddCheck({
-    AreaCode: areaCode,
-    Mobile,
-  })
-  if (checkRes.Ret !== 200) return
-  if (checkRes.Data.CheckResult !== 0) {
-      ElMessageBox.confirm(checkRes.Data.Tips,'操作提示',{
-      autofocus:false,
-    }).then(()=>{
-    }).catch(()=>{})
-    return
+  if (props.contactTatle === '添加联系人') {
+      // 新增用户时进行校验
+    const checkRes = await apiCustomerUser.userAddCheck({
+      AreaCode: areaCode,
+      Mobile,
+    })
+    if (checkRes.Ret !== 200) return
+    if (checkRes.Data.CheckResult !== 0) {
+        ElMessageBox.confirm(checkRes.Data.Tips,'操作提示',{
+        autofocus:false,
+      }).then(()=>{
+      }).catch(()=>{})
+      return
+    }
   }
 
+
   const params = {
     RealName,
     CompanyId,

src/views/customer/components/ContactTable.vue

@@ -104,7 +104,7 @@ const sortFieldMap = {
 // 设置排序字段
 filterState.SortField = sortFieldMap[e.prop] || 0;
 // 设置排序规则
-filterState.SortRule = e.order ? (e.order === 'descending' ? 1 : 2) : 0;
+filterState.SortRule = e.order ? (e.order === 'descending' ? 2 : 1) : 0;
 handleFilterList()
 }
 function handleFilterList() {