From b0d4df5f39525ae7fe252e8ee65d85fd71dca721 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:53:32 +0800
Subject: [PATCH] 手动下单：检验中订单撤销报错问题修复
---
src/views/business/inspectionTask/index.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 9bd39e8..0683654 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -3,6 +3,12 @@
<div style="height: 100%">
<div class="search">
<el-form :model="queryParams" ref="queryParams" size="small" :inline="true">
+ <el-form-item label="IFS鍩�" prop="contract">
+ <el-select @keyup.enter.native="refreshTable" v-model="queryParams.contract" clearable placeholder="璇烽�夋嫨" size="small">
+ <el-option label="ZTNS" value="ZTNS"/>
+ <el-option label="KJNS" value="KJNS"/>
+ </el-select>
+ </el-form-item>
<el-form-item label="鎵瑰彿" prop="updateBatchNo" v-if="tabIndex !== 0">
<el-input v-model="queryParams.updateBatchNo" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="refreshTable()">
@@ -58,7 +64,7 @@
</div>
</div>
<lims-table :tableData="tableData" :column="column" :page="page" :rowClassName="rowClassName"
- :height="'calc(100vh - 300px)'" @pagination="pagination" key="tableData0">
+ :height="66" @pagination="pagination" key="tableData0">
<div slot="action" slot-scope="scope">
<el-button size="small" type="text" @click="handleDataLook(scope.row)">鏁版嵁鏌ョ湅</el-button>
<el-button type="text" size="small"
@@ -211,8 +217,6 @@
></ShowInfo> -->
<!--淇敼妫�楠屽�煎脊妗�-->
<edit-inspection-item ref="editInspectionItem"></edit-inspection-item>
- <!--鏌ョ湅宸ユ椂寮规-->
- <viewManHourDia ref="viewManHourDia"></viewManHourDia>
<!--涓嶅悎鏍煎娴嬫煡鐪嬪脊妗�-->
<un-pass-retest-result v-if="retestVisible" :retestInfo="retestInfo" :retestVisible="retestVisible"
@closeRetestLook="closeRetestLook"></un-pass-retest-result>
@@ -240,7 +244,6 @@
import EditInspectionItem from "./components/EditInspectionItem.vue";
import limsTable from "@/components/Table/lims-table.vue";
-import viewManHourDia from "./components/viewManHourDia.vue"
import UnPassRetestResult from "@/components/rawMaterialInspection/unPassRetestResult.vue"
import {
claimInsOrderPlan,
@@ -259,14 +262,12 @@
import { upReportUrl } from "@/api/business/insReport";
import onlyoffice from "@/components/Onlyoffice/onlyoffice.vue";
import filePreview from "@/components/Preview/filePreview.vue";
-import tab from "../../../plugins/tab";
export default {
name: 'InspectionTask',
components: {
filePreview, onlyoffice,
EditInspectionItem,
limsTable,
- viewManHourDia,
UnPassRetestResult
},
dicts: ["urgency_level", "inspection_task_state", 'material_prop_type'],
@@ -362,6 +363,25 @@
inspectionTaskState: [],
tableData: [],
column: [
+ {
+ label: 'IFS鍩�',
+ prop: 'contract',
+ width: '120px',
+ dataType: 'tag',
+ formatData: (params) => {
+ return params
+ },
+ formatType: (params) => {
+ if (params === 'ZTNS') {
+ return ''
+ } else if (params === 'KJNS') {
+ return 'success'
+ }else {
+ return null
+ }
+ }
+
+ },
{
label: "鎵瑰彿",
prop: "updateBatchNo",
@@ -659,10 +679,6 @@
// 淇敼妫�楠屽��
editInspection(row) {
this.$refs.editInspectionItem.showDialog(row.id);
- },
- // 鏌ョ湅宸ユ椂
- viewManHour(row) {
- this.$refs.viewManHourDia.showDialog(row.id, row.insState);
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
--
Gitblit v1.9.3