From c1c20fe004cd930a95eb5758f927e6ab178799e9 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 13 十一月 2023 11:56:26 +0800
Subject: [PATCH] modified: src/views/basic/crew/index.vue modified: src/views/basic/part/index.vue modified: src/views/common/part.vue modified: src/views/technology/operation/index.vue modified: src/views/technology/routing/routing-form.vue modified: src/views/admin/user/index.vue
---
src/views/basic/part/index.vue | 18 ++++++++++++++++++
src/views/technology/routing/routing-form.vue | 4 ++--
src/views/technology/operation/index.vue | 2 +-
src/views/basic/crew/index.vue | 2 +-
src/views/common/part.vue | 18 ++++++++++++++++++
5 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/src/views/basic/crew/index.vue b/src/views/basic/crew/index.vue
index 32213f4..ca1ef6a 100644
--- a/src/views/basic/crew/index.vue
+++ b/src/views/basic/crew/index.vue
@@ -71,7 +71,7 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/crew/upload'
},
prelang: 'operation',
diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index 26cdc5d..f33b8f0 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -97,6 +97,24 @@
isSearch: true,
searchInfoType: 'text'
},
+ {
+ minWidth: '120',
+ prop: 'domainNo',
+ label: '鍩熺紪鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
+ prop: 'domainName',
+ label: '鍩熸弿杩�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
// 闆朵欢绫诲瀷
{
minWidth: '140',
diff --git a/src/views/common/part.vue b/src/views/common/part.vue
index 71ec427..1337028 100644
--- a/src/views/common/part.vue
+++ b/src/views/common/part.vue
@@ -135,6 +135,24 @@
searchInfoType: 'text'
},
{
+ minWidth: '120',
+ prop: 'domainNo',
+ label: '鍩熺紪鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
+ prop: 'domainName',
+ label: '鍩熸弿杩�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
minWidth: '140',
prop: 'materialAttribute',
label: '闆朵欢灞炴��',
diff --git a/src/views/technology/operation/index.vue b/src/views/technology/operation/index.vue
index b3cac78..d1f1581 100644
--- a/src/views/technology/operation/index.vue
+++ b/src/views/technology/operation/index.vue
@@ -35,7 +35,7 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/operation/excel/upload'
},
prelang: 'operation',
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 4e8f7aa..fa56abf 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -132,10 +132,10 @@
style="width: 146px;display: inline-block;font-size:12px;font-weight:bold;"
>{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span
>
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="涓诲伐鑹�" prop="master">
<el-switch v-model="dataForm.master"> </el-switch>
- </el-form-item> -->
+ </el-form-item>
</el-col>
</el-row>
</el-form>
--
Gitblit v1.9.3