Commit fa609b49 authored by wangxl's avatar wangxl

555

parent b1cef27e
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<a-form-model-item prop="spec"> <a-form-model-item prop="spec">
<!-- <para-multi-select :width="180" v-model="formData.spec" :typeId="57" /> -->
<cascader-select v-model="formData.spec" /> <cascader-select v-model="formData.spec" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
......
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
<div>专业</div> <div>专业</div>
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<a-form-model-item ref="spec" prop="spec" :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }"> <a-form-model-item ref="spec" prop="spec">
<para-multi-select v-model="formData.spec" :typeId="57" /> <cascader-select v-model="formData.spec" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -87,11 +87,12 @@ import { isEmptyParams, getCardInfo } from "@/views/utils/common" ...@@ -87,11 +87,12 @@ import { isEmptyParams, getCardInfo } from "@/views/utils/common"
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import moment from 'moment' import moment from 'moment'
import unitTreeSelect from '@/views/components/common/unitTreeSelect' import unitTreeSelect from '@/views/components/common/unitTreeSelect'
import cascaderSelect from '@/views/components/common/cascaderSelect'
export default { export default {
name: "personEdit", name: "personEdit",
components: { components: {
unitTreeSelect unitTreeSelect,cascaderSelect
}, },
data () { data () {
return { return {
......
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
<div class="required">专业</div> <div class="required">专业</div>
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<a-form-model-item ref="spec" prop="spec" :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }"> <a-form-model-item ref="spec" prop="spec" >
<para-multi-select v-model="formData.spec" :typeId="57" /> <cascader-select v-model="formData.spec" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -77,12 +77,13 @@ ...@@ -77,12 +77,13 @@
import { isEmptyParams, getCardInfo } from "@/views/utils/common" import { isEmptyParams, getCardInfo } from "@/views/utils/common"
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import moment from 'moment' import moment from 'moment'
import cascaderSelect from '@/views/components/common/cascaderSelect'
export default { export default {
name: "personEdit", name: "personEdit",
components: { components: {
cascaderSelect
}, },
data () { data () {
return { return {
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<div class="special-middle"> <div class="special-middle">
<div> <div>
<a-form-model-item :prop="'members.' + index + '.spec'" :rules="{required: true,message: '*',trigger: 'change',}"> <a-form-model-item :prop="'members.' + index + '.spec'" :rules="{required: true,message: '*',trigger: 'change',}">
<para-multi-select v-model="item.spec" :width="120" :typeId="57" /> <cascader-select v-model="item.spec" />
</a-form-model-item> </a-form-model-item>
</div> </div>
</div> </div>
...@@ -154,12 +154,15 @@ ...@@ -154,12 +154,15 @@
//用法 <proj-group-member :members.sync="formData.members" /> //用法 <proj-group-member :members.sync="formData.members" />
import { checkIdentitytionId } from "@/views/utils/common" import { checkIdentitytionId } from "@/views/utils/common"
import cascaderSelect from '@/views/components/common/cascaderSelect'
const Model = { name: null, certId: null, title: null, education: null, degree: null, spec: null, workUnit: null } const Model = { name: null, certId: null, title: null, education: null, degree: null, spec: null, workUnit: null }
export default { export default {
name: 'ProjGroupMember', name: 'ProjGroupMember',
components: {
cascaderSelect
},
data () { data () {
return { return {
...@@ -172,9 +175,6 @@ export default { ...@@ -172,9 +175,6 @@ export default {
return [] return []
} }
}, },
},
components: {
}, },
created () { created () {
}, },
......
...@@ -596,7 +596,7 @@ ...@@ -596,7 +596,7 @@
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<a-form-model-item prop="knowledgeId"> <a-form-model-item prop="knowledgeId">
<para-multi-select v-model="formData.knowledgeId" :typeId="57" /> <cascader-select v-model="item.spec" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
......
...@@ -312,7 +312,6 @@ ...@@ -312,7 +312,6 @@
<a-col :span="20"> <a-col :span="20">
<a-form-model-item prop="knowledgeId"> <a-form-model-item prop="knowledgeId">
<cascader-select v-model="formData.knowledgeId" /> <cascader-select v-model="formData.knowledgeId" />
<!-- <para-multi-select v-model="formData.knowledgeId" :typeId="57" /> -->
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment