提交代码

src/api/qualityTesting.ts

@@ -24,6 +24,9 @@ export interface QualityTesting {
 
     status?: number
 
+    inspectQty?:number
+
+
     inspectorId?: number
 
     inspectTime?:  string

src/views/biz/orderProcessPlan/components/ReportDetail.vue

@@ -35,6 +35,26 @@ const columns = [
     key: 'quantity',
     width: 120
   },
+  {
+    title: '完成数量',
+    key: 'qualifiedQty',
+    width: 120
+  },
+  {
+    title: '报废数量',
+    key: 'scrapQty',
+    width: 120
+  },
+  {
+    title: '返工数量',
+    key: 'reworkQty',
+    width: 120
+  },
+  {
+    title: '让步接收数量',
+    key: 'connectionQty',
+    width: 120
+  },
   {
     title: '提交人',
     key: 'userName',

src/views/biz/qualityTesting/index.vue

@@ -245,6 +245,29 @@
         </n-space>
      </n-drawer>
 
+    <!--派工详情弹窗-->
+    <n-modal v-model:show="showQualityTestingDetail" title="派工详情" style="width: 1000px" >
+      <n-card>
+        <n-descriptions :column="2" bordered size="small" label-placement="left" style="margin-bottom: 16px">
+          <n-descriptions-item label="物料编码">{{ qualityTestingInfo.materialCode || '-' }}</n-descriptions-item>
+          <n-descriptions-item label="物料名称">{{ qualityTestingInfo.materialName || '-' }}</n-descriptions-item>
+          <n-descriptions-item label="工单号">{{ qualityTestingInfo.workOrderCode || '-' }}</n-descriptions-item>
+          <n-descriptions-item label="工序名称">{{ qualityTestingInfo.processName || '-' }}</n-descriptions-item>
+          <n-descriptions-item label="派工编号">{{ qualityTestingInfo.assingCode || '-' }}</n-descriptions-item>
+          <n-descriptions-item label="报工数量">{{ qualityTestingInfo.totalQty ?? '-' }}</n-descriptions-item>
+          <n-descriptions-item label="质检数量">{{ qualityTestingInfo.inspectQty ?? '-' }}</n-descriptions-item>
+          <n-descriptions-item label="质检状态">{{ handlerPatchStatus(qualityTestingInfo.status) ?? '-' }}</n-descriptions-item>
+
+        </n-descriptions>
+
+        <template #footer>
+          <n-space justify="end">
+            <n-button @click="showQualityTestingDetail = false">取消</n-button>
+          </n-space>
+        </template>
+      </n-card>
+
+    </n-modal>
 
   </div>
 </template>
@@ -252,8 +275,8 @@
 <script setup lang="ts">
 import { ref, reactive, h, onMounted } from 'vue'
 import {
-  NButton, NSpace, NIcon, NUpload,NTag, useMessage, useDialog, type DataTableColumns, type UploadCustomRequestOptions,
+  NButton, NSpace, NIcon, NUpload, NTag, useMessage, useDialog, type DataTableColumns, type UploadCustomRequestOptions,
-  NDropdown
+  NDropdown, NDescriptions, NDescriptionsItem
 } from 'naive-ui'
 
 import {
@@ -480,11 +503,25 @@ const formRules = {
 // 表格列
 const columns: DataTableColumns<QualityTesting> = [
   // { type: 'selection' },
+  { title: '质检编号', key: 'qcNo',align: 'center',minWidth: 150,
+    render(row:any) {
+      return h(
+          'a',
           {
-    title: '质检编号', 
+            class: 'route-code-link',
-    key: 'qcNo',
+            href: 'javascript:;',
-    minWidth:160,
+            style: {
-    align: 'center' 
+              color: '#2080f0',
+              textDecoration: 'underline',
+              cursor: 'pointer',
+            },
+            onClick: (e: MouseEvent) => {
+              viewQualityTestingDetail(row)
+            },
+          },
+          row.assingCode
+      )
+    }
   },
   {
     title: '物料名称',
@@ -943,8 +980,23 @@ function handleSubmitDetail(submitDetail:any){
 
 }
 
+const qualityTestingInfo = ref<QualityTesting>()
+const showQualityTestingDetail = ref<Boolean>(false)
 
 
+//查看质检详情
+const viewQualityTestingDetail = (row)=>{
+  console.log(row)
+  showQualityTestingDetail.value = true
+  qualityTestingInfo.value = row
+}
+
+const handlerPatchStatus = (qualityTestingStatus)=>{
+  const opt = qcStatusOptions.value.find(o => o.value === qualityTestingStatus || String(o.value) === String(qualityTestingStatus))
+  if (!opt) return qualityTestingStatus ?? '-'
+  return opt.label
+}
+
 async function handleSubmitResultDetail() {
 
   formDetailOKData.qcId = qcId.value

src/views/production/componets/AssingWorkTreeTable.vue

@@ -68,6 +68,7 @@
             <n-descriptions :column="2" bordered size="small" label-placement="left" style="margin-bottom: 16px">
               <n-descriptions-item label="物料编码">{{ assingWorkDetail.materialCode || '-' }}</n-descriptions-item>
               <n-descriptions-item label="物料名称">{{ assingWorkDetail.materialName || '-' }}</n-descriptions-item>
+              <n-descriptions-item label="工单号">{{ assingWorkDetail.workOrderCode || '-' }}</n-descriptions-item>
               <n-descriptions-item label="工序名称">{{ assingWorkDetail.processName || '-' }}</n-descriptions-item>
               <n-descriptions-item label="车间名称">{{ assingWorkDetail.workshopName || '-' }}</n-descriptions-item>
               <n-descriptions-item label="生产工段">{{ assingWorkDetail.sectionName || '-' }}</n-descriptions-item>
@@ -193,7 +194,13 @@ const AssingWorkColumns :DataTableColumns<AssingWork> = [
       return row.materialName || '-'
     }
   },
-  
+  {
+    align:'center',
+    title: '工单号',
+    key: 'workOrderCode',
+    width: 120,
+    ellipsis: { tooltip: true }
+  },
   {
     align:'center',
     title: '工序名称',