diff --git a/App.vue b/App.vue
index 8a1e5ae..e63c163 100644
--- a/App.vue
+++ b/App.vue
@@ -12,13 +12,16 @@ onLaunch(async () => {
   // #ifdef APP-PLUS
   let sysInfo = uni.getSystemInfoSync()
   let brand = sysInfo.brand.toLowerCase()
-  if (brand === 'chainway') {
+
+  if (brand === 'huawei') {
     plus.screen.lockOrientation('landscape')
   }
-  urovo.scanRegister(data => {
-    console.log('优博讯扫码结果：' + data)
-    $store('biz').scanQRInfo = data
-  })
+  if (brand === 'urovo') {
+    urovo.scanRegister(data => {
+      console.log('优博讯扫码结果：' + data)
+      $store('biz').scanQRInfo = data
+    })
+  }
   // #endif
 })
 
diff --git a/components/sample/sample-detail-popup.vue b/components/sample/sample-detail-popup.vue
index 9defde2..25ec113 100644
--- a/components/sample/sample-detail-popup.vue
+++ b/components/sample/sample-detail-popup.vue
@@ -70,7 +70,7 @@ const open = () => {
   justify-content: space-between;
   margin-bottom: 10px;
   border-bottom: 1px solid #eee;
-  padding: 4px 0;
+  padding: 8px 0;
 }
 .label-my {
   color: #606266;
@@ -80,7 +80,8 @@ const open = () => {
   text-align: center;
   font-size: 18px;
   font-weight: 400;
-  padding: 10px;
+  padding: 20px;
+  padding-top: 35px;
   background-color: $uni-color-primary;
   color: #fff;
 }
diff --git a/defaultBaseUrl.js b/defaultBaseUrl.js
index 8d4dde1..283777f 100644
--- a/defaultBaseUrl.js
+++ b/defaultBaseUrl.js
@@ -1,8 +1,8 @@
 // 在此不用配置接口前缀
 const isDev = process.env.NODE_ENV === 'development'
-// const BaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
-const BaseUrl = isDev ? 'http://192.168.26.190:48080/admin-api' : 'http://192.168.26.116:888/admin-api'
-
+const BaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
+// const BaseUrl = isDev ? 'http://192.168.26.163:48080/admin-api' : 'http://192.168.26.116:888/admin-api'
+// 
 // const BaseUrl = isDev ? 'http://localhost:9999' : ''
 const upgradeBaseUrl = 'http://192.168.26.116:888'
 
diff --git a/nx/api/sampleWarehouse.js b/nx/api/sampleWarehouse.js
index f925768..eec7398 100644
--- a/nx/api/sampleWarehouse.js
+++ b/nx/api/sampleWarehouse.js
@@ -11,7 +11,7 @@ export default {
   execReturnToStock: data =>
     request({
       url: '/qms/business-sub-sample/execReturnToStock',
-      method: 'GET',
+      method: 'POST',
       data
     }),
   // 库位变更
@@ -42,6 +42,20 @@ export default {
       method: 'POST',
       data
     }),
+  // 调拨创建临时数据
+  createDispatchTempData: data =>
+    request({
+      url: '/qms/business-sample-dispatch/createTempData',
+      method: 'POST',
+      data
+    }),
+  // 按样品添加内部调拨数据
+  addDispatchSample: data =>
+    request({
+      url: '/qms/business-sample-dispatch/addBySampleCode',
+      method: 'POST',
+      data
+    }),
   // 查询待归还样品
   searchBySampleCode: params =>
     request({
diff --git a/nx/api/user.js b/nx/api/user.js
index 389c15e..b390a7f 100644
--- a/nx/api/user.js
+++ b/nx/api/user.js
@@ -34,5 +34,12 @@ export default {
       url: '/sys/app-client-role/getListByUserIdAndClientId',
       method: 'GET'
     })
-  }
+  },
+  // 获取当前部门下的用户
+  getAssignUserList: params =>
+    request({
+      url: '/qms/bus/sample/task-assign/getAssignUserList',
+      method: 'GET',
+      params
+    })
 }
