fix: 删除组织状态字段，更新系统disabled为pageScopedDisabled

src/types/dept/type.ts

@@ -6,7 +6,6 @@ export interface DeptTreeItem {
   deptName: string, // 部门名称
   parentId: number | null, // 上级部门 id
   orderNum: number | undefined, // 排序
-  isDisabled: IS_DISABLED, // 状态： 0-启用， 1-禁用
   createdBy: number, // 创建人
   updatedBy: number, // 更新人
   createdAt: string, // 创建时间
@@ -18,6 +17,6 @@ export interface DeptTreeItem {
 
 export type DeptTree = DeptTreeItem & { children: DeptTreeItem[] }
 
-export type addDeptProps = Pick<DeptTreeItem, 'isDisabled' | 'parentId' | 'deptName' | 'orderNum'>
+export type addDeptProps = Pick<DeptTreeItem, 'parentId' | 'deptName' | 'orderNum'>
 
 export type editDeptProps = addDeptProps & {id?: DeptTreeItem['id']}

src/views/auth/dept/CreateDrawer.vue

@@ -22,12 +22,6 @@
       <el-form-item label="排序" prop="orderNum">
         <el-input-number placeholder="请输入排序" v-model="formParams.orderNum" />
       </el-form-item>
-      <el-form-item label="状态" prop="isDisabled">
-        <el-radio-group v-model="formParams.isDisabled" >
-          <el-radio-button label="启用" value="1" />
-          <el-radio-button label="禁用" value="0" />
-        </el-radio-group>
-      </el-form-item>
     </el-form>
 
     <template #footer>
@@ -70,7 +64,6 @@
   const defaultValueRef = () => ({
     id: null,
     parentId: null,
-    isDisabled: 1,
     deptName: '',
     orderNum: undefined,
   });
@@ -107,7 +100,6 @@
       }
       const msg = formParams.value.id ? '编辑成功' : '添加成功';
       const params = { ...formParams.value };
-      params.isDisabled = formParams.value.isDisabled ? IS_DISABLED.YES : IS_DISABLED.NO;
       if (formParams.value.id) {
         updateDepartments(params).then(() => {
           message.success(msg);
@@ -137,7 +129,7 @@
     (value) => {
       if (value) {
         Object.entries(value).forEach(([key, value]) => {
-          if (['id', 'parentId', 'deptName', 'orderNum', 'isDisabled'].includes(key)) {
+          if (['id', 'parentId', 'deptName', 'orderNum'].includes(key)) {
             formParams.value[key] = value;
           }
         });

src/views/message/sysnotion-config/SysnotionConfig.vue

@@ -4,16 +4,16 @@
       <div @click="rollback()"
         ><img src="@/views/message/reportmessage/img/rollback.png" />返回</div
       >
-      <span >{{ disabled ? '新建' : '查看'}}系统通知</span>
+      <span >{{ pageScopedDisabled ? '新建' : '查看'}}系统通知</span>
     </div>
     <div class="content">
       <div class="left">
         <!-- 基本配置 -->
-        <BasicInfo ref="basicInfoRef" :data-soure="ruleForm" :is-disabled="isDisabled" />
+        <BasicInfo ref="basicInfoRef" :data-soure="ruleForm" :is-disabled="!pageScopedDisabled" />
         <!-- 内容配置区域 -->
-        <ContentConfig ref="contentConfigRef" :data-soure="ruleForm" :is-disabled="isDisabled" :key="initKey"/>
+        <ContentConfig ref="contentConfigRef" :data-soure="ruleForm" :is-disabled="!pageScopedDisabled" :key="initKey"/>
         <!-- 按钮区域 -->
-        <div class="btns" v-if="disabled">
+        <div class="btns" v-if="pageScopedDisabled">
           <div style="position: absolute; right: 0; bottom: 0">
             <el-button @click="onCancel">取消</el-button>
             <el-button @click="onSave">暂存</el-button>
@@ -87,7 +87,7 @@
   const sysId = Number(route.query.id as string);
   const viewModel = route.query.viewModel as string;
   const initKey = ref(0)
-  const disabled = computed(() => !isDisabled.value || viewModel === 'edit');
+  const pageScopedDisabled = computed(() => !isDisabled.value || viewModel === 'edit');
   
   /**
    * 获取当前系统配置信息

src/views/message/sysnotion-config/compontents/BasicInfo.vue

@@ -13,7 +13,7 @@
       class="el-form-outer"
     >
       <el-form-item label="消息样式: " prop="messageType">
-        <el-radio-group v-model="ruleForm.messageType" :disabled="!disabled">
+        <el-radio-group v-model="ruleForm.messageType" :disabled="!pageScopedDisabled">
           <el-radio :value="item.value" v-for="item in messageTypeOptions" :key="item.value"
             >{{ item.label }}
           </el-radio>
@@ -25,7 +25,7 @@
           placeholder="请输入20字以内的消息标题"
           maxlength="20"
           show-word-limit
-          :disabled="!disabled"
+          :disabled="!pageScopedDisabled"
         />
       </el-form-item>
       <el-form-item
@@ -45,7 +45,7 @@
           list-type="picture-card"
           :on-exceed="handleExceed"
           :on-preview="handlePictureCardPreview"
-          :disabled="!disabled"
+          :disabled="!pageScopedDisabled"
         >
           <el-icon class="avatar-uploader-icon"><Plus /></el-icon>
         </el-upload>
@@ -59,7 +59,7 @@
             :key="item.value"
             :value="item.value"
             :label="item.label"
-            :disabled="!disabled"
+            :disabled="!pageScopedDisabled"
           />
         </el-checkbox-group>
       </el-form-item>
@@ -70,7 +70,7 @@
           placeholder="请选择失效时间"
           format="YYYY/MM/DD hh:mm:ss"
           value-format="YYYY-MM-DD hh:mm:ss"
-          :disabled="!disabled"
+          :disabled="!pageScopedDisabled"
           :disabled-date="disabledDate"
         />
         <span class="tip-message">请注意：超过该日期后，【APP/PC 主页】将不再弹出消息！</span>
@@ -80,7 +80,7 @@
         :recipientType="ruleForm.recipientType"
         :userGroupList="ruleForm.userGroupList"
         :customUserList="ruleForm.customUserList"
-        :disabled="!disabled"
+        :disabled="!pageScopedDisabled"
       />
     </el-form>
   </CardLayout>
@@ -111,7 +111,7 @@ import { ref, watch, computed, unref } from 'vue'
   }
   const props = defineProps<Props>();
   const route = useRoute(); 
-  const disabled = computed(() => props.isDisabled === false || route.query.viewModel === 'edit')
+  const pageScopedDisabled = computed(() => props.isDisabled === false || route.query.viewModel === 'edit')
   const labelPosition = ref<FormProps['labelPosition']>('left');
   const childFromRef = ref<InstanceType<typeof PushObject>>();
   const actionUrl = computed(() => {

src/views/message/sysnotion-config/compontents/ContentConfig.vue

@@ -20,12 +20,12 @@
           :rows="5"
           maxlength="500"
           show-word-limit
-          :disabled="!disabled"
+          :disabled="!pageScopedDisabled"
         />
       </el-form-item>
 
       <el-form-item label="详情内容" prop="contentType" class="transprant">
-        <el-radio-group v-model="ruleForm.contentType" :disabled="isDisabled">
+        <el-radio-group v-model="ruleForm.contentType" :disabled="pageScopedDisabled">
           <el-radio :value="item.value" v-for="item in contentTypeOptinos" :key="item.value">{{
             item.label
           }}</el-radio>
@@ -40,7 +40,7 @@
         <el-input
           v-model="ruleForm.contentUrl"
           placeholder="请将链接地址粘贴到此处"
-          :disabled="!disabled"
+          :disabled="!pageScopedDisabled"
         />
       </el-form-item>
       <el-form-item
@@ -90,7 +90,7 @@
   const route = useRoute();
   const labelPosition = ref<FormProps['labelPosition']>('left');
   const userStore = useUserStore();
-  const disabled = computed(() => props.isDisabled === false || route.query.viewModel === 'edit')
+  const pageScopedDisabled = computed(() => props.isDisabled === false || route.query.viewModel === 'edit')
   
 
   /**
@@ -216,7 +216,7 @@
 
   const handleCreated = (editor) => {
     editorRef.value = editor // 创建富文本编辑器
-    if(!disabled.value){
+    if(!pageScopedDisabled.value){
       editorRef.value.disable()  //禁用
     } else {
       editorRef.value.enable()  //启用