Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/certificate.vue

@@ -231,7 +231,7 @@
           <span
             v-if="scope.row.releaseRecordNum"
             class="report-count-link"
-            @click="handleViewReportRecord(scope.row.reportId)"
+            @click="handleViewReportRecord(scope.row.reportId,scope.row.equipId)"
           >
             {{ scope.row.releaseRecordNum }}
           </span>
@@ -342,6 +342,7 @@
   <PrintIssueRecordDialog
     v-model:visible="reportRecordDialogVisible"
     :report-id="currentReportId"
+    :equip-id="currentEquipId"
   />
 
   <!-- 发放报告对话框 -->
@@ -515,6 +516,7 @@ const currentReportType = ref<100 | 200>(100)
 // 发放报告记录对话框状态
 const reportRecordDialogVisible = ref(false)
 const currentReportId = ref('')
+const currentEquipId = ref('')
 // 打印机列表
 const printList = ref([])
 const printUrl = ref('') // 打印文件地址
@@ -592,8 +594,9 @@ const resetQuery = () => {
 }
 
 /** 查看发放报告记录 */
-const handleViewReportRecord = (reportId: string) => {
+const handleViewReportRecord = (reportId: string,equipId :string) => {
   currentReportId.value = reportId
+  currentEquipId.value = equipId
   reportRecordDialogVisible.value = true
 }
 

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/PrintIssueRecordDialog.vue

@@ -83,11 +83,13 @@ import PrintIssueRecordDetailDialog from './PrintIssueRecordDetailDialog.vue'
 export interface IssueReportRecordDialogProps {
   visible: boolean
   reportId: string
+  equipId: string
 }
 
 const props = withDefaults(defineProps<IssueReportRecordDialogProps>(), {
   visible: false,
-  reportId: ''
+  reportId: '',
+  equipId: ''
 })
 const emit = defineEmits<{
   'update:visible': [value: boolean]
@@ -104,6 +106,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   orderItemReportId: '',
+  equipId: '',
   businessType: 1 //业务类型(0=出具报告,1=打印发证)
 })
 
@@ -117,7 +120,9 @@ watch(
   (newVal) => {
     dialogVisible.value = newVal
     if (newVal && props.reportId) {
+      console.log('传过来的参数', props)
       queryParams.orderItemReportId = props.reportId
+      queryParams.equipId = props.equipId
       getList()
     }
   },
@@ -139,6 +144,7 @@ const getList = async () => {
   loading.value = true
   try {
     const params = { ...queryParams }
+    console.log('查询参数:', params)
     const data = await PipeTaskOrderApi.getIssueReportRecordPage(params)
     list.value = data.list || []
     total.value = data.total || 0