From 8fd6d4cfa3fd1462949c3b2b6bbbcc3d9d42b092 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Tue, 10 Oct 2023 08:18:40 +0800
Subject: [PATCH] 1

---
 src/api/hr/org/index.ts                       |  10 +
 .../DesignForm/public/expand/user.vue         |  24 ++-
 .../DesignForm/public/expand/userDialog.vue   |  28 ++-
 .../DesignForm/public/form/formItem.vue       |  82 ++++----
 .../DesignForm/public/map/componentTest.vue   | 187 ------------------
 5 files changed, 87 insertions(+), 244 deletions(-)
 delete mode 100644 src/components/DesignForm/public/map/componentTest.vue

diff --git a/src/api/hr/org/index.ts b/src/api/hr/org/index.ts
index d95a906c2..3a06bc781 100644
--- a/src/api/hr/org/index.ts
+++ b/src/api/hr/org/index.ts
@@ -122,3 +122,13 @@ export function getTeamListCont(data: searchTeamList): AxiosPromise<orgTeamListC
 		data: data
 	});
 }
+/**
+ * 获取人员列表
+ */
+ export function searchUserCustomerFormList(data:any): AxiosPromise<archivesList[]>{
+	return request({
+		url: '/hrapi/org/search_userlist_customerform',
+		method: 'post',
+		data: data
+	});
+}
diff --git a/src/components/DesignForm/public/expand/user.vue b/src/components/DesignForm/public/expand/user.vue
index 484bbf77d..6a0e47906 100644
--- a/src/components/DesignForm/public/expand/user.vue
+++ b/src/components/DesignForm/public/expand/user.vue
@@ -25,29 +25,39 @@ const userDialogEl = ref()
 //       	emits('update:modelValue', newVal)
 //     }
 // })
-const userlist = ref("")
+// const userlist = ref<any>("")
 const value = computed({
-	get: () => props.modelValue,
+	get: () => {
+		console.log("value-get",props.modelValue)
+		// userlist.value = props.modelValue
+		return props.modelValue
+	},
 	set: (newVal: any) => {
-		// console.log("value-set",newVal)
-		emits('update:modelValue', newVal)
+		console.log("value-set",newVal)
+		// emits('update:modelValue', newVal)
 		let newValJson:criteriaForPeopleList[] = JSON.parse(newVal)
-		// console.log("value-newValJson",newValJson)
+		console.log("value-newValJson",newValJson)
 		if(newValJson.length > 0){
 			let userAry = new Array
+			let userKeyAry = new Array
 			newValJson.forEach(item =>{
 				userAry.push(item.name+"("+item.number+")")
+				userKeyAry.push(item.userkey.toString())
 			})
-			userlist.value = userAry.join(',')
+			emits('update:modelValue', userAry.join(','))
+			// userlist.value = userAry.join(',')
+			// 
 		}
 		
 	},
 });
 
 const openDialog = () => {
+	// console.log("value-----》",value.value)
     userDialogEl.value.open()
 }
 onMounted(() => {
+	console.log("value---1--》",value.value,props.modelValue)
     nextTick(() => {})
 })
 
