From c539e4c982cc703963d90713f808ba52edceb2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 9 Aug 2023 21:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=88=97=E8=AE=BE=E7=BD=AE=E5=A2=9E=E5=8A=A0=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E9=BB=98=E8=AE=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/material/MaterialList.vue       | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index f23a1624..d51da18d 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -108,7 +108,7 @@
           </a-dropdown>
           <a-popover trigger="click" placement="right">
             <template slot="content">
-              <a-checkbox-group @change="onColChange" v-model="settingColumns" :defaultValue="settingColumns">
+              <a-checkbox-group @change="onColChange" v-model="settingDataIndex" :defaultValue="settingDataIndex">
                 <a-row style="width: 500px">
                   <template v-for="(item,index) in defColumns">
                     <template>
@@ -120,6 +120,11 @@
                     </template>
                   </template>
                 </a-row>
+                <a-row style="padding-top: 10px;">
+                  <a-col>
+                    恢复默认列配置：<a-button @click="handleRestDefault" type="link" size="small">恢复默认</a-button>
+                  </a-col>
+                </a-row>
               </a-checkbox-group>
             </template>
             <a-button icon="setting">列设置</a-button>
@@ -237,12 +242,14 @@
         ipagination:{
           pageSizeOptions: ['10', '20', '30', '50', '100', '200']
         },
-        // 实际表头
+        // 实际索引
+        settingDataIndex:[],
+        // 实际列
         columns:[],
-        // 初始化设置的表头
-        settingColumns:['mBarCode','name','standard','model','color','categoryName','materialOther','unit', 'stock',
-          'purchaseDecimal','commodityDecimal','wholesaleDecimal','lowDecimal','enabled','enableSerialNumber','enableBatchNumber','action'],
-        // 默认的列
+        // 默认索引
+        defDataIndex:['action','mBarCode','name','standard','model','color','categoryName','materialOther','unit', 'stock',
+          'purchaseDecimal','commodityDecimal','wholesaleDecimal','lowDecimal','enabled','enableSerialNumber','enableBatchNumber'],
+        // 默认列
         defColumns: [
           {
             title: '操作',
@@ -312,26 +319,27 @@
       initColumnsSetting(){
         let columnsStr = Vue.ls.get('materialColumns')
         if(columnsStr && columnsStr.indexOf(',')>-1) {
-          this.settingColumns = columnsStr.split(',')
+          this.settingDataIndex = columnsStr.split(',')
+        } else {
+          this.settingDataIndex = this.defDataIndex
         }
         this.columns = this.defColumns.filter(item => {
-          if (this.settingColumns.includes(item.dataIndex)) {
-            return true
-          }
-          return false
+          return this.settingDataIndex.includes(item.dataIndex)
         })
       },
       //列设置更改事件
       onColChange (checkedValues) {
         this.columns = this.defColumns.filter(item => {
-          if (checkedValues.includes(item.dataIndex)) {
-            return true
-          }
-          return false
+          return checkedValues.includes(item.dataIndex)
         })
         let columnsStr = checkedValues.join()
         Vue.ls.set('materialColumns', columnsStr)
       },
+      //恢复默认
+      handleRestDefault() {
+        Vue.ls.remove('materialColumns')
+        this.initColumnsSetting()
+      },
       loadTreeData(){
         let that = this;
         let params = {};