From 94f8b8e3a070da1ca9655e84e1328559cfe22564 Mon Sep 17 00:00:00 2001
From: hreenshan112 <hreenshan112@noreply.gitcode.com>
Date: Thu, 5 Dec 2024 10:09:35 +0800
Subject: [PATCH] =?UTF-8?q?11=E6=9C=88=E4=BB=BDPCbug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/DesignForm/fieldUnit.ts               |   1 +
 src/components/DesignForm/app/index.vue       |  15 +++
 .../DesignForm/formControlPropertiNew.vue     |   2 +-
 .../DesignForm/tableListPage/index.vue        |   8 ++
 src/widget/index.ts                           |   2 +
 src/widget/systemunit/deptOrgSearch.vue       | 101 ++++++++++++++++++
 6 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 src/widget/systemunit/deptOrgSearch.vue

diff --git a/src/api/DesignForm/fieldUnit.ts b/src/api/DesignForm/fieldUnit.ts
index 70aedaf..903c2bf 100644
--- a/src/api/DesignForm/fieldUnit.ts
+++ b/src/api/DesignForm/fieldUnit.ts
@@ -4,3 +4,4 @@ export const orgUnit = ["org"]
 export const choiceUnit = ["radio"]
 export const switchUnit = ["switch"]
 export const checkboxUnit = ["checkbox"]
+export const orgDeptUnit = ["deptOrg"]
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index f75a530..7ae3608 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -25,6 +25,7 @@ import {
   switchUnit,
   orgUnit,
   checkboxUnit,
+  orgDeptUnit,
 } from "@/api/DesignForm/fieldUnit";
 import type { FormInstance, FormRules, ElNotification } from "element-plus";
 import { gainFormPageListCont } from "@/api/DesignForm/requestapi";
