From fe95308667627240179c301dde7e6d4c79264d74 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 19 三月 2025 17:21:07 +0800
Subject: [PATCH] 能力范围查询调整
---
src/views/business/unpass/index.vue | 40 ++++++++++----------
src/views/business/rawMaterialInspection/index.vue | 6 +-
src/views/business/unpass/index-manage.vue | 56 ++++++++++++++--------------
src/views/structural/capabilityAndLaboratory/capability/index.vue | 18 ++++++++-
4 files changed, 67 insertions(+), 53 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index bf3e4be..3b0eb60 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -308,7 +308,6 @@
tableData1: [],
tableLoading1: false,
column1: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
{
dataType: 'tag',
label: '妫�楠岀姸鎬�',
@@ -346,7 +345,7 @@
},
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{ label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
- { label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
+ { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
@@ -371,6 +370,7 @@
}
}
},
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
{ label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
@@ -395,7 +395,7 @@
},
{ label: '鍗曚綅', prop: 'buyUnitMeas' },
{ label: '鎺ユ敹鏃堕棿', prop: 'receiverDate' },
- { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
+ { label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
{
dataType: 'action',
fixed: 'right',
diff --git a/src/views/business/unpass/index-manage.vue b/src/views/business/unpass/index-manage.vue
index e478a36..35eb7b6 100644
--- a/src/views/business/unpass/index-manage.vue
+++ b/src/views/business/unpass/index-manage.vue
@@ -83,34 +83,34 @@
tableLoading: false,
column: [
{ label: '缂栧彿', prop: 'no' },
- {
- label: "OA瀹℃牳鐘舵��",
- prop: "oaState",
- width: "100px",
- dataType: "tag",
- formatData: (params) => {
- if (params == 1) {
- return "寰呭鏍�";
- } else if(params == 2) {
- return "瀹℃牳涓�";
- } else if(params == 3) {
- return "閫氳繃";
- } else {
- return "椹冲洖";
- }
- },
- formatType: (params) => {
- if (params == 1) {
- return "warning";
- } else if(params == 2) {
- return "info";
- } else if(params == 3) {
- return "success";
- } else {
- return "danger";
- }
- },
- },
+ // {
+ // label: "OA瀹℃牳鐘舵��",
+ // prop: "oaState",
+ // width: "100px",
+ // dataType: "tag",
+ // formatData: (params) => {
+ // if (params == 1) {
+ // return "寰呭鏍�";
+ // } else if(params == 2) {
+ // return "瀹℃牳涓�";
+ // } else if(params == 3) {
+ // return "閫氳繃";
+ // } else {
+ // return "椹冲洖";
+ // }
+ // },
+ // formatType: (params) => {
+ // if (params == 1) {
+ // return "warning";
+ // } else if(params == 2) {
+ // return "info";
+ // } else if(params == 3) {
+ // return "success";
+ // } else {
+ // return "danger";
+ // }
+ // },
+ // },
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{
label: "闆朵欢鍙�",
diff --git a/src/views/business/unpass/index.vue b/src/views/business/unpass/index.vue
index e52f63b..2e796ae 100644
--- a/src/views/business/unpass/index.vue
+++ b/src/views/business/unpass/index.vue
@@ -43,26 +43,26 @@
tableLoading: false,
column: [
{ label: '缂栧彿', prop: 'no' },
- {
- label: "OA瀹℃牳鐘舵��",
- prop: "oaState",
- width: "100px",
- dataType: "tag",
- formatData: (params) => {
- if (params == 0) {
- return "鍚�";
- } else {
- return "鏄�";
- }
- },
- formatType: (params) => {
- if (params == 0) {
- return "danger";
- } else {
- return "primary";
- }
- },
- },
+ // {
+ // label: "OA瀹℃牳鐘舵��",
+ // prop: "oaState",
+ // width: "100px",
+ // dataType: "tag",
+ // formatData: (params) => {
+ // if (params == 0) {
+ // return "鍚�";
+ // } else {
+ // return "鏄�";
+ // }
+ // },
+ // formatType: (params) => {
+ // if (params == 0) {
+ // return "danger";
+ // } else {
+ // return "primary";
+ // }
+ // },
+ // },
{
dataType: 'action',
fixed: 'right',
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 72cb9b8..8c590ae 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -33,9 +33,19 @@
v-model="itemParameterForm.inspectionItemSubclass" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
- <el-form-item label="妫�楠屽璞�" prop="sample">
+ <el-form-item label="妫�楠屽璞�" prop="sample" v-if="radio===0">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="itemParameterForm.sample" @keyup.enter.native="refreshTable()">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="妫�楠屽璞�" prop="specimenName" v-if="radio===1">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="itemParameterForm.specimenName" @keyup.enter.native="refreshTable()">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="闆朵欢鍙�" prop="partNo" v-if="radio===1">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="itemParameterForm.partNo" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
<el-form-item>
@@ -298,7 +308,9 @@
itemParameterForm: {
inspectionItem: null,
inspectionItemSubclass: null,
- sample: null
+ sample: null,
+ specimenName: null,
+ partNo: null
},
radio: 0,
productLoad: false,
@@ -346,6 +358,7 @@
total:0,
size:10,
current:1,
+ partNo: null,
layout: 'total, prev, pager, next'
},
productableLoading: false,
@@ -541,6 +554,7 @@
this.diaProduct = true
this.objectId = row.id
this.productPage.current = 1
+ this.productPage.partNo = this.itemParameterForm.partNo
this.getProductList(row)
},
// 鏌ヨ浜у搧缁存姢鍒楄〃鏁版嵁
--
Gitblit v1.9.3