From ba5f88d21cc6efc472139c1000e3f892ebcb92ae Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 19 Aug 2024 11:04:57 +0800
Subject: [PATCH] biaodan

---
 src/mixin/formMixin.js                    | 35 ++++++++++++++++-------
 src/views/course/components/applyForm.vue | 18 ++++++++----
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/mixin/formMixin.js b/src/mixin/formMixin.js
index 100d182..6597fd9 100644
--- a/src/mixin/formMixin.js
+++ b/src/mixin/formMixin.js
@@ -57,8 +57,8 @@ export default {
         name: '企业性质',
         field: 'company_type',
         rule: '',
-        edit_input: "text",
-        help: '可选择是否需要学员填写',
+        edit_input: "radio",
+        help: '请选择企业性质',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
@@ -67,8 +67,8 @@ export default {
         name: '所在区域',
         field: 'company_area',
         rule: '',
-        edit_input: "text",
-        help: '可选择是否需要学员填写',
+        edit_input: "radio",
+        help: '请选择所在区域',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
@@ -77,8 +77,8 @@ export default {
         name: '所属行业',
         field: 'company_industry',
         rule: '',
-        edit_input: "text",
-        help: '可选择是否需要学员填写',
+        edit_input: "radio",
+        help: '请选择所属行业',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
@@ -87,8 +87,8 @@ export default {
         name: '人才类型',
         field: 'type',
         rule: '',
-        edit_input: "text",
-        help: '可选择是否需要学员填写',
+        edit_input: "radio",
+        help: '请选择人才类型',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
@@ -97,8 +97,8 @@ export default {
         name: '学历',
         field: 'education',
         rule: '',
-        edit_input: "text",
-        help: '可选择是否需要学员填写',
+        edit_input: "radio",
+        help: '请选择学历',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
@@ -126,6 +126,7 @@ export default {
       getparameter({
         number:number
       }).then(res=>{
+        // 获取数据字典插入到 select中
         res.map(item=>{
           for(var k in this.formSelect){
             if(item.number===k){
@@ -133,6 +134,20 @@ export default {
             }
           }
         })
+        // 数据插入到 selectFormList 的select_item中{key:'',value:''}
+        this.selectFormList.map(sform=>{
+          for(var k in this.formSelect){
+            if(sform.field===k){
+              this.formSelect[k].map(kf=>{
+                sform.select_item.push({
+                  key:kf.value,
+                  value:kf.value
+                })
+              })
+            }
+          }
+        })
+        console.log("this.selectFormList123",this.selectFormList)
       })
     }
   },
diff --git a/src/views/course/components/applyForm.vue b/src/views/course/components/applyForm.vue
index a0302ca..4750123 100644
--- a/src/views/course/components/applyForm.vue
+++ b/src/views/course/components/applyForm.vue
@@ -109,7 +109,6 @@
         splitR: 0.7,
         selectedForm: {},
         selectedIndex: 0,
-        canSelectForm: [] // 可选填字段，比较接口中是否有 并把id这些赋给mixins中的选填
       }
     },
     created() {
@@ -137,8 +136,9 @@
           }],
           ...this.select
         })
-        this.formList = res.data
-        this.updateObjects(this.selectFormList, this.formList)
+        this.formList = res.data
+          this.updateObjects(this.selectFormList, this.formList)
+
         console.log("this.selectFormList", this.selectFormList, this.formList)
 
       },
@@ -249,9 +249,17 @@
       dialogVisible(newval) {
         if (newval) {
           this.getFormList()
-          console.log("this.course_id", this.course_id, this.canSelectForm)
         } else {
-          this.course_id = ''
+          this.course_id = ''
+          this.selectFormList.map(item=>{
+            item.is_open = false
+            if(item.id){
+              item.id = ''
+            }
+            if(item.course_id){
+              item.course_id = ''
+            }
+          })
           this.$emit("refresh")
         }
       }