feat:样品标签打印

App.vue

@@ -4,7 +4,7 @@ import { onLaunch, onShow, onError } from '@dcloudio/uni-app'
 import { NxInit } from './nx'
 import $store from '@/nx/store'
 // #ifdef APP-PLUS
-import * as urovo from '@/uni_modules/zzjc-urovo'
+import * as urovo from './uni_modules/zzjc-urovo'
 // #endif
 onLaunch(async () => {
   // 加载nx底层依赖

defaultBaseUrl.js

@@ -1,7 +1,7 @@
 // 在此不用配置接口前缀
 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.163: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/auncel.js

@@ -1,24 +0,0 @@
-import request from '@/nx/request'
-const taskPrefix = '/qms/bus/qmsBusAssayTask'
-
-export const getConAssayTaskWithReportTemplateContent = id => {
-  return request({
-    url: '/qms/config/assay-task/getConTaskWithReportTemplateDataContent',
-    method: 'get',
-    params: {
-      id
-    }
-  })
-}
-export const queryTaskDetailListByAssayTaskId = params => {
-  return request({
-    url: taskPrefix + '/getAssayTaskDataWithDetailData',
-    method: 'get',
-    params: params
-  })
-}
-
-export default {
-  getConAssayTaskWithReportTemplateContent,
-  queryTaskDetailListByAssayTaskId
-}

nx/api/report.js

@@ -0,0 +1,23 @@
+import request from '@/nx/request'
+
+export const getBusinessSubSample = id => {
+  return request({
+    url: '/qms/business-sub-sample/get',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+export const getConfigReportTemplateByKey = params => {
+  return request({
+    url: '/qms/config-report-template/getByKey',
+    method: 'GET',
+    params: params
+  })
+}
+
+export default {
+  getBusinessSubSample,
+  getConfigReportTemplateByKey
+}

nx/api/sampleWarehouse.js

@@ -52,7 +52,7 @@ export default {
   // 按样品添加内部调拨数据
   addDispatchSample: data =>
     request({
-      url: '/qms/business-sample-dispatch/addBySampleCode',
+      url: '/qms/business-sample-dispatch/addBySampleReturnCode',
       method: 'POST',
       data
     }),

nx/helper/print.js

@@ -1,4 +1,4 @@
-import { getConAssayTaskWithReportTemplateContent, queryTaskDetailListByAssayTaskId } from '@/nx/api/auncel'
+import { getConfigReportTemplateByKey, getBusinessSubSample } from '@/nx/api/report'
 export default {
   //打印机Map对象
   printMap: new Map(),
@@ -178,36 +178,33 @@ export default {
       //不存在则打开
       this.open(printServerIp)
     }
-    if (printer.socketTask) {
+    if (printer?.socketTask) {
       printer.socketTask.send({
         data: data
       })
     }
   },
   //获取打印模板并执行打印
-  getPrintTemplateAndPrint(currentTask) {
+  getPrintTemplateAndPrint(businessSubId) {
-    const id = currentTask.taskTypeId
+    getBusinessSubSample(businessSubId)
-    getConAssayTaskWithReportTemplateContent(id)
       .then(res => {
-        this.print(currentTask, res)
+        this.print(res)
       })
       .catch(err => {
         console.log(err)
       })
   },
   //调用send方法执行打印
-  print(currentTask, conAssayTask) {
+  print(businessSubData) {
+    const { printTemplate } = businessSubData
     const me = this
-    let id = currentTask.id
+    me.getReportData(printTemplate, function (res) {
-    const reportTemplate = conAssayTask.reportTemplateDataContent
-    me.getReportData(id, function (res) {
-      const data = res.data || []
       const reportData = {
-        data: data
+        data: [businessSubData]
       }
       let printData = {
-        type: 'print',
+        type: 'preview',
-        reportTemplate: reportTemplate,
+        reportTemplate: res.content,
         reportData: JSON.stringify(reportData)
       }
       //连接打印服务
@@ -220,12 +217,11 @@ export default {
     })
   },
   //获取打印模板
-  getReportData(id, onComplete) {
+  getReportData(templateKey, onComplete) {
     const param = {
-      taskId: id,
+      key: templateKey
-      hideResultFlag: 'true'
     }
-    queryTaskDetailListByAssayTaskId(param).then(res => {
+    getConfigReportTemplateByKey(param).then(res => {
       onComplete(res)
     })
   }

nx/request/index.js

@@ -204,7 +204,8 @@ http.interceptors.response.use(
     if (code !== 0) {
       uni.showToast({
         title: msg || response.config.custom.errorMsg,
-        icon: 'none'
+        icon: 'none',
+        duration: 3000
       })
       if (code === 401) {
         userStore.logout(true)

pages.json

@@ -160,13 +160,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/analysis/sample/sample-receive",
-			"style": {
-				"navigationBarTitleText": "样品分析-收样",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/analysis/sample/sample-work-list",
 			"style": {
@@ -196,13 +189,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/analysis/sample/sample-report",
-			"style": {
-				"navigationBarTitleText": "数据上报",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/analysis/sample/sample-report-search",
 			"style": {

pages/analysis/sample/sample-print.vue

@@ -226,7 +226,7 @@ function printTask() {
     confirmColor: '#0055A2',
     success: res => {
       if (res.confirm) {
-        nx.$print.getPrintTemplateAndPrint(currentTask.value)
+        // nx.$print.getPrintTemplateAndPrint(currentTask.value)
       }
     }
   })