|
@@ -354,11 +354,11 @@
|
|
<el-form-item
|
|
<el-form-item
|
|
label="提醒内容:"
|
|
label="提醒内容:"
|
|
prop="remindContent"
|
|
prop="remindContent"
|
|
- style="line-height: 6px !important"
|
|
|
|
|
|
+ style="position: relative;"
|
|
>
|
|
>
|
|
<span
|
|
<span
|
|
v-html="deatilData.remindContent"
|
|
v-html="deatilData.remindContent"
|
|
- style="display: flex; justify-content: start"
|
|
|
|
|
|
+ style="position: absolute;top: -13px;"
|
|
></span>
|
|
></span>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -403,8 +403,8 @@
|
|
</el-form-item></el-col
|
|
</el-form-item></el-col
|
|
>
|
|
>
|
|
<el-col :span="14">
|
|
<el-col :span="14">
|
|
- <el-form-item label="提醒内容:" prop="remindContent">
|
|
|
|
- <div v-html="deatilData2.remindInfoRespVO?.remindContent"></div>
|
|
|
|
|
|
+ <el-form-item label="提醒内容:" prop="remindContent" style="position: relative;">
|
|
|
|
+ <div v-html="deatilData2.remindInfoRespVO?.remindContent" style="position: absolute;top: -13px;"></div>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -501,7 +501,7 @@ import Editor from "@/components/Editor";
|
|
import choiceOrange from "@/components/choiceOrange";
|
|
import choiceOrange from "@/components/choiceOrange";
|
|
import FileUpload from "@/components/FileUpload";
|
|
import FileUpload from "@/components/FileUpload";
|
|
import { getTime } from "../../../utils";
|
|
import { getTime } from "../../../utils";
|
|
-import { getNowDateTime } from "@/utils/ruoyi";
|
|
|
|
|
|
+import { parseTime } from "@/utils/ruoyi";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "RemindInfo",
|
|
name: "RemindInfo",
|
|
@@ -546,6 +546,7 @@ export default {
|
|
form: {
|
|
form: {
|
|
deptId: null,
|
|
deptId: null,
|
|
remindZzList: [],
|
|
remindZzList: [],
|
|
|
|
+ doneDate:null
|
|
},
|
|
},
|
|
// 表单校验
|
|
// 表单校验
|
|
rules: {
|
|
rules: {
|
|
@@ -678,6 +679,7 @@ export default {
|
|
deptId: undefined,
|
|
deptId: undefined,
|
|
pubDate: undefined,
|
|
pubDate: undefined,
|
|
remindZzList: [],
|
|
remindZzList: [],
|
|
|
|
+ doneDate:undefined
|
|
};
|
|
};
|
|
this.resetForm("form");
|
|
this.resetForm("form");
|
|
},
|
|
},
|
|
@@ -747,7 +749,8 @@ export default {
|
|
this.form.fileUrls && this.form.fileUrls.length > 0
|
|
this.form.fileUrls && this.form.fileUrls.length > 0
|
|
? this.form.fileUrls.split(",")
|
|
? this.form.fileUrls.split(",")
|
|
: [];
|
|
: [];
|
|
- this.form.doneDate = "2024-3-6";
|
|
|
|
|
|
+ this.form.doneDate = parseTime(new Date(), "{y}-{m}-{d}");
|
|
|
|
+ console.log('this.form', this.form)
|
|
this.$refs["form"].validate((valid) => {
|
|
this.$refs["form"].validate((valid) => {
|
|
if (!valid) {
|
|
if (!valid) {
|
|
return;
|
|
return;
|