Merge pull request 'feat : 研发人员选择' (#663) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/663
This commit is contained in:
@@ -106,7 +106,7 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<user-picker :multiple="false" ref="userPicker" title="请选择研发人员" v-model:value="userList" @ok="selected"
|
<user-picker :multiple="false" ref="userPicker" title="请选择研发人员" v-model:value="userList" @ok="selected"
|
||||||
:setNullToSelectList="true"/>
|
:setNullToSelectList="true" :isResearch="true"/>
|
||||||
|
|
||||||
<div style="width:100%;text-align: center;padding: 10px">
|
<div style="width:100%;text-align: center;padding: 10px">
|
||||||
<el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
|
<el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ const props = defineProps({
|
|||||||
multiple: {
|
multiple: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
}
|
},
|
||||||
})
|
})
|
||||||
const chooseUser=()=>{
|
const chooseUser=()=>{
|
||||||
userPicker.value.showUserPicker()
|
userPicker.value.showUserPicker()
|
||||||
|
|||||||
@@ -96,7 +96,11 @@ const props = defineProps({
|
|||||||
checkMatrix: {
|
checkMatrix: {
|
||||||
default: false,
|
default: false,
|
||||||
type: Boolean
|
type: Boolean
|
||||||
}
|
},
|
||||||
|
isResearch: {
|
||||||
|
default: false,
|
||||||
|
type: Boolean
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const radio = ref(0);
|
const radio = ref(0);
|
||||||
let selectItem = reactive({
|
let selectItem = reactive({
|
||||||
@@ -140,7 +144,8 @@ watch(() => filterText.value, (newVal) => {
|
|||||||
const getList = () => {
|
const getList = () => {
|
||||||
let params = {
|
let params = {
|
||||||
chooseId: 0,
|
chooseId: 0,
|
||||||
chooseName: filterText.value
|
chooseName: filterText.value,
|
||||||
|
isResearch: props.isResearch
|
||||||
}
|
}
|
||||||
getMosrUser(params).then(res => {
|
getMosrUser(params).then(res => {
|
||||||
dataList.value = res.data;
|
dataList.value = res.data;
|
||||||
@@ -165,11 +170,13 @@ async function loadNode(node, resolve) {
|
|||||||
let params = {}
|
let params = {}
|
||||||
if (data.id) {
|
if (data.id) {
|
||||||
params = {
|
params = {
|
||||||
chooseId: data.id
|
chooseId: data.id,
|
||||||
|
isResearch: props.isResearch
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
params = {
|
params = {
|
||||||
chooseId: 0
|
chooseId: 0,
|
||||||
|
isResearch: props.isResearch
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let result = await getMosrUser(params).then(res => {
|
let result = await getMosrUser(params).then(res => {
|
||||||
|
|||||||
Reference in New Issue
Block a user