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

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

@@ -88,6 +88,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;" />
           </a-tooltip>
@@ -139,6 +162,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -147,6 +171,7 @@
     components: {
       AllocationOutModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -171,12 +196,14 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','number','materialsList','operTimeStr','userName','materialCount','totalPrice','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center", width: 150,
+            align:"center", width: 160,
             scopedSlots: { customRender: 'action' },
           },
           { title: '单据编号', dataIndex: 'number',width:160},
@@ -191,6 +218,7 @@
           { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
           { title: '数量', dataIndex: 'materialCount',width:60},
           { title: '金额合计', dataIndex: 'totalPrice',width:80},
+          { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

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

@@ -88,6 +88,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;" />
           </a-tooltip>
@@ -139,6 +162,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -147,6 +171,7 @@
     components: {
       AssembleModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -171,8 +196,10 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','number','materialsList','operTimeStr','userName','materialCount','totalPrice','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
@@ -191,6 +218,7 @@
           { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
           { title: '数量', dataIndex: 'materialCount',width:60},
           { title: '金额合计', dataIndex: 'totalPrice',width:80},
+          { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

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

@@ -88,6 +88,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;" />
           </a-tooltip>
@@ -139,6 +162,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -147,6 +171,7 @@
     components: {
       DisassembleModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -171,8 +196,10 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','number','materialsList','operTimeStr','userName','materialCount','totalPrice','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
@@ -191,6 +218,7 @@
           { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
           { title: '数量', dataIndex: 'materialCount',width:60},
           { title: '金额合计', dataIndex: 'totalPrice',width:80},
+          { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

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

@@ -102,6 +102,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;" />
           </a-tooltip>
@@ -153,6 +176,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -161,6 +185,7 @@
     components: {
       OtherInModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -187,16 +212,19 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center", width: 150,
+            align:"center", width: 160,
             scopedSlots: { customRender: 'action' },
           },
           { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
           { title: '单据编号', dataIndex: 'number',width:160},
+          { title: '关联单据', dataIndex: 'linkNumber',width:140},
           { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
             customRender:function (text,record,index) {
               if(text) {
@@ -208,6 +236,7 @@
           { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
           { title: '数量', dataIndex: 'materialCount',width:60},
           { title: '金额合计', dataIndex: 'totalPrice',width:80},
+          { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

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

@@ -102,6 +102,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;" />
           </a-tooltip>
@@ -153,6 +176,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -161,6 +185,7 @@
     components: {
       OtherOutModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -187,16 +212,19 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center", width: 150,
+            align:"center", width: 160,
             scopedSlots: { customRender: 'action' },
           },
           { title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
           { title: '单据编号', dataIndex: 'number',width:160},
+          { title: '关联单据', dataIndex: 'linkNumber',width:140},
           { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
             customRender:function (text,record,index) {
               if(text) {
@@ -208,6 +236,7 @@
           { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
           { title: '数量', dataIndex: 'materialCount',width:60},
           { title: '金额合计', dataIndex: 'totalPrice',width:80},
+          { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

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

@@ -111,6 +111,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;" />
           </a-tooltip>
@@ -162,6 +185,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -170,6 +194,7 @@
     components: {
       PurchaseBackModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -197,12 +222,15 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney',
+          'needBackMoney','changeAmount','debt','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center", width: 160,
+            align:"center", width: 180,
             scopedSlots: { customRender: 'action' },
           },
           { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
@@ -212,6 +240,7 @@
               return text
             }
           },
+          { title: '关联单据', dataIndex: 'linkNumber',width:140},
           { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
             customRender:function (text,record,index) {
               if(text) {
@@ -228,14 +257,23 @@
               return (record.discountMoney + record.discountLastMoney).toFixed(2);
             }
           },
+          { title: '优惠率', dataIndex: 'discount',width:60,
+            customRender:function (text,record,index) {
+              return text? text + '%':''
+            }
+          },
+          { title: '退款优惠', dataIndex: 'discountMoney',width:80},
+          { title: '其它费用', dataIndex: 'otherMoney',width:80},
           { title: '待退金额', dataIndex: 'needBackMoney',width:80,
             customRender:function (text,record,index) {
               let needBackMoney = record.discountLastMoney + record.otherMoney
               return needBackMoney? needBackMoney.toFixed(2):0
             }
           },
-          { title: '退款', dataIndex: 'changeAmount',width:50},
+          { title: '结算账户', dataIndex: 'accountName',width:80},
-          { title: '欠款', dataIndex: 'debt',width:60},
+          { title: '本次退款', dataIndex: 'changeAmount',width:80},
+          { title: '本次欠款', dataIndex: 'debt',width:80},
+          { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

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

@@ -242,13 +242,9 @@
           span: 18,
           offset: 1
         },
-        // 实际索引
-        settingDataIndex:[],
         // 默认索引
         defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney',
           'needInMoney','changeAmount','debt','status'],
-        // 实际列
-        columns:[],
         // 默认列
         defColumns: [
           {
@@ -317,7 +313,6 @@
     computed: {
     },
     created () {
-      this.initColumnsSetting()
       this.initSystemConfig()
       this.initSupplier()
       this.getDepotData()

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

@@ -90,6 +90,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;" />
@@ -144,6 +167,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -152,6 +176,7 @@
     components: {
       PurchaseOrderModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -177,12 +202,15 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney',
+          'changeAmount','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center", width: 150,
+            align:"center", width: 180,
             scopedSlots: { customRender: 'action' },
           },
           { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
@@ -192,6 +220,7 @@
               return text
             }
           },
+          { title: '关联订单', dataIndex: 'linkNumber',width:140},
           { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
             customRender:function (text,record,index) {
               if(text) {
@@ -212,7 +241,16 @@
               }
             }
           },
-          { 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: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

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

@@ -111,6 +111,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;" />
           </a-tooltip>
@@ -162,6 +185,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -170,6 +194,7 @@
     components: {
       RetailBackModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -197,12 +222,15 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','getAmount',
+          'backAmount','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center", width: 150,
+            align:"center", width: 180,
             scopedSlots: { customRender: 'action' },
           },
           { title: '会员', dataIndex: 'organName',width:120, ellipsis:true},
@@ -212,6 +240,7 @@
               return text
             }
           },
+          { title: '关联单据', dataIndex: 'linkNumber',width:140},
           { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
             customRender:function (text,record,index) {
               if(text) {
@@ -233,6 +262,8 @@
             }
           },
           { title: '找零', dataIndex: 'backAmount',width:50},
+          { title: '付款账户', dataIndex: 'accountName',width:80},
+          { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

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

@@ -106,6 +106,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;" />
           </a-tooltip>
@@ -157,6 +180,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -165,6 +189,7 @@
     components: {
       RetailOutModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -191,12 +216,15 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','getAmount',
+          'backAmount','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center", width: 150,
+            align:"center", width: 180,
             scopedSlots: { customRender: 'action' },
           },
           { title: '会员', dataIndex: 'organName',width:120, ellipsis:true},
@@ -214,6 +242,7 @@
             }
           },
           { title: '单据日期', dataIndex: 'operTimeStr',width:145},
+          { title: '收款类型', dataIndex: 'payType',width:80},
           { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
           { title: '数量', dataIndex: 'materialCount',width:60},
           { title: '金额合计', dataIndex: 'totalPrice',width:80},
@@ -227,6 +256,8 @@
             }
           },
           { title: '找零', dataIndex: 'backAmount',width:50},
+          { title: '收款账户', dataIndex: 'accountName',width:80},
+          { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

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

@@ -112,6 +112,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;" />
           </a-tooltip>
@@ -162,6 +185,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -170,6 +194,7 @@
     components: {
       SaleBackModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -197,12 +222,15 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney','needBackMoney',
+          'changeAmount','debt','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
-            align:"center", width: 160,
+            align:"center", width: 180,
             scopedSlots: { customRender: 'action' },
           },
           { title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
@@ -212,6 +240,7 @@
               return text
             }
           },
+          { title: '关联单据', dataIndex: 'linkNumber',width:140},
           { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
             customRender:function (text,record,index) {
               if(text) {
@@ -228,14 +257,24 @@
               return (record.discountMoney + record.discountLastMoney).toFixed(2);
             }
           },
+          { title: '优惠率', dataIndex: 'discount',width:60,
+            customRender:function (text,record,index) {
+              return text? text + '%':''
+            }
+          },
+          { title: '退款优惠', dataIndex: 'discountMoney',width:80},
+          { title: '其它费用', dataIndex: 'otherMoney',width:80},
           { title: '待退金额', dataIndex: 'needBackMoney',width:80,
             customRender:function (text,record,index) {
               let needBackMoney = record.discountLastMoney + record.otherMoney
               return needBackMoney? needBackMoney.toFixed(2):0
             }
           },
-          { title: '退款', dataIndex: 'changeAmount',width:50},
+          { title: '结算账户', dataIndex: 'accountName',width:80},
-          { title: '欠款', dataIndex: 'debt',width:60},
+          { title: '本次退款', dataIndex: 'changeAmount',width:80},
+          { title: '本次欠款', dataIndex: 'debt',width:80},
+          { title: '销售人员', dataIndex: 'salesManStr',width:120},
+          { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

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: {

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

@@ -120,6 +120,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">
@@ -181,6 +204,7 @@
   import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -189,6 +213,7 @@
     components: {
       SaleOutModal,
       BillDetail,
+      JEllipsis,
       JDate
     },
     data () {
@@ -217,8 +242,11 @@
           span: 18,
           offset: 1
         },
-        // 表头
+        // 默认索引
-        columns: [
+        defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney',
+          'needOutMoney','changeAmount','debt','status'],
+        // 默认列
+        defColumns: [
           {
             title: '操作',
             dataIndex: 'action',
@@ -233,6 +261,7 @@
               return text
             }
           },
+          { title: '关联订单', dataIndex: 'linkNumber',width:140},
           { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
             customRender:function (text,record,index) {
               if(text) {
@@ -249,16 +278,27 @@
               return (record.discountMoney + record.discountLastMoney).toFixed(2);
             }
           },
+          { title: '优惠率', dataIndex: 'discount',width:60,
+            customRender:function (text,record,index) {
+              return text? text + '%':''
+            }
+          },
+          { title: '收款优惠', dataIndex: 'discountMoney',width:80},
+          { title: '其它费用', dataIndex: 'otherMoney',width:80},
           { title: '待收金额', dataIndex: 'needOutMoney',width:80,
             customRender:function (text,record,index) {
               let needOutMoney = record.discountLastMoney + record.otherMoney - record.deposit
               return needOutMoney? needOutMoney.toFixed(2):0
             }
           },
-          { title: '收款', dataIndex: 'changeAmount',width:60},
+          { title: '结算账户', dataIndex: 'accountName',width:80},
-          { title: '欠款', dataIndex: 'debt',width:60,
+          { title: '扣除订金', dataIndex: 'deposit',width:80},
+          { title: '本次收款', dataIndex: 'changeAmount',width:80},
+          { title: '本次欠款', dataIndex: 'debt',width:80,
             scopedSlots: { customRender: 'customRenderDebt' }
           },
+          { title: '销售人员', dataIndex: 'salesManStr',width:120},
+          { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }

jshERP-web/src/views/bill/mixins/BillListMixin.js

@@ -16,6 +16,10 @@ export const BillListMixin = {
       retailList: [],
       userList: [],
       accountList: [],
+      // 实际索引
+      settingDataIndex:[],
+      // 实际列
+      columns:[],
     }
   },
   computed: {
@@ -33,6 +37,7 @@ export const BillListMixin = {
     }
   },
   created() {
+    this.initColumnsSetting()
   },
   methods: {
     myHandleAdd() {