@@ -56,7 +66,7 @@ onMounted(() => {
 	<el-input
 		placeholder="请选择用户或输入用户名称"
 		v-bind="$props"
-		v-model="userlist"
+		v-model="value"
 		@click="openDialog"
 	>
 		<template #append>
diff --git a/src/components/DesignForm/public/expand/userDialog.vue b/src/components/DesignForm/public/expand/userDialog.vue
index 81a0c3e20..9558cad51 100644
--- a/src/components/DesignForm/public/expand/userDialog.vue
+++ b/src/components/DesignForm/public/expand/userDialog.vue
@@ -7,7 +7,7 @@
 import { ref, onMounted, reactive, nextTick } from 'vue'
 import { getRequest } from '@/api/DesignForm'
 import formatResult from '@/utils/DesignForm/formatResult'
-import { getOrgFormTree,getOrgFormUserList } from '@/api/hr/org/index'
+import { getOrgFormTree,getOrgFormUserList,searchUserCustomerFormList } from '@/api/hr/org/index'
 import { orgform,criteriaForPeopleList } from '@/api/hr/org/type'
 import UserRole from '@/assets/icons/user.svg'
 
@@ -125,16 +125,26 @@ const delAllClick = () => {
 // 弹窗处理
 const open = () => {
     visible.value = true
-	// console.log("open--->",props.modelValue)
+	console.log("open--->",props.modelValue)
     if (props.modelValue) {
-      	// checkData.value = props.modelValue.split(',')
-		let jsonCont:criteriaForPeopleList[]  = JSON.parse(props.modelValue)
-		if(jsonCont.length > 0) {
-			checkDataList.splice(0,checkDataList.length)
-			jsonCont.forEach(item=>{
-				checkDataList.push(item)
+		searchUserCustomerFormList({name:props.modelValue})
+			.then(({data})=>{
+				console.log("弹窗处理",data)
+				// checkDataList = data
+				if(data.length > 0){
+					data.forEach((item:any) => {
+						checkDataList.push(item)
+					})
+				}
 			})
-		}
+      	// checkData.value = props.modelValue.split(',')
+		// let jsonCont:criteriaForPeopleList[]  = JSON.parse(props.modelValue)
+		// if(jsonCont.length > 0) {
+		// 	checkDataList.splice(0,checkDataList.length)
+		// 	jsonCont.forEach(item=>{
+		// 		checkDataList.push(item)
+		// 	})
+		// }
     } else {
 		checkDataList.splice(0,checkDataList.length)
     }
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 86ca55234..f216b2d74 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -211,47 +211,47 @@ const getAxiosOptions = debounce((data?: any) => {
 			if (method === 'get') {
 				newData = { params: newData }
 			}
-          	getRequest(sourceFun, newData, { method: method })
-				.then((res: any) => {
-				const result = res.data.list || res.data
-				let formatRes: any = result
-				// 这里做数据转换，很多时候后端并不能提供完全符合且一样的数据
-				if (typeof afterResponse === 'string' && afterResponse) {
-					formatRes = formatResult(result, afterResponse)
-				} else if (typeof afterResponse === 'function') {
-					// 没有return时，使用原来的，相当于没处理
-					formatRes = afterResponse(result) ?? result
-				} else if (label || value) {
-					// 没有设置afterResponse时，这里将数据转换为[{label:'',value:''}]形式。只处理一级
-					formatRes = []
-					result.forEach((item: any) => {
-					formatRes.push({
-						label: item[label] || item.label,
-						value: item[value] || item.value
-					})
-					})
-				}
-				if (formatRes === false) {
-					return
-				}
-				// console.log('formatRes', formatRes)
-				if (props.data.type === 'treeSelect') {
-					control.value.data = formatRes
-				} else {
-					options.value = formatRes
-				}
-				if (typeof formatRes === 'object') {
-					window.sessionStorage.setItem(key, JSON.stringify(formatRes)) //缓存，例如子表添加时不用每添加一行就请求一次
-				}
-				})
-				.catch((res: any) => {
-				if (props.data.type === 'treeSelect') {
-					control.value.data = []
-				} else {
-					options.value = []
-				}
-					console.log(res)
-				})
+          	// getRequest(sourceFun, newData, { method: method })
+			// 	.then((res: any) => {
+			// 	const result = res.data.list || res.data
+			// 	let formatRes: any = result
+			// 	// 这里做数据转换，很多时候后端并不能提供完全符合且一样的数据
+			// 	if (typeof afterResponse === 'string' && afterResponse) {
+			// 		formatRes = formatResult(result, afterResponse)
+			// 	} else if (typeof afterResponse === 'function') {
+			// 		// 没有return时，使用原来的，相当于没处理
+			// 		formatRes = afterResponse(result) ?? result
+			// 	} else if (label || value) {
+			// 		// 没有设置afterResponse时，这里将数据转换为[{label:'',value:''}]形式。只处理一级
+			// 		formatRes = []
+			// 		result.forEach((item: any) => {
+			// 		formatRes.push({
+			// 			label: item[label] || item.label,
+			// 			value: item[value] || item.value
+			// 		})
+			// 		})
+			// 	}
+			// 	if (formatRes === false) {
+			// 		return
+			// 	}
+			// 	// console.log('formatRes', formatRes)
+			// 	if (props.data.type === 'treeSelect') {
+			// 		control.value.data = formatRes
+			// 	} else {
+			// 		options.value = formatRes
+			// 	}
+			// 	if (typeof formatRes === 'object') {
+			// 		window.sessionStorage.setItem(key, JSON.stringify(formatRes)) //缓存，例如子表添加时不用每添加一行就请求一次
+			// 	}
+			// 	})
+			// 	.catch((res: any) => {
+			// 	if (props.data.type === 'treeSelect') {
+			// 		control.value.data = []
+			// 	} else {
+			// 		options.value = []
+			// 	}
+			// 		console.log(res)
+			// 	})
         	}
     	}
       	setFormDict(formProps.value.dict) // 表格里新增时行时需要重新设一次
diff --git a/src/components/DesignForm/public/map/componentTest.vue b/src/components/DesignForm/public/map/componentTest.vue
deleted file mode 100644
index bad19f71b..000000000
--- a/src/components/DesignForm/public/map/componentTest.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-  <el-row style="flex-wrap: nowrap">
-    <el-input v-model="value" :placeholder="placeholder" />
-    <el-button @click="visibleClick">选择</el-button>
-  </el-row>
-  <el-dialog v-model="state.visible" title="详细地址" width="800px">
-    <div class="map-container">
-      <el-input id="tipInput" v-model="state.tipInput" />
-      <div id="container" style="width: 100%; height: 400px"></div>
-      <div id="panel"></div>
-    </div>
-    <template #footer>
-      <el-button @click="selectClick" type="primary">确定</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup lang="ts">
-  import { reactive, watch, ref, onMounted, nextTick } from 'vue'
-  import { loadScript } from '@/utils/DesignForm'
-
-  const props = withDefaults(
-    defineProps<{
-      modelValue?: string
-      disabled?: boolean
-      placeholder?: string
-    }>(),
-    {}
-  )
-
-  const emits = defineEmits<{
-    (e: 'update:modelValue', value: string): void
-  }>()
-  const value = ref(props.modelValue)
-  watch(
-    () => props.modelValue,
-    () => {
-      value.value = props.modelValue
-    }
-  )
-  const state = reactive({
-    visible: false,
-    tipInput: ''
-  })
-  const selectClick = () => {
-    state.visible = false
-    value.value = state.tipInput
-    emits('update:modelValue', value.value)
-  }
-  const visibleClick = () => {
-    state.visible = true
-    // 初始地址
-    nextTick(() => {
-      const map = initMap()
-      mapSearch(map)
-    })
-  }
-  const center = ref([113.264499, 23.130061])
-  // 地图选择
-  const initMap = () => {
-    const map = new AMap.Map('container', {
-      resizeEnable: true,
-      center: center.value,
-      zoom: 11,
-      viewMode: '3D' // 使用3D视图
-    })
-    //实时路况图层
-    const marker = new AMap.Marker({
-      position: map.getCenter(),
-      //icon: '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
-      // 设置是否可以拖拽
-      draggable: true,
-      cursor: 'move'
-      // content: 'markerContent',
-    })
-    const { lat, lng } = map.getCenter()
-    getDetailAddress(lng, lat, marker)
-    map.add(marker) //添加到地图
-    map.on('click', (e: any) => {
-      const lnglat = e.lnglat
-      const lat = lnglat.lat
-      const lng = lnglat.lng
-      map.setCenter([lng, lat]) //设置地图中心点
-      marker.setPosition([lng, lat]) //更新点标记位置
-      getDetailAddress(lng, lat, marker)
-    })
-    return map
-  }
-  const mapSearch = (map: any) => {
-    AMap.plugin(['AMap.PlaceSearch', 'AMap.AutoComplete'], function () {
-      const auto = new AMap.AutoComplete({
-        input: 'tipInput'
-      })
-      const placeSearch = new AMap.PlaceSearch({
-        pageSize: 5, // 单页显示结果条数
-        pageIndex: 1, // 页码
-        city: '', // 兴趣点城市
-        citylimit: false, //是否强制限制在设置的城市内搜索
-        map: map, // 展现结果的地图实例
-        panel: 'panel', // 结果列表将在此容器中进行展示。
-        autoFitView: true // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-      })
-      auto.on('select', (evt: any) => {
-        placeSearch.setCity(evt.poi.adcode)
-        placeSearch.search(evt.poi.name) //关键字查询查询
-        /*placeSearch.search(evt.poi.name, function (status, result) {
-          //关键字查询查询
-          // 查询成功时，result即对应匹配的POI信息
-          console.log("搜索结果", result);
-        });*/
-        state.tipInput = evt.poi.name // 更新输入框的值
-      }) //注册监听，当选中某条记录时会触发
-      /*
-      // 搜索结果地图上的icon层
-       placeSearch.on('markerClick',()=>{
-        console.log('placeSearch.onmarkerClick')
-      })*/
-      // 搜索列表点击事件
-      placeSearch.on('listElementClick', (evt: any) => {
-        state.tipInput = evt.data.name
-      })
-    })
-  }
-  const getDetailAddress = (lng: number, lat: number, marker: any) => {
-    // 根据经纬度获取详细地址
-    AMap.plugin('AMap.Geocoder', () => {
-      const geocoder = new AMap.Geocoder()
-      geocoder.getAddress([lng, lat], (status: string, result: any) => {
-        if (status === 'complete' && result.info === 'OK') {
-          const detailAddress = result.regeocode.formattedAddress
-          state.tipInput = detailAddress
-          marker.setLabel({
-            direction: 'center',
-            offset: new AMap.Pixel(0, -25), //设置文本标注偏移量
-            content: `<div class='info'>${detailAddress}</div>` //设置文本标注内容
-          })
-        }
-      })
-    })
-  }
-  onMounted(() => {
-    console.log('onMountedonMounted')
-    loadScript(
-      'https://webapi.amap.com/maps?v=2.0&key=ljiKlTAsS7SNVqDM16IUwRVFFhrvbxiF&plugin=AMap.PlaceSearch'
-    ).then(() => {})
-  })
-</script>
-<style lang="scss">
-  .map-container {
-    position: relative;
-  }
-  .amap-sug-result {
-    z-index: 2500;
-  }
-  #panel {
-    z-index: 2500;
-    position: absolute;
-    background-color: white;
-    max-height: 90%;
-    overflow-y: auto;
-    top: 10px;
-    right: 10px;
-    width: 280px;
-    .amap_lib_placeSearch {
-      border: 1px solid #ebedf0;
-      border-radius: 2px;
-      padding: 5px 10px 2px;
-      .poibox {
-        border-bottom: 1px solid #e8e8e8;
-        cursor: pointer;
-        padding: 10px 5px;
-        position: relative;
-        min-height: 35px;
-      }
-      .amap_lib_placeSearch_pic {
-        width: 46px;
-        height: 46px;
-        float: left;
-        margin: 4px 10px 0 0;
-        img {
-          width: 46px;
-          height: 46px;
-        }
-      }
-    }
-  }
-</style>