From 026bdfc32e588f67e3300666220a9aa5c52658e5 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 1 Jun 2022 16:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2=E8=A1=A8?=
=?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/yxk-admin.scss | 11 ++--
.../category/descriptionPreview/form.json | 6 +-
.../category/descriptionPreview/index.vue | 2 +-
.../descriptionPreview/module/PreviewForm.vue | 66 ++++++++++++++-----
4 files changed, 59 insertions(+), 26 deletions(-)
diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss
index 65d6597..7514d82 100644
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@@ -613,11 +613,7 @@
.el-select .el-input .el-select__caret{
color: #fff;
}
- .el-select .el-input.is-disabled .el-input__inner,
- .el-select .el-input.is-disabled .el-input__inner:hover,
- .el-select .el-input.is-disabled .el-input__inner:focus{
- border-color: #339cff;
- }
+
}
.dialog-footer{
margin: 30px auto 0 auto;
@@ -643,6 +639,11 @@
.el-select {
height: 36px;
}
+ .el-select .el-input.is-disabled .el-input__inner,
+ .el-select .el-input.is-disabled .el-input__inner:hover,
+ .el-select .el-input.is-disabled .el-input__inner:focus{
+ border-color: #339cff;
+ }
}
// el-tree 最终节点不显示箭头
diff --git a/src/views/category/descriptionPreview/form.json b/src/views/category/descriptionPreview/form.json
index 374a8e0..ac994d4 100644
--- a/src/views/category/descriptionPreview/form.json
+++ b/src/views/category/descriptionPreview/form.json
@@ -59,7 +59,7 @@
"isInputClass": "date",
"isInputLength": 200,
"isFullRow": 0,
- "isRequired": 0
+ "isRequired": 1
},
{
"id": "8",
@@ -77,13 +77,13 @@
"isInputClass": "textarea",
"isInputLength": 510,
"isFullRow": 1,
- "isRequired": 0
+ "isRequired": 1
},
{
"id": "10",
"fieldName": "bgqx",
"fieldCnName": "保管期限",
- "isInputClass": "select",
+ "isInputClass": "date",
"isInputLength": 200,
"isFullRow": 0,
"isRequired": 0
diff --git a/src/views/category/descriptionPreview/index.vue b/src/views/category/descriptionPreview/index.vue
index c83bf93..1988c84 100644
--- a/src/views/category/descriptionPreview/index.vue
+++ b/src/views/category/descriptionPreview/index.vue
@@ -89,7 +89,7 @@ export default {
handleClose(done) {
this.settingFormVisible = false
this.previewFormVisible = false
- this.editResetForm()
+ // this.editResetForm()
done()
},
// 当前选中的字段
diff --git a/src/views/category/descriptionPreview/module/PreviewForm.vue b/src/views/category/descriptionPreview/module/PreviewForm.vue
index ddb265c..f8a2447 100644
--- a/src/views/category/descriptionPreview/module/PreviewForm.vue
+++ b/src/views/category/descriptionPreview/module/PreviewForm.vue
@@ -12,14 +12,24 @@
placeholder=""
:style="{ width: item.isInputLength+'px'}"
:disabled="isDisabled"
+ :validate-event="isDisabled"
>
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -61,18 +80,27 @@ export default {
return {
formPreviewData: [],
addOrUpdateForm: {},
- rules: {}
+ rules: {},
+ tableData: [],
+ selectData: {},
+ popoverVisible: false
}
},
mounted() {
this.formPreviewData = formData
- this.editrow()
+ this.editFormRow()
},
methods: {
- editrow(row) {
+ editFormRow(row) {
this.rules = {}
- this.formPreviewData.map(x => {
- this.rules[x.fieldName] = [{ required: x.isRequired === 1, message: '请输入' + x.fieldCnName, trigger: 'blur' }]
+ this.formPreviewData.map(item => {
+ this.rules[item.fieldName] = [
+ {
+ required: item.isRequired === 1,
+ message: (item.isInputClass === 'text' ? '请输入' : '请选择') + item.fieldCnName,
+ trigger: item.isInputClass === 'text' ? 'blur' : 'change'
+ }
+ ]
})
this.addOrUpdateForm = Object.assign({}, row)
},
@@ -96,6 +124,10 @@ export default {
return false
}
})
+ },
+ handleClose(done) {
+ this.popoverVisible = false
+ done()
}
}
}