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/targetSettings/component/dailogAdd.vue | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/views/goalManagement/targetSettings/component/dailogAdd.vue b/src/views/goalManagement/targetSettings/component/dailogAdd.vue
index 721fe7e..9b384ac 100644
--- a/src/views/goalManagement/targetSettings/component/dailogAdd.vue
+++ b/src/views/goalManagement/targetSettings/component/dailogAdd.vue
@@ -22,7 +22,7 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="指标值" prop="value" size="default">
- <el-input v-model="form.value" placeholder="请填写指标值" />
+ <el-input v-model.number="form.value" placeholder="请填写指标值" />
</el-form-item>
</el-col>
</el-row>
@@ -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';
@@ -78,9 +86,11 @@
});
const titles = ref();
const disabled = ref(false);
+ const titleT=ref()
// 打开弹窗
const openDialog = (title: string, value: any, id: number) => {
Shows.value = true;
+ titleT.value=title
titles.value = `${title}目标设定`;
form.value.targetType = value;
disabled.value = title == '查看' ? true : false;
@@ -90,10 +100,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);
@@ -132,17 +156,24 @@
message: '指标值不能为空',
trigger: 'change',
},
+ {
+ type:"number",
+ message: '指标值只能为数字类型',
+ trigger: 'change',
+ },
],
- level:[],
- completeDate:[],
- memo:[]
-
+ level: [],
+ completeDate: [],
+ memo: [],
});
// 提交
const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return;
await formEl.validate((valid, fields) => {
if (valid) {
+ if(titleT.value=='新建'){
+ delete form.value.id
+ }
Shows.value = false;
goalManagementApi()
.getTargetMngAddOrupdata(form.value)
@@ -158,7 +189,7 @@
formEl.resetFields();
}
});
- formEl.resetFields();
+ formEl.resetFields();
} else {
console.log('error submit!', fields);
}
@@ -174,9 +205,12 @@
formEl.resetFields();
};
return {
+ timeC,
openDialog,
handleClose,
titles,
+ titleT,
+ // timeDate,
Shows,
form,
full,
@@ -195,4 +229,4 @@
.el-row {
padding: 0 0 20px 0;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2