feat:样品库管理

2025-11-21 17:56:33 +08:00
parent 7ee3df9ab9
commit 753766893b
24 changed files with 818 additions and 218 deletions
--- 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>
--- 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') {
    // 按样品变更：首扫应为纯字符串（样品编号）
--- 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>
--- 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,
--- 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'
--- 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
--- 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>
--- 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 = ''
 })
--- 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(() => {