From 2fefc3c07619a513fe82144ea1f8d75c068bcb9e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:07:49 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/manufacturingorder/index.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 2f4af42..0e1c7b3 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -428,8 +428,8 @@
},
{
minWidth: '120',
- prop: 'orderRemark',
- label: '閿�鍞鍗曞娉�',
+ prop: 'remark',
+ label: '澶囨敞',
sort: true,
isTrue: true,
isSearch: true,
@@ -824,12 +824,12 @@
],
toolbar: [],
operator: [
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.searchStock
- }
+ // {
+ // text: '鏌ョ湅搴撳瓨',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.searchStock
+ // }
],
operatorConfig: {
fixed: 'right',
--
Gitblit v1.9.3