From 10376bbbdf1aa42f4e80609cb636b1c947b83e2e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 16 Jan 2024 18:15:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A3=80=E9=AA=8C=E9=A1=B9?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/behavior.vue | 3 +--
 src/views/qm/first.vue    | 9 +--------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/views/qm/behavior.vue b/src/views/qm/behavior.vue
index 0c87e68d..dc2b7054 100644
--- a/src/views/qm/behavior.vue
+++ b/src/views/qm/behavior.vue
@@ -3,7 +3,6 @@
         <el-header>
             <div class="left-panel">
                 <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'ptest.create'">新增</el-button>
-                <!-- <el-button type="primary" icon="el-icon-top" @click="importInspect">上传</el-button> -->
             </div>
             <div class="right-panel">
                 <el-date-picker
@@ -178,7 +177,7 @@ import saveDialog from './behavior_form.vue';
             //获取检验项目
             getTextItem(){
                 let that = this;
-                that.$API.qm.getTestItem.get({tag:'behavior',page:0}).then(res=>{
+                that.$API.qm.getTestItem.get({tag:'performance',page:0}).then(res=>{
                     that.behaviors = res;
                     that.query.testitem = res[0].id;
                     that.apiObj = that.$API.qm.ptest.list;
diff --git a/src/views/qm/first.vue b/src/views/qm/first.vue
index 48bf19d2..bbe57c61 100644
--- a/src/views/qm/first.vue
+++ b/src/views/qm/first.vue
@@ -17,20 +17,13 @@
                 </el-table-column>
                 <el-table-column label="工序" prop="number">
                 </el-table-column>
-                <el-table-column label="检测内容">
+                <el-table-column label="检测内容及标准">
                     <template #default="scope">
                         <div v-for="item in scope.row.ftestitems" :key="item.id">
                             {{ item.testitem_description }}
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="检测标准" show-overflow-tooltip>
-                    <template #default="scope">
-                        <div v-for="item in scope.row.ftestitems" :key="item.id">
-                            {{ item.testitem_name }}
-                        </div>
-                    </template>
-                </el-table-column>
                 <el-table-column label="操作人测量值" prop="production_date">
                     <template #default="scope">
                         <div v-for="item in scope.row.ftestitems" :key="item.id">