From a831b79d695473619f44c42836c05bef7cef44c2 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 11 八月 2022 19:00:24 +0800
Subject: [PATCH] 对接
---
src/views/goalManagement/targetSettings/index.vue | 1
src/views/goalManagement/performanceAppraisal/index.vue | 14 +-
src/views/goalManagement/targetDecompositionYear/component/Dailog.vue | 2
src/views/goalManagement/TargetBook/component/DailogSearch.vue | 16 +-
src/views/goalManagement/TargetBook/index.vue | 11 +
src/views/goalManagement/IncentiveRecording/index.vue | 7 +
src/views/goalManagement/Incentivestandard/index.vue | 2
src/views/goalManagement/targetDecompositionYear/index.vue | 1
src/views/goalManagement/performanceAppraisal/component/DailogSearch.vue | 29 ++++-
src/views/goalManagement/TargetBook/component/DailogAdd.vue | 29 +++--
src/views/goalManagement/targetSettings/component/dailogAdd.vue | 35 +++++-
src/views/goalManagement/performanceAppraisal/component/DailogKh.vue | 2
src/views/goalManagement/performanceAppraisal/component/DailogAq.vue | 100 ++++++++++++++-----
src/views/goalManagement/targetDecompositionMonth/index.vue | 1
14 files changed, 181 insertions(+), 69 deletions(-)
diff --git a/src/views/goalManagement/IncentiveRecording/index.vue b/src/views/goalManagement/IncentiveRecording/index.vue
index e1dd080..a7a3e5b 100644
--- a/src/views/goalManagement/IncentiveRecording/index.vue
+++ b/src/views/goalManagement/IncentiveRecording/index.vue
@@ -4,7 +4,7 @@
<el-row>
<el-col :span="4">
<el-form-item size="default">
- <el-input v-model="ruleForm.searchParams.personName" placeholder="请选择被奖惩者">
+ <el-input v-model="personName" placeholder="请选择被奖惩者">
<template #append>
<el-button :icon="Search" @click="openSearch" />
</template>
@@ -92,8 +92,10 @@
},
});
// 重置
+ const personName=ref()
const resetForm = () => {
ruleForm.searchParams.personId = '';
+ personName.value = '';
listApi();
};
const listApi = () => {
@@ -229,10 +231,11 @@
};
const userId = (val: any) => {
ruleForm.searchParams.personId = val.uid;
- ruleForm.searchParams.personName = val.realName;
+ personName.value = val.realName;
};
return {
timeDate,
+ personName,
ruleForm,
userId,
resetForm,
diff --git a/src/views/goalManagement/Incentivestandard/index.vue b/src/views/goalManagement/Incentivestandard/index.vue
index a8f3fed..5f9bf56 100644
--- a/src/views/goalManagement/Incentivestandard/index.vue
+++ b/src/views/goalManagement/Incentivestandard/index.vue
@@ -27,7 +27,7 @@
<div class="btns">
<div>
<el-button size="default" type="primary" :icon="Plus" @click="openD('新建')" >新建</el-button>
- <el-button size="default" type="warning" :disabled="warning" plain :icon="EditPen" @click="openD">修改 </el-button>
+ <!-- <el-button size="default" type="warning" :disabled="warning" plain :icon="EditPen" @click="openD">修改 </el-button> -->
<el-button size="default" type="danger" :disabled="danger" :icon="Delete" plain @click="handleSelectionChange">删除</el-button>
</div>
<div>
diff --git a/src/views/goalManagement/TargetBook/component/DailogAdd.vue b/src/views/goalManagement/TargetBook/component/DailogAdd.vue
index 3f572d3..06e9ea2 100644
--- a/src/views/goalManagement/TargetBook/component/DailogAdd.vue
+++ b/src/views/goalManagement/TargetBook/component/DailogAdd.vue
@@ -5,7 +5,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="岗位" size="default">
- <el-input v-model="form.jobId" placeholder="请选择">
+ <el-input v-model="form.jobName" placeholder="请选择">
<template #append> <el-button :icon="Search" @click="daiInpt" /> </template
></el-input>
</el-form-item>
@@ -14,7 +14,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="责任书签订日期" size="default">
- <el-date-picker v-model="form.signDate" style="width:100%" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择日期时间" />
+ <el-date-picker v-model="form.signDate" style="width:100%" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择日期时间" />
</el-form-item>
</el-col>
</el-row>
@@ -88,14 +88,29 @@
.then((res) => {
if (res.data.code == 200) {
form.value = res.data.data;
+ form.value.signDate=timeC(form.value.signDate)
} else {
ElMessage.error(res.data.msg);
}
});
};
+ 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 submitForm = () => {
dialogVisible.value = false;
+ delete form.value.jobName
goalManagementApi()
.gettargetDutyfileInfoAddorUpdata(form.value)
.then((res) => {
@@ -135,17 +150,10 @@
};
const IdNumber=(val:any)=>{
form.value.jobId=val.id
+ form.value.jobName=val.date
}
// 点击上传
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 handleRemove: UploadProps['onRemove'] = (file, uploadFiles) => {
@@ -176,6 +184,7 @@
}
};
return {
+ timeC,
IdNumber,
dialogVisible,
form,
diff --git a/src/views/goalManagement/TargetBook/component/DailogSearch.vue b/src/views/goalManagement/TargetBook/component/DailogSearch.vue
index 1801078..4e7e97a 100644
--- a/src/views/goalManagement/TargetBook/component/DailogSearch.vue
+++ b/src/views/goalManagement/TargetBook/component/DailogSearch.vue
@@ -24,11 +24,11 @@
</el-row>
</el-form>
<el-button size="default" :icon="Delete">清除选择</el-button>
- <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" >
+ <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 :label="scope.row.id" @click="radio(scope.row)" size="large">{{ null }}</el-radio>
</el-radio-group>
</template>
</el-table-column>
@@ -59,7 +59,7 @@
:disable-transitions="false"
@close="handleClose(tag)"
>
- {{ tag.id }}
+ {{ tag.date }}
</el-tag>
</div>
</el-col>
@@ -89,24 +89,24 @@
// 表格
const tableData = [
{ id:1,
- date: '2016-05-03',
+ date: '岗位1',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{
id:2,
- date: '2016-05-02',
+ date: '岗位2',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{
id:3,
- date: '2016-05-04',
+ date: '岗位3',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{ id:4,
- date: '2016-05-01',
+ date: '岗位4',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
diff --git a/src/views/goalManagement/TargetBook/index.vue b/src/views/goalManagement/TargetBook/index.vue
index 870165a..ff14d68 100644
--- a/src/views/goalManagement/TargetBook/index.vue
+++ b/src/views/goalManagement/TargetBook/index.vue
@@ -4,7 +4,7 @@
<el-row>
<el-col :span="4">
<el-form-item size="default">
- <el-input v-model="ruleForm.searchParams.jobId" placeholder="请选择岗位">
+ <el-input v-model="jobName" placeholder="请选择岗位">
<template #append> <el-button :icon="Search" @click="openSearch" /> </template
></el-input>
</el-form-item>
@@ -61,7 +61,7 @@
/>
</div>
<DailogAdd ref="openAdd" @navAddorUpdata="onAddorUpdata"></DailogAdd>
- <DailogSearch ref="openUser"></DailogSearch>
+ <DailogSearch ref="openUser" @backNum="IdNumber"></DailogSearch>
</div>
</div>
</template>
@@ -88,6 +88,7 @@
// 重置
const resetForm = () => {
ruleForm.searchParams.jobId = '';
+ jobName.value=""
listApi();
};
const listApi = () => {
@@ -116,6 +117,11 @@
const onAddorUpdata = () => {
listApi();
};
+ const jobName=ref()
+ const IdNumber=(val:any)=>{
+ ruleForm.jobId=val.id
+ jobName.value=val.date
+ }
// 表格
const tableData = ref();
const currentPage4 = ref();
@@ -222,6 +228,7 @@
openUser.value.openDailog();
};
return {
+ IdNumber,
ruleForm,
resetForm,
listApi,
diff --git a/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue b/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
index cc51dcd..ef2895f 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>
@@ -95,7 +102,7 @@
<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 +119,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 +142,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">
@@ -162,13 +169,14 @@
examineDepartmentName: '',
examinePersonId: '', ////考核人ID/外键
examinePersonName: '',
- examineTemplateId: 1, ////绩效考核模板ID/外键
+ examineTemplateId: '', ////绩效考核模板ID/外键
examineTemplateName: '',
examineTotalNumber: '', ////总分
+ acceptanceNumber: '', ///合格分数
extraFile: '9', //责任书附件
itemDetail: '', ////考核项目
memo: '', ////备注信息
- numberDetailJson: '[{"id":"123","number":"123"}]', ////各个考核项目的具体得分，json格式。形式为：[{“id”:"123","number":"123"}]
+ numberDetailJson: [], ////各个考核项目的具体得分，json格式。形式为：[{“id”:"123","number":"123"}]
title: '', ////考核标题
});
const titles = ref();
@@ -185,10 +193,25 @@
.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;
} else {
ElMessage.error(res.data.msg);
}
});
+ };
+ 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 +227,39 @@
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) {
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 +284,10 @@
dialogVisible.value = false;
formEl.resetFields();
};
- const handleClose=(formEl: FormInstance | undefined)=>{
+ const handleClose = (formEl: FormInstance | undefined) => {
if (!formEl) return;
formEl.resetFields();
- }
+ };
const activeName = ref('1');
// 新增弹窗
const Show = ref();
@@ -250,16 +300,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 +325,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);
}
};
//全屏
@@ -331,6 +372,9 @@
};
return {
rules,
+ timeC,
+ numberC,
+ onType,
handleClose,
nameData1,
nameData2,
diff --git a/src/views/goalManagement/performanceAppraisal/component/DailogKh.vue b/src/views/goalManagement/performanceAppraisal/component/DailogKh.vue
index 2c51d4a..c295342 100644
--- a/src/views/goalManagement/performanceAppraisal/component/DailogKh.vue
+++ b/src/views/goalManagement/performanceAppraisal/component/DailogKh.vue
@@ -62,7 +62,7 @@
</el-row>
</el-form>
<el-tabs v-model="activeName" class="demo-tabs">
- <el-tab-pane label="目标指标分解" name="1">
+ <el-tab-pane label="考核项目" name="1">
<el-button type="primary" size="default" @click="daiAdd('新增','')">新增</el-button>
</el-tab-pane>
</el-tabs>
diff --git a/src/views/goalManagement/performanceAppraisal/component/DailogSearch.vue b/src/views/goalManagement/performanceAppraisal/component/DailogSearch.vue
index 01d64c1..26f4d8d 100644
--- a/src/views/goalManagement/performanceAppraisal/component/DailogSearch.vue
+++ b/src/views/goalManagement/performanceAppraisal/component/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" width="70px">
<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>
@@ -64,7 +64,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false" size="default">关闭</el-button>
- <el-button type="primary" @click="dialogVisible = false" size="default">确定</el-button>
+ <el-button type="primary" @click="submitForm" size="default">确定</el-button>
</span>
</template>
</el-dialog>
@@ -75,7 +75,7 @@
import { ElMessageBox, ElMessage, ElButton, ElInput, TabsPaneContext, FormInstance } from 'element-plus';
import { goalManagementApi } from '/@/api/goalManagement';
export default defineComponent({
- setup() {
+ setup(props,{emit}) {
const dialogVisible = ref<boolean>(false);
const openDailog = () => {
dialogVisible.value = true;
@@ -122,6 +122,12 @@
ruleForm.pageIndex = val;
listApi();
};
+ // 提交
+ const submitForm=()=>{
+ dialogVisible.value = false
+ emit("typeDome",dynamicTags.value[0],list.value)
+ clear()
+ }
// 右方点击添加后显示标签
const dynamicTags = ref(['']);
const handleClose = (tag: string) => {
@@ -129,8 +135,19 @@
radio1.value = '';
};
const radio1 = ref('');
+ const list=ref([])
const radio = (event: any) => {
- dynamicTags.value[0] = event;
+
+ goalManagementApi()
+ .getexamineTemplateDetail(event.id)
+ .then((res) => {
+ if (res.data.code == 200) {
+ list.value = res.data.data;
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ dynamicTags.value[0] = event;
};
const clear=()=>{
dynamicTags.value=['']
@@ -146,6 +163,8 @@
}
};
return {
+ submitForm,
+ list,
reset,
dialogVisible,
listApi,
diff --git a/src/views/goalManagement/performanceAppraisal/index.vue b/src/views/goalManagement/performanceAppraisal/index.vue
index 0f3e9de..d47901e 100644
--- a/src/views/goalManagement/performanceAppraisal/index.vue
+++ b/src/views/goalManagement/performanceAppraisal/index.vue
@@ -141,8 +141,9 @@
import DailogAq from './component/DailogAq.vue';
import DailogKh from './component/DailogKh.vue';
import { ref, toRefs, reactive, onMounted, defineComponent } from 'vue';
-import { ElMessageBox, ElMessage, ElButton, ElInput, TabsPaneContext, FormInstance } from 'element-plus';
+import { ElMessageBox, ElMessage, ElButton, ElInput, FormInstance } from 'element-plus';
import { Plus, Delete, Upload, Download, Refresh, View, EditPen } from '@element-plus/icons-vue';
+import type { TabsPaneContext } from 'element-plus'
import { goalManagementApi } from '/@/api/goalManagement';
export default defineComponent({
components: { ElButton, ElInput, DailogAq, DailogKh },
@@ -158,6 +159,7 @@
// 重置
const resetForm = () => {
ruleForm.searchParams.examineDepartmentId = '';
+ listApi()
};
const listApi = () => {
goalManagementApi()
@@ -283,8 +285,9 @@
};
// 切换
const activeName = ref('1');
- const handleClick = (val: any) => {
- if (val == '1') {
+ const handleClick = (val: TabsPaneContext) => {
+ console.log(val)
+ if (val.props.name == '1') {
listApi();
}else{
listApis();
@@ -300,11 +303,12 @@
});
// 重置
const resetForms = () => {
- ruleForm.searchParams.examineDepartmentId = '';
+ ruleForms.searchParams.title = '';
+ listApis()
};
const listApis = () => {
goalManagementApi()
- .getexamineTemplateList(ruleForm)
+ .getexamineTemplateList(ruleForms)
.then((res) => {
if (res.data.code == 200) {
tableDatas.value = res.data.data;
diff --git a/src/views/goalManagement/targetDecompositionMonth/index.vue b/src/views/goalManagement/targetDecompositionMonth/index.vue
index ea96184..4473a7a 100644
--- a/src/views/goalManagement/targetDecompositionMonth/index.vue
+++ b/src/views/goalManagement/targetDecompositionMonth/index.vue
@@ -105,6 +105,7 @@
const resetForm = () => {
ruleForm.searchParams.qName = '';
ruleForm.searchParams.indexNum = '';
+ listApi()
};
const listApi = () => {
goalManagementApi()
diff --git a/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue b/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
index 1157f13..a9a2932 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
@@ -40,7 +40,7 @@
<el-table-column align="center" property="dutyDepartmentName" label="责任部门" width="180" />
<el-table-column align="center" property="value" label="考核指标" width="180" />
<el-table-column align="center" property="makerDepartmentName" label="制定人部门" />
- <el-table-column align="center" property="makeDate" label="制定日期" />
+ <el-table-column align="center" property="makeDate" :formatter="timeDate" label="制定日期" />
<el-table-column align="center" property="commitPersonName" label="上报人" />
<el-table-column align="center" property="操作">
<template #default="scope">
diff --git a/src/views/goalManagement/targetDecompositionYear/index.vue b/src/views/goalManagement/targetDecompositionYear/index.vue
index 8782bc2..9042819 100644
--- a/src/views/goalManagement/targetDecompositionYear/index.vue
+++ b/src/views/goalManagement/targetDecompositionYear/index.vue
@@ -103,6 +103,7 @@
const resetForm = () => {
ruleForm.searchParams.qName = '';
ruleForm.searchParams.indexNum = '';
+ listApi()
};
const listApi = () => {
goalManagementApi()
diff --git a/src/views/goalManagement/targetSettings/component/dailogAdd.vue b/src/views/goalManagement/targetSettings/component/dailogAdd.vue
index 721fe7e..7366ede 100644
--- a/src/views/goalManagement/targetSettings/component/dailogAdd.vue
+++ b/src/views/goalManagement/targetSettings/component/dailogAdd.vue
@@ -38,7 +38,14 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="完成期限" size="default" prop="completeDate">
- <el-date-picker v-model="form.completeDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
+ <el-date-picker
+ v-model="form.completeDate"
+ 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>
@@ -56,6 +63,7 @@
</template>
<script lang="ts">
import { ref, toRefs, reactive, onMounted, watch, defineComponent } from 'vue';
+// import { timeDate } from '/@/assets/index.ts';
import screenfull from 'screenfull';
import { ElMessageBox, ElMessage, ElButton, ElInput, TabsPaneContext } from 'element-plus';
import type { FormInstance, FormRules } from 'element-plus';
@@ -90,10 +98,24 @@
.then((res) => {
if (res.data.code == 200) {
form.value = res.data.data;
+ form.value.completeDate = timeC(form.value.completeDate);
} else {
ElMessage.error(res.data.msg);
}
});
+ };
+ 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 full = ref(false);
@@ -133,10 +155,9 @@
trigger: 'change',
},
],
- level:[],
- completeDate:[],
- memo:[]
-
+ level: [],
+ completeDate: [],
+ memo: [],
});
// 提交
const submitForm = async (formEl: FormInstance | undefined) => {
@@ -158,7 +179,7 @@
formEl.resetFields();
}
});
- formEl.resetFields();
+ formEl.resetFields();
} else {
console.log('error submit!', fields);
}
@@ -174,9 +195,11 @@
formEl.resetFields();
};
return {
+ timeC,
openDialog,
handleClose,
titles,
+ // timeDate,
Shows,
form,
full,
diff --git a/src/views/goalManagement/targetSettings/index.vue b/src/views/goalManagement/targetSettings/index.vue
index 63a96fc..5e30dee 100644
--- a/src/views/goalManagement/targetSettings/index.vue
+++ b/src/views/goalManagement/targetSettings/index.vue
@@ -102,6 +102,7 @@
const resetForm = () => {
ruleForm.searchParams.qName = '';
ruleForm.searchParams.indexNum = '';
+ listApi()
};
const listApi = () => {
goalManagementApi()
--
Gitblit v1.9.2