feat:样品分析

pages/analysis/index/index.vue

@@ -26,7 +26,7 @@ const popupShow = ref(false)
 const isAllowAgainPrint = ref(false)
 
 const menuItemList = ref([
-  { url: '/pages/analysis/sample/sample-receive', otherConf: { icon: 'arrow-downward' }, name: '收样' },
+  // { url: '/pages/analysis/sample/sample-receive', otherConf: { icon: 'arrow-downward' }, name: '收样' },
   { url: '/pages/analysis/sample/sample-work-list', otherConf: { icon: 'edit-pen-fill' }, name: '样品分析' },
   { url: '/pages/analysis/sample/sample-report', otherConf: { icon: 'arrow-upward' }, name: '数据上报' },
   { url: '/pages/analysis/sample/sample-report-search', otherConf: { icon: 'search' }, name: '待审数据' },

pages/analysis/sample/components/task-item.vue

@@ -11,7 +11,7 @@
         <view class="mt3 mb3">{{ task.taskName }}{{ task.assayOper }}</view>
         <view class="x-f">
           <u-icon name="clock"></u-icon>
-          <text class="ml5">{{ task.taskOperTime }}</text>
+          <text class="ml5">{{ taskOperatorTime }}</text>
         </view>
       </u-col>
     </u-row>
@@ -19,7 +19,7 @@
 </template>
 
 <script setup>
-import { computed } from 'vue'
+import nx from '@/nx'
 
 const props = defineProps({
   task: {
@@ -36,6 +36,7 @@ const props = defineProps({
   }
 })
 
+const taskOperatorTime = nx.$dayjs(props.task.taskOperatorTime).format('YYYY-MM-DD HH:mm:ss')
 const emit = defineEmits(['click'])
 
 const handleClick = () => {

pages/analysis/sample/sample-print.vue

@@ -189,7 +189,7 @@ function getAssayTask() {
     finishStatus: 'submited,finished'
   }
 
-  nx.$api.auncel.getAssayTaskList(param).then(res => {
+  nx.$api.assayTask.getAssayTaskList(param).then(res => {
     taskList.value = res || []
     if (taskList.value.length > 0) {
       const first = taskList.value[0]

pages/analysis/sample/sample-receive.vue

@@ -98,20 +98,8 @@ import { getDataSourceTypeShow } from '../common'
 const currentNode = ref('F30')
 const scrollTop = ref(0)
 const current = ref(0)
-const taskList = ref([
-  { id: 1, taskNo: 'TASK-1', taskName: '任务1', taskOperTime: '2022-03-01 10:00:00' },
-  { id: 1, taskNo: 'TASK-1', taskName: '任务1', taskOperTime: '2022-03-01 10:00:00' },
-  { id: 1, taskNo: 'TASK-1', taskName: '任务1', taskOperTime: '2022-03-01 10:00:00' },
-  { id: 1, taskNo: 'TASK-1', taskName: '任务1', taskOperTime: '2022-03-01 10:00:00' },
-  { id: 1, taskNo: 'TASK-1', taskName: '任务1', taskOperTime: '2022-03-01 10:00:00' },
-  { id: 1, taskNo: 'TASK-1', taskName: '任务1', taskOperTime: '2022-03-01 10:00:00' },
-  { id: 1, taskNo: 'TASK-1', taskName: '任务1', taskOperTime: '2022-03-01 10:00:00' },
-  { id: 1, taskNo: 'TASK-1', taskName: '任务1', taskOperTime: '2022-03-01 10:00:00' },
-  { id: 1, taskNo: 'TASK-1', taskName: '任务1', taskOperTime: '2022-03-01 10:00:00' }
-])
-const sampleList = ref([
-  { id: 1, sampleCode: 'SAMPLE-1', sampleName: '样品1', sort: 1, checked: false, sampleProcessNo: 'F30' }
-])
+const taskList = ref([])
+const sampleList = ref([])
 const dicSampleProcessCodeList = ref([])
 
 // 计算属性
@@ -188,7 +176,7 @@ const getAssayTask = () => {
     assayOper: userInfo.value.nickname
   }
 
-  nx.$api.auncel
+  nx.$api.assayTask
     .getAssayTaskList(param)
     .then(res => {
       taskList.value = res || []

pages/analysis/sample/sample-report-search.vue

@@ -155,7 +155,7 @@ const getAssayTask = () => {
     wfStatus: 'running',
     assayOper: userInfo.value.realname
   }
-  nx.$api.auncel.getAssayTaskList(param).then(res => {
+  nx.$api.assayTask.getAssayTaskList(param).then(res => {
     taskList.value = res
     if (taskList.value.length > 0) {
       current.value = 0

pages/analysis/sample/sample-report.vue

@@ -19,6 +19,7 @@
             v-for="(task, index) in taskList"
             :key="index"
             :task="task"
+            :seq="index + 1"
             :active="current === index"
             @click="switchTask(index)"
           />
@@ -167,7 +168,7 @@ const getAssayTask = () => {
     wfStatus: '0,revoke',
     assayOper: userInfo.value.nickname
   }
-  nx.$api.auncel
+  nx.$api.assayTask
     .getAssayTaskList(param)
     .then(res => {
       taskList.value = res