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

src/views/customer/UserList.vue

@@ -85,7 +85,7 @@ const tableColOpt = computed( ()=>{
       },
       { 
         label: '最近一次阅读时间',
-        key: 'ModifyTime',
+        key: 'LastReadTime',
         sort: true
       },
       {
@@ -153,7 +153,7 @@ function handleTableSort(e) {
   const sortFieldMap = {
     CreateTime: 1,
     RegisterTime: 2,
-    ModifyTime: 3,
+    LastReadTime: 3,
     ReadTimes: 4
   };
   // 设置排序字段

src/views/customer/components/ContactTable.vue

@@ -41,7 +41,7 @@ const tableColOpt = computed( ()=>{
     },
     { 
       label: '最近一次阅读时间',
-      key: 'ModifyTime',
+      key: 'LastReadTime',
       sort: true
     },
     {
@@ -98,7 +98,7 @@ function handleTableSort(e) {
 const sortFieldMap = {
   CreateTime: 1,
   RegisterTime: 2,
-  ModifyTime: 3,
+  LastReadTime: 3,
   ReadTimes: 4
 };
 // 设置排序字段

src/views/customer/components/MoveUser.vue

@@ -29,6 +29,7 @@ async function getDepartList() {
 watch(() => show.value, (newval) => {
   if (newval) {
     formData.value.UserId = props.userId
+    formRef.value ? formRef.value.clearValidate() : '';
     getDepartList()
   }
 })

src/views/customer/components/ToFormalize.vue

@@ -42,6 +42,7 @@ watch(() => show.value, (newval) => {
     formData.value.RealName = props.data.RealName
     formData.value.Mobile = props.data.Mobile
     formData.value.UserId = props.data.UserId
+    formRef.value ? formRef.value.clearValidate() : '';
     getDepartList()
   }
 })