@@ -183,6 +184,9 @@ const unitIsShow = (val: tableButton, unitName: string) => {
     case "checkbox":
       return checkboxUnit.includes(unitName);
       break;
+    case "deptOrg":
+      return orgDeptUnit.includes(unitName);
+      break;
     default:
       if (val.fieldClass != "datePicker" && val.fieldClass != "timePicker") {
         return inputUnit.includes(unitName);
@@ -1005,7 +1009,18 @@ const transformOption = (val: string | number, type?: string) => {
                   v-if="unitIsShow(item, 'org')"
                 >
                 </el-select>
+                <DeptOrgSearch
+                  v-if="unitIsShow(item, 'deptOrg')"
+                  v-model:model-value="item.value"
+                />
               </el-form-item>
+
+              <!-- <DeptOrgPage
+                v-if="item.fieldClass === 'deptOrg' && type != 4"
+                :data="data"
+                :form-props="formProps"
+                :tablekey="props.tablekey"
+              /> -->
             </div>
           </template>
           <div class="group group-btn" v-if="searchData.length">
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index ce7c2da..f3180a3 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -499,7 +499,7 @@ const attrList = computed(() => {
         value: config.append,
         placeholder: "文本后缀",
         path: "config.append",
-        vShow: ["input", "password"],
+        vShow: ["input", "password", "digitpage"],
       },
       // {
       //     label: '状态打开时的值',
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 32a75f9..d42b723 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -25,6 +25,7 @@ import {
   switchUnit,
   orgUnit,
   checkboxUnit,
+  orgDeptUnit,
 } from "@/api/DesignForm/fieldUnit";
 import type { FormInstance, FormRules, ElNotification } from "element-plus";
 import { gainFormPageListCont } from "@/api/DesignForm/requestapi";
@@ -179,6 +180,9 @@ const unitIsShow = (val: tableButton, unitName: string) => {
     case "checkbox":
       return checkboxUnit.includes(unitName);
       break;
+    case "deptOrg":
+      return orgDeptUnit.includes(unitName);
+      break;
     default:
       if (val.fieldClass != "datePicker" && val.fieldClass != "timePicker") {
         return inputUnit.includes(unitName);
@@ -989,6 +993,10 @@ const diGuiJilian = (val: any, options: any[]) => {
                   v-if="unitIsShow(item, 'org')"
                 >
                 </el-select>
+                <DeptOrgSearch
+                  v-if="unitIsShow(item, 'deptOrg')"
+                  v-model:model-value="item.value"
+                />
               </el-form-item>
             </div>
           </template>
diff --git a/src/widget/index.ts b/src/widget/index.ts
index e8747f0..e8bcec8 100644
--- a/src/widget/index.ts
+++ b/src/widget/index.ts
@@ -22,6 +22,7 @@ import FounderTime from './systemunit/founderTime.vue'
 import EditTime from './systemunit/editTime.vue'
 import OwnerPage from './systemunit/ownerPage.vue'
 import DeptOrgPage from './systemunit/deptOrgPage.vue'
+import DeptOrgSearch from './systemunit/deptOrgSearch.vue'
 import Editor from "@/components/WangEditor/index.vue";
 
 // import { QuillEditor } from '@vueup/vue-quill'
@@ -49,6 +50,7 @@ export default (app: any)	=> {
 	app.component('EditTime',EditTime)		//创建时间主键
 	app.component('OwnerPage',OwnerPage)		//选择拥有者 
 	app.component('DeptOrgPage',DeptOrgPage)		//所属部门
+	app.component('DeptOrgSearch',DeptOrgSearch)		//所属部门
 
 	app.component('Editor', Editor)		//Editor富文本
 }
diff --git a/src/widget/systemunit/deptOrgSearch.vue b/src/widget/systemunit/deptOrgSearch.vue
new file mode 100644
index 0000000..80e17da
--- /dev/null
+++ b/src/widget/systemunit/deptOrgSearch.vue
@@ -0,0 +1,101 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-12-05 09:26:54
+@ 备注: 搜索用部门
+-->
+<script lang="ts" setup>
+import { orgAndPeople } from "@/api/displayboardapi/types";
+import { getPeopleKey, getUserCont } from "@/api/hr/people/index";
+import { govthree } from "@/api/opk/opk/api";
+
+const props = withDefaults(
+  defineProps<{
+    modelValue: any; // 子表和弹性布局时时有传
+  }>(),
+  {}
+);
+const emits = defineEmits(["update:modelValue"]);
+const orgList = ref<orgAndPeople[]>();
+const orgLoading = ref(false);
+const orgTree = {
+  label: "name",
+  children: "child",
+};
+
+const value = computed({
+  get() {
+    console.log("行政组织-1--》", props.modelValue);
+    if (
+      props.modelValue != "" &&
+      props.modelValue != undefined &&
+      props.modelValue != null
+    ) {
+      return props.modelValue * 1;
+    } else {
+      return props.modelValue;
+    }
+  },
+  set(newVal: any) {
+    emits("update:modelValue", newVal);
+    // updateModel(newVal)
+    return newVal;
+  },
+});
+
+onMounted(() => {
+  orgLoading.value = true;
+  getUserCont()
+    .then((data: any) => {
+      let orgId = data.data.organization * 1;
+      let companyId = data.data.company * 1;
+      if (companyId == null || companyId == "" || companyId == "0" || companyId == 0) {
+        companyId = 309;
+      }
+      if (orgId == null || orgId == "" || orgId == "0" || orgId == 0) {
+        orgId = "";
+      }
+      nextTick(() => {
+        govthree({ id: companyId, all: 1 })
+          .then(({ data }) => {
+            orgList.value = data;
+            if (
+              Number.isNaN(value.value) ||
+              isNaN(value.value) ||
+              value.value == null ||
+              value.value == "" ||
+              value.value == "0" ||
+              value.value == 0 ||
+              value.value == undefined
+            ) {
+              nextTick(() => {
+                value.value = orgId;
+                console.log("行政组织---》", orgId, value.value);
+              });
+            }
+          })
+          .finally(() => {
+            orgLoading.value = false;
+          });
+      });
+    })
+    .finally(() => {
+      orgLoading.value = false;
+    });
+});
+</script>
+<template>
+  <el-tree-select
+    v-loading="orgLoading"
+    element-loading-text="Loading..."
+    v-model="value"
+    :data="orgList"
+    :props="orgTree"
+    :render-after-expand="false"
+    :filterable="true"
+    node-key="id"
+    clearable
+    check-strictly
+    style="width: 140px"
+  />
+</template>
+<style lang="scss" scoped></style>