Эх сурвалжийг харах

feat:增加pc端电信 结构化数据 留资页面必填项

malin 3 жил өмнө
parent
commit
19324e721e

+ 2 - 2
src/web/staticres/common-module/pc-dialog/css/leave-info-dialog.css

@@ -274,9 +274,9 @@
   /* height: 36px; */
   min-height: 36px!important;
 }
-.el-select-dropdown__wrap{
+/* .el-select-dropdown__wrap{
   max-height:124px;
-}
+} */
 
 
 #success-dialog .success-dialog-container{

+ 2 - 2
src/web/staticres/common-module/pc-dialog/css/leave-solution-dialog.css

@@ -267,9 +267,9 @@
   /* height: 36px; */
   min-height: 36px!important;
 }
-.el-select-dropdown__wrap{
+/* .el-select-dropdown__wrap{
   max-height:124px;
-}
+} */
 
 
 #success-dialog .success-dialog-container{

+ 16 - 5
src/web/staticres/common-module/pc-dialog/js/leave-info-dialog.js

@@ -60,7 +60,7 @@ var temp = `
                       <el-option v-for="item in jobData" :key="item.value" :label="item.label" :value="item.value">
                       </el-option>
                     </el-select>
-                    <el-select v-show="showBranch" v-model="form.branch" placeholder="请选择部门" class="item-input short-input" clearable>
+                    <el-select v-if="defaultSource v-show="showBranch" v-model="form.branch" placeholder="请选择部门" class="item-input short-input" clearable>
                       <el-option v-for="item in branchData" :key="item.value" :label="item.label" :value="item.value">
                       </el-option>
                     </el-select>
@@ -208,12 +208,23 @@ var vm = new Vue({
         }
       }
     }
+    // var validJob = function(rule,value,callback) {
+    //   if(value === '') {
+    //     return callback();
+    //   } else {
+    //     if (value === '其他' && vm.form.otherJob === '') {
+    //       return callback();
+    //     } else {
+    //       callback();
+    //     }
+    //   }
+    // }
     var validJob = function(rule,value,callback) {
       if(value === '') {
-        return callback();
+        return callback(new Error('职位不能为空'));
       } else {
-        if (value === '其他' && vm.form.otherJob === '') {
-          return callback();
+        if (value === '其他' && vmbid.form.otherJob === '') {
+          return callback(new Error('请输入职位'));
         } else {
           callback();
         }
@@ -278,7 +289,7 @@ var vm = new Vue({
         job: [
           {
             required: false,
-            validator: validJob
+            validator: validJob,
           }
         ]
       },

+ 21 - 2
src/web/staticres/frontRouter/pc/solution/js/pc-collect-solution-info.js

@@ -34,7 +34,7 @@ var temps = `
                   </el-form-item>
                 </div>
                 <div class="long-control" style="position: relative;">
-                  <el-form-item label="公司名称 :">
+                  <el-form-item label="公司名称 :" prop="companyName">
                     <el-input 
                     v-model.trim="form.companyName" 
                     data-long-input
@@ -49,7 +49,7 @@ var temps = `
                   </div>
                 </div>
                 <div class="long-control">
-                  <el-form-item label="职位 :">
+                  <el-form-item label="职位 :" prop="job">
                     <el-select v-model="form.job" placeholder="请选择职位" data-short-input clearable>
                       <el-option v-for="item in jobData" :key="item.value" :label="item.label" :value="item.value">
                       </el-option>
@@ -150,6 +150,18 @@ var vmSolution = new Vue({
         }
       }
     }
+    // 新增部门必填
+    var validBranch = function(rule,value,callback) {
+      if(value === '') {
+        return callback(new Error('部门不能为空'));
+      } else {
+        if (value === '其他' && vmbid.form.otherJob === '') {
+          return callback(new Error('请输入部门'));
+        } else {
+          callback();
+        }
+      }
+    }
     return {
       dialogTitleTop: '请留下您的信息,我们会尽快和您联系',
       dialogTitle: '',
@@ -201,6 +213,13 @@ var vmSolution = new Vue({
             required: true,
             validator: validJob
           }
+        ],
+        // 新增部门必填
+        branch: [
+          {
+            required: true,
+            validator: validBranch
+          }
         ]
       },
       showSearchResult: false,