From 74c2ee57f01f17cf61f69440b8981321452377b2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 13 十二月 2023 11:26:34 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/masterproductionschedule/index.vue | 4 ++--
src/views/common/document.vue | 8 ++++----
src/views/plan/manufacturingorder/auto-operationtask.vue | 8 ++++----
src/views/common/teststandardradio.vue | 6 +++---
src/views/technology/document/index.vue | 4 ++--
src/views/technology/document/checkStandardTable.vue | 18 +++++++++---------
src/views/technology/document/teststandard.vue | 4 ++++
7 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/src/views/common/document.vue b/src/views/common/document.vue
index 6edd889..fe74309 100644
--- a/src/views/common/document.vue
+++ b/src/views/common/document.vue
@@ -151,7 +151,7 @@
searchInfoType: 'text'
},
// 缁濈紭棰滆壊
- {
+ /* {
minWidth: '120',
prop: 'insulationColor',
label: '缁濈紭棰滆壊',
@@ -169,7 +169,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '120',
prop: 'version',
@@ -189,7 +189,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '120',
prop: 'country',
label: '鍥藉',
@@ -197,7 +197,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '120',
prop: 'state',
diff --git a/src/views/common/teststandardradio.vue b/src/views/common/teststandardradio.vue
index 5729466..bd569a7 100644
--- a/src/views/common/teststandardradio.vue
+++ b/src/views/common/teststandardradio.vue
@@ -44,7 +44,7 @@
align="center"
width="50"
/>
- <el-table-column label="绾胯姱" prop="wireCore" align="center" />
+ <!-- <el-table-column label="绾胯姱" prop="wireCore" align="center" /> -->
<el-table-column label="鍙傛暟缂栧彿" prop="code" align="center" />
<el-table-column label="鍙傛暟椤�" prop="parameterItem" align="center" />
<el-table-column
@@ -57,8 +57,8 @@
prop="parameterFormat"
align="center"
/>
- <el-table-column label="閫氶亾" prop="aisle" align="center" />
- <el-table-column label="閮ㄤ綅" prop="position" align="center" />
+ <!-- <el-table-column label="閫氶亾" prop="aisle" align="center" />
+ <el-table-column label="閮ㄤ綅" prop="position" align="center" /> -->
<el-table-column label="鍗曚綅" prop="unit" align="center" />
</el-table>
</el-col>
diff --git a/src/views/plan/manufacturingorder/auto-operationtask.vue b/src/views/plan/manufacturingorder/auto-operationtask.vue
index 0fc3bb8..79dfcbd 100644
--- a/src/views/plan/manufacturingorder/auto-operationtask.vue
+++ b/src/views/plan/manufacturingorder/auto-operationtask.vue
@@ -74,7 +74,7 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="locationId" label="搴撲綅" align="center">
+ <!-- <el-table-column prop="locationId" label="搴撲綅" align="center">
<template slot-scope="scope">
<el-select
v-model="scope.row.locationId"
@@ -92,7 +92,7 @@
</el-option>
</el-select>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="partNo"
label="闆朵欢鍙�"
@@ -124,7 +124,7 @@
</el-table-column>
<el-table-column prop="sunit" label="鍗曚綅2" align="center">
</el-table-column> -->
- <el-table-column prop="reelSpec" label="杞藉叿瑙勬牸" align="center">
+ <!-- <el-table-column prop="reelSpec" label="杞藉叿瑙勬牸" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.reelSpec"></el-input>
</template>
@@ -133,7 +133,7 @@
<template slot-scope="scope">
<el-input v-model="scope.row.discNum"></el-input>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="remark" label="澶囨敞" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.remark"></el-input>
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index f996069..02c064d 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -411,7 +411,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '140',
prop: 'inventoryReservedQuantity',
label: '搴撳瓨棰勭暀鏁伴噺',
@@ -419,7 +419,7 @@
isTrue: true,
isSearch: false,
searchInfoType: 'text'
- },
+ }, */
/* {
minWidth: '140',
prop: 'outsourcingNumber',
diff --git a/src/views/technology/document/checkStandardTable.vue b/src/views/technology/document/checkStandardTable.vue
index dbeb7ec..d6d9d41 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
diff --git a/src/views/technology/document/index.vue b/src/views/technology/document/index.vue
index a59a433..d9f05e7 100644
--- a/src/views/technology/document/index.vue
+++ b/src/views/technology/document/index.vue
@@ -239,7 +239,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '120',
prop: 'projectType',
label: '椤圭洰绫诲埆',
@@ -271,7 +271,7 @@
isSearch: true,
searchInfoType: 'text'
},
-
+ */
// 鎻忚堪
{
minWidth: '120',
diff --git a/src/views/technology/document/teststandard.vue b/src/views/technology/document/teststandard.vue
index 69faf64..64e25ab 100644
--- a/src/views/technology/document/teststandard.vue
+++ b/src/views/technology/document/teststandard.vue
@@ -187,6 +187,10 @@
created() {
getTestStand(this.paramObj)
},
+ mounted(){
+ console.log(11111);
+ getTestStand(this.paramObj)
+ },
methods: {
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
--
Gitblit v1.9.3