From c60ce7e35c2c4e2f4c8b2aa24aab839a931f3a62 Mon Sep 17 00:00:00 2001 From: shj <1790240199@qq.com> Date: 星期四, 11 八月 2022 15:11:14 +0800 Subject: [PATCH] 对接 --- src/views/goalManagement/IncentiveRecording/index.vue | 4 ++-- src/views/goalManagement/performanceAppraisal/index.vue | 10 +++++----- src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue | 8 ++++++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue b/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue index d5fed46..c0a5906 100644 --- a/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue +++ b/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue @@ -19,7 +19,7 @@ ></el-input> </el-form-item> </el-col> - <el-col :span="11" :offset="2" > + <el-col :span="11" :offset="2"> <el-form-item label="奖惩类型" size="default"> <el-select v-model="form.standardType" disabled size="default" style="width: 100%" placeholder="请选择"> <el-option label="奖励" :value="1" /> @@ -29,7 +29,7 @@ </el-col> </el-row> <el-row> - <el-col :span="24" > + <el-col :span="24"> <el-form-item label="奖惩内容" size="default"> <el-input disabled v-model="form.content" placeholder="请填写奖惩内容" /> </el-form-item> @@ -102,6 +102,10 @@ // 提交 const submitForm = () => { dialogVisible.value = false; + delete form.value.standardType; + delete form.value.content; + delete form.value.reason; + delete form.value.rewardPunishmentStandardName goalManagementApi() .getrewardPunishmentAddOrUpdate(form.value) .then((res) => { diff --git a/src/views/goalManagement/IncentiveRecording/index.vue b/src/views/goalManagement/IncentiveRecording/index.vue index 6cfe139..e1dd080 100644 --- a/src/views/goalManagement/IncentiveRecording/index.vue +++ b/src/views/goalManagement/IncentiveRecording/index.vue @@ -28,7 +28,7 @@ <div class="btns"> <div> <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button> - <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> + <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> --> <el-button size="default" :disabled="danger" type="danger" :icon="Delete" plain @click="onDeleteAll">删除 </el-button> </div> <div> @@ -45,7 +45,7 @@ <span v-if="scope.row.standardType == 2">惩罚</span> </template> </el-table-column> - <el-table-column property="personId" align="center" label="被奖惩者" sortable /> + <el-table-column property="personName" align="center" label="被奖惩者" sortable /> <el-table-column property="content" label="奖惩内容" align="center" sortable show-overflow-tooltip /> <el-table-column property="reason" label="奖惩依据" align="center" sortable show-overflow-tooltip /> <el-table-column label="操作" align="center" sortable show-overflow-tooltip> diff --git a/src/views/goalManagement/performanceAppraisal/index.vue b/src/views/goalManagement/performanceAppraisal/index.vue index a1c9637..0f3e9de 100644 --- a/src/views/goalManagement/performanceAppraisal/index.vue +++ b/src/views/goalManagement/performanceAppraisal/index.vue @@ -21,7 +21,7 @@ <div class="btns"> <div> <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button> - <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> + <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> --> <el-button size="default" :disabled="danger" type="danger" plain :icon="Delete" @click="onDeleteAll">删除</el-button> </div> </div> @@ -40,7 +40,7 @@ </el-table-column> <el-table-column property="examineDate" align="center" :formatter="timeDate" label="考核日期" sortable /> <el-table-column property="examineDepartmentName" align="center" label="考核部门" sortable /> - <el-table-column property="examinePersonId" label="考核人" align="center" sortable show-overflow-tooltip /> + <el-table-column property="examinePersonName" label="考核人" align="center" sortable show-overflow-tooltip /> <el-table-column property="beExaminedDepartmentName" label="被考核部门" align="center" sortable show-overflow-tooltip /> <el-table-column property="examineTotalNumber" label="总分" align="center" sortable show-overflow-tooltip /> <el-table-column property="numberDetailJson.number" label="考核结果" align="center" sortable show-overflow-tooltip /> @@ -84,7 +84,7 @@ <div class="btns"> <div> <el-button size="default" type="primary" :icon="Plus" @click="openDs('新建')">新建</el-button> - <el-button size="default" :disabled="warnings" type="warning" plain :icon="EditPen">修改</el-button> + <!-- <el-button size="default" :disabled="warnings" type="warning" plain :icon="EditPen">修改</el-button> --> <el-button size="default" :disabled="dangers" type="danger" plain :icon="Delete" @click="onDeleteAlls">删除</el-button> </div> </div> @@ -105,8 +105,8 @@ </el-table-column> <el-table-column label="标准标题" property="title" align="center" sortable /> <el-table-column property="applyRange" align="center" label="适用范围" sortable /> - <el-table-column property="setPersonId" label="设定人" align="center" sortable show-overflow-tooltip /> - <el-table-column property="setPersonDepartmentId" label="设定人部门" align="center" sortable show-overflow-tooltip /> + <el-table-column property="setPersonName" label="设定人" align="center" sortable show-overflow-tooltip /> + <el-table-column property="setPersonDepartmentName" label="设定人部门" align="center" sortable show-overflow-tooltip /> <el-table-column property="setTimem" label="设定日期" align="center" :formatter="timeDate" sortable show-overflow-tooltip /> <el-table-column property="templateCode" label="模板分类编码" align="center" sortable show-overflow-tooltip /> <el-table-column property="acceptanceNumber" label="合格分数" align="center" sortable show-overflow-tooltip /> -- Gitblit v1.9.2