diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 4c584b29..d710b0a4 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -131,6 +131,14 @@ export default {
type: Number,
default: 0,
},
+ projectId: {
+ type: Number,
+ default: null,
+ },
+ chooseStageId: {
+ type: Number,
+ default: null,
+ },
},
setup(props, ctx) {
const state = reactive({
@@ -242,6 +250,7 @@ export default {
console.log("创建成功", res);
message.success("创建成功");
closeDrawer();
+ //渲染到学历路径列表
if (props.learn == 0)
apitaskadd
.addTask({
@@ -249,9 +258,9 @@ export default {
duration: 0,
flag: true,
name: obj.evaluationName,
- projectId: 28,
+ projectId: props.projectId,
projectTaskId: 0,
- stageId: 3,
+ stageId: props.chooseStageId,
type: 10,
})
.then((res) => {
@@ -265,6 +274,7 @@ export default {
.catch((err) => {
console.log(err);
});
+ //渲染到项目列表
else {
let editObj1 = {
chapterId: 36,
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index b33cbfa4..f7cfbcd0 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -46,6 +46,7 @@
@expand="expandTable"
:pagination="false"
:row-selection="rowSelection"
+ filterMultiple:false
/>
@@ -93,6 +94,14 @@ export default {
type: Number,
default: 0,
},
+ projectId: {
+ type: Number,
+ default: null,
+ },
+ chooseStageId: {
+ type: Number,
+ default: null,
+ },
},
setup(props, ctx) {
const state = reactive({
@@ -171,27 +180,35 @@ export default {
return columns;
};
const rowSelection = {
- onChange: (selectedRowKeys, selectedRows) => {
- console.log(
- `selectedRowKeys: ${selectedRowKeys}`,
- "selectedRows: ",
- selectedRows
- );
- },
- getCheckboxProps: (record) => ({
- // disabled: record.name === 'Disabled User',
- // // Column configuration not to be checked
- name: record.name,
- }),
+ type: 'radio',
+ // onChange: (selectedRowKeys, selectedRows) => {
+ // this.selectedRowKeys = selectedRowKeys
+ // if (selectedRows.length > 1) {
+ // //获取选中的数据的key
+ // var selectNumber = this.selectedRowKeys[1]
+ // //清空选中的key
+ // this.selectedRowKeys = []
+ // //选中的数据的key重新赋值给selectedRowKeys
+ // this.selectedRowKeys.push(selectNumber)
+ // }
+ // },
+ // getCheckboxProps: (record) => ({
+ // // disabled: record.name === 'Disabled User',
+ // // // Column configuration not to be checked
+ // name: record.name,
+ // }),
+ onSelect: ( selectedRows, selected,selectedRowKeys) => {
+ console.log('selectedRowKeys',selectedRowKeys,'selectedRows', selectedRows, 'selected', selected)
+ }
};
const getTableDate = (tableData) => {
let data = tableData;
let array = [];
data.map((value, index) => {
- console.log("123", value);
+ // console.log("123", value);
let obj = {
- id: value.routerId,
+ // id: value.routerId,
key: index,
num: value.essayQuestionVoList.length,
name: value.assessmentName ? value.assessmentName : "-",
@@ -218,7 +235,7 @@ export default {
.queryAssessmentDetailList(obj)
.then((res) => {
if (res.status === 200) {
- // console.log("获取路径列表数据", res.data.data);
+ console.log("获取全部评估信息", res.data.data);
let arr = res.data.data.rows;
if (
arr.length === 0 &&
@@ -271,9 +288,9 @@ export default {
duration: 0,
flag: true,
name: obj.appraiseName,
- projectId: 28,
+ projectId: props.projectId,
projectTaskId: 0,
- stageId: 3,
+ stageId: props.chooseStageId,
type: 11,
})
.then((res) => {
diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index cbc1f9eb..eb13065c 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -156,6 +156,14 @@ export default {
type: Number,
default: 0,
},
+ projectId: {
+ type: Number,
+ default: null,
+ },
+ chooseStageId: {
+ type: Number,
+ default: null,
+ },
},
setup(props, ctx) {
const state = reactive({
@@ -240,9 +248,9 @@ export default {
duration: 0,
flag: true,
name: obj.voteName,
- projectId: 28,
+ projectId: props.projectId,
projectTaskId: 0,
- stageId: 3,
+ stageId: props.chooseStageId,
type: 12,
})
.then((res) => {
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index abc1b0b0..5196f740 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -243,6 +243,8 @@
@@ -260,6 +262,8 @@