zgty/zgty-mas-m
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:样品分析

Browse Source
This commit is contained in:
houjunxiang
2025-11-15 18:09:04 +08:00
parent d3f6ad4bf6
commit 00e21aebd3
60 changed files with 299 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pages/analysis/sample/components/task-item.vue
View File

@@ -3,8 +3,11 @@
<view class="u-tab-item" :class="{ 'u-tab-item-active': active }" @tap.stop="handleClick">
<u-row class="full-width">
<u-col span="2" class="text-center" style="position: relative">
<u-icon :color="taskStyle(task)" name="tags-fill" size="40"></u-icon>
<text class="seq">{{ seq }}</text>
<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>
<text class="seq">{{ seq }}</text>
</template>
</u-col>
<u-col span="10">
<view class="fs18">{{ task.taskNo }}</view>

125
pages/analysis/sample/sample-report-search.vue
View File

@@ -1,11 +1,10 @@
<template>
<view>
<navbar-back :autoBack="false" title="审核查询" @leftClick="customBack"></navbar-back>
<navbar-back :autoBack="false" title="分析记录" @leftClick="customBack"></navbar-back>
<u-row gutter="16">
<u-col span="4">
<view class="content-title-name">
<text>任务列表</text>
<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
@@ -14,15 +13,22 @@
scroll-with-animation
class="content-main-left"
:scroll-top="scrollTop"
@scrolltolower="handleScrolltolower"
>
<TaskItem
v-for="(task, index) in taskList"
v-for="(task, index) in listData"
:key="index"
:task="task"
:seq="index + 1"
:active="current === index"
:active="selectedIndex === index"
@click="switchTask(index)"
/>
>
<template #tag="{ task }">
<u-icon v-if="task.flowStatus === 'approved'" name="/static/images/status/completed.png" size="45" />
<u-icon v-else name="/static/images/status/wait_for_audit.png" size="45" />
</template>
</TaskItem>
<up-loadmore :status="loadStatus" />
</scroll-view>
</u-col>
<u-col span="8">
@@ -33,33 +39,30 @@
<view>
<scroll-view scroll-y scroll-with-animation style="height: calc(75vh - 60px)">
<block v-for="(sample, index) in sampleList" :key="index">
<view class="p5 fs16">
<u-row
@click="showSampleDetail(sample.id, index)"
:class="selectedIndex.value === index ? 'selected_Sample' : ''"
>
<u-col span="2" class="text-center" :style="sampleStyle(sample)">
<view class="sample-item">
<u-row @click="showSampleDetail(sample.id, index)">
<u-col span="2" class="text-center">
<view>
<text>【{{ index + 1 }}】</text>
</view>
</u-col>
<u-col span="5">
<u-col span="4">
<view>
<text class="pl5">{{ sample.sampleAssayCode }}</text>
</view>
<view>
<text class="pl5">
{{ getDataSourceTypeShow(sample.dataSourceType) }}{{ sample.sampleName }}
{{ sample.sampleName }}
</text>
</view>
</u-col>
<u-col span="5">
<u-col span="4">
<view>
<text style="padding-left: 10px">{{ sample.assayProject }}</text>
<text style="padding-left: 10px" v-html="sample.assayProject"></text>
</view>
</u-col>
</u-row>
<u-line class="p5" color="#bbb" />
<u-icon class="sample-status" name="/static/images/status/return_b.png" size="45" />
</view>
</block>
</scroll-view>
@@ -88,20 +91,16 @@
<script setup>
import { ref, computed, onMounted } from 'vue'
import { onLoad, onBackPress } from '@dcloudio/uni-app'
import { onLoad, onBackPress, onPullDownRefresh } from '@dcloudio/uni-app'
import SampleDetailPopup from '@/components/sample/sample-detail-popup.vue'
import TaskItem from './components/task-item.vue'
import nx from '@/nx'
import { useListData } from '@/nx/hooks/usePageListData'
import { getDataSourceTypeShow } from '../common'
// 响应式数据
const scrollTop = ref(0)
const current = ref(0)
const currentTask = ref({})
const currentTaskId = ref('')
const reviewNum = ref(0)
const selectedIndex = ref(-1)
const taskList = ref([])
const selectedIndex = ref(0)
const sampleList = ref([])
const showDetailPopup = ref(false)
const detailId = ref('')
@@ -114,56 +113,40 @@ const customBack = () => {
uni.reLaunch({ url: '/pages/analysis/index/index' })
}
const sampleStyle = sample => {
if ((sample.weightSubmitStatus === 0 || sample.weightSubmitStatus === 1) && sample.reviewCount > 0) {
return 'color: red'
}
if (sample.weightSubmitStatus === 2 && sample.reviewCount > 0) {
return 'color: green'
}
return ''
function handleScrolltolower() {
scrollToLower()
}
const currentTask = computed(() => {
if (listData.value.length > 0) {
return listData.value[selectedIndex.value]
} else {
return {}
}
})
const switchTask = async index => {
if (index === current.value) return
current.value = index
selectedIndex.value = -1
const task = taskList.value[index]
currentTask.value = task
getAssayTaskDetail(task.id)
if (index === selectedIndex.value) return
selectedIndex.value = index
getAssayTaskDetail(currentTask.value.id)
}
const showSampleDetail = (id, index) => {
selectedIndex.value = index
detailId.value = id
showDetailPopup.value = true
}
const searchParams = computed(() => ({
taskAssignStatus: 'submitted',
taskAssayStatus: 'submitted'
}))
const getAssayTask = () => {
taskList.value = []
sampleList.value = []
current.value = 0
const param = {
taskAssignStatus: 'submitted',
taskAssayStatus: 'submitted',
finishStatus: 'not_start',
flowStatus: 'not_start',
assayOper: userInfo.value.realname
}
nx.$api.assayTask.getAssayTaskList(param).then(res => {
taskList.value = res
if (taskList.value.length > 0) {
currentTask.value = taskList.value[0]
getAssayTaskDetail(currentTask.value.id)
}
})
}
const { listData, scrollToLower, loadStatus, getInitData } = useListData({
searchParams,
api: nx.$api.assayTask.getAssayTaskPage
})
const getAssayTaskDetail = businessAssayTaskId => {
reviewNum.value = 0
nx.$api.assayTask.getAssayTaskDataList({ businessAssayTaskId }).then(res => {
sampleList.value = res || []
})
const getAssayTaskDetail = async businessAssayTaskId => {
const res = await nx.$api.assayTask.getAssayTaskDetailList({ businessAssayTaskId })
sampleList.value = res || []
}
const previewPDF = () => {
@@ -173,8 +156,11 @@ const previewPDF = () => {
}
// 生命周期
onMounted(() => {
getAssayTask()
onMounted(async () => {
await getInitData()
if (listData.value.length > 0) {
getAssayTaskDetail(currentTask.value.id)
}
})
onBackPress(() => {
@@ -195,7 +181,16 @@ onBackPress(() => {
justify-content: center;
align-items: center;
}
.sample-item {
position: relative;
border-bottom: 1px solid #eee;
padding: 4px;
.sample-status {
position: absolute;
top: 0;
right: 0;
}
}
.content-main-left {
background-color: #f6f6f6;
}

94
pages/analysis/sample/sample-work-detail.vue
View File

@@ -51,7 +51,10 @@
v-for="(sample, index) in sampleDataList"
:key="index"
class="u-tab-item"
:class="currentSampleIndex === index ? 'u-tab-item-active' : ''"
:class="[
currentSampleIndex === index ? 'u-tab-item-active' : '',
sample.rollbackStatus === 'in_progress' ? 'u-tab-item-disabled' : ''
]"
:data-current="index"
@tap.stop="switchSample(index, false)"
>
@@ -60,11 +63,25 @@
<view>
{{ sample.sampleCode }}
</view>
<view> {{ getDataSourceTypeShow(sample.dataSourceType) }}{{ sample.sampleName }} </view>
<view> {{ sample.sampleName }} </view>
</view>
</view>
</scroll-view>
<u-button class="btn-operation" type="primary" @click="submitTask()">数据上报</u-button>
<u-button
v-if="taskIngredientsStatus === 'allow_submit'"
class="btn-operation"
type="primary"
@click="submitTask()"
>数据上报</u-button
>
<u-button
v-else
class="btn-operation"
type="primary"
:disabled="taskIngredientsStatus === 'in_progress'"
@click="handleIngredients()"
>{{ taskIngredientsStatus === 'initial' ? '下发配料' : '等待配料' }}</u-button
>
</u-col>
<u-col span="6">
<view class="field-name" v-html="selectedField.title" />
@@ -248,6 +265,7 @@ const { proxy } = getCurrentInstance()
// 响应式数据定义
const taskId = ref('')
const taskIngredientsStatus = ref('') //配料状态
const configReportTemplateKey = ref('')
const elId = nx.$helper.uuid()
const scrollTop = ref(0) //tab标题的滚动条位置
@@ -378,9 +396,17 @@ const autoNextField = () => {
//自动切换到下一个样品
const autoNextSample = () => {
if (sampleDataList.value.length <= currentSampleIndex.value + 1) return
const index = currentSampleIndex.value + 1
switchSample(index, true)
let index = currentSampleIndex.value + 1
// 在数组范围内，且当前样品是 in_progress，就继续往后找
while (index < sampleDataList.value.length) {
const sample = sampleDataList.value[index]
if (sample.rollbackStatus !== 'in_progress') {
// 找到了合法的样品，切换
switchSample(index, true)
return
}
index++
}
}
//手动切换样品
@@ -831,11 +857,16 @@ function handleAssayTypeChange({ index, value }) {
}
// 获取任务数据
async function getSampleAnalysisByTaskId() {
const { assayTaskAnalysisDataList, configAssayMethodProjectRangeList, businessAssayTasNo, formValue } =
await nx.$api.assayTask.batchSampleAndQcAnalysisByTaskId(taskId.value)
const {
assayTaskAnalysisDataList,
configAssayMethodProjectRangeList,
businessAssayTasNo,
formValue,
ingredientsStatus
} = await nx.$api.assayTask.batchSampleAndQcAnalysisByTaskId(taskId.value)
title.value = '样品分析-任务单编号：' + businessAssayTasNo
taskIngredientsStatus.value = ingredientsStatus
// 处理分析数据
assayGroups.value = assayTaskAnalysisDataList.map(group => {
// 必须深拷贝 datas！防止多个表格共享引用
const tableData = JSON.parse(JSON.stringify(group.datas || []))
@@ -1083,29 +1114,29 @@ const auncelDoSelect = res => {
//提交任务单
const submitTask = () => {
// const params = {
// businessAssayTaskId: taskId.value
// }
// const msg = '请确认所有样品数据都已保存，然后再提交指派单！是否继续？'
// uni.showModal({
// title: '提示',
// content: msg,
// cancelColor: '#0055A2',
// confirmColor: '#0055A2',
// success: res => {
// if (res.cancel) return
// nx.$api.assayTask.submitTask(params).then(res => {
// uni.navigateTo({
// url: '/pages/analysis/sample/sample-report-search'
// })
// })
// }
// })
if (checkSampleReturning()) return
const url = `/pages/analysis/sample/pdf-preview?businessAssayTaskId=${taskId.value}&reportKey=${configReportTemplateKey.value}&showConfirmBtn=true`
uni.navigateTo({ url })
}
// 配料下发
function handleIngredients() {
if (checkSampleReturning()) return
const params = {
businessAssayTaskId: businessAssayTaskId.value
}
nx.$api.assayTask.taskIngredients(params).then(res => {
getSampleAnalysisByTaskId()
})
}
function checkSampleReturning() {
const analysisSampleData = assayGroups.value.filter(t => t.value == 'analysis').tableData
const hasReturning = analysisSampleData.some(item => item.rollbackStatus === 'in_progress')
if (hasReturning) {
nx.$helper.showToast('该任务单存在退回中的样品')
return true
}
return false
}
// 生命周期
const { lockOrientation } = useScreenOrientation()
@@ -1242,6 +1273,11 @@ onBackPress(() => {
color: #0055a2;
font-weight: 600;
}
.u-tab-item-disabled {
background-color: #ddd;
pointer-events: none;
opacity: 0.6;
}
.btn-operation {
width: 80%;

127
pages/analysis/sample/sample-work-list.vue
View File

@@ -25,44 +25,35 @@
<u-col span="8">
<view class="content-title-name">
<text>样品列表</text>
<up-badge v-if="sampleList.length > 0" class="ml5" :value="sampleList.length" type="warning"></up-badge>
</view>
<u-gap height="5" bg-color="#0055A2"></u-gap>
<view>
<scroll-view scroll-y scroll-with-animation style="height: calc(75vh - 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="p5 fs16">
<view v-if="currentTask.reviewCount === sample.reviewCount" class="sample-item">
<u-row>
<u-col span="2" class="text-center">
<u-row>
<u-col span="6" class="text-center">
<!-- v-if="
sample.rollbackStatus !== 'running' &&
sample.rollbackStatus !== 'finished'
" -->
<u-checkbox :name="sample.id"></u-checkbox>
<u-col span="4" class="text-center">
<u-checkbox :disabled="sampleDisabled(sample.rollbackStatus)" :name="sample.id"></u-checkbox>
</u-col>
<u-col span="6" class="text-center">
<u-col span="8" class="text-center">
<view
><text>【{{ index + 1 }}】</text></view
>
</u-col>
</u-row>
</u-col>
<u-col span="10" class="flex">
<u-col span="10">
<u-row>
<u-col span="6">
<view class="sample_desc">
<view>
<view
><text class="pl10">{{ sample.sampleAssayCode }}</text></view
>
<view>
<text class="pl10">
{{ getDataSourceTypeShow(sample.dataSourceType) }}{{ sample.sampleName }}
</text>
</view>
</view>
<u-col span="4">
<view>
{{ sample.sampleAssayCode }}
</view>
<view>
{{ sample.sampleName }}
</view>
</u-col>
<u-col span="6">
@@ -73,7 +64,12 @@
</u-row>
</u-col>
</u-row>
<u-line class="p5" color="#bbb" />
<u-icon
v-if="sample.rollbackStatus"
class="sample-status"
:name="`/static/images/status/${sampleReturnIcon(sample.rollbackStatus)}.png`"
size="45"
/>
</view>
</block>
</u-checkbox-group>
@@ -111,7 +107,7 @@
<script setup>
import { ref, computed, getCurrentInstance } from 'vue'
import { onLoad, onBackPress } from '@dcloudio/uni-app'
import { onLoad, onBackPress, onPullDownRefresh } from '@dcloudio/uni-app'
import nx from '@/nx'
import { useScreenOrientation } from '@/nx/hooks/useScreenOrientation'
import { getDataSourceTypeShow } from '../common'
@@ -128,6 +124,21 @@ const taskList = ref([])
const sampleList = ref([])
const checkedSampleCodes = ref([])
const sampleReturnIcon = rollbackStatus => {
switch (rollbackStatus) {
case 'returned':
return 'return_returned'
case 'rejected':
return 'return_rejected'
case 'in_progress':
return 'return_in_progress'
default:
return ''
}
}
const sampleDisabled = rollbackStatus => {
return rollbackStatus === 'returned' || rollbackStatus === 'in_progress'
}
// 计算属性
const userInfo = computed(() => nx.$store('user').userInfo)
@@ -135,6 +146,12 @@ const userInfo = computed(() => nx.$store('user').userInfo)
const customBack = () => {
uni.reLaunch({ url: '/pages/analysis/index/index' })
}
onPullDownRefresh(() => {
getAssayTask().finally(() => {
uni.stopPullDownRefresh()
uni.showToast({ title: '刷新成功', icon: 'none' })
})
})
const showRollbackModal = () => {
if (checkedSampleCodes.value.length === 0) {
uni.showToast({ title: '请选择要退回的样品！', icon: 'none' })
@@ -149,23 +166,14 @@ const applyRollbackSample = () => {
return
}
showRollbackModalFlag.value = false
uni.showModal({
title: '提示',
content: '发起申请，退回已勾选的样品，是否继续？',
cancelColor: '#0055A2',
confirmColor: '#0055A2',
success: res => {
if (res.cancel) return
const data = {
remark: rollbackContent.value,
taskId: currentTask.value.id,
detailIds: checkedSampleCodes.value.join(',')
}
nx.$api.assayTask.createRollbackApply(data).then(() => {
getAssayTaskDetail(currentTask.value.id)
})
}
const data = {
backDesc: rollbackContent.value,
idList: checkedSampleCodes.value
}
nx.$api.assayTask.rollbackAssayTask(data).then(() => {
getAssayTaskDetail(currentTask.value.id)
showRollbackModalFlag.value = false
checkedSampleCodes.value = []
})
}
@@ -202,27 +210,26 @@ const switchTask = async index => {
checkedSampleCodes.value = []
}
const getAssayTask = () => {
const getAssayTask = async () => {
rollbackContent.value = ''
const param = {
taskAssignStatus: 'submitted',
taskAssayStatusList: ['not_start', 'saved']
// assayOper: userInfo.value.nickname
}
nx.$api.assayTask.getAssayTaskList(param).then(res => {
if (res) {
taskList.value = res
if (taskList.value.length > 0) {
currentTask.value = taskList.value[0]
getAssayTaskDetail(currentTask.value.id)
}
const res = await nx.$api.assayTask.getAssayTaskList(param)
if (res) {
taskList.value = res
if (taskList.value.length > 0) {
currentTask.value = taskList.value[0]
getAssayTaskDetail(currentTask.value.id)
}
})
}
}
const getAssayTaskDetail = businessAssayTaskId => {
sampleList.value = []
nx.$api.assayTask.getAssayTaskDataList({ businessAssayTaskId }).then(res => {
nx.$api.assayTask.getAssayTaskDetailList({ businessAssayTaskId }).then(res => {
const list = res || []
list.forEach(item => (item.checked = false))
sampleList.value = list
@@ -270,6 +277,16 @@ onBackPress(() => {
background-color: #f6f6f6;
}
.sample-item {
position: relative;
border-bottom: 1px solid #eee;
padding: 4px;
.sample-status {
position: absolute;
top: 0;
right: 0;
}
}
.content-main-right-operation {
height: 50px;
padding-top: 10px;
@@ -279,14 +296,4 @@ onBackPress(() => {
font-size: 18px;
width: 95%;
}
.sample_desc {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
}
.sample_desc_warn {
color: red;
padding-right: 10px;
}
</style>