From b3ebb6f99f647a08cac70ebd9cf1baabdffc6852 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 20 十二月 2023 14:55:56 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/teststandard/index.vue | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index 709f3b4..120c1c0 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -78,7 +78,7 @@
align="center"
width="50"
/>
- <el-table-column
+ <!-- <el-table-column
label="鏄惁寮曠敤宸ヨ壓鍙傛暟"
prop="isReference"
align="center"
@@ -125,7 +125,7 @@
<template slot-scope="scope">
<el-input v-model="scope.row.wireCore"></el-input>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="鍙傛暟缂栧彿" prop="code" align="center" />
<el-table-column
label="鍙傛暟椤�"
@@ -188,8 +188,28 @@
<template slot-scope="scope">
<el-input v-model="scope.row.parameterFormat"></el-input>
</template>
+ </el-table-column><el-table-column
+ label="娴嬭瘯鏂规硶"
+ prop="purpose"
+ align="center"
+ width="80"
+ >
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.purpose"></el-input>
+ </template>
</el-table-column>
<el-table-column
+ label="娴嬭瘯鐩殑"
+ prop="method"
+ align="center"
+ width="80"
+ >
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.method"></el-input>
+ </template>
+ </el-table-column>
+
+ <!-- <el-table-column
label="閫氶亾"
prop="aisle"
align="center"
@@ -208,7 +228,7 @@
<template slot-scope="scope">
<el-input v-model="scope.row.position"></el-input>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="鍗曚綅" prop="unit" align="center" />
<!--<el-table-column label="鍙傛暟绫诲瀷" prop="type" align="center" :formatter="getParam"/>-->
<el-table-column label="鎿嶄綔" align="center">
@@ -220,13 +240,13 @@
v-if="editable"
>鎻掑叆
</el-button>
- <el-button
+ <!-- <el-button
type="text"
size="mini"
@click.stop="editTestStandardParam(scope.row)"
v-if="editable && scope.row.id != null"
>鍏紡
- </el-button>
+ </el-button> -->
<el-button
type="text"
size="mini"
@@ -301,7 +321,7 @@
isShowQuery: false,
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/testStandard/upload'
},
prelang: 'operation',
--
Gitblit v1.9.3