From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/basic/part/index.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index ed5c987..7da5a07 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -191,7 +191,7 @@
searchInfoType: 'text'
},
// 涓�绾у垎绫�
- /* {
+ {
minWidth: '120',
prop: 'assortment',
label: '涓�绾у垎绫�',
@@ -228,7 +228,7 @@
optList: () => {
return this.getThreeLevelClassification()
}
- }, */
+ },
// 瑙勬牸
{
minWidth: '140',
@@ -449,15 +449,17 @@
created() {
this.table.column.find((e) => e.label === 'IFS鍚敤鎵规绠＄悊').isTrue = false
this.table.column.find((e) => e.label === '璁″垝鏂规硶').isTrue = false
- this.getUnitType('unit')
- this.getMaterialType('material_type')
this.getCategoryType('category')
this.getAssortmentType('assortment')
this.getPlanningMethodType('planning_method_type')
this.getThreeLevelClassificationType('three_classification_type')
- this.getMaterialAttributeType()
this.getExaminerDict('examiner_type')
},
+ mounted(){
+ this.getUnitType('unit')
+ this.getMaterialType('material_type')
+ this.getMaterialAttributeType()
+ },
computed: {
...mapGetters(['permissions'])
},
--
Gitblit v1.9.3