feat:样品分析

nx/api/assayTask.js

@@ -12,6 +12,15 @@ const getAssayTaskList = params => {
     }
   })
 }
+const getAssayTaskPage = params => {
+  return request({
+    url: '/qms/business-assay-task/page',
+    method: 'GET',
+    params: {
+      ...params
+    }
+  })
+}
 // 获取样品列表
 const getAssayTaskDataList = params => {
   return request({
@@ -20,6 +29,13 @@ const getAssayTaskDataList = params => {
     method: 'GET'
   })
 }
+const getAssayTaskDetailList = params => {
+  return request({
+    url: `/qms/business-assay-task-detail/list`,
+    params,
+    method: 'GET'
+  })
+}
 // 获取样品分析配置数据
 const getSampleAnalysisByTaskId = businessAssayTaskId => {
   return request({
@@ -192,6 +208,17 @@ const submitTask = params => {
   })
 }
 
+const taskIngredients = params => {
+  return request({
+    url: '/qms/bus/sample/analysis/issuedIngredients',
+    method: 'POST',
+    params,
+    custom: {
+      showSuccess: true
+    }
+  })
+}
+
 // 撤销提交任务明细
 const redoAssayTaskDetail = params => {
   return request({
@@ -230,13 +257,11 @@ const reportAssayTask = id => {
   })
 }
 
-const rollbackAssayTask = id => {
+const rollbackAssayTask = data => {
   return request({
-    url: taskPrefix + '/rollbackAssayTask',
+    url: '/qms/bus/sample/analysis/rollbackAnalysisSample',
     method: 'POST',
-    params: {
-      id
-    }
+    data
   })
 }
 
@@ -262,7 +287,9 @@ const queryQmsDicSampleProcessCodeList = () => {
 
 export default {
   getAssayTaskList,
+  getAssayTaskPage,
   getAssayTaskDataList,
+  getAssayTaskDetailList,
   getSampleAnalysisByTaskId,
   batchSampleAndQcAnalysisByTaskId,
   saveBatchSmpleAndQcAnalysis,
@@ -283,5 +310,6 @@ export default {
   createRollbackApply,
   rollbackAssayTask,
   submitTask,
+  taskIngredients,
   queryQmsDicSampleProcessCodeList
 }

nx/hooks/usePageListData.js

@@ -7,9 +7,7 @@ export function useListData({ searchParams, api, needInitListData = false, proce
   const loadingData = ref(true)
   const pageParams = reactive({
     pageNo: 1,
-    pageSize: 10,
-    order: 'desc',
-    column: 'createTime'
+    pageSize: 5
   })
   const total = ref(0)
   const loadStatus = ref('loadmore')
@@ -21,12 +19,12 @@ export function useListData({ searchParams, api, needInitListData = false, proce
       ...unref(searchParams),
       ...pageParams
     }
-    let { records, total: pageTotal } = await api(params)
+    let { list, total: pageTotal } = await api(params)
     total.value = pageTotal
     if (processData) {
-      records = processData(records)
+      list = processData(list)
     }
-    return records
+    return list
   }
 
   // 页面底部触底加载更多