From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/goalManagement/performanceAppraisal/component/DailogAq.vue | 180 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 132 insertions(+), 48 deletions(-)
diff --git a/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue b/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
index cc51dcd..b192f25 100644
--- a/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
+++ b/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
@@ -10,7 +10,14 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="考核日期" size="default" prop="examineDate">
- <el-date-picker v-model="form.examineDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
+ <el-date-picker
+ v-model="form.examineDate"
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
+ placeholder="请选择"
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -72,30 +79,16 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="考核模板">
- <el-upload
- v-model:file-list="fileList"
- class="upload-demo"
- action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
- multiple
- :on-preview="handlePreview"
- :on-remove="handleRemove"
- :before-remove="beforeRemove"
- :limit="3"
- :on-exceed="handleExceed"
- >
- <el-button type="primary">点击上传</el-button>
- <template #tip>
- <div class="el-upload__tip">添加相关附件</div>
- </template>
- </el-upload>
+ <el-form-item label="附件">
+ <uploaderFile :fileList="fileList" :systemName="'GOAL_MANAGE'" :disabled="disabled"
+ @successUploader="successUploader" @deleteFile="deleteFile"></uploaderFile>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="考核模板" size="default" prop="examineTemplateName">
- <el-input disabled v-model="form.examineTemplateName">
+ <el-input v-model="form.examineTemplateName">
<template #append> <el-button :icon="Search" @click="daiAdd" /></template>
</el-input>
</el-form-item>
@@ -112,12 +105,12 @@
<!-- <el-button type="primary" size="default" @click="daiAdd">新增</el-button> -->
</el-tab-pane>
</el-tabs>
- <el-table :data="tableData" style="width: 100%">
- <el-table-column align="center" prop="date" label="考核项目" />
- <el-table-column align="center" prop="name" label="考核内容" />
+ <el-table :data="form.numberDetailJson" style="width: 100%">
+ <el-table-column align="center" prop="itemDetail" label="考核项目" />
+ <el-table-column align="center" prop="content" label="考核内容" />
<el-table-column align="center" label="考核分数">
<template #default="scope">
- <el-input v-model="scope.row.address" type="textarea"> </el-input>
+ <el-input @blur="numberC" v-model.number="scope.row.number"> </el-input>
</template>
</el-table-column>
<!-- <el-table-column align="center" prop="address" label="制定日期" />
@@ -135,7 +128,7 @@
</span>
</template>
</el-dialog>
- <DailogSearch ref="Show"></DailogSearch>
+ <DailogSearch ref="Show" @typeDome="onType"></DailogSearch>
<DailogSearchUser ref="Shows" @SearchUser="userId"></DailogSearchUser>
</template>
<script lang="ts">
@@ -147,8 +140,9 @@
import { goalManagementApi } from '/@/api/goalManagement';
import type { UploadProps, UploadUserFile } from 'element-plus';
import type { FormInstance, FormRules } from 'element-plus';
+import uploaderFile from '/@/components/uploaderFile/index.vue';
export default defineComponent({
- components: { DailogSearchUser, DailogSearch },
+ components: { DailogSearchUser, DailogSearch,uploaderFile },
setup(props, { emit }) {
const dialogVisible = ref<boolean>(false);
const ruleFormRef = ref<FormInstance>();
@@ -162,22 +156,25 @@
examineDepartmentName: '',
examinePersonId: '', ////考核人ID/外键
examinePersonName: '',
- examineTemplateId: 1, ////绩效考核模板ID/外键
+ examineTemplateId: '', ////绩效考核模板ID/外键
examineTemplateName: '',
examineTotalNumber: '', ////总分
- extraFile: '9', //责任书附件
+ acceptanceNumber: '', ///合格分数
+ extraFile: '', //责任书附件
itemDetail: '', ////考核项目
memo: '', ////备注信息
- numberDetailJson: '[{"id":"123","number":"123"}]', ////各个考核项目的具体得分，json格式。形式为：[{“id”:"123","number":"123"}]
+ numberDetailJson: [], ////各个考核项目的具体得分，json格式。形式为：[{“id”:"123","number":"123"}]
title: '', ////考核标题
});
const titles = ref();
+ const titleT = ref();
const disabled = ref(false);
// 打开弹窗
const openDailog = (title: string, value: any, id: number) => {
department();
dialogVisible.value = true;
titles.value = `${title}安全考核管理`;
+ titleT.value=title
disabled.value = title == '查看' ? true : false;
if (title == '查看' || title == '修改')
goalManagementApi()
@@ -185,10 +182,69 @@
.then((res) => {
if (res.data.code == 200) {
form.value = res.data.data;
+ form.value.examineDate = timeC(form.value.examineDate);
+ form.value.numberDetailJson = form.value.currentExamineDtoList;
+
+
+ if(res.data.data.extraFile!=null&&res.data.data.extraFile!=''){
+ var extraFileList = res.data.data.extraFile.split(',')
+ for(var a = 0;a<extraFileList.length;a++){
+ fileList.value.push(
+ {
+ name:extraFileList[a]
+ }
+ )
+ }
+ }else {
+ fileList.value = []
+ }
+
+ // fileList.value = (res.data.data.fileList?res.data.data.fileList:[])
} else {
ElMessage.error(res.data.msg);
}
});
+ };
+ // 上传成功组装数据
+ const successUploader = (list) =>{
+ console.log('successUploader',list)
+ fileList.value = list
+ var formFileList = ''
+ for(var a = 0;a<fileList.value.length;a++){
+ if(a==fileList.value.length-1){
+ formFileList+=fileList.value[a].name
+ }else {
+ formFileList+=fileList.value[a].name+','
+ }
+ }
+ form.value.extraFile = formFileList
+ }
+ const deleteFile = (list) =>{
+ console.log('deleteFile',list)
+ fileList.value = list
+ const formFileList = ''
+ for(var a = 0;a<fileList.value.length;a++){
+ if(a==fileList.value.length-1){
+ formFileList.value+=fileList.value[a].name
+ }else {
+ formFileList.value+=fileList.value[a].name+','
+ }
+ }
+ form.value.extraFile = formFileList
+ }
+
+ const timeC = (timestamp: any) => {
+ let a = new Date(timestamp).getTime();
+ const date = new Date(a);
+ const Y = date.getFullYear() + '-';
+ const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+ const D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
+ const h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+ const m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+ const s = date.getSeconds(); // 秒
+ const dateString = Y + M + D + h + m + `:${s}`;
+ // console.log('dateString', dateString); // > dateString 2021-07-06 14:23
+ return dateString;
};
// 验证
const rules = reactive<FormRules>({
@@ -204,12 +260,42 @@
examineTemplateName: [{ required: true, message: '考核模板不能为空', trigger: 'blur' }],
memo: [],
});
+ // 接收
+ const onType = (data: any, val: any) => {
+ form.value.examineTotalNumber = '';
+ form.value.examineTemplateId = data.id;
+ form.value.examineTemplateName = data.title;
+ form.value.acceptanceNumber = data.acceptanceNumber;
+ form.value.numberDetailJson = val.examineItemList;
+ };
+ const numberC = () => {
+ let arr = 0;
+ for (let i = 0; i < form.value.numberDetailJson.length; i++) {
+ if (form.value.numberDetailJson[i].number != undefined) {
+ arr = parseInt(arr) + parseInt(form.value.numberDetailJson[i].number);
+ } else {
+ arr = parseInt(arr) + 0;
+ }
+ }
+ form.value.examineTotalNumber = arr;
+ };
// 提交
const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return;
await formEl.validate((valid, fields) => {
if (valid) {
+ if(titleT.value=='新建'){
+ delete form.value.id
+ }
dialogVisible.value = false;
+ let arr = [];
+ for (let i = 0; i < form.value.numberDetailJson.length; i++) {
+ arr.push({
+ id: form.value.numberDetailJson[i].id,
+ number: form.value.numberDetailJson[i].number,
+ });
+ }
+ form.value.numberDetailJson = JSON.stringify(arr);
goalManagementApi()
.getexamineMngAddOrUpdate(form.value)
.then((res) => {
@@ -234,10 +320,11 @@
dialogVisible.value = false;
formEl.resetFields();
};
- const handleClose=(formEl: FormInstance | undefined)=>{
+ const handleClose = (formEl: FormInstance | undefined) => {
if (!formEl) return;
formEl.resetFields();
- }
+ fileList.value=[]
+ };
const activeName = ref('1');
// 新增弹窗
const Show = ref();
@@ -250,16 +337,7 @@
Shows.value.openDailog(type);
};
// 点击上传
- const fileList = ref<UploadUserFile[]>([
- {
- name: 'element-plus-logo.svg',
- url: 'https://element-plus.org/images/element-plus-logo.svg',
- },
- {
- name: 'element-plus-logo2.svg',
- url: 'https://element-plus.org/images/element-plus-logo.svg',
- },
- ]);
+ const fileList = ref<UploadUserFile[]>([]);
const handleRemove: UploadProps['onRemove'] = (file, uploadFiles) => {
console.log(file, uploadFiles);
@@ -284,15 +362,15 @@
form.value.examinePersonId = val.uid;
form.value.examinePersonName = val.realName;
} else if (type == 0) {
- let uid=[]
- let realName=[]
- for(let i=0;i<val.length;i++){
- uid.push(val[i].uid)
- realName.push(val[i].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)
+ form.value.beExaminedPersonName = realName.toString();
+ console.log(form.value.beExaminedPersonId, form.value.beExaminedPersonName);
}
};
//全屏
@@ -330,7 +408,11 @@
console.log(form.value);
};
return {
+ titleT,
rules,
+ timeC,
+ numberC,
+ onType,
handleClose,
nameData1,
nameData2,
@@ -360,6 +442,8 @@
full,
toggleFullscreen,
FullScreen,
+ successUploader,
+ deleteFile
};
},
});
@@ -368,4 +452,4 @@
.el-row {
padding: 0 0 20px 0;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2