给全部单据增加列设置的功能

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -91,6 +91,29 @@
               批量操作 <a-icon type="down" />
             </a-button>
           </a-dropdown>
+          <a-popover trigger="click" placement="right">
+            <template slot="content">
+              <a-checkbox-group @change="onColChange" v-model="settingDataIndex" :defaultValue="settingDataIndex">
+                <a-row style="width: 500px">
+                  <template v-for="(item,index) in defColumns">
+                    <template>
+                      <a-col :span="8">
+                        <a-checkbox :value="item.dataIndex">
+                          <j-ellipsis :value="item.title" :length="10"></j-ellipsis>
+                        </a-checkbox>
+                      </a-col>
+                    </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>
+          </a-popover>
           <a-tooltip placement="left" title="销售订单不涉及收款金额，销售订单可以转销售出库单，但需要先对销售订单进行审核。
           勾选单据之后可以进行批量操作（删除、审核、反审核）" slot="action">
             <a-icon v-if="btnEnableList.indexOf(1)>-1" type="question-circle" style="font-size:20px;float:right;" />
@@ -150,6 +173,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import { getCurrentSystemConfig } from '@/api/api'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -158,6 +182,7 @@
     components: {
       SaleOrderModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -183,16 +208,19 @@
           span: 18,
           offset: 1
         },
-        // 表头
-        columns: [
+        // 默认索引
+        defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney',
+          'changeAmount','status','purchaseStatus'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center", width: 150,
+            align:"center", width: 180,
             scopedSlots: { customRender: 'action' },
           },
           { title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
-          { title: '单据编号', dataIndex: 'number',width:120},
+          { title: '单据编号', dataIndex: 'number',width:140},
           { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
             customRender:function (text,record,index) {
               if(text) {
@@ -201,6 +229,7 @@
             }
           },
           { title: '单据日期', dataIndex: 'operTimeStr',width:145},
+          { title: '销售人员', dataIndex: 'salesManStr',width:120},
           { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
           { title: '数量', dataIndex: 'materialCount',width:60},
           { title: '金额合计', dataIndex: 'totalPrice',width:80},
@@ -213,12 +242,21 @@
               }
             }
           },
-          { title: '收取订金', dataIndex: 'changeAmount',width:60},
+          { title: '优惠率', dataIndex: 'discount',width:60,
+            customRender:function (text,record,index) {
+              return text? text + '%':''
+            }
+          },
+          { title: '付款优惠', dataIndex: 'discountMoney',width:80},
+          { title: '优惠后金额', dataIndex: 'discountLastMoney',width:100},
+          { title: '结算账户', dataIndex: 'accountName',width:80},
+          { title: '收取订金', dataIndex: 'changeAmount',width:80},
+          { title: '备注', dataIndex: 'remark',width:200},
+          { title: '采购进度', dataIndex: 'purchaseStatus', width: 80, align: "center",
+            scopedSlots: { customRender: 'customRenderPurchaseStatus' }
+          },
           { title: '状态', dataIndex: 'status', width: 70, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
-          },
-          { title: '采购进度', dataIndex: 'purchaseStatus', width: 70, align: "center",
-            scopedSlots: { customRender: 'customRenderPurchaseStatus' }
           }
         ],
         url: {