feat:对照需求表

src/views/sys/sysOrg/form.vue

@@ -2,96 +2,41 @@
   <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
     <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
       <el-row :gutter="24">
+        <el-col :span="12" class="mb20">
+          <el-form-item label="上级组织" prop="orgPreCode">
+            <SelectOrgTree v-model="form.orgPreCode" value-key="orgCode" placeholder="请选择上级组织" clearable />
+          </el-form-item>
+        </el-col>
         <el-col :span="12" class="mb20">
           <el-form-item label="组织编码" prop="orgCode">
             <el-input v-model="form.orgCode" placeholder="请输入组织编码" />
           </el-form-item>
         </el-col>
-
         <el-col :span="12" class="mb20">
           <el-form-item label="组织名称" prop="orgName">
             <el-input v-model="form.orgName" placeholder="请输入组织名称" />
           </el-form-item>
         </el-col>
-
         <el-col :span="12" class="mb20">
           <el-form-item label="唯一标识码" prop="orgSn">
             <el-input v-model="form.orgSn" placeholder="请输入唯一标识码" />
           </el-form-item>
         </el-col>
-
         <el-col :span="12" class="mb20">
-          <el-form-item label="组织结构类型(字典)" prop="orgType">
-            <el-input v-model="form.orgType" placeholder="请输入组织结构类型(字典)" />
+          <el-form-item label="组织类型" prop="orgType">
+            <dict-select disabled v-model="form.orgType" :options="dh_org_type" placeholder="请选择组织类型" />
           </el-form-item>
         </el-col>
-
-        <el-col :span="12" class="mb20">
-          <el-form-item label="省" prop="province">
-            <el-input v-model="form.province" placeholder="请输入省" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12" class="mb20">
-          <el-form-item label="市" prop="city">
-            <el-input v-model="form.city" placeholder="请输入市" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12" class="mb20">
-          <el-form-item label="县" prop="county">
-            <el-input v-model="form.county" placeholder="请输入县" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12" class="mb20">
-          <el-form-item label="域ID" prop="domainId">
-            <el-input v-model="form.domainId" placeholder="请输入域ID" />
-          </el-form-item>
-        </el-col>
-
         <el-col :span="12" class="mb20">
           <el-form-item label="状态" prop="stat">
             <el-input v-model="form.stat" placeholder="请输入状态" />
           </el-form-item>
         </el-col>
-
         <el-col :span="12" class="mb20">
           <el-form-item label="排序码" prop="sort">
             <el-input v-model="form.sort" placeholder="请输入排序码" />
           </el-form-item>
         </el-col>
-
-        <el-col :span="12" class="mb20">
-          <el-form-item label="所有组排序织" prop="allSort">
-            <el-input v-model="form.allSort" placeholder="请输入所有组排序织" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12" class="mb20">
-          <el-form-item label="子系统服务编码,默认evo-thirdParty" prop="service">
-            <el-input v-model="form.service" placeholder="请输入子系统服务编码,默认evo-thirdParty" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12" class="mb20">
-          <el-form-item label="禁止绑定用户 ：0-可绑定用户，1-不可绑定用户" prop="forbidBindUser">
-            <el-input v-model="form.forbidBindUser" placeholder="请输入禁止绑定用户 ：0-可绑定用户，1-不可绑定用户" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12" class="mb20">
-          <el-form-item label="禁止绑定用户服务" prop="forbidBindService">
-            <el-input v-model="form.forbidBindService" placeholder="请输入禁止绑定用户服务" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12" class="mb20">
-          <el-form-item label="是否为同步" prop="isSync">
-            <el-input v-model="form.isSync" placeholder="请输入是否为同步" />
-          </el-form-item>
-        </el-col>
-
       </el-row>
     </el-form>
     <template #footer>
@@ -107,7 +52,6 @@
 import { useDict } from '/@/hooks/dict';
 import { useMessage } from "/@/hooks/message";
 import { getObj, addObj, putObj } from '/@/api/sys/sysOrg'
-import { rule } from '/@/utils/validate';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
@@ -115,14 +59,15 @@ const dataFormRef = ref();
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
+const { dh_org_type } = useDict("dh_org_type")
 
-// 提交表单数据
-const form = reactive({
+const defaultForm = {
   id: '',
   orgCode: '',
   orgName: '',
   orgSn: '',
-  orgType: '',
+  orgType: 'org_base',
+  orgPreCode: '',
   province: '',
   city: '',
   county: '',
@@ -134,16 +79,30 @@ const form = reactive({
   forbidBindUser: '',
   forbidBindService: '',
   isSync: '',
-});
+}
+
+const createForm = () => ({
+  ...defaultForm,
+})
+
+// 提交表单数据
+const form = reactive(createForm());
 
 // 定义校验规则
 const dataRules = ref({
+  orgCode: [{ required: true, message: '组织编码不能为空', trigger: 'blur' }],
+  orgName: [{ required: true, message: '组织名称不能为空', trigger: 'blur' }],
+  orgType: [{ required: true, message: '组织类型不能为空', trigger: 'change' }],
 })
 
+const resetForm = () => {
+  Object.assign(form, createForm());
+}
+
 // 打开弹窗
-const openDialog = (id: string) => {
+const openDialog = (id = '') => {
   visible.value = true
-  form.id = ''
+  resetForm()
 
   // 重置表单数据
   nextTick(() => {
@@ -177,18 +136,24 @@ const onSubmit = async () => {
 
 
 // 初始化表单数据
-const getsysOrgData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
+const getsysOrgData = async (id: string) => {
+  try {
+    loading.value = true
+    const res: any = await getObj(id)
+    // default
+    if (!res.data.orgType) {
+      res.data.orgType = defaultForm.orgType
+    }
     Object.assign(form, res.data)
-  }).finally(() => {
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
     loading.value = false
-  })
+  }
 };
 
 // 暴露变量
 defineExpose({
   openDialog
 });
-</script>
+</script>