From 07b12c3c051ac0f062cb244599319adb36256203 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 5 Jan 2024 09:29:48 +0800
Subject: [PATCH] =?UTF-8?q?13025=20=E7=94=A8=E5=B7=A5=E5=BD=A2=E5=BC=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/audit/components/edit.vue       | 36 +++----------------
 .../xgf/insert/components/corpInfoEdit.vue    |  3 --
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/src/views/xgf/audit/components/edit.vue b/src/views/xgf/audit/components/edit.vue
index 2e0317c..6e98470 100644
--- a/src/views/xgf/audit/components/edit.vue
+++ b/src/views/xgf/audit/components/edit.vue
@@ -172,7 +172,7 @@
               <el-form-item label="用工形式" prop="EMPLOYMENT_FORM">
                 <Treeselect
                   :options="employmentTypeList"
-                  :normalizer="SpecialNormalizer"
+                  :normalizer="normalizer"
                   v-model="dataForm.EMPLOYMENT_FORM"
                   placeholder="请选择用工形式"
                   no-options-text="暂无数据"
@@ -886,12 +886,13 @@ export default {
     },
     getDict() {
       requestFN(
-        '/xgf/dictionaries/getLevels',
+        '/xgf/dictionaries/listSelectTree',
         {
           DICTIONARIES_ID: '720992d898bf4fd7b44bf0ba1f1bbb88'
         }
       ).then((data) => {
-        this.employmentTypeList = data.list
+        const employmentTypeList = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+        this.employmentTypeList = this.removeEmptyChildren(employmentTypeList)
       })
       requestFN(
         '/xgf/dictionaries/getLevels',
@@ -929,35 +930,6 @@ export default {
 
     // 获取数据字典数据
     getDictByDicId(dicId) {
-      /* var dicListVal = []
-      return new Promise((resolve) => {
-        let id = ''
-        if (!dicId) {
-          id = '0'
-        } else {
-          id = dicId
-        }
-        requestFN(
-          '/dictionaries/getLevelsAndSCount',
-          {
-            DICTIONARIES_ID: id
-          }
-        ).then((data) => {
-          if (data.list.length > 0) {
-            dicListVal = data.list.map((e) => {
-              if (e.zcount == '0') {
-                return { value: e.DICTIONARIES_ID.toString(), numValue: e.BIANMA.toString(), label: e.NAME, id: e.DICTIONARIES_ID, leaf: true }
-              } else {
-                return { value: e.DICTIONARIES_ID.toString(), numValue: e.BIANMA.toString(), label: e.NAME, id: e.DICTIONARIES_ID, children: [], leaf: false }
-              }
-            })
-          } else {
-            dicListVal = undefined
-          }
-          return resolve(dicListVal)
-        }).catch((e) => {
-        })
-      }) */
     },
     // 地图相关
     mapOpen() {
diff --git a/src/views/xgf/insert/components/corpInfoEdit.vue b/src/views/xgf/insert/components/corpInfoEdit.vue
index 38985d0..85186a1 100644
--- a/src/views/xgf/insert/components/corpInfoEdit.vue
+++ b/src/views/xgf/insert/components/corpInfoEdit.vue
@@ -154,9 +154,6 @@
           <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item label="用工形式" prop="EMPLOYMENT_FORM">
-                <!--                <el-select v-model="form.EMPLOYMENT_FORM" style="width: 100%;">-->
-                <!--                  <el-option v-for="item in employmentTypeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />-->
-                <!--                </el-select>-->
                 <Treeselect
                   :options="employmentTypeList"
                   :normalizer="normalizer"