角色管理、标准内容自动识别、标准清单

src/pages/config/pages/roleManage/index.vue

@@ -71,6 +71,9 @@
                             prop="useFlag"
                             label="角色状态"
                             width="170px">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.useFlag===0?'禁用':'启用' }}</span>
+                        </template>
                     </el-table-column>
                     <el-table-column
                             prop="operator"
@@ -184,9 +187,20 @@
                     </el-form-item>
                     <el-form-item label="角色描述" prop="remarks" label-width="80px" class="add-form-item">
                         <el-input v-model="addForm.remarks"
-                                  placeholder="请输入上级描述"
+                                  placeholder="请输入角色描述"
                                   clearable></el-input>
                     </el-form-item>
+                    <el-form-item label="角色状态" prop="useFlag" label-width="145px">
+                        <el-select class="bead-input" v-model="addForm.useFlag">
+                            <el-option
+                                    v-for="item in options"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                 </el-form>
             </div>
             <div slot="footer">
@@ -243,7 +257,8 @@ export default {
         SuperiorRoleModel: false,
         addFormRules: {
             name: [
-                { required: true, message: '请输入角色名称', trigger: 'blur' }
+                { required: true, message: '请输入角色名称', trigger: 'blur' },
+                {type: 'string', max: 100, message: '角色名称不能超过100个字符', trigger: 'blur'}
             ]
         },
         addForm: {
@@ -251,8 +266,19 @@ export default {
             parentId: '', // 上级ID
             remarks: '', // 角色描述
             parent: '',
+            useFlag: '',
             id: ''
         },
+        options: [
+            {
+                value: "0",
+                label: "禁用",
+            },
+            {
+                value: "1",
+                label: "启用",
+            }
+    ],
         addModel: false,
         treeData3: [],
         defaultProps3: {

src/pages/localTool/standardRecognition/index.vue

@@ -259,10 +259,10 @@ export default {
           },
         ],
         fileType: [
-          { required: true, message: "文本状态称不能为空", trigger: "blur" },
+          { required: true, message: "文本状态称不能为空", trigger: "change" },
         ],
         fileName: [
-          { required: true, message: '文件不能为空', trigger: 'blur' }
+          { required: true, message: '文件不能为空', trigger: 'change' }
         ]
       },
       options: [
@@ -515,7 +515,8 @@ export default {
           message: "文件上传成功",
           type: "success",
         });
-        // this.$refs['uploadFilesdfEo'].resetFields()
+        this.$refs['uploadFilesdfEo'].clearValidate('fileName')
+        this.$refs['uploadFilesdfEo'].clearValidate('standName')
       } else {
         this.defaultFileList = [];
         this.uploadFilesdfEo.attId = "";

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -421,6 +421,7 @@
             <el-button
               class="common-button-default"
               type="danger"
+              style="margin-left: 0px"
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
@@ -552,9 +553,6 @@ export default {
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
           {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
-        ],
-        remark: [
-          {required: true,type: 'string', max: 500, message: '表单名称不能超过500个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,