zhangying před 11 měsíci
rodič
revize
637c608948

+ 2 - 0
h5app/src/components/industrySelection.vue

@@ -177,6 +177,8 @@ export default defineComponent({
       getAllIndustryList().then(data => {
         allIndustryList.value = data;
         if (!props.CurIndustryID) {
+          selectIndustryInfo.value = ""
+          selectIndustryInfo.text = ""
           selectModelList[selectType.one].isSelect = true;
           selectModelList[selectType.one].disabled = false;
           selectModelList[selectType.one].industryName = ''

+ 2 - 1
vue/src/views/baseSettings/institution/edit.vue

@@ -300,11 +300,12 @@ export default defineComponent({
     const mobileValidate = ()=>{
       isAllowCommit.value = true;
       const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
+      const landlineReg = /[0-9-()()]{7,18}/;
       if(!mobileReg.test(formData.dataModel.frMobile)){
         message.error("输入的法人电话有误!");
         isAllowCommit.value = false;
       }
-      if(!mobileReg.test(formData.dataModel.fzrMobile)){
+      if (!mobileReg.test(formData.dataModel.fzrMobile) && !landlineReg.test(formData.dataModel.fzrMobile)) {
         message.error("输入的负责人电话有误!");
         isAllowCommit.value = false;
       }

+ 2 - 2
vue/src/views/jobUserManager/jobuser/vitae.vue

@@ -20,7 +20,7 @@
             {{ jobUserInfo.age }}岁
           </span>
           <span>
-            {{ jobUserInfo.nation }}
+            {{ jobUserInfo.nationName }}
           </span>
         </div>
         <!-- 政治面貌,学历,手机 -->
@@ -122,7 +122,7 @@ const jobUserInfo = reactive({
   name: "",
   genderName: "",
   age: null,
-  nation: "",
+  nationName: "",
   politicsStatusName: "",
   cultureName: "",
   userMobile: "",