Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

# Conflicts:
#	frontend/src/api/system/dictData.ts
#	frontend/src/views/authority/role/components/rolePopup.vue

frontend/src/views/authority/role/components/rolePopup.vue

@@ -2,6 +2,7 @@
     <!-- 基础信息弹出框 -->
   <el-dialog :model-value="dialogVisible" :title="title" v-bind="dialogSmall" @close="handleCancel" width="500" draggable>
     <div>
+
         <el-form :model="data" 
                   ref='formRuleRef'
                   :rules='rules'
@@ -9,9 +10,11 @@
         <el-form-item label="名称" prop='name' :label-width="100">
           <el-input v-model="data.name" placeholder="请输入名称" autocomplete="off" />
         </el-form-item>
+
         <el-form-item label="编码" prop='code' :label-width="100">
           <el-input v-model="data.code" placeholder="请输入编码" autocomplete="off" />
         </el-form-item>
+
         <el-form-item label="类型" prop='type' :label-width="100">
           <el-select v-model="data.type" placeholder="请选择类型" autocomplete="off">
           <el-option
@@ -22,6 +25,7 @@
           />
           </el-select>
         </el-form-item>
+
         <el-form-item label="描述" prop='remark' :label-width="100">
           <el-input v-model="data.remark" :rows="2" type="textarea" placeholder="请输入备注" autocomplete="off" />
         </el-form-item>
@@ -52,6 +56,7 @@
   } from '@/api/role/role'
 
   const dictStore = useDictStore()
+
   const {dialogVisible,title,data,openType,getTableList}  = defineProps<{
     dialogVisible:boolean;
     title:string;
@@ -66,6 +71,7 @@
     }
   }>();
 
+
   //定义规则
   const formRuleRef = ref<FormInstance>()
   //定义校验规则
@@ -83,6 +89,7 @@
   }
   
   const handleOK = () => {
+
     ElMessage.info('角色数据提交')
     try {
       formRuleRef.value?.validate((valid: boolean) => {
@@ -119,11 +126,13 @@
         emit('update:visible',false)
       } else {
         ElMessage.error('表单验证失败！')
+        
       }
+
     })
   } catch (error) {
     console.error('验证过程中发生错误', error)
   }
-  }
+    
   
   </script>