web-对运营机构、驿站站点、站点人员的联系电话录入保存添加了验证

vue/src/views/baseSettings/institution/edit.vue

@@ -179,7 +179,7 @@ export default defineComponent({
       opCategory.value = operateType;
       getInstitutionByID(institutionID).then((result: any) => {
         formData.dataModel = result;
-        // console.log('dataModel',formData.dataModel);
+        //console.log('dataModel',formData.dataModel);
         GetManageSites(formData.dataModel.institutionID);
       });
     }
@@ -217,12 +217,11 @@ export default defineComponent({
       getSiteByID(siteID).then((result :any)=> {
         manageSites.value[index]= result;
         // console.log("manageSites",manageSites.value);
-        validateSameSite();
+        /*validateSameSite();*/
       });
     };
 
-    const validateSameSite = ()=>{
-      isAllowCommit.value = true;
+    /*const validateSameSite = ()=>{
       if(manageSites.value.length>1){
         manageSites.value.forEach(item=>{
           const sameData = manageSites.value.filter(x => x.siteID == item.siteID);
@@ -232,6 +231,18 @@ export default defineComponent({
           }
         });
       }
+    };*/
+    const mobileValidate = ()=>{
+      isAllowCommit.value = true;
+      const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
+      if(!mobileReg.test(formData.dataModel.frMobile)){
+        message.error("输入的法人电话有误!");
+        isAllowCommit.value = false;
+      }
+      if(!mobileReg.test(formData.dataModel.fzrMobile)){
+        message.error("输入的负责人电话有误!");
+        isAllowCommit.value = false;
+      }
     };
 
     const onClose = (reload: any) => {
@@ -241,7 +252,8 @@ export default defineComponent({
     };
 
     const onFinish = () => {
-      validateSameSite();
+      mobileValidate();
+      /*validateSameSite();*/
       if (isAllowCommit.value){
         formData.dataModel.manageSites = manageSites.value;
         saveInstitution(formData.dataModel).then(result => {
@@ -249,8 +261,6 @@ export default defineComponent({
             onClose(1);
           }
         });
-      }else{
-          message.error("不允许添加相同的站点!");
       }
     };
 

vue/src/views/baseSettings/siteInfo/edit.vue

@@ -133,7 +133,7 @@ import {getSiteByID, saveSite} from "@/api/baseSettings/siteInfo";
 import BUploadFile from "@/components/file/uploadFile.vue";
 import {message, SelectProps, TableColumnsType, TableProps} from "ant-design-vue";
 import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
-import {getSiteUserList,getSiteUserDataList,getListBySiteID, getSiteUserByID} from "@/api/baseSettings/userInfo";
+import {getSiteUserList,getSiteUserDataList,getListBySiteID} from "@/api/baseSettings/userInfo";
 import {getInstitutionDataList} from "@/api/baseSettings/institution";
 import {getPaginationTotalTitle} from "@/utils/common";
 
@@ -225,7 +225,7 @@ export default defineComponent({
       getUserDataList();
       getSiteByID(siteID).then((result: any) => {
         formData.dataModel = result;
-        // console.log("dataModel",formData.dataModel);
+        //console.log("dataModel",formData.dataModel);
         getManageUsers(formData.dataModel.siteID);
         // console.log("manageUsers",manageUsers.value);
         if (formData.dataModel.regionCode != null){
@@ -251,7 +251,7 @@ export default defineComponent({
       });
     }
 
-    const addSiteUser = () => {
+    /*const addSiteUser = () => {
       if(allUsers.value.length >0){
         const newUser = allUsers.value[0];
         // console.log(newUser);
@@ -264,8 +264,8 @@ export default defineComponent({
     const delSiteUser = (site) =>{
       (manageUsers.value as any[]).splice(site, 1);
       validateSameUser();
-    }
-    const manageUsersChange = (index:any,siteUserID:any) =>{
+    }*/
+    /*const manageUsersChange = (index:any,siteUserID:any) =>{
       // console.log('siteUserID',siteUserID);
       getSiteUserByID(siteUserID).then((result :any)=> {
         result.siteID = formData.dataModel.siteID;
@@ -273,9 +273,9 @@ export default defineComponent({
         // console.log('manageUsers',manageUsers.value);
         validateSameUser();
       });
-    }
+    }*/
 
-    const validateSameUser = ()=>{
+   /* const validateSameUser = ()=>{
       isAllowCommit.value = true;
       if (manageUsers.value.length>1){
         manageUsers.value.forEach(item=>{
@@ -286,22 +286,26 @@ export default defineComponent({
           }
         });
       }
+      if (!isAllowCommit.value)message.error("不允许添加相同的人员!");
+    }*/
+
+    const mobileValidate = ()=>{
+      isAllowCommit.value = true;
+      const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
+      if(!mobileReg.test(formData.dataModel.fzrMobile)){
+        message.error("输入的联系电话有误!");
+        isAllowCommit.value = false;
+      }
     }
+
     const onClose = (reload: any) => {
       tabsViewStore.closeCurrentTabByPath('/baseSettings/site/add');
       tabsViewStore.closeCurrentTabByPath('/baseSettings/site/edit');
       tabsViewStore.openTab('/baseSettings/site/index',{reload:reload});
     };
     const onFinish = () => {
-      validateSameUser();
-      if (!isAllowCommit.value){
-        message.error("不允许添加相同的人员!");
-      }else if(formData.dataModel.siteCode==null||formData.dataModel.siteName ==null||formData.dataModel.institutionID==null||
-      formData.dataModel.regionCode==null||formData.dataModel.streetCode==null||formData.dataModel.detailAddress==null){
-        message.error("请填写完整的站点信息!");
-        isAllowCommit.value = false;
-      }
-
+      mobileValidate();
+      /*validateSameUser();*/
       if (isAllowCommit.value){
         formData.dataModel.manageUsers = manageUsers.value;
         saveSite(formData.dataModel).then(result => {
@@ -340,9 +344,9 @@ export default defineComponent({
       getUserDataList,
       getInstitutionList,
       getAllUsers,
-      addSiteUser,
+      /*addSiteUser,
       delSiteUser,
-      manageUsersChange,
+      manageUsersChange,*/
     };
   },
   created() {

vue/src/views/baseSettings/siteUser/edit.vue

@@ -87,8 +87,8 @@ export default defineComponent({
       loading: false
     });
     const allSites = ref<any>([]);
-    const genderList =  ref<SelectProps["options"]>();
-    const roleList =  ref<SelectProps["options"]>([]);
+    const genderList = ref<SelectProps["options"]>();
+    const roleList = ref<SelectProps["options"]>([]);
 
     const getAllSites = () => {
       getSiteList({pageIndex:1,pageSize:9999}).then((result :any) => {
@@ -112,7 +112,7 @@ export default defineComponent({
       opCategory.value = operateType;
       getSiteUserByID(siteUserID).then((result: any) => {
         formData.dataModel = result;
-        // console.log("dataModel",formData.dataModel);
+        //console.log("dataModel",formData.dataModel);
       });
     };
 
@@ -120,6 +120,15 @@ export default defineComponent({
       formState.selectedRowKeys = selectedRowKeys;
     };
 
+    const mobileValidate = ()=>{
+      isAllowCommit.value = true;
+      const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
+      if(!mobileReg.test(formData.dataModel.mobile)){
+        message.error("输入的联系电话有误!");
+        isAllowCommit.value = false;
+      }
+    };
+
     const onClose = (reload: any) => {
       tabsViewStore.closeCurrentTabByPath('/baseSettings/user/add');
       tabsViewStore.closeCurrentTabByPath('/baseSettings/user/edit');
@@ -127,10 +136,7 @@ export default defineComponent({
     };
 
     const onFinish = () => {
-      if(formData.dataModel.siteUserName==null||formData.dataModel.gender ==null||formData.dataModel.mobile==null|| formData.dataModel.roleID==null){
-        message.error("请填写完整的人员信息!");
-        isAllowCommit.value = false;
-      }
+      mobileValidate();
       if(isAllowCommit.value){
         saveSiteUser(formData.dataModel).then(result => {
           if (result) {