feat:打印部门选择

nx/helper/print.js

@@ -224,7 +224,14 @@ export default {
       })
   },
   //调用send方法执行打印
-  print(businessSubData) {
+  print(
+    businessSubData,
+    printParams = {
+      PrintPaperType: '64MM',
+      printCopies: 1,
+      showPrintDialog: false
+    }
+  ) {
     const { printTemplate } = businessSubData
     if (!printTemplate) return uni.showToast({ title: '样品未配置打印模板', icon: 'error' })
     const me = this
@@ -233,11 +240,11 @@ export default {
         data: [businessSubData]
       }
       let printData = {
-        type: 'preview',
+        type: 'print',
+        ...printParams,
         reportTemplate: res.content,
         reportData: JSON.stringify(reportData)
       }
-      console.log(printData)
 
       //连接打印服务
       let printList = uni.getStorageSync('KEY_PRINT_LIST')

nx/store/company-dept.js

@@ -72,6 +72,9 @@ const companyDeptStore = defineStore({
         this.onCancel()
       }
       this.close()
+    },
+    reset() {
+      Object.assign(this.$state, defaultState())
     }
   }
 })

nx/store/user.js

@@ -3,6 +3,7 @@ import userApi from '@/nx/api/user'
 import { getSysParameterBizByName } from '@/nx/api/sys'
 import md5 from 'md5'
 import nx from '@/nx'
+import companyDeptStore from './company-dept'
 import { COMPANY_DEPT_RETRY_HEADER, VISIT_COMPANY_STORAGE_KEY, VISIT_DEPT_STORAGE_KEY } from '@/nx/config'
 // 默认用户信息
 const defaultUserInfo = {
@@ -131,6 +132,9 @@ const user = defineStore({
       uni.removeStorageSync(COMPANY_DEPT_RETRY_HEADER)
       uni.removeStorageSync(VISIT_COMPANY_STORAGE_KEY)
       uni.removeStorageSync(VISIT_DEPT_STORAGE_KEY)
+
+      const deptStore = companyDeptStore()
+      deptStore.reset()
     }
   }
 })

pages/analysis/sample/sample-work-edit-task.vue

@@ -271,9 +271,9 @@ const realFormData = computed(() => {
 // 实际保存逻辑
 async function handleSave(change) {
   let params = {}
-  const staticFieldKeys = staticFormSchema.map(item => item.fieldKey);
+  
   const dynamicData = Object.fromEntries(
-    Object.entries(realFormData.value).filter(([key]) => !staticFieldKeys.includes(key))
+    Object.entries(realFormData.value).filter(([key]) => key !== 'assayTime')
   );
   console.log(dynamicData)
   if (change) {