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 |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index 9154b53..7da5a07 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -93,7 +93,8 @@
         multiSelect: true, //
         seqNo: true,
         isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
-        isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
+        isSearch: false, // 楂樼骇鏌ヨ鎸夐挳,
+        isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
         defaultOrderBy: { column: 'id', direction: 'desc' }
       },
       table: {
@@ -190,7 +191,7 @@
             searchInfoType: 'text'
           },
           // 涓�绾у垎绫�
-          {
+           {
             minWidth: '120',
             prop: 'assortment',
             label: '涓�绾у垎绫�',
@@ -227,7 +228,7 @@
             optList: () => {
               return this.getThreeLevelClassification()
             }
-          },
+          }, 
           // 瑙勬牸
           {
             minWidth: '140',
@@ -239,7 +240,7 @@
             searchInfoType: 'text'
           },
           // 鍨嬪彿
-          {
+          /* {
             minWidth: '140',
             prop: 'partModel',
             label: '鍨嬪彿',
@@ -301,7 +302,7 @@
             optList: () => {
               return this.lotTrackingIfsOptions
             }
-          },
+          }, */
           // 鐗堟湰鍙�
           {
             minWidth: '140',
@@ -311,7 +312,7 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
+          }/* ,
           // 璁″垝鏂规硶
           {
             minWidth: '140',
@@ -325,9 +326,9 @@
             optList: () => {
               return this.planningMethodOptions
             }
-          },
+          }, */
           // 鍥惧彿
-          {
+         /*  {
             minWidth: '140',
             prop: 'drawingNumber',
             label: '鍥惧彿',
@@ -355,9 +356,9 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
+          }, */
           // 妫�楠屽憳
-          {
+          /* {
             minWidth: '140',
             prop: 'examiner',
             label: '妫�楠屽憳',
@@ -388,7 +389,7 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          }
+          } */
         ],
         toolbar: [
           {
@@ -448,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