feat：待审数据

pages/analysis/index/index.vue

@@ -28,9 +28,9 @@ const isAllowAgainPrint = ref(false)
 const menuItemList = ref([
   // { 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', otherConf: { icon: 'arrow-upward' }, name: '数据上报' },
   { url: '/pages/analysis/sample/sample-report-search', otherConf: { icon: 'search' }, name: '待审数据' },
-  { url: '/pages/analysis/sample/sample-print', otherConf: { icon: 'file-text-fill' }, name: '单据补打' },
+  // { url: '/pages/analysis/sample/sample-print', otherConf: { icon: 'file-text-fill' }, name: '单据补打' },
   { url: '/pages/analysis/setting/setting', otherConf: { icon: 'setting-fill' }, name: '系统设置' }
 ])
 

pages/analysis/sample/pdf-preview.vue

@@ -15,7 +15,7 @@ import { getBaseUrl } from '@/defaultBaseUrl'
 import nx from '@/nx'
 
 // 响应式数据
-const taskId = ref('')
+const businessAssayTaskId = ref('')
 const localFilePath = ref('')
 const reportKey = ref('')
 const hideResultFlag = ref('')
@@ -87,10 +87,10 @@ const loadPdfOnAndroid = async pdfUrl => {
 const getPdf = async () => {
   const printBaseUrl = getBaseUrl()
   const baseUrl = getBaseUrl()
-  let dataUrl = `${baseUrl}/qms/bus/qmsBusAssayTask/getAssayTaskDataWithDetailData?taskId=${taskId.value}`
+  let dataUrl = `${baseUrl}/qms/bus/sample/analysis-audit/crossAuditByTaskId?businessAssayTaskId=${businessAssayTaskId.value}`
   dataUrl += `&hideResultFlag=${hideResultFlag.value}`
   const token = nx.$store('user').token
-  let url = `${printBaseUrl}/report/gridpp/report/previewDocs`
+  let url = `${printBaseUrl}/qms/config-report-template/preview`
   url += `?token=${token}`
   url += `&type=PDF`
   url += `&reportKey=${reportKey.value}`
@@ -123,8 +123,8 @@ const deleteTmpFile = () => {
 
 // 生命周期
 onLoad(param => {
-  if (param.taskId) {
-    taskId.value = param.taskId
+  if (param.businessAssayTaskId) {
+    businessAssayTaskId.value = param.businessAssayTaskId
     reportKey.value = param.reportKey
     hideResultFlag.value = param.hideResultFlag
   }

pages/analysis/sample/sample-work-list.vue

@@ -55,7 +55,7 @@
                           <view class="sample_desc">
                             <view>
                               <view
-                                ><text class="pl10">{{ sample.sampleCode }}</text></view
+                                ><text class="pl10">{{ sample.sampleAssayCode }}</text></view
                               >
                               <view>
                                 <text class="pl10">
@@ -67,9 +67,7 @@
                         </u-col>
                         <u-col span="6">
                           <view>
-                            <text class="pl10">
-                              {{ sample.assayProject }}
-                            </text>
+                            <text class="pl10" v-html="sample.assayProject"> </text>
                           </view>
                         </u-col>
                       </u-row>
@@ -212,7 +210,7 @@ const getAssayTask = () => {
   }
   nx.$api.assayTask.getAssayTaskList(param).then(res => {
     if (res) {
-      taskList.value = res.list
+      taskList.value = res
       if (taskList.value.length > 0) {
         currentTask.value = taskList.value[0]
         getAssayTaskDetail(currentTask.value.id)