修改bug

src/api/checklistrecord/index.js

@@ -11,6 +11,17 @@ export async function checklistrecordPage(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
+/**
+ * 批记录管理分页查询放行单记录
+ */
+export async function checklistrecordBatchRecordPage(data) {
+  const res = await request.post('/mes/checklistrecord/batchRecordPage', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 /**
  *根据生产工单id查放行单列表
  */

src/api/unacceptedProduct/index.js

@@ -12,6 +12,20 @@ export async function getList(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
+/**
+ * 批记录管理-不合格品分页列表
+ */
+export async function batchRecordPage(data) {
+  const res = await request.post(
+    '/qms/unqualifiedproducts/batchRecordPage',
+    data
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 /**
  * 不合格品打印前查询
  */

src/views/batchRecord/components/tables/materialTable.vue

@@ -350,7 +350,7 @@
           materialName: item.materialName || item.categoryName || '',
           specification:
             item.specification || item.specifications || item.model || '',
-          batchNo: item.batchNo || '',
+          batchNo: item.batchNo || order.batchNo || '',
           unit: item.unit || '',
           quantity:
             item.quantity || item.outQuantity || item.demandQuantity || '',

src/views/batchRecord/components/tables/pendingBatchRecordTable.vue

@@ -32,7 +32,7 @@
   import productReleaseApproval from '../../print/electrodeBatchRecord/productReleaseApproval.vue';
   import samplingForm from '../../print/electrodeBatchRecord/samplingForm.vue';
   import {
-    checklistrecordPage,
+    checklistrecordBatchRecordPage,
     checklistrecordQueryPrint
   } from '@/api/checklistrecord/index';
   import {
@@ -40,7 +40,7 @@
     querySamplingPrint
   } from '@/api/samplingRecords';
   import {
-    getList as unacceptedProductPage,
+    batchRecordPage as unacceptedProductPage,
     queryPrint as queryUnacceptedProductPrint
   } from '@/api/unacceptedProduct/index';
   import { getByCode } from '@/api/system/dictionary-data';
@@ -914,7 +914,7 @@
             size: limit,
             ...this.tableQuery
           };
-          const res = checklistrecordPage(body);
+          const res = checklistrecordBatchRecordPage(body);
           Promise.resolve(res).then((data) => {
             this.tableData = data?.list || data?.records || [];
           });

src/views/batchRecord/components/tables/workOrderTable.vue

@@ -476,6 +476,7 @@
           department:
             fallback.departmentName || fallback.department || '生产部',
           workshop: fallback.workshopName || fallback.workshop || '生产车间',
+          applyDeptName: row.applyDeptName || '',
           storageCondition: fallback.storageCondition || '常温避光保存',
           orderCode: fallback.code || row.orderCode || '',
           processOrderCode: fallback.code || row.processOrderCode || '',

src/views/batchRecord/print/electrodeBatchRecord/productionOrder.vue

@@ -69,7 +69,7 @@
             margin-bottom: 8px;
           "
         >
-          <div>申请部门：{{ form.workshop }}</div>
+          <div>申请部门：{{ form.applyDeptName }}</div>
           <div
             >加工单号：<span style="color: #0000ff">{{
               form.processOrderCode