diff --git a/nx/hooks/usePageListData.js b/nx/hooks/usePageListData.js
index 2a97791..67a6841 100644
--- a/nx/hooks/usePageListData.js
+++ b/nx/hooks/usePageListData.js
@@ -7,7 +7,7 @@ export function useListData({ searchParams, api, needInitListData = false, proce
   const loadingData = ref(true)
   const pageParams = reactive({
     pageNo: 1,
-    pageSize: 5
+    pageSize: 10
   })
   const total = ref(0)
   const loadStatus = ref('loadmore')
diff --git a/pages/analysis/sample/components/task-item.vue b/pages/analysis/sample/components/task-item.vue
index 4856973..f42decb 100644
--- a/pages/analysis/sample/components/task-item.vue
+++ b/pages/analysis/sample/components/task-item.vue
@@ -5,13 +5,13 @@
       <u-col span="2" class="text-center" style="position: relative">
         <slot name="tag" v-if="$slots.tag" :task="task"></slot>
         <template v-else>
-          <u-icon :color="taskStyle(task)" name="tags-fill" size="40"></u-icon>
+          <u-icon :color="taskStyle(task)" name="tags-fill" size="50"></u-icon>
           <text class="seq">{{ seq }}</text>
         </template>
       </u-col>
       <u-col span="10">
-        <view class="fs18">{{ task.taskNo }}</view>
-        <view class="mt3 mb3">{{ task.taskName }}{{ task.assayOper }}</view>
+        <view class="fs20">{{ task.taskNo }}</view>
+        <view class="mt8 mb8">{{ task.taskName }}{{ task.assayOper }}</view>
         <view class="x-f">
           <u-icon name="clock"></u-icon>
           <text class="ml5">{{ taskOperatorTime }}</text>
@@ -75,8 +75,8 @@ const taskStyle = task => {
 }
 .seq {
   position: absolute;
-  top: 12px;
-  left: 12px;
+  top: 20px;
+  left: 20px;
   color: #fff;
   font-size: 11px;
 }
diff --git a/pages/analysis/sample/sample-report-search.vue b/pages/analysis/sample/sample-report-search.vue
index f1da8b5..e063c29 100644
--- a/pages/analysis/sample/sample-report-search.vue
+++ b/pages/analysis/sample/sample-report-search.vue
@@ -8,7 +8,7 @@
         </view>
         <u-gap height="5" bg-color="#0055A2"></u-gap>
         <scroll-view
-          style="height: 75vh"
+          style="height: 82vh"
           scroll-y
           scroll-with-animation
           class="content-main-left"
@@ -37,7 +37,7 @@
         </view>
         <u-gap height="5" bg-color="#0055A2"></u-gap>
         <view>
-          <scroll-view scroll-y scroll-with-animation style="height: calc(75vh - 60px)">
+          <scroll-view scroll-y scroll-with-animation style="height: calc(82vh - 60px)">
             <block v-for="(sample, index) in sampleList" :key="index">
               <view class="sample-item">
                 <u-row @click="showSampleDetail(sample.businessAssayTaskDataId, index)">
@@ -50,7 +50,7 @@
                     <view>
                       <text class="pl5">{{ sample.sampleAssayCode }}</text>
                     </view>
-                    <view>
+                    <view class="mt10">
                       <text class="pl5">
                         {{ sample.sampleName }}
                       </text>
@@ -58,7 +58,7 @@
                   </u-col>
                   <u-col span="4">
                     <view>
-                      <text style="padding-left: 10px" v-html="sample.assayProject"></text>
+                      <rich-text :nodes="sample.assayProject"> </rich-text>
                     </view>
                   </u-col>
                 </u-row>
@@ -171,10 +171,9 @@ onBackPress(() => {
 
 <style lang="scss" scoped>
 .content-title-name {
-  height: 50px;
+  height: 60px;
   box-sizing: border-box;
   font-size: 20px;
-  font-weight: 300;
   padding: 10px;
   text-align: center;
   display: flex;
diff --git a/pages/analysis/sample/sample-work-detail.vue b/pages/analysis/sample/sample-work-detail.vue
index 870a70b..3917595 100644
--- a/pages/analysis/sample/sample-work-detail.vue
+++ b/pages/analysis/sample/sample-work-detail.vue
@@ -8,8 +8,9 @@
     </navbar-back>
 
     <u-row gutter="8">
-      <u-col span="3">
+      <u-col span="3" style="height: 60px">
         <up-tabs
+          class="content-tabs"
           :current="activeAssayTypeIndex"
           :list="assayGroups"
           lineColor="#5ac725"
@@ -24,15 +25,15 @@
         ></up-tabs>
         <u-gap height="5" bg-color="#0055A2"></u-gap>
       </u-col>
-      <u-col span="6">
+      <u-col span="6" style="height: 60px">
         <view class="content-title-name">
           <view class="current-sample-code">{{ currentSampleData.sampleCode }}</view>
           <view>数据采集或录入</view>
         </view>
         <u-gap height="5" bg-color="#0055A2"></u-gap>
       </u-col>
-      <u-col span="3">
-        <u-dropdown style="height: 35px">
+      <u-col span="3" style="height: 60px">
+        <u-dropdown>
           <u-dropdown-item
             v-model="curParameterKey"
             :title="curParameterTitle"
@@ -63,7 +64,7 @@
               <view>
                 {{ sample.sampleCode }}
               </view>
-              <view> {{ sample.sampleName }} </view>
+              <view class="mt10"> {{ sample.sampleName }} </view>
             </view>
           </view>
         </scroll-view>
@@ -149,8 +150,8 @@
         </view>
       </u-col>
       <u-col span="3">
-        <view>
-          <scroll-view class="content-right-scroll" scroll-y scroll-with-animation>
+        <view class="pt10">
+          <scroll-view class="content-right-scroll" scroll-y scroll-with-animation :scroll-top="scrollFieldTop">
             <view>
               <!-- <template v-for="(fields, groupIndex) in fieldGroup" :key="'group_' + groupIndex"> -->
               <!-- <view> -->
@@ -168,7 +169,7 @@
                 <template v-for="(fields, groupIndex) in currentGroup">
                   <up-collapse-item v-if="fields.label !== '全部'">
                     <template #title>
-                      <text class="font-bold">{{ fields.label }}</text>
+                      <text class="font-bold fs18">{{ fields.label }}</text>
                     </template>
                     <template v-for="(field, fieldIndex) in fields.fields" :key="groupIndex + '-' + fieldIndex">
                       <view
@@ -281,6 +282,7 @@ const taskIngredientsStatus = ref('') //配料状态
 const configReportTemplateKey = ref('')
 const elId = nx.$helper.uuid()
 const scrollTop = ref(0) //tab标题的滚动条位置
+const scrollFieldTop = ref(0)
 const menuHeight = ref(0) // 左边菜单的高度
 const menuItemHeight = ref(0) // 左边菜单item的高度
 const weightDataIsToZero = ref(false) //重量数据是否归零
@@ -879,6 +881,7 @@ watch(
 const collapseRef = ref()
 const activeCollapses = ref([])
 function handleAssayTypeChange({ index, value }) {
+  scrollFieldTop.value = 0
   activeAssayTypeKey.value = value
   activeAssayTypeIndex.value = index
   currentSampleIndex.value = 0
@@ -1217,25 +1220,37 @@ onBackPress(() => {
   color: #fff;
   display: flex;
 }
-
 .content-title-name {
-  font-size: 18px;
-  font-weight: 300;
-  padding: 4px 0;
+  font-size: 22px;
   display: flex;
+  align-items: center;
   justify-content: center;
+  height: 100%;
+}
+.content-tabs {
+  height: 100%;
+  :deep(.u-tabs__wrapper) {
+    height: 100%;
+  }
 }
-
 .current-sample-code {
   font-weight: bold;
   margin-right: 20px;
 }
-
+:deep(.u-dropdown) {
+  height: 100%;
+  .u-dropdown__menu {
+    height: 60px !important;
+    .u-dropdown__menu__item__text {
+      font-size: 18px !important;
+    }
+  }
+}
 .form-item-my {
   display: flex;
   align-items: center;
   min-height: 35px;
-  font-size: 13px;
+  font-size: 16px;
   border-bottom: 1px solid #dcdcdc;
 }
 .selected-field {
@@ -1285,10 +1300,10 @@ onBackPress(() => {
   color: #c0c4cc;
 }
 .content-left-scroll {
-  height: 68vh;
+  height: 75vh;
 }
 .content-right-scroll {
-  height: 68vh;
+  height: 74vh;
 }
 .valid-warning {
   color: orange;
@@ -1302,7 +1317,7 @@ onBackPress(() => {
   align-items: center;
   font-size: 16px;
   color: #444;
-  padding: 4px 8px;
+  padding: 8px 16px;
   box-sizing: border-box;
   border-bottom: 2px dotted #444;
 }
@@ -1335,8 +1350,9 @@ onBackPress(() => {
   position: relative;
   .code {
     position: absolute;
-    top: 15px;
-    left: 55px;
+    font-style: 18px;
+    top: 25px;
+    left: 70px;
   }
 }
 
@@ -1405,7 +1421,7 @@ onBackPress(() => {
 
 .field-name {
   font-size: 26px;
-  padding: 8px;
+  padding: 16px;
   width: 100%;
 }
 
diff --git a/pages/analysis/sample/sample-work-list.vue b/pages/analysis/sample/sample-work-list.vue
index a155fcc..ff62f45 100644
--- a/pages/analysis/sample/sample-work-list.vue
+++ b/pages/analysis/sample/sample-work-list.vue
@@ -8,7 +8,7 @@
           <up-badge v-if="taskList.length > 0" class="ml5" :value="taskList.length" type="warning"></up-badge>
         </view>
         <u-gap height="5" bg-color="#0055A2"></u-gap>
-        <scroll-view style="height: 75vh" scroll-y scroll-with-animation class="content-main-left">
+        <scroll-view style="height: 82vh" scroll-y scroll-with-animation class="content-main-left">
           <template v-if="taskList.length > 0">
             <TaskItem
               v-for="(task, index) in taskList"
@@ -29,7 +29,7 @@
         </view>
         <u-gap height="5" bg-color="#0055A2"></u-gap>
         <view>
-          <scroll-view scroll-y scroll-with-animation style="height: calc(75vh - 60px)">
+          <scroll-view scroll-y scroll-with-animation style="height: calc(82vh - 60px)">
             <u-checkbox-group placement="column" v-model="checkedSampleCodes">
               <block v-for="(sample, index) in sampleList" :key="index">
                 <view v-if="currentTask.reviewCount === sample.reviewCount" class="sample-item">
@@ -52,13 +52,13 @@
                           <view>
                             {{ sample.sampleAssayCode }}
                           </view>
-                          <view>
+                          <view class="mt10">
                             {{ sample.sampleName }}
                           </view>
                         </u-col>
                         <u-col span="6">
                           <view>
-                            <text class="pl10" v-html="sample.assayProject"> </text>
+                            <rich-text :nodes="sample.assayProject"> </rich-text>
                           </view>
                         </u-col>
                       </u-row>
@@ -263,10 +263,9 @@ onBackPress(() => {
 
 <style lang="scss" scoped>
 .content-title-name {
-  height: 50px;
+  height: 60px;
   box-sizing: border-box;
-  font-size: 20px;
-  font-weight: 300;
+  font-size: 22px;
   padding: 10px;
   text-align: center;
   display: flex;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 45e9fdf..7a18308 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,7 +13,7 @@ import { reactive, ref, computed, onMounted } from 'vue'
 import nx from '@/nx'
 import { useGridCol } from '@/nx/hooks/useGridCol'
 let list = reactive([
-  { url: '/pages/lims/index/index', name: '设备管理', icon: '设备管理' },
+  // { url: '/pages/lims/index/index', name: '设备管理', icon: '设备管理' },
   { url: '/pages/analysis/index/index', name: '分析管理', icon: '分析管理' },
   { url: '/pages/sampleWarehouse/index/index', name: '样品库管理', icon: '样品库管理' }
 ])
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4a48953..6b2883a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,7 +9,7 @@
     <view class="header">
       <image src="/static/images/login/logo.png"></image>
     </view>
-
+    <view class="text-center pt10 fs22 font-bold"> 实验室管理系统 </view>
     <view class="list">
       <view class="list-call">
         <u-icon name="account" color="#0055a2" size="30"></u-icon>
@@ -20,11 +20,16 @@
         <input
           class="sl-input"
           v-model="loginInfo.password"
-          type="text"
+          :type="passwordFieldType"
           maxlength="32"
           placeholder="请输入密码"
-          password="true"
         />
+        <u-icon
+          :name="passwordVisible ? 'eye-fill' : 'eye-off'"
+          color="#0055a2"
+          size="30"
+          @click="togglePasswordVisibility"
+        ></u-icon>
       </view>
     </view>
     <view class="login-btn">
@@ -56,6 +61,14 @@ let loginInfo = reactive({
   password: 'P@ssword25',
   captchaVerification: ''
 })
+
+const passwordVisible = ref(false)
+const passwordFieldType = ref('password')
+
+function togglePasswordVisibility() {
+  passwordVisible.value = !passwordVisible.value
+  passwordFieldType.value = passwordVisible.value ? 'text' : 'password'
+}
 onShow(() => {
   //检查APP更新
   // #ifdef APP-PLUS
@@ -186,6 +199,6 @@ function onCaptchaError(error) {
 }
 
 .login-btn {
-  margin-top: 20px;
+  margin-top: 50px;
 }
 </style>
diff --git a/pages/sampleWarehouse/dispatchGiveBack/index.vue b/pages/sampleWarehouse/dispatchGiveBack/index.vue
index 266db9b..56bc62c 100644
--- a/pages/sampleWarehouse/dispatchGiveBack/index.vue
+++ b/pages/sampleWarehouse/dispatchGiveBack/index.vue
@@ -1,7 +1,159 @@
 <template>
-  <view> </view>
+  <navbar-back title="调拨归还"></navbar-back>
+  <view class="pl8 pr8 pt8">
+    <view class="x-f">
+      <text class="pl6">归还人：</text>
+      <uni-data-select v-model="givebackUserId" :localdata="range" placeholder="请选择样品归还人"></uni-data-select>
+    </view>
+    <view class="border-b p6 x-f"
+      ><view class="pr16">库管员：</view><text>{{ userInfo.nickname }}</text></view
+    >
+    <up-input
+      style="padding-top: 20px"
+      border="bottom"
+      v-model="sampleCode"
+      placeholder="请扫描需要归还的样品编号"
+      prefixIcon="scan"
+      fontSize="16"
+      prefixIconStyle="font-size: 30px;"
+      @confirm="getSampleList"
+    >
+    </up-input>
+
+    <uni-section v-if="sampleList.length > 0" type="line" title="归还样品明细" titleFontSize="15px">
+      <template #right> <up-text type="error" size="18" bold :text="sampleList.length"></up-text></template>
+      <scroll-view style="height: 49vh" scroll-y scroll-with-animation>
+        <uni-card margin="5px" v-for="item in sampleList" class="sample-item">
+          <view class="x-bc">
+            <view
+              >样品名称：<text class="black">{{ item.sampleName }}</text></view
+            >
+            <view>调拨人：<text class="black">{{}}</text></view>
+          </view>
+          <view class="x-bc">
+            <view
+              >样品编号：<text class="black">{{ item.sampleReturnCode }}</text></view
+            >
+            <view>调拨时间：<text class="black">{{}}</text></view>
+          </view>
+          <view class="mt4"
+            >归库编码：<text class="black">{{ item.sampleReturnCode }}</text></view
+          >
+          <view class="mt4"
+            >样品库名称：<text class="black">{{ item.warehouseName }}</text></view
+          >
+          <view class="mt4"
+            >库位码：<text class="black">{{ item.warehouseLocationCode }}</text></view
+          >
+        </uni-card>
+      </scroll-view>
+      <up-button type="primary" :loading="btnLoading" style="width: 50%" text="提交" @click="handleSubmit"></up-button>
+    </uni-section>
+  </view>
 </template>
 
-<script setup></script>
+<script setup>
+import { computed, ref, toRefs, watch, onMounted } from 'vue'
+import { debounce } from 'lodash'
+import nx from '@/nx'
+import { onLoad, onShow } from '@dcloudio/uni-app'
 
-<style lang="scss" scoped></style>
+const btnLoading = ref(false)
+let sampleCode = ref('')
+let sampleList = ref([])
+const range = ref([])
+const userInfo = computed(() => nx.$store('user').userInfo)
+const givebackUserId = ref('')
+const { scanQRInfo } = toRefs(nx.$store('biz'))
+watch(scanQRInfo, newVal => {
+  debouncedHandleScan(newVal)
+})
+const debouncedHandleScan = debounce(val => {
+  if (!val) return
+  scanQRInfo.value = ''
+  if (nx.$router.getCurrentPage().route !== 'pages/sampleWarehouse/dispatchGiveBack/index') return
+  try {
+    sampleCode.value = val
+    getSampleList()
+  } catch (error) {
+    uni.showToast({
+      title: '请扫描正确的样品编码',
+      icon: 'none'
+    })
+  }
+}, 300)
+onShow(() => {
+  scanQRInfo.value = ''
+})
+
+async function getSampleList() {
+  if (sampleCode.value === '') return
+  let params = {
+    pageSize: 999,
+    pageNo: 1,
+    returnStatus: 'completed',
+    dispatchStatus: '1',
+    sampleReturnCode: sampleCode.value
+  }
+
+  const { list } = await nx.$api.sampleWarehouse.queryReturnToStockSample(params)
+  if (list.length === 0) {
+    return uni.showToast({ title: '未查询到该样品信息', icon: 'none' })
+  }
+  const existingCodes = new Set(sampleList.value.map(item => item.id)) // 假设唯一标识是 `code`
+  const newItems = list.filter(item => !existingCodes.has(item.id))
+
+  if (newItems.length === 0) {
+    return uni.showToast({ title: '该样品已存在，无需重复添加', icon: 'none' })
+  }
+
+  sampleList.value.push(...newItems)
+}
+async function handleSubmit() {
+  if (givebackUserId.value === '') {
+    return uni.showToast({
+      title: '请选择样品归还人',
+      icon: 'none'
+    })
+  }
+  btnLoading.value = true
+  const givebackUser = range.value.find(item => item.value === givebackUserId.value)?.nickname
+  await nx.$api.sampleWarehouse
+    .execSampleDispatch({
+      detailIds: sampleList.value.map(item => item.id),
+      givebackUserId: givebackUserId.value,
+      givebackUser
+    })
+    .finally(() => {
+      btnLoading.value = false
+    })
+  uni.showToast({
+    title: '归还成功',
+    icon: 'none'
+  })
+  handleReset()
+}
+function handleReset() {
+  sampleCode.value = ''
+  sampleList.value = []
+}
+onMounted(async () => {
+  const data = await nx.$api.user.getAssignUserList()
+  range.value = data.map(item => ({ text: item.nickname, value: item.id }))
+})
+</script>
+
+<style lang="scss" scoped>
+.sample-item {
+  position: relative;
+  pointer-events: none;
+  .item-checkbox {
+    position: absolute;
+    right: 5px;
+    top: 5px;
+  }
+}
+:deep(.uni-select__input-placeholder) {
+  font-size: 16px;
+}
+</style>
diff --git a/pages/sampleWarehouse/execChangeLocation/index.vue b/pages/sampleWarehouse/execChangeLocation/index.vue
index cd87811..afe5d61 100644
--- a/pages/sampleWarehouse/execChangeLocation/index.vue
+++ b/pages/sampleWarehouse/execChangeLocation/index.vue
@@ -69,6 +69,7 @@
 <script setup>
 import { ref, reactive, computed, onMounted, toRefs, watch } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
+import { debounce } from 'lodash'
 import nx from '@/nx'
 
 const changeType = ref('sample')
@@ -134,24 +135,23 @@ function handleChangeType(e) {
 let isFirstInput = ref(true)
 const { scanQRInfo } = toRefs(nx.$store('biz'))
 watch(scanQRInfo, newVal => {
-  if (!newVal) return
+  debouncedHandleScan(newVal)
+})
+const debouncedHandleScan = debounce(val => {
+  if (!val) return
   scanQRInfo.value = ''
   if (nx.$router.getCurrentPage().route !== 'pages/sampleWarehouse/execChangeLocation/index') return
   try {
-    console.log(newVal)
-
-    const isJson = nx.$helper.isJsonString(newVal)
-    console.log(isJson)
-
+    const isJson = nx.$helper.isJsonString(val)
     if (isFirstInput.value) {
-      handleFirstScan(newVal, isJson)
+      handleFirstScan(val, isJson)
     } else {
-      handleSecondScan(newVal, isJson)
+      handleSecondScan(val, isJson)
     }
   } catch (error) {
     uni.showToast({ title: '扫码内容解析失败', icon: 'none' })
   }
-})
+}, 300)
 function handleFirstScan(rawValue, isJson) {
   if (changeType.value === 'sample') {
     // 按样品变更：首扫应为纯字符串（样品编号）
diff --git a/pages/sampleWarehouse/index/index.vue b/pages/sampleWarehouse/index/index.vue
index 1d7ad98..df4f8e9 100644
--- a/pages/sampleWarehouse/index/index.vue
+++ b/pages/sampleWarehouse/index/index.vue
@@ -12,7 +12,7 @@
 
     <up-grid :col="gridCol" :border="false">
       <up-grid-item class="mb20 mt20" v-for="item in menuItemList" :key="item.url" @click="goTo(item.url)">
-        <u-icon :name="item.otherConf.icon" color="#0055A2" size="80" />
+        <u-icon :name="item.otherConf.icon" color="#0055A2" size="60" />
         <view class="grid-text">{{ item.name }}</view>
       </up-grid-item>
     </up-grid>
@@ -104,6 +104,6 @@ const { gridCol } = useGridCol([400], [2, 3])
 
 <style scoped lang="scss">
 .grid-text {
-  font-size: 24px;
+  font-size: 18px;
 }
 </style>
diff --git a/pages/sampleWarehouse/returnToStock/index.vue b/pages/sampleWarehouse/returnToStock/index.vue
index 8eeb156..e0a786c 100644
--- a/pages/sampleWarehouse/returnToStock/index.vue
+++ b/pages/sampleWarehouse/returnToStock/index.vue
@@ -29,16 +29,26 @@
 <script setup>
 import { ref, reactive, computed, onMounted, toRefs, watch } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
+import { debounce } from 'lodash'
 import nx from '@/nx'
 
 const { scanQRInfo } = toRefs(nx.$store('biz'))
 watch(scanQRInfo, newVal => {
-  if (!newVal) return
+  debouncedHandleScan(newVal)
+})
+const debouncedHandleScan = debounce(val => {
+  if (!val) return
   scanQRInfo.value = ''
   if (nx.$router.getCurrentPage().route !== 'pages/sampleWarehouse/returnToStock/index') return
   try {
-    if (nx.$helper.isJsonString(newVal)) {
-      const codeObj = JSON.parse(newVal)
+    if (nx.$helper.isJsonString(val)) {
+      const codeObj = JSON.parse(val)
+      if (codeObj.code === locationCode.value) {
+        return uni.showToast({
+          title: '请勿重复扫描',
+          icon: 'none'
+        })
+      }
       locationCode.value = codeObj.code
     } else {
       if (!locationCode.value) {
@@ -48,7 +58,7 @@ watch(scanQRInfo, newVal => {
         })
         return
       } else {
-        sampleCode.value = newVal
+        sampleCode.value = val
         // 执行归库
         handleReturnToStock()
       }
@@ -56,7 +66,7 @@ watch(scanQRInfo, newVal => {
   } catch (error) {
     uni.showToast({ title: '扫码内容解析失败', icon: 'none' })
   }
-})
+}, 300)
 onShow(() => {
   scanQRInfo.value = ''
 })
@@ -69,11 +79,11 @@ function handleReturnToStock() {
   nx.$api.sampleWarehouse
     .execReturnToStock({
       warehouseLocationCode: locationCode.value,
-      sampleCode: sampleCode.value
+      sampleReturnCode: sampleCode.value
     })
     .then(res => {
       successCount.value++
-      if (res.print) {
+      if (res.isPrint) {
         uni.showToast({
           title: `归库成功，归库码为【${res.code}】`,
           duration: 3000,
diff --git a/pages/sampleWarehouse/sampleDispatchExternal/detail.vue b/pages/sampleWarehouse/sampleDispatchExternal/detail.vue
index 040c8a6..791f1e1 100644
--- a/pages/sampleWarehouse/sampleDispatchExternal/detail.vue
+++ b/pages/sampleWarehouse/sampleDispatchExternal/detail.vue
@@ -11,6 +11,7 @@
       ><text>申请事由：</text><text>{{ applyData.applyContent }}</text></view
     >
     <up-input
+      v-if="showAction"
       style="padding-top: 20px"
       border="bottom"
       v-model="sampleCode"
@@ -37,12 +38,14 @@
             <view class="mt4"
               >库位码：<text class="black">{{ item.warehouseLocationCode }}</text></view
             >
-            <up-checkbox class="item-checkbox" :name="item.sampleReturnCode"> </up-checkbox>
+            <up-checkbox v-if="showAction" class="item-checkbox" :name="item.sampleReturnCode"> </up-checkbox>
           </uni-card>
         </up-checkbox-group>
       </scroll-view>
       <up-button
+        v-if="showAction"
         type="primary"
+        :loading="btnLoading"
         :disabled="checkedSampleCodes.length !== sampleList.length"
         style="width: 50%"
         text="提交"
@@ -56,10 +59,16 @@
 import { computed, ref, toRefs, watch } from 'vue'
 import nx from '@/nx'
 import { onLoad, onShow } from '@dcloudio/uni-app'
+import { debounce } from 'lodash'
 
+let btnLoading = ref(false)
 let sampleCode = ref('')
-let applyData = ref({ applyUser: '张三', applyTime: '2021-01-01 10:10:10', applyContent: '测试' })
+let applyData = ref({})
 let sampleList = ref([])
+
+const showAction = computed(() => {
+  return applyData.value.finishStatus === 'pending'
+})
 async function getDetailList() {
   const { list } = await nx.$api.sampleWarehouse.querySampleDispatchApplyDetail({
     parentId: applyData.value.id,
@@ -71,15 +80,18 @@ let checkedSampleCodes = ref([])
 
 const { flagInfo, scanQRInfo } = toRefs(nx.$store('biz'))
 onLoad(async options => {
-  applyData.value = flagInfo
+  applyData.value = flagInfo.value
   getDetailList()
 })
 watch(scanQRInfo, newVal => {
-  if (!newVal) return
+  debouncedHandleScan(newVal)
+})
+const debouncedHandleScan = debounce(val => {
+  if (!val) return
   scanQRInfo.value = ''
   if (nx.$router.getCurrentPage().route !== 'pages/sampleWarehouse/sampleDispatchExternal/detail') return
   try {
-    sampleCode.value = newVal
+    sampleCode.value = val
     if (
       sampleCode.value === sampleList.value.find(item => item.sampleReturnCode === sampleCode.value)?.sampleReturnCode
     ) {
@@ -103,13 +115,16 @@ watch(scanQRInfo, newVal => {
       icon: 'none'
     })
   }
-})
+}, 300)
 onShow(() => {
   scanQRInfo.value = ''
 })
 
 async function handleSubmit() {
-  await nx.$api.sampleWarehouse.execSampleDispatch({ id: applyData.value.id })
+  btnLoading.value = true
+  await nx.$api.sampleWarehouse.execSampleDispatch({ id: applyData.value.id }).finally(() => {
+    btnLoading.value = false
+  })
   uni.showToast({
     title: '调拨成功',
     icon: 'none'
diff --git a/pages/sampleWarehouse/sampleDispatchExternal/index.vue b/pages/sampleWarehouse/sampleDispatchExternal/index.vue
index 8b51261..90adc71 100644
--- a/pages/sampleWarehouse/sampleDispatchExternal/index.vue
+++ b/pages/sampleWarehouse/sampleDispatchExternal/index.vue
@@ -11,7 +11,7 @@
     <scroll-view style="height: 82vh" scroll-y scroll-with-animation @scrolltolower="handleScrolltolower">
       <view class="data-item" v-for="(item, index) in listData" @click="handleDetail(item)">
         <view
-          >申请人：<text>{{ item.applyUser }}</text></view
+          >申请人：<text class="pl20">{{ item.applyUser }}</text></view
         >
         <view
           >申请时间：<text>{{ nx.$dayjs(item.applyTime).format('YYYY-MM-DD HH:mm:ss') }}</text></view
diff --git a/pages/sampleWarehouse/sampleDispatchInternal/index.vue b/pages/sampleWarehouse/sampleDispatchInternal/index.vue
index ddd5f29..1ccbd49 100644
--- a/pages/sampleWarehouse/sampleDispatchInternal/index.vue
+++ b/pages/sampleWarehouse/sampleDispatchInternal/index.vue
@@ -1,6 +1,10 @@
 <template>
   <navbar-back title="样品调拨"></navbar-back>
-  <view class="pl8 pr8">
+  <view class="pl8 pr8 pt8">
+    <view class="x-f">
+      <text class="pl6">领取人：</text>
+      <uni-data-select v-model="receiverId" :localdata="range" placeholder="请选择样品领取人"></uni-data-select>
+    </view>
     <view class="border-b p6 x-f"
       ><view class="pr16">库管员：</view><text>{{ userInfo.nickname }}</text></view
     >
@@ -12,6 +16,7 @@
       prefixIcon="scan"
       fontSize="16"
       prefixIconStyle="font-size: 30px;"
+      @confirm="getScanSample"
     >
     </up-input>
 
@@ -33,48 +38,96 @@
           >
         </uni-card>
       </scroll-view>
-      <up-button :disabled="!receiver" type="primary" style="width: 50%" text="提交" @click="handleSubmit"></up-button>
+      <up-button type="primary" :loading="btnLoading" style="width: 50%" text="提交" @click="handleSubmit"></up-button>
     </uni-section>
   </view>
 </template>
 
 <script setup>
-import { computed, ref, toRefs, watch } from 'vue'
+import { computed, ref, toRefs, watch, onMounted } from 'vue'
 import nx from '@/nx'
 import { onLoad, onShow } from '@dcloudio/uni-app'
 
+const btnLoading = ref(false)
 let sampleCode = ref('')
 let sampleList = ref([])
-let receiver = ref('')
-
+const range = ref([])
 const userInfo = computed(() => nx.$store('user').userInfo)
-
+const receiverId = ref('')
 const { scanQRInfo } = toRefs(nx.$store('biz'))
 watch(scanQRInfo, newVal => {
-  if (!newVal) return
+  debouncedHandleScan(newVal)
+})
+const debouncedHandleScan = debounce(val => {
+  if (!val) return
   scanQRInfo.value = ''
-  if (nx.$router.getCurrentPage().route !== 'pages/sampleWarehouse/sampleDispatchExternal/detail') return
+  if (nx.$router.getCurrentPage().route !== 'pages/sampleWarehouse/sampleDispatchInternal/index') return
   try {
-    sampleCode.value = newVal
+    sampleCode.value = val
+    getScanSample()
   } catch (error) {
     uni.showToast({
       title: '请扫描正确的样品编码',
       icon: 'none'
     })
   }
-})
+}, 300)
 onShow(() => {
   scanQRInfo.value = ''
 })
 
+let dispatchTempId = ref('')
+// 创建临时数据
+async function createDispatchTempData() {
+  const data = await nx.$api.sampleWarehouse.createDispatchTempData()
+  dispatchTempId.value = data.id
+}
+async function getScanSample() {
+  if (sampleCode.value === '') return
+  await nx.$api.sampleWarehouse.addDispatchSample({ id: dispatchTempId.value, sampleReturnCode: sampleCode.value })
+  getSampleList()
+}
+async function getSampleList() {
+  const { list } = await nx.$api.sampleWarehouse.querySampleDispatchApplyDetail({
+    pageSize: 999,
+    pageNo: 1,
+    parentId: dispatchTempId.value
+  })
+  sampleList.value = list
+}
 async function handleSubmit() {
-  await nx.$api.sampleWarehouse.execSampleDispatch({})
+  if (receiverId.value === '') {
+    return uni.showToast({
+      title: '请选择样品领取人',
+      icon: 'none'
+    })
+  }
+  btnLoading.value = true
+  const receiver = range.value.find(item => item.value === receiverId.value)?.nickname
+  await nx.$api.sampleWarehouse
+    .execSampleDispatch({
+      id: dispatchTempId.value,
+      applyUserId: receiverId.value,
+      applyUser: receiver
+    })
+    .finally(() => {
+      btnLoading.value = false
+    })
   uni.showToast({
     title: '调拨成功',
     icon: 'none'
   })
-  uni.navigateBack()
 }
+function handleReset() {
+  sampleCode.value = ''
+  sampleList.value = []
+  createDispatchTempData()
+}
+onMounted(async () => {
+  const data = await nx.$api.user.getAssignUserList()
+  range.value = data.map(item => ({ text: item.nickname, value: item.id }))
+  handleReset()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -87,4 +140,7 @@ async function handleSubmit() {
     top: 5px;
   }
 }
+:deep(.uni-select__input-placeholder) {
+  font-size: 16px;
+}
 </style>
diff --git a/pages/sampleWarehouse/sampleSearch/index.vue b/pages/sampleWarehouse/sampleSearch/index.vue
index f893895..db5b61d 100644
--- a/pages/sampleWarehouse/sampleSearch/index.vue
+++ b/pages/sampleWarehouse/sampleSearch/index.vue
@@ -58,15 +58,19 @@
 <script setup>
 import { ref, computed, onMounted, toRefs, watch } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
+import { debounce } from 'lodash'
 import nx from '@/nx'
 
 const { scanQRInfo } = toRefs(nx.$store('biz'))
 watch(scanQRInfo, newVal => {
-  if (!newVal) return
+  debouncedHandleScan(newVal)
+})
+const debouncedHandleScan = debounce(val => {
+  if (!val) return
   scanQRInfo.value = ''
   if (nx.$router.getCurrentPage().route !== 'pages/sampleWarehouse/sampleSearch/index') return
   try {
-    sampleCode.value = newVal
+    sampleCode.value = val
     handleSearch()
   } catch (error) {
     uni.showToast({
@@ -74,7 +78,7 @@ watch(scanQRInfo, newVal => {
       icon: 'none'
     })
   }
-})
+}, 300)
 onShow(() => {
   scanQRInfo.value = ''
 })
diff --git a/pages/sampleWarehouse/sampleTakeOff/index.vue b/pages/sampleWarehouse/sampleTakeOff/index.vue
index 6cf15ec..a641bdc 100644
--- a/pages/sampleWarehouse/sampleTakeOff/index.vue
+++ b/pages/sampleWarehouse/sampleTakeOff/index.vue
@@ -52,6 +52,7 @@
 import { computed, ref, toRefs, watch, reactive } from 'vue'
 import nx from '@/nx'
 import { onLoad, onShow } from '@dcloudio/uni-app'
+import { debounce } from 'lodash'
 
 const takeOffType = ref('sample')
 const takeOffTypeOptions = reactive([
@@ -75,11 +76,14 @@ const userInfo = computed(() => nx.$store('user').userInfo)
 
 const { scanQRInfo } = toRefs(nx.$store('biz'))
 watch(scanQRInfo, newVal => {
-  if (!newVal) return
+  debouncedHandleScan(newVal)
+})
+const debouncedHandleScan = debounce(val => {
+  if (!val) return
   scanQRInfo.value = ''
   if (nx.$router.getCurrentPage().route !== 'pages/sampleWarehouse/sampleTakeOff/index') return
   try {
-    const isJson = nx.$helper.isJsonString(newVal)
+    const isJson = nx.$helper.isJsonString(val)
     const isSample = takeOffType.value === 'sample'
     if (isJson) {
       if (isSample) {
@@ -88,11 +92,11 @@ watch(scanQRInfo, newVal => {
           icon: 'none'
         })
       }
-      const codeObj = JSON.parse(newVal)
+      const codeObj = JSON.parse(val)
       targetCode.value = codeObj.code
     } else {
       if (isSample) {
-        targetCode.value = newVal
+        targetCode.value = val
       } else {
         return uni.showToast({
           title: '请扫描正确库位码',
@@ -107,7 +111,7 @@ watch(scanQRInfo, newVal => {
       icon: 'none'
     })
   }
-})
+}, 300)
 onShow(() => {
   scanQRInfo.value = ''
 })
@@ -138,7 +142,7 @@ async function handleSubmit() {
   if (takeOffType.value === 'warehouseLocation') {
     params.locationCode = targetCode.value
   } else {
-    params.sampleCode = targetCode.value
+    params.sampleReturnCodes = sampleList.value.map(item => item.sampleReturnCode)
   }
   btnLoading.value = true
   await nx.$api.sampleWarehouse.execTakeOff(params).finally(() => {
diff --git a/uni_modules/uni-data-select/changelog.md b/uni_modules/uni-data-select/changelog.md
index 016e3d2..1681eae 100644
--- a/uni_modules/uni-data-select/changelog.md
+++ b/uni_modules/uni-data-select/changelog.md
@@ -1,3 +1,15 @@
+## 1.1.0（2025-08-19）
+- 新增 插槽 selected empty option
+- 新增 mutiple 属性,支持多选功能
+- 新增 wrap 属性,支持选中的文字超过一行显示
+- 新增 align 属性,支持修改选中的文字显示的位置
+- 新增 hideRight 属性,支持隐藏右侧所有按钮
+- 新增 mode 属性,支持修改边框样式
+- 新增 事件 open close clear
+## 1.0.10（2025-04-14）
+- 修复 清除按钮不展示问题
+## 1.0.9（2025-03-26）
+- 优化 默认背景为白色与整体组件保持风格统一
 ## 1.0.8（2024-03-28）
 - 修复 在vue2下:style动态绑定导致编译失败的bug
 ## 1.0.7（2024-01-20）
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
index edab65a..85b2d7b 100644
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -2,30 +2,59 @@
 	<view class="uni-stat__select">
 		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
 		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
-			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
-				<view class="uni-select__input-box" @click="toggleSelector">
-					<view v-if="current" class="uni-select__input-text">{{textShow}}</view>
-					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
-					<view v-if="current && clear && !disabled" @click.stop="clearVal">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled, 'uni-select--wrap': shouldWrap , 'border-default': mode == 'default','border-bottom': mode == 'underline'}">
+				<view class="uni-select__input-box" @click="toggleSelector" :class="{'uni-select__input-box--wrap': shouldWrap}">
+          <view v-if="slotSelected" class="slot-content padding-top-bottom" :class="{'uni-select__input-text--wrap': shouldWrap}">
+            <slot name="selected" :selectedItems="getSelectedItems()"></slot>
+          </view>
+          <template v-else>
+            <view v-if="textShow" class="uni-select__input-text" :class="{'uni-select__input-text--wrap': shouldWrap}">
+              <view class="padding-top-bottom" :class="'align-'+align">{{textShow}}</view>
+            </view>
+            <view v-else class="uni-select__input-text uni-select__input-placeholder" :class="'align-'+align">{{typePlaceholder}}</view>
+          </template>
+					<view key="clear-button" v-if="!hideRight && shouldShowClear && clear && !disabled" @click.stop="clearVal">
 						<uni-icons type="clear" color="#c0c4cc" size="24" />
 					</view>
-					<view v-else>
+					<view key="arrow-button" v-else-if="!hideRight">
 						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
 					</view>
 				</view>
 				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
-				<view class="uni-select__selector" :style="getOffsetByPlacement" v-if="showSelector">
-					<view :class="placement=='bottom'?'uni-popper__arrow_bottom':'uni-popper__arrow_top'"></view>
-					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
-						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
-							<text>{{emptyTips}}</text>
-						</view>
-						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
-							@click="change(item)">
-							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
-						</view>
-					</scroll-view>
-				</view>
+					<view class="uni-select__selector" :style="getOffsetByPlacement" v-if="showSelector">
+						<view :class="placement=='bottom'?'uni-popper__arrow_bottom':'uni-popper__arrow_top'"></view>
+						<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+							<template v-if="slotEmpty && mixinDatacomResData.length === 0">
+								<view class="uni-select__selector-empty">
+									<slot name="empty" :empty="emptyTips"></slot>
+								</view>
+							</template>
+							<template v-else>
+								<view v-if="mixinDatacomResData.length === 0" class="uni-select__selector-empty">
+									<text>{{emptyTips}}</text>
+								</view>
+							</template>
+							<template v-if="slotOption">
+								<view v-for="(itemData,index) in mixinDatacomResData" :key="index" @click="change(itemData)">
+									<slot name="option" :item="itemData" :itemSelected="multiple? getCurrentValues().includes(itemData.value):getCurrentValues() == itemData.value"></slot>
+								</view>
+							</template>
+							<template v-else>
+								<view v-if="!multiple && mixinDatacomResData.length > 0" class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+									@click="change(item)">
+									<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+								</view>
+								<view v-if="multiple && mixinDatacomResData.length > 0" >
+									<checkbox-group @change="checkBoxChange">
+										<label class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index" >
+											<checkbox :value="index+''" :checked="getCurrentValues().includes(item.value)" :disabled="item.disable"></checkbox>
+											<view :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</view>
+										</label>
+									</checkbox-group>
+								</view>
+							</template>
+						</scroll-view>
+					</view>
 			</view>
 		</view>
 	</view>
@@ -36,22 +65,56 @@
 	 * DataChecklist 数据选择器
 	 * @description 通过数据渲染的下拉框组件
 	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
-	 * @property {String} value 默认值
+	 * @property {String|Array} value 默认值，多选时为数组
 	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
 	 * @property {Boolean} clear 是否可以清空已选项
 	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
 	 * @property {String} label 左侧标题
 	 * @property {String} placeholder 输入框的提示文字
 	 * @property {Boolean} disabled 是否禁用
+	 * @property {Boolean} multiple 是否多选模式
+	 * @property {Boolean} wrap 是否允许选中文本换行显示
 	 * @property {String} placement 弹出位置
 	 * 	@value top   		顶部弹出
 	 * 	@value bottom		底部弹出（default)
+	 * @property {String} align 选择文字的位置
+	 *  @value left 显示左侧
+	 *  @value center 显示中间
+	 *  @value right 显示 右侧
+	 * @property {Boolean} hideRight 是否隐藏右侧按钮
+	 * @property {String} mode 边框样式
+	 *  @value default 四周边框
+	 *  @value underline 下边框
+	 *  @value none 无边框
 	 * @event {Function} change  选中发生变化触发
+	 * @event {Function} open  选择框开启时触发
+	 * @event {Function} close  选择框关闭时触发
+	 * @event {Function} clear  点击清除按钮之后触发
 	 */
 
 	export default {
 		name: "uni-data-select",
 		mixins: [uniCloud.mixinDatacom || {}],
+		emits: [
+			'open',
+			'close',
+			'update:modelValue',
+			'input',
+			'clear',
+			'change'
+		],
+		model: {
+			prop: 'modelValue',
+			event: 'update:modelValue'
+		},
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
 		props: {
 			localdata: {
 				type: Array,
@@ -60,11 +123,11 @@
 				}
 			},
 			value: {
-				type: [String, Number],
+				type: [String, Number, Array],
 				default: ''
 			},
 			modelValue: {
-				type: [String, Number],
+				type: [String, Number, Array],
 				default: ''
 			},
 			label: {
@@ -99,7 +162,27 @@
 			placement: {
 				type: String,
 				default: 'bottom'
-			}
+			},
+      multiple: {
+				type: Boolean,
+				default: false
+			},
+			wrap: {
+				type: Boolean,
+				default: false
+			},
+			align:{
+				type: String,
+				default: "left"
+			},
+			hideRight: {
+				type: Boolean,
+				default: false
+			},
+      mode:{
+        type: String,
+        default: 'default'
+      }
 		},
 		data() {
 			return {
@@ -133,20 +216,35 @@
 					common
 			},
 			valueCom() {
-				// #ifdef VUE3
-				return this.modelValue;
-				// #endif
-				// #ifndef VUE3
-				return this.value;
-				// #endif
+        if (this.value === '') return this.modelValue
+				if (this.modelValue === '') return this.value
+				return this.value
 			},
 			textShow() {
 				// 长文本显示
-				let text = this.current;
-				if (text.length > 10) {
-					return text.slice(0, 25) + '...';
+				if (this.multiple) {
+					const currentValues = this.getCurrentValues();
+					if (Array.isArray(currentValues) && currentValues.length > 0) {
+						const selectedItems = this.mixinDatacomResData.filter(item => currentValues.includes(item.value));
+						return selectedItems.map(item => this.formatItemName(item)).join(', ');
+					} else {
+						return ''; // 空数组时返回空字符串，显示占位符
+					}
+				} else {
+					return this.current;
 				}
-				return text;
+			},
+			shouldShowClear() {
+				if (this.multiple) {
+					const currentValues = this.getCurrentValues();
+					return Array.isArray(currentValues) && currentValues.length > 0;
+				} else {
+					return !!this.current;
+				}
+			},
+			shouldWrap() {
+				// 只有在多选模式、开启换行、且有内容时才应用换行样式
+				return this.multiple && this.wrap && !!this.textShow;
 			},
 			getOffsetByPlacement() {
 				switch (this.placement) {
@@ -155,10 +253,38 @@
 					case 'bottom':
 						return "top:calc(100% + 12px);";
 				}
+			},
+      slotSelected(){
+        // #ifdef VUE2
+        return this.$scopedSlots ? this.$scopedSlots.selected : false
+        // #endif
+        // #ifdef VUE3
+        return this.$slots ? this.$slots.selected : false
+        // #endif
+      },
+      slotEmpty(){
+        // #ifdef VUE2
+        return this.$scopedSlots ? this.$scopedSlots.empty : false
+        // #endif
+        // #ifdef VUE3
+        return this.$slots ? this.$slots.empty : false
+        // #endif
+      },
+			slotOption(){
+				// #ifdef VUE2
+				return this.$scopedSlots ? this.$scopedSlots.option : false
+				// #endif
+				// #ifdef VUE3
+				return this.$slots ? this.$slots.option : false
+				// #endif
 			}
 		},
-
 		watch: {
+			showSelector:{
+				handler(val,old){
+					val ? this.$emit('open') : this.$emit('close')
+				}
+			},
 			localdata: {
 				immediate: true,
 				handler(val, old) {
@@ -178,9 +304,20 @@
 					}
 				}
 			},
-
 		},
 		methods: {
+			getSelectedItems() {
+				const currentValues = this.getCurrentValues();
+				let _minxData = this.mixinDatacomResData
+				// #ifdef MP-WEIXIN || MP-TOUTIAO
+				_minxData = JSON.parse(JSON.stringify(this.mixinDatacomResData))
+				// #endif
+				if (this.multiple) {
+					return _minxData.filter(item => currentValues.includes(item.value)) || [];
+				} else {
+					return _minxData.filter(item => item.value === currentValues) || [];
+				}
+			},
 			debounce(fn, time = 100) {
 				let timer = null
 				return function(...args) {
@@ -190,6 +327,23 @@
 					}, time)
 				}
 			},
+			// 检查项目是否已选中
+			isSelected(item) {
+				if (this.multiple) {
+					const currentValues = this.getCurrentValues();
+					return Array.isArray(currentValues) && currentValues.includes(item.value);
+				} else {
+					return this.getCurrentValues() === item.value;
+				}
+			},
+			// 获取当前选中的值
+			getCurrentValues() {
+				if (this.multiple) {
+					return Array.isArray(this.valueCom) ? this.valueCom : (this.valueCom ? [this.valueCom] : []);
+				} else {
+					return this.valueCom;
+				}
+			},
 			// 执行数据库查询
 			query() {
 				this.mixinDatacomEasyGet();
@@ -201,7 +355,7 @@
 				}
 			},
 			initDefVal() {
-				let defValue = ''
+				let defValue = this.multiple ? [] : ''
 				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
 					defValue = this.valueCom
 				} else {
@@ -212,47 +366,105 @@
 					if (strogeValue || strogeValue === 0) {
 						defValue = strogeValue
 					} else {
-						let defItem = ''
+						let defItem = this.multiple ? [] : ''
 						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
-							defItem = this.mixinDatacomResData[this.defItem - 1].value
+							defItem = this.multiple ? [this.mixinDatacomResData[this.defItem - 1].value] : this.mixinDatacomResData[this.defItem - 1].value
 						}
 						defValue = defItem
 					}
-					if (defValue || defValue === 0) {
+					if (defValue || defValue === 0 || (this.multiple && Array.isArray(defValue) && defValue.length > 0)) {
 						this.emit(defValue)
 					}
 				}
-				const def = this.mixinDatacomResData.find(item => item.value === defValue)
-				this.current = def ? this.formatItemName(def) : ''
+
+				if (this.multiple) {
+					const selectedValues = Array.isArray(defValue) ? defValue : (defValue ? [defValue] : []);
+					const selectedItems = this.mixinDatacomResData.filter(item => selectedValues.includes(item.value));
+					this.current = selectedItems.map(item => this.formatItemName(item));
+				} else {
+					const def = this.mixinDatacomResData.find(item => item.value === defValue)
+					this.current = def ? this.formatItemName(def) : ''
+				}
 			},
 
 			/**
-			 * @param {[String, Number]} value
+			 * @param {[String, Number, Array]} value
 			 * 判断用户给的 value 是否同时为禁用状态
 			 */
 			isDisabled(value) {
-				let isDisabled = false;
-
-				this.mixinDatacomResData.forEach(item => {
-					if (item.value === value) {
-						isDisabled = item.disable
-					}
-				})
-
-				return isDisabled;
+				if (Array.isArray(value)) {
+					// 对于数组，如果任意一个值被禁用，则认为整体被禁用
+					return value.some(val => {
+						return this.mixinDatacomResData.some(item => item.value === val && item.disable);
+					});
+				} else {
+					let isDisabled = false;
+					this.mixinDatacomResData.forEach(item => {
+						if (item.value === value) {
+							isDisabled = item.disable
+						}
+					})
+					return isDisabled;
+				}
 			},
-
 			clearVal() {
-				this.emit('')
+				const emptyValue = this.multiple ? [] : '';
+				this.emit(emptyValue)
+				this.current = this.multiple ? [] : ''
 				if (this.collection) {
 					this.removeCache()
 				}
+				this.$emit('clear')
+			},
+			checkBoxChange(res){
+				let range = res.detail.value
+
+				let currentValues = range && range.length > 0? range.map((item)=>{
+					const index = parseInt(item, 10);
+
+					if (isNaN(index)) {
+						console.error(`无效索引: ${item}`);
+					}
+
+					if (index < 0 || index >= this.mixinDatacomResData.length) {
+						console.error(`索引越界: ${index}`);
+					}
+
+					return this.mixinDatacomResData[index].value;
+				}) : []
+				const selectedItems = this.mixinDatacomResData.filter(dataItem => currentValues.includes(dataItem.value));
+				this.current = selectedItems.map(dataItem => this.formatItemName(dataItem));
+
+				this.emit(currentValues);
 			},
 			change(item) {
 				if (!item.disable) {
-					this.showSelector = false
-					this.current = this.formatItemName(item)
-					this.emit(item.value)
+					if (this.multiple) {
+						// 多选模式
+						let currentValues = this.getCurrentValues();
+						if (!Array.isArray(currentValues)) {
+							currentValues = currentValues ? [currentValues] : [];
+						}
+
+						const itemValue = item.value;
+						const index = currentValues.indexOf(itemValue);
+
+						if (index > -1) {
+							currentValues.splice(index, 1);
+						} else {
+							currentValues.push(itemValue);
+						}
+
+						const selectedItems = this.mixinDatacomResData.filter(dataItem => currentValues.includes(dataItem.value));
+						this.current = selectedItems.map(dataItem => this.formatItemName(dataItem));
+
+						this.emit(currentValues);
+					} else {
+						// 单选模式
+						this.showSelector = false
+						this.current = this.formatItemName(item)
+						this.emit(item.value)
+					}
 				}
 			},
 			emit(val) {
@@ -330,6 +542,11 @@
 	$uni-main-color: #333 !default;
 	$uni-secondary-color: #909399 !default;
 	$uni-border-3: #e5e5e5;
+  $uni-primary: #2979ff !default;
+	$uni-success: #4cd964 !default;
+	$uni-warning: #f0ad4e !default;
+	$uni-error: #dd524d !default;
+	$uni-info: #909399 !default;
 
 	/* #ifndef APP-NVUE */
 	@media screen and (max-width: 500px) {
@@ -352,6 +569,7 @@
 	}
 
 	.uni-stat-box {
+		background-color: #fff;
 		width: 100%;
 		flex: 1;
 	}
@@ -370,9 +588,16 @@
 		margin-right: 5px;
 	}
 
+  .border-bottom {
+    border-bottom: solid 1px $uni-border-3;
+  }
+
+  .border-default {
+    border: 1px solid $uni-border-3;
+  }
+
 	.uni-select {
 		font-size: 14px;
-		border: 1px solid $uni-border-3;
 		box-sizing: border-box;
 		border-radius: 4px;
 		padding: 0 5px;
@@ -384,15 +609,20 @@
 		/* #endif */
 		flex-direction: row;
 		align-items: center;
-		border-bottom: solid 1px $uni-border-3;
 		width: 100%;
 		flex: 1;
-		height: 35px;
+		min-height: 35px;
 
 		&--disabled {
 			background-color: #f5f7fa;
 			cursor: not-allowed;
 		}
+
+		&--wrap {
+			height: auto;
+			min-height: 35px;
+			// align-items: flex-start;
+		}
 	}
 
 	.uni-select__label {
@@ -404,7 +634,8 @@
 	}
 
 	.uni-select__input-box {
-		height: 35px;
+		// height: 35px;
+		width: 0px;
 		position: relative;
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -412,6 +643,24 @@
 		flex: 1;
 		flex-direction: row;
 		align-items: center;
+
+		&--wrap {
+			.uni-select__input-text {
+				margin-right: 8px;
+			}
+		}
+
+    .padding-top-bottom {
+      padding-top: 5px;
+      padding-bottom: 5px;
+    }
+
+    .slot-content {
+      width: 100%;
+      display: flex;
+      flex-direction: row;
+			flex-wrap: wrap;
+    }
 	}
 
 	.uni-select__input {
@@ -463,15 +712,18 @@
 		display: flex;
 		cursor: pointer;
 		/* #endif */
+		flex-direction: row;
+		align-items: center;
 		line-height: 35px;
 		font-size: 14px;
-		text-align: center;
 		/* border-bottom: solid 1px $uni-border-3; */
 		padding: 0px 10px;
 	}
 
-	.uni-select__selector-item:hover {
-		background-color: #f9f9f9;
+
+
+	.uni-select__selector-item-check {
+		margin-left: auto;
 	}
 
 	.uni-select__selector-empty:last-child,
@@ -490,15 +742,14 @@
 	.uni-popper__arrow_bottom,
 	.uni-popper__arrow_bottom::after,
 	.uni-popper__arrow_top,
-	.uni-popper__arrow_top::after,
-	{
-	position: absolute;
-	display: block;
-	width: 0;
-	height: 0;
-	border-color: transparent;
-	border-style: solid;
-	border-width: 6px;
+	.uni-popper__arrow_top::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
 	}
 
 	.uni-popper__arrow_bottom {
@@ -544,11 +795,22 @@
 		text-overflow: ellipsis;
 		-o-text-overflow: ellipsis;
 		overflow: hidden;
+
+		&--wrap {
+			white-space: normal;
+			text-overflow: initial;
+			-o-text-overflow: initial;
+			overflow: visible;
+			word-wrap: break-word;
+			word-break: break-all;
+			// line-height: 1.5;
+		}
 	}
 
 	.uni-select__input-placeholder {
 		color: $uni-base-color;
 		font-size: 12px;
+    margin: 1px 0;
 	}
 
 	.uni-select--mask {
@@ -559,4 +821,17 @@
 		left: 0;
 		z-index: 2;
 	}
+
+  .align-left {
+    text-align: left;
+  }
+
+  .align-center {
+    text-align: center;
+  }
+
+  .align-right {
+    text-align: right;
+  }
+
 </style>
diff --git a/uni_modules/uni-data-select/package.json b/uni_modules/uni-data-select/package.json
index 5864594..4033502 100644
--- a/uni_modules/uni-data-select/package.json
+++ b/uni_modules/uni-data-select/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-data-select",
   "displayName": "uni-data-select 下拉框选择器",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "通过数据驱动的下拉框选择器",
   "keywords": [
     "uni-ui",
@@ -12,12 +12,14 @@
 ],
   "repository": "https://github.com/dcloudio/uni-ui",
   "engines": {
-    "HBuilderX": "^3.1.1"
+    "HBuilderX": "^3.1.1",
+    "uni-app": "^4.45",
+    "uni-app-x": ""
   },
   "directories": {
     "example": "../../temps/example_temps"
   },
-"dcloudext": {
+  "dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -35,52 +37,70 @@
       "permissions": "无"
     },
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
-    "type": "component-vue"
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
   },
   "uni_modules": {
-    "dependencies": ["uni-load-more"],
+    "dependencies": [
+      "uni-load-more"
+    ],
     "encrypt": [],
     "platforms": {
       "cloud": {
-        "tcb": "y",
-        "aliyun": "y",
-        "alipay": "n"
+        "tcb": "√",
+        "aliyun": "√",
+        "alipay": "√"
       },
       "client": {
-        "App": {
-          "app-vue": "u",
-          "app-nvue": "n"
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "-",
+            "android": "√",
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "-",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "-",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
         },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "u",
-          "百度": "u",
-          "字节跳动": "u",
-        "QQ": "u",
-        "京东": "u"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
         }
       }
     }
   }
-}
+}
\ No newline at end of file