From 9708d43789b5795598b84c6c895ad8c521ce3c9e Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 03 八月 2022 09:18:52 +0800
Subject: [PATCH] 对接
---
.env.development | 2 +-
vite.config.ts | 2 +-
src/views/goalManagement/IncentiveRecording/index.vue | 9 +++++++--
src/views/goalManagement/performanceAppraisal/index.vue | 27 +++++++++++++++++++++++----
src/views/goalManagement/targetDecompositionYear/component/Dailog.vue | 6 +++---
5 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/.env.development b/.env.development
index d94ce93..c1f8b28 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,6 @@
#VITE_API_URL = 'http://192.168.0.76:8009'
# VITE_API_URL = 'http://192.168.0.8:8008'
- VITE_API_URL = 'http://192.168.0.76:8010'
+ VITE_API_URL = 'http://192.168.0.76:8009'
# VITE_API_URL = 'http://192.168.0.10:8008'
# VITE_API_URL = 'http://192.168.0.62:8008'
diff --git a/src/views/goalManagement/IncentiveRecording/index.vue b/src/views/goalManagement/IncentiveRecording/index.vue
index 0a2f8d9..a2c6909 100644
--- a/src/views/goalManagement/IncentiveRecording/index.vue
+++ b/src/views/goalManagement/IncentiveRecording/index.vue
@@ -68,7 +68,7 @@
/>
</div>
<DailogAdd ref="openAdd" @navAddorUpdata="onAddorUpdata"></DailogAdd>
- <DailogSearchUser ref="openUser"></DailogSearchUser>
+ <DailogSearchUser ref="openUser" @SearchUser="userId"></DailogSearchUser>
</div>
</div>
</template>
@@ -87,7 +87,7 @@
pageSize: 10,
pageIndex: 1,
searchParams: {
- personId: '1', ////员工
+ personId: '', ////员工
},
});
// 重置
@@ -224,8 +224,13 @@
const openSearch=()=>{
openUser.value.openDailog()
}
+ const userId=(val:any)=>{
+ ruleForm.searchParams.personId=val.uid
+
+ }
return {
ruleForm,
+ userId,
resetForm,
listApi,
handleClick,
diff --git a/src/views/goalManagement/performanceAppraisal/index.vue b/src/views/goalManagement/performanceAppraisal/index.vue
index eb2da3c..9b38832 100644
--- a/src/views/goalManagement/performanceAppraisal/index.vue
+++ b/src/views/goalManagement/performanceAppraisal/index.vue
@@ -7,10 +7,7 @@
<el-row>
<el-col :span="4">
<el-form-item size="default">
- <el-select v-model="ruleForm.searchParams.examineDepartmentId" style="width: 100%" placeholder="请选择考核部门">
- <el-option label="Zone one" value="shanghai" />
- <el-option label="Zone two" value="beijing" />
- </el-select>
+ <el-tree-select v-model="ruleForm.searchParams.examineDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -318,6 +315,7 @@
};
onMounted(() => {
listApis();
+ department()
});
const onAddorUpdatas = () => {
listApis();
@@ -421,7 +419,28 @@
// });
});
};
+ //部门树
+ const department = () => {
+ goalManagementApi()
+ .getTreedepartment()
+ .then((res) => {
+ if (res.data.code == 200) {
+ data.value = res.data.data;
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ };
+ const propse = {
+ label: 'depName',
+ children: 'children',
+ value: 'depId',
+ };
+ const data = ref();
return {
+ department,
+ propse,
+ data,
activeName,
ruleForm,
resetForm,
diff --git a/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue b/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
index f49da8a..797b644 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
@@ -36,7 +36,7 @@
<el-button type="primary" size="default" @click="daiAdd" :disabled="disabled">新增</el-button>
</el-tab-pane>
</el-tabs>
- <el-table :data="form.targetDivideDetailList" style="width: 100%">
+ <el-table :data="formUp.targetDivideDetailList" style="width: 100%">
<el-table-column align="center" property="dutyDepartmentId" label="责任部门" width="180" />
<el-table-column align="center" property="value" label="考核指标" width="180" />
<el-table-column align="center" property="makerDepartmentId" label="制定人部门" />
@@ -110,8 +110,8 @@
delTargetDivideDetails: '', //要删除的目标指标分解ID,多个用逗号隔开
targetDivideDetailList: [], //目标指标分解列表
});
- const add = (e: any) => {
- formUp.targetDivideDetailList.push(e);
+ const add = (val: any) => {
+ formUp.targetDivideDetailList.push(val);
// let obj=JSON.parse(JSON.stringify(form.value))
};
// 新增
diff --git a/vite.config.ts b/vite.config.ts
index 506f200..ddc2da1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -28,7 +28,7 @@
open: env.VITE_OPEN,
proxy: {
'/gitee': {
- target: 'https://192.168.0.76:8010',
+ target: 'https://192.168.0.76:8009',
ws: true,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/gitee/, ''),
--
Gitblit v1.9.2