From 6918a5f2511219f526d298db99e58b5afca47e2d Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Wed, 1 Jun 2022 14:23:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=91=97=E5=BD=95=E7=95=8C=E9=9D=A2-=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/yxk-admin.scss | 5 ++ .../category/descriptionPreview/data.json | 2 +- .../category/descriptionPreview/index.vue | 3 - .../descriptionPreview/module/SettingForm.vue | 57 ++++++++++++++----- src/views/login.vue | 3 + 5 files changed, 52 insertions(+), 18 deletions(-) diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 8fae4e8..65d6597 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -613,6 +613,11 @@ .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; diff --git a/src/views/category/descriptionPreview/data.json b/src/views/category/descriptionPreview/data.json index d22e04f..ed1ea37 100644 --- a/src/views/category/descriptionPreview/data.json +++ b/src/views/category/descriptionPreview/data.json @@ -215,7 +215,7 @@ "isDisplayWidth": null, "isDisplayOrder": 0, "isDisplayAlign": "center", - "isInputClass": "popmodality", + "isInputClass": "popover", "isInput": 1, "isInputLength": 200, "isFullrow": 0, diff --git a/src/views/category/descriptionPreview/index.vue b/src/views/category/descriptionPreview/index.vue index a1e1b33..c83bf93 100644 --- a/src/views/category/descriptionPreview/index.vue +++ b/src/views/category/descriptionPreview/index.vue @@ -231,9 +231,6 @@ export default { } .edit-form-dialog{ ::v-deep .el-dialog{ - .el-col-9{ - margin-top: 106px; - } .el-input.is-disabled .el-input__inner{ color: #fff; } diff --git a/src/views/category/descriptionPreview/module/SettingForm.vue b/src/views/category/descriptionPreview/module/SettingForm.vue index 735d14a..f747b1a 100644 --- a/src/views/category/descriptionPreview/module/SettingForm.vue +++ b/src/views/category/descriptionPreview/module/SettingForm.vue @@ -24,7 +24,7 @@ - + @@ -33,10 +33,6 @@ - - 自动补零 - - @@ -53,16 +49,16 @@ 自动生成 - - - - 自动加一 - + 值不重复 + + 自动补零 + + @@ -197,13 +193,22 @@ export default { }, methods: { getForm() { + // 初始化 this.form.isSupplement = !!this.form.isSupplement this.form.isFullrow = !!this.form.isFullrow this.form.isInput = !!this.form.isInput this.form.isRequired = !!this.form.isRequired + this.form.isAuto = !!this.form.isAuto + // 初始化 - 著录形式 - 对应字典 + if (this.form.isInputClass === 'select' || this.form.isInputClass === 'popover') { + this.dictionaryData = dictionarylist + } else { + this.dictionaryData = [] + this.form.isDefaultValueType = null + } this.changeSupplement() }, - // 著录形式为'下拉框'、'弹出框'的，对应字典不为空，反之为空； + // 著录形式为'下拉框'、'弹出框'的，对应字典不为空，反之为空 selectInputClass(value) { if (value === 'select' || value === 'popover') { this.dictionaryData = dictionarylist @@ -211,9 +216,11 @@ export default { this.dictionaryData = [] this.form.isDefaultValueType = null } - - if (value !== 'number') { - this.form.isIncrease = false + // 字段类型为数字型，且默认著录类型为数字框不可更改 + if (this.form.isDataType === 2) { + this.form.isInputClass = 'number' + this.dictionaryData = [] + this.$message.error('字段类型为数字型，且默认著录类型为数字框') } }, // '自动补零' false - 补零位数清空 @@ -221,6 +228,28 @@ export default { if (!this.form.isSupplement) { this.form.isSupplementNum = undefined } + if (this.form.isSupplement) { + // '字段类型'为数字型时，'自动补零'不可操作 + if (this.form.isDataType === 2) { + this.form.isSupplement = false + this.$message.error('字段类型必须为字符型才可操作！') + } + // 著录形式必须-数字框 + if (this.form.isInputClass !== 'number') { + this.form.isSupplement = false + this.$message.error('著录形式必须为数字框才可操作！') + } + } + }, + // 自动生成 - 规则出自“档案规则设置”页面，著录形式为“文本框”才可 + changeAuto() { + if (this.form.isAutoField === 1) { + this.form.isAuto = false + this.$message.error('已经为档号组成项，不可设置为自动生成') + } else if (this.form.isInputClass !== 'text') { + this.form.isAuto = false + this.$message.error('著录形式必须为文本框才可操作！') + } }, submitForm(formName) { // 选择'自动补零'，位数必填 diff --git a/src/views/login.vue b/src/views/login.vue index 5448222..c68f25f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -250,6 +250,7 @@ export default { background: #fff; box-shadow: 0px 0px 16px 1px rgba(83, 83, 83, 0.16); border-radius: 10px; + .el-form-item { width: 100% !important; height: 50px; @@ -258,9 +259,11 @@ export default { .el-form-item__content{ height: 100%; .el-input{ + font-size: 16px; height: 100%; input{ height: 100%; + padding: 0 15px 0 40px; } } }