tangning 2 rokov pred
rodič
commit
af1b6bbca7

+ 3 - 3
src/views/lanUser/adddetailsModal.vue

@@ -80,13 +80,13 @@
               // @ts-ignore
               validator: async (rule, value) => {
                 console.log('value',value)
-                const regPos = /^[\da-z]+$/i; // 非中文
+                const regPos = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/; // 非中文
                 if (!value) {
-                  return Promise.reject('请输入字母或数字组合');
+                  return Promise.reject('请输入正确的手机号');
                 }
                 if (!regPos.test(value)) {
                   /* eslint-disable-next-line */
-                  return Promise.reject('请输入字母或数字组合');
+                  return Promise.reject('请输入正确的手机号');
                 }
                 return Promise.resolve();
               },

+ 6 - 6
src/views/lanUser/list.vue

@@ -108,11 +108,11 @@
           fixed: 'left',
           width: 60,
         },
-        // {
-        //   title: t('routes.staff.userName'),
-        //   dataIndex: 'nickName',
-        //   width: 120,
-        // },
+        {
+          title: t('routes.staff.userName'),
+          dataIndex: 'nickName',
+          width: 120,
+        },
         {
           title: t('routes.staff.userId'),
           dataIndex: 'userName',
@@ -131,7 +131,7 @@
 
         {
           title: '创建人',
-          dataIndex: 'createUserName',
+          dataIndex: 'sysUserName',
           width: 80,
         },
 

+ 1 - 1
src/views/productOperation/cameraScene.vue

@@ -15,7 +15,7 @@
         </template>
 
         <template #href="{ record }">
-          <a v-if="(record.status == 1 || (record.status == -2 && record.payStatus == 1))" target="_blank" :href="'/'+record.thumb">{{record.sceneName}}</a>
+          <a v-if="(record.status == 1 || (record.status == -2 && record.payStatus == 1))" target="_blank" :href="record.thumb">{{record.sceneName}}</a>
           <span v-else-if="record.sceneName">{{record.sceneName}}</span>
           <span v-else>-</span>
         </template>