diff --git a/src/views/par/examPlan/ParExamCate.vue b/src/views/par/examPlan/ParExamCate.vue
index 7b4e54ec8a6a8f1417c7078b7a972b12dc681086..6d8f7b25e498577e248f4153370ab4795841d546 100644
--- a/src/views/par/examPlan/ParExamCate.vue
+++ b/src/views/par/examPlan/ParExamCate.vue
@@ -4,8 +4,7 @@
style="top: 100px;"
:width="1200"
v-model="editVisible"
- @ok="handleEditOk"
- @cancel="cancelHandel"
+ :maskClosable=false
:bodyStyle="{ 'max-height': '500px', overflow: 'scroll' }"
:confirmLoading="confirmLoading"
>
@@ -24,6 +23,11 @@
+
+
+ 关闭
+
+
@@ -127,9 +131,6 @@ export default {
record.dwlx = this.param.dwlx
this.$refs.examItemModel.begin(record, this.type)
},
- handleEditOk () {
- this.close()
- },
/**
* 关闭弹出框
*/
diff --git a/src/views/par/examPlan/ParExamItem.vue b/src/views/par/examPlan/ParExamItem.vue
index c4fc5ed59a50770542e936f57972f7f36265be5c..a7f54446adcc1a3767c6099a8cf3e8c08cca7980 100644
--- a/src/views/par/examPlan/ParExamItem.vue
+++ b/src/views/par/examPlan/ParExamItem.vue
@@ -6,6 +6,7 @@
v-model="editVisible"
@ok="handleEditOk"
@cancel="cancelHandel"
+ :maskClosable=false
:bodyStyle="{ 'max-height': '500px', overflow: 'scroll' }"
:confirmLoading="confirmLoading"
>
diff --git a/src/views/par/examPlan/ParExamPlan.vue b/src/views/par/examPlan/ParExamPlan.vue
index 71b8b5932f68d96c52302227bef8d5a83e8f4fa0..135d29ab774653a386f9225da3a6e4487d9306e3 100644
--- a/src/views/par/examPlan/ParExamPlan.vue
+++ b/src/views/par/examPlan/ParExamPlan.vue
@@ -111,11 +111,11 @@ export default {
ellipsis: true
},
{
- title: '考评开始时间',
+ title: '考评开始日期',
dataIndex: 'kssj'
},
{
- title: '考评结束时间',
+ title: '考评结束日期',
dataIndex: 'jssj'
},
{
diff --git a/src/views/par/examPlan/ParExamPlanPersonnel.vue b/src/views/par/examPlan/ParExamPlanPersonnel.vue
index dcfef583ca8a1f6cfde10c5720f4d838e88eada5..b3df875bae2221e446bdfba8b0b26e0f999262d2 100644
--- a/src/views/par/examPlan/ParExamPlanPersonnel.vue
+++ b/src/views/par/examPlan/ParExamPlanPersonnel.vue
@@ -108,11 +108,11 @@ export default {
ellipsis: true
},
{
- title: '考评开始时间',
+ title: '考评开始日期',
dataIndex: 'kssj'
},
{
- title: '考评结束时间',
+ title: '考评结束日期',
dataIndex: 'jssj'
},
{
diff --git a/src/views/par/examPlan/PlanItem.vue b/src/views/par/examPlan/PlanItem.vue
index 4590ddd25592d164acb2e60a61d268a5da475951..2f8393ebf3adde4f3e825ac6c3f58e14a57150fe 100644
--- a/src/views/par/examPlan/PlanItem.vue
+++ b/src/views/par/examPlan/PlanItem.vue
@@ -5,15 +5,17 @@
:width="800"
v-model="editVisible"
@ok="handleEditOk"
+ :maskClosable=false
@cancel="cancelHandel"
:confirmLoading="confirmLoading"
>
-
+
@@ -23,6 +25,7 @@
@@ -31,10 +34,8 @@
-
-
+
+
四不两直检查
定期检查
@@ -46,7 +47,7 @@
-
+
@@ -99,15 +100,7 @@ export default {
}, 0)
} else if (record.inOrUp === 'insert') {
setTimeout(() => {
- this.editForm.setFieldsValue({
- kpjhmc: '',
- dwlx: '',
- jcfs: '',
- kssj: '',
- jssj: '',
- bz: '',
- kpzqid: ''
- })
+ this.editForm.resetFields()
}, 0)
}
this.editVisible = true