From e0e5c40ca2cc5ad69fd69c6a372c9774ac88f352 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期五, 05 八月 2022 15:07:02 +0800
Subject: [PATCH] 对接
---
src/components/DailogSearch/DailogSearch.vue | 8 ++--
src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue | 1
src/views/goalManagement/performanceAppraisal/component/DailogSearch.vue | 44 ++++++++++++++++-----
src/components/DailogSearchUser/index.vue | 35 +++++++++++------
src/views/goalManagement/performanceAppraisal/component/DailogAq.vue | 13 +++++-
5 files changed, 70 insertions(+), 31 deletions(-)
diff --git a/src/components/DailogSearch/DailogSearch.vue b/src/components/DailogSearch/DailogSearch.vue
index eda01ac..9a993bc 100644
--- a/src/components/DailogSearch/DailogSearch.vue
+++ b/src/components/DailogSearch/DailogSearch.vue
@@ -24,11 +24,11 @@
</el-row>
</el-form>
<el-button size="default" :icon="Delete" @click="clear">清除选择</el-button>
- <el-table :data="tableData" style="width: 100%; margin-top: 20px" @cell-click="radio">
+ <el-table :data="tableData" style="width: 100%; margin-top: 20px">
<el-table-column align="center">
<template #default="scope">
<el-radio-group v-model="radio1">
- <el-radio :label="scope.row.id" size="large">{{ null }}</el-radio>
+ <el-radio :label="scope.row.id" @click="radio(scope.row)" size="large">{{ null }}</el-radio>
</el-radio-group>
</template>
</el-table-column>
@@ -139,8 +139,8 @@
radio1.value = '';
};
const radio1 = ref('');
- const radio = (event: any) => {
- dynamicTags.value[0] = event;
+ const radio = (data: any) => {
+ dynamicTags.value[0] = data;
};
const clear=()=>{
dynamicTags.value=['']
diff --git a/src/components/DailogSearchUser/index.vue b/src/components/DailogSearchUser/index.vue
index 1632e6a..857c1cd 100644
--- a/src/components/DailogSearchUser/index.vue
+++ b/src/components/DailogSearchUser/index.vue
@@ -26,11 +26,12 @@
</el-col>
</el-row>
</el-form>
- <el-table :data="tableData" style="width: 100%; margin-top: 20px" @cell-click="radio">
- <el-table-column align="center">
+ <el-table :data="tableData" style="width: 100%; margin-top: 20px" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" v-if="types==0"/>
+ <el-table-column align="center" v-if="types!=0">
<template #default="scope">
<el-radio-group v-model="radio1">
- <el-radio :label="scope.row.uid" size="large">{{ null }}</el-radio>
+ <el-radio :label="scope.row.uid" @click="radio(scope.row)" size="large">{{ null }}</el-radio>
</el-radio-group>
</template>
</el-table-column>
@@ -44,9 +45,9 @@
style="padding: 20px 0; border-bottom: 1px solid #dedede"
v-model:currentPage="currentPage4"
v-model:page-size="pageSize4"
- :page-sizes="[100, 200, 300, 400]"
+ :page-sizes="[10, 20, 30, 40]"
layout="total, sizes, prev, pager, next, jumper"
- :total="400"
+ :total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
@@ -124,6 +125,7 @@
.then((res) => {
if (res.data.code == 200) {
tableData.value=res.data.data
+ total.value=tableData.value.length
}else{
ElMessage.error(res.data.msg);
}
@@ -139,13 +141,16 @@
});
// 表格
const tableData = ref();
- const currentPage4 = ref();
- const pageSize4 = ref();
+ const currentPage4 = ref(1);
+ const pageSize4 = ref(10);
+ const total=ref()
const handleSizeChange = (val: number) => {
- console.log(`${val} items per page`);
+ // console.log(`${val} items per page`);
+ pageSize4.value=val
};
const handleCurrentChange = (val: number) => {
- console.log(`current page: ${val}`);
+ // console.log(`current page: ${val}`);
+ currentPage4.value=val
};
// 右方点击添加后显示标签
const dynamicTags = ref(['']);
@@ -154,14 +159,16 @@
radio1.value = '';
};
const radio1 = ref('');
- const radio = (event: any) => {
- dynamicTags.value[0] = event;
+ const radio = (data: any) => {
+ dynamicTags.value[0] = data;
};
+ const handleSelectionChange = (val:any) => {
+ dynamicTags.value=val
+}
const types=ref()
// 开启弹窗
const dialogVisible = ref(false);
const openDailog = (type:any) => {
- console.log(type)
types.value=type
dialogVisible.value = true;
};
@@ -175,10 +182,11 @@
}
};
const submitForm = () => {
- emit('SearchUser', dynamicTags.value);
+ emit('SearchUser', dynamicTags.value[0],types.value);
dialogVisible.value = false;
};
return {
+ total,
types,
filterText,
treeRef,
@@ -195,6 +203,7 @@
pageSize4,
handleSizeChange,
handleCurrentChange,
+ handleSelectionChange,
radio1,
dynamicTags,
handleClose,
diff --git a/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue b/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
index d7f272c..af27844 100644
--- a/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
+++ b/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
@@ -65,7 +65,7 @@
<el-col :span="11" :offset="2">
<el-form-item label="被考核人" size="default" prop="beExaminedPersonName">
<el-input v-model="form.beExaminedPersonName">
- <template #append> <el-button :icon="Search" @click="daiInpt(2)" /></template>
+ <template #append> <el-button :icon="Search" @click="daiInpt(0)" /></template>
</el-input>
</el-form-item>
</el-col>
@@ -280,8 +280,15 @@
form.value.examinePersonId = val.uid;
form.value.examinePersonName = val.realName;
} else if (type == 2) {
- form.value.beExaminedPersonId = val.uid;
- form.value.beExaminedPersonName = val.realName;
+ let uid=[]
+ let realName=[]
+ for(let i=0;i<val.length;i++){
+ uid.push(val[i].uid)
+ realName.push(val[i].realName)
+ }
+ form.value.beExaminedPersonId = uid.toString();
+ form.value.beExaminedPersonName =realName.toString();
+ console.log(form.value.beExaminedPersonId,form.value.beExaminedPersonName)
}
};
//全屏
diff --git a/src/views/goalManagement/performanceAppraisal/component/DailogSearch.vue b/src/views/goalManagement/performanceAppraisal/component/DailogSearch.vue
index bb63dd6..01d64c1 100644
--- a/src/views/goalManagement/performanceAppraisal/component/DailogSearch.vue
+++ b/src/views/goalManagement/performanceAppraisal/component/DailogSearch.vue
@@ -18,18 +18,21 @@
<el-col :span="6" :offset="1">
<el-form-item>
<el-button size="default" type="primary" @click="listApi()">查询</el-button>
- <el-button size="default" @click="resetForm(ruleFormRef)">重置</el-button>
+ <el-button size="default" @click="reset">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
- <el-button size="default" :icon="Delete">清除选择</el-button>
- <el-table :data="tableData" style="width: 100%; margin-top: 20px">
- <el-table-column align="center" width="50px" type="selection"></el-table-column>
- <el-table-column align="center" prop="date" label="标准标题" />
- <!-- <el-table-column align="center" prop="name" label="目标指标编号" width="180" />
- <el-table-column align="center" prop="address" label="年度" />
- <el-table-column align="center" prop="address" label="指标值" /> -->
+ <el-button size="default" :icon="Delete" @click="clear">清除选择</el-button>
+ <el-table :data="tableData" style="width: 100%; margin-top: 20px" @cell-click="radio">
+ <el-table-column align="center" width="70px">
+ <template #default="scope">
+ <el-radio-group v-model="radio1">
+ <el-radio :label="scope.row.id" size="large">{{ null }}</el-radio>
+ </el-radio-group>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="title" label="标准标题" />
</el-table>
<el-pagination
style="padding: 20px 0; border-bottom: 1px solid #dedede"
@@ -43,6 +46,7 @@
/>
</el-col>
<el-col :span="7">
+ <div v-if="dynamicTags[0]==''?false:true">
<el-tag
v-for="tag in dynamicTags"
:key="tag"
@@ -52,8 +56,9 @@
:disable-transitions="false"
@close="handleClose(tag)"
>
- {{ tag }}
+ {{ tag.title }}
</el-tag>
+ </div>
</el-col>
</el-row>
<template #footer>
@@ -98,7 +103,11 @@
}
});
};
-
+ // 重置
+ const reset=()=>{
+ ruleForm.searchParams.title=""
+ listApi()
+ }
const tableData = ref();
const currentPage4 = ref();
const pageSize4 = ref();
@@ -114,10 +123,19 @@
listApi();
};
// 右方点击添加后显示标签
- const dynamicTags = ref(['Tag 1', 'Tag 2', 'Tag 3']);
+ const dynamicTags = ref(['']);
const handleClose = (tag: string) => {
dynamicTags.value.splice(dynamicTags.value.indexOf(tag), 1);
+ radio1.value = '';
};
+ const radio1 = ref('');
+ const radio = (event: any) => {
+ dynamicTags.value[0] = event;
+ };
+ const clear=()=>{
+ dynamicTags.value=['']
+ radio1.value=""
+ }
//全屏
const full = ref(false);
const toggleFullscreen = () => {
@@ -128,6 +146,7 @@
}
};
return {
+ reset,
dialogVisible,
listApi,
openDailog,
@@ -143,6 +162,9 @@
Delete,
full,
toggleFullscreen,
+ radio1,
+ radio,
+ clear,
FullScreen,
};
},
diff --git a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
index b74644b..9786b4e 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
@@ -184,6 +184,7 @@
};
const data = ref();
const onUser = (e: any) => {
+ console.log(e)
form.value.commitPersonId = e.uid;
form.value.commitPersonName = e.realName;
};
--
Gitblit v1.9.2