From 0a5bc054639610f7ccaf8e0a2f87136268c66abf Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 27 十二月 2023 16:34:22 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/workbench/productrecord-tab.vue | 8 ++--
src/views/plan/manufacturingorder/index.vue | 21 +++++-----
src/views/plan/manufacturingorder/productorder-form.vue | 4 +-
src/views/technology/document/document-form.vue | 4 +-
src/views/quality/teststandard/index.vue | 20 +++++-----
src/views/technology/document/teststandard.vue | 1
src/views/basic/param/param-form.vue | 5 --
7 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/src/views/basic/param/param-form.vue b/src/views/basic/param/param-form.vue
index fa7f914..2f1fe1d 100644
--- a/src/views/basic/param/param-form.vue
+++ b/src/views/basic/param/param-form.vue
@@ -13,7 +13,7 @@
class="l-mes"
>
<el-form-item label="鍙傛暟缂栧彿" prop="code">
- <el-input v-model="dataForm.code" placeholder="鍙傛暟缂栧彿"></el-input>
+ <el-input v-model="dataForm.code" placeholder="鍙傛暟缂栧彿" disabled></el-input>
</el-form-item>
<el-form-item label="鍙傛暟椤�" prop="parameterItem">
<el-input
@@ -99,9 +99,6 @@
dict: ''
},
dataRule: {
- code: [
- { required: true, message: '鍙傛暟缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }
- ],
parameterItem: [
{ required: true, message: '鍙傛暟椤逛笉鑳戒负绌�', trigger: 'blur' }
],
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index af81923..b9bfe77 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -451,6 +451,16 @@
// 鏍囬
column: [
{
+ minWidth: '120',
+ prop: 'moNo',
+ label: '杞﹂棿璁㈠崟鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ render: { fun: this.addOrUpdateHandle }
+ },
+ {
minWidth: '140',
prop: 'state',
label: '鐘舵��',
@@ -591,16 +601,7 @@
return this.bomTypeDbOptions
}
},
- {
- minWidth: '120',
- prop: 'moNo',
- label: '杞﹂棿璁㈠崟鍙�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- render: { fun: this.addOrUpdateHandle }
- },
+
{
minWidth: '120',
prop: 'manufactureAttr',
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 2bf8212..9117086 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -478,7 +478,7 @@
</el-table>
</el-card>
</el-tab-pane>
- <el-tab-pane
+ <!-- <el-tab-pane
label="妫�娴嬫爣鍑�"
key="tb1"
id="tb1"
@@ -491,7 +491,7 @@
:moRoutingOperationId="moRoutingOperationId"
@refreshTestStandardInfo="refreshTestStandardInfo"
></testStandardTable>
- </el-tab-pane>
+ </el-tab-pane> -->
<!-- <el-tab-pane
label="鎶芥瑙勫垯"
key="tb2"
diff --git a/src/views/product/workbench/productrecord-tab.vue b/src/views/product/workbench/productrecord-tab.vue
index 9c72652..275b8aa 100644
--- a/src/views/product/workbench/productrecord-tab.vue
+++ b/src/views/product/workbench/productrecord-tab.vue
@@ -120,12 +120,12 @@
:show-overflow-tooltip="true"
>
<template slot="header" slot-scope="scope">
- <div style="line-height: 14px;">SN鍙�</div>
+ <div style="line-height: 14px;">鎵规鍙�</div>
<div class="th" @click.stop>
<template>
<el-input
type="text"
- placeholder="SN鍙�"
+ placeholder="鎵规鍙�"
v-model="searchContent.outBatchNo"
clearable
size="mini"
@@ -280,7 +280,7 @@
</el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="闄勪欢">
+ <!-- <el-tab-pane label="闄勪欢">
<el-upload
ref="upload"
action="/mes/operationTask/upload"
@@ -292,7 +292,7 @@
:auto-upload="false"
list-type="picture"
></el-upload>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</div>
</div>
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index 27c09ec..52b4d38 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -192,16 +192,6 @@
</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"
@@ -210,6 +200,16 @@
<el-input v-model="scope.row.method"></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="閫氶亾"
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index 906bb1f..93cf63a 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -535,7 +535,7 @@
:richContent="ele.remark"
></rich-text>
</el-tab-pane> -->
- <el-tab-pane label="妫�娴嬫爣鍑�">
+ <!-- <el-tab-pane label="妫�娴嬫爣鍑�">
<checkStandardTable
ref="documentTestStandardTable"
:dataFormId="dataForm.id"
@@ -554,7 +554,7 @@
refreshTestStandardInfo
"
></checkStandardTable>
- </el-tab-pane>
+ </el-tab-pane> -->
<!-- <el-tab-pane label="鎶芥瑙勫垯">
<div>
<div style="padding: 0px 20px;">
diff --git a/src/views/technology/document/teststandard.vue b/src/views/technology/document/teststandard.vue
index 4607896..699a20c 100644
--- a/src/views/technology/document/teststandard.vue
+++ b/src/views/technology/document/teststandard.vue
@@ -42,6 +42,7 @@
align="center"
/>
<el-table-column label="鍗曚綅" prop="unit" align="center" />
+ <el-table-column label="娴嬭瘯鏂规硶" prop="method" align="center" />
</el-table>
</el-col>
</el-row>
--
Gitblit v1.9.3