From c735bd1c657475e2f94c403f69ab21e759eeefb8 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Thu, 7 Jul 2022 10:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=B1=BB=E7=AE=A1=E7=90=86-=E9=97=A8?=
 =?UTF-8?q?=E7=B1=BB=E5=AD=97=E6=AE=B5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/category/fileNoFormat/index.vue     |  2 +-
 src/views/components/category/SettingForm.vue | 15 ++++++++++++++-
 src/views/system/role/index.vue               |  4 ++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/views/category/fileNoFormat/index.vue b/src/views/category/fileNoFormat/index.vue
index 3f5e3c2..98811cd 100644
--- a/src/views/category/fileNoFormat/index.vue
+++ b/src/views/category/fileNoFormat/index.vue
@@ -109,7 +109,7 @@ export default {
       FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then((res) => {
         this.table.left.data.splice(0, this.table.left.data.length)
         res.forEach((item) => {
-          if (!item.isDisplayformat) {
+          if (!item.isDisplayformat && item.isInput && !item.isAutomatic) {
             this.table.left.data.push(item)
           }
         })
diff --git a/src/views/components/category/SettingForm.vue b/src/views/components/category/SettingForm.vue
index 6c054de..92aad1e 100644
--- a/src/views/components/category/SettingForm.vue
+++ b/src/views/components/category/SettingForm.vue
@@ -84,6 +84,8 @@
 
 <script>
 import { getDicts } from '@/api/archivesConfig/dict'
+import { getNoFormatField } from '@/api/category/fileNoFormat'
+
 export default {
   name: 'SettingForm',
   components: {},
@@ -328,13 +330,24 @@ export default {
       }
     },
     // 自动生成 - 规则出自“档案规则设置”页面，著录形式为“文本框”才可
-    changeAuto() {
+    changeAuto(value) {
       if (this.form.isAutomaticField === 1) {
         this.form.isAutomatic = false
         this.$message.error('已经为档号组成项，不可设置为自动生成')
       } else if (this.form.isInputClass !== 'text') {
         this.form.isAutomatic = false
         this.$message.error('著录形式必须为文本框才可操作！')
+      } else if (value) {
+        console.log(this.form)
+        getNoFormatField({ categoryId: this.form.categoryId }).then((res) => {
+          const repeatIndex = res.findIndex((item) => {
+            return item.dictionaryId === this.form.id
+          })
+          if (repeatIndex >= 0) {
+            this.form.isAutomatic = false
+            this.$message.error('已经为档号组成项，不能设为自动生成!')
+          }
+        })
       }
     },
     // submitForm(formName) {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index cd48e2c..12a13af 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -371,4 +371,8 @@ export default {
     border: 0;
     padding: 0;
   }
+ ::v-deep .el-table__body tr.current-row > td{
+    color: #fff;
+    background-color: #13439E;
+ }
 </style>