From 0042dbfd410064ebfab00826f927ed73448db5ec Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 21 五月 2024 14:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/technology/document/checkStandardTable.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/views/technology/document/checkStandardTable.vue b/src/views/technology/document/checkStandardTable.vue
index dbeb7ec..3ab90a5 100644
--- a/src/views/technology/document/checkStandardTable.vue
+++ b/src/views/technology/document/checkStandardTable.vue
@@ -104,13 +104,13 @@
align="center"
width="50"
/>
- <el-table-column label="绾胯姱" prop="wireCore" align="center" />
- <el-table-column
+ <!-- <el-table-column label="绾胯姱" prop="wireCore" align="center" /> -->
+ <!-- <el-table-column
prop="isCheck"
label="鎶芥"
align="center"
:formatter="isCheckFormatter"
- />
+ /> -->
<el-table-column label="鍙傛暟缂栧彿" prop="code" align="center" />
<el-table-column
label="鍙傛暟椤�"
@@ -162,12 +162,12 @@
align="center"
>
</el-table-column>
- <el-table-column label="閫氶亾" prop="aisle" align="center">
+ <!-- <el-table-column label="閫氶亾" prop="aisle" align="center">
</el-table-column>
<el-table-column label="閮ㄤ綅" prop="position" align="center">
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="鍗曚綅" prop="unit" align="center" />
- <el-table-column
+ <!-- <el-table-column
width="150"
label="缁ф壙妫�娴嬮浂浠�"
prop="extendsPartNo"
@@ -196,9 +196,9 @@
></el-button>
</el-input>
</template>
- </el-table-column>
+ </el-table-column> -->
- <el-table-column
+ <!-- <el-table-column
width="150"
label="缁ф壙妫�娴嬪伐搴�"
prop="extendsPartNo"
@@ -257,7 +257,7 @@
></el-button>
</el-input>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
<el-button
@@ -344,7 +344,10 @@
getOperationTestStandardParam,
addOperationTestStandardParam
} from '@/api/plan/moteststandard'
-import { getTestStandardParams } from '@/api/quality/teststandard'
+import {
+ getTestStandardParams
+} from '@/api/technology/document'
+//import { getTestStandardParams } from '@/api/quality/teststandard'
import testStandardDialog from '@/views/common/teststandard'
import EditOrderParamForm from './editparamform'
import ParamDialog from '@/views/common/param.vue'
--
Gitblit v1.9.3