feat:样品库管理

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')
   }
+  if (brand === 'urovo') {
     urovo.scanRegister(data => {
       console.log('优博讯扫码结果：' + data)
       $store('biz').scanQRInfo = data
     })
+  }
   // #endif
 })
 

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;
 }

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.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.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'
 

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({

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
+    })
 }

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')

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="fs20">{{ task.taskNo }}</view>
-        <view class="mt3 mb3">{{ task.taskName }}{{ task.assayOper }}</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;
+  top: 20px;
-  left: 12px;
+  left: 20px;
   color: #fff;
   font-size: 11px;
 }

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;

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-size: 22px;
-  font-weight: 300;
   padding: 10px;
   text-align: center;
   display: flex;