From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/a7-Ensure-results-validity/detailFormDialog.vue | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue b/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue
index 5c2976d..69ece8f 100644
--- a/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue
+++ b/src/components/do/a7-Ensure-results-validity/detailFormDialog.vue
@@ -12,7 +12,10 @@
</el-col>
<el-col :span="12">
<el-form-item label="璁″垝寮�灞曟椂闂�" prop="plannedTime">
- <el-input v-model="form.plannedTime" size="small" clearable></el-input>
+ <!-- <el-input v-model="form.plannedTime" size="small" clearable></el-input> -->
+ <el-date-picker v-model="form.plannedTime" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ size="small" type="date" value-format="yyyy-MM-dd">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -77,6 +80,9 @@
operationType: '',
};
},
+ mounted() {
+
+ },
// 鏂规硶闆嗗悎
methods: {
openDia(type, row) {
@@ -88,6 +94,7 @@
},
searchInfo (row) {
this.form = {...row}
+ console.log('this is current instance', this.form);
},
// 鎻愪氦琛ㄥ崟
submitForm () {
--
Gitblit v1.9.3