diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue index 95d67fe7..33f81f2d 100644 --- a/jshERP-web/src/views/bill/AllocationOutList.vue +++ b/jshERP-web/src/views/bill/AllocationOutList.vue @@ -170,6 +170,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 150, + scopedSlots: { customRender: 'action' }, + }, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { @@ -191,12 +197,6 @@ { title: '金额合计', dataIndex: 'totalPrice',width:80}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 150, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue index c19495cf..f3083f10 100644 --- a/jshERP-web/src/views/bill/AssembleList.vue +++ b/jshERP-web/src/views/bill/AssembleList.vue @@ -170,6 +170,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 150, + scopedSlots: { customRender: 'action' }, + }, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { @@ -191,12 +197,6 @@ { title: '金额合计', dataIndex: 'totalPrice',width:80}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 150, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue index 6521cfec..7bb9b912 100644 --- a/jshERP-web/src/views/bill/DisassembleList.vue +++ b/jshERP-web/src/views/bill/DisassembleList.vue @@ -170,6 +170,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 150, + scopedSlots: { customRender: 'action' }, + }, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { @@ -191,12 +197,6 @@ { title: '金额合计', dataIndex: 'totalPrice',width:80}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 150, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index 746d245d..123ea89e 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -186,6 +186,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 150, + scopedSlots: { customRender: 'action' }, + }, { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { @@ -208,12 +214,6 @@ { title: '金额合计', dataIndex: 'totalPrice',width:80}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 150, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index c4c7951b..bd1be2b0 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -186,6 +186,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 150, + scopedSlots: { customRender: 'action' }, + }, { title: '客户', dataIndex: 'organName',width:120, ellipsis:true}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { @@ -208,12 +214,6 @@ { title: '金额合计', dataIndex: 'totalPrice',width:80}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 150, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index c40f3ef2..cbecb45a 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -196,6 +196,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 160, + scopedSlots: { customRender: 'action' }, + }, { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { @@ -230,12 +236,6 @@ { title: '退款', dataIndex: 'changeAmount',width:50}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 160, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index 8885f5b7..9c81db9b 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -198,6 +198,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 180, + scopedSlots: { customRender: 'action' }, + }, { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { @@ -238,12 +244,6 @@ }, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 180, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 092f6435..64bda2fd 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -176,6 +176,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 150, + scopedSlots: { customRender: 'action' }, + }, { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { @@ -208,12 +214,6 @@ { title: '支付订金', dataIndex: 'changeAmount',width:60}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 150, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index be12f318..c224d8fd 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -196,6 +196,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 150, + scopedSlots: { customRender: 'action' }, + }, { title: '会员', dataIndex: 'organName',width:120, ellipsis:true}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { @@ -228,12 +234,6 @@ { title: '找零', dataIndex: 'backAmount',width:50}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 150, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 92161d96..a5493866 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -190,6 +190,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 150, + scopedSlots: { customRender: 'action' }, + }, { title: '会员', dataIndex: 'organName',width:120, ellipsis:true}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { @@ -222,12 +228,6 @@ { title: '找零', dataIndex: 'backAmount',width:50}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 150, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index 1b8ae216..c286a59c 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -196,6 +196,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 160, + scopedSlots: { customRender: 'action' }, + }, { title: '客户', dataIndex: 'organName',width:120, ellipsis:true}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { @@ -230,12 +236,6 @@ { title: '退款', dataIndex: 'changeAmount',width:50}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 160, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index f6706ca4..e3864fca 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -182,6 +182,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 150, + scopedSlots: { customRender: 'action' }, + }, { title: '客户', dataIndex: 'organName',width:120, ellipsis:true}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { @@ -217,12 +223,6 @@ }, { title: '采购进度', dataIndex: 'purchaseStatus', width: 70, align: "center", scopedSlots: { customRender: 'customRenderPurchaseStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 150, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index 37115fae..3cc32597 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -198,6 +198,12 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + align:"center", width: 180, + scopedSlots: { customRender: 'action' }, + }, { title: '客户', dataIndex: 'organName',width:120, ellipsis:true}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { @@ -238,12 +244,6 @@ }, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", width: 180, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue index 153ef697..63e18279 100644 --- a/jshERP-web/src/views/financial/AdvanceInList.vue +++ b/jshERP-web/src/views/financial/AdvanceInList.vue @@ -172,6 +172,13 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + width:200, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '付款会员', dataIndex: 'organName',width:140, ellipsis:true}, { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, @@ -182,13 +189,6 @@ { title: '备注', dataIndex: 'remark',width:200}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - width:200, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue index 17015faa..dc40cbd6 100644 --- a/jshERP-web/src/views/financial/GiroList.vue +++ b/jshERP-web/src/views/financial/GiroList.vue @@ -172,6 +172,13 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + width:200, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, @@ -180,13 +187,6 @@ { title: '备注', dataIndex: 'remark',width:200}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - width:200, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue index bdfb03d7..812bdd07 100644 --- a/jshERP-web/src/views/financial/ItemInList.vue +++ b/jshERP-web/src/views/financial/ItemInList.vue @@ -182,6 +182,13 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + width:200, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '往来单位', dataIndex: 'organName',width:140, ellipsis:true}, { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, @@ -191,13 +198,6 @@ { title: '备注', dataIndex: 'remark',width:200}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - width:200, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue index 89e08f3a..14589df7 100644 --- a/jshERP-web/src/views/financial/ItemOutList.vue +++ b/jshERP-web/src/views/financial/ItemOutList.vue @@ -182,6 +182,13 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + width:200, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '往来单位', dataIndex: 'organName',width:140, ellipsis:true}, { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, @@ -191,13 +198,6 @@ { title: '备注', dataIndex: 'remark',width:200}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - width:200, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue index 56ffe984..2d5bdcca 100644 --- a/jshERP-web/src/views/financial/MoneyInList.vue +++ b/jshERP-web/src/views/financial/MoneyInList.vue @@ -183,6 +183,13 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + width:200, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '客户', dataIndex: 'organName',width:140, ellipsis:true}, { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, @@ -194,13 +201,6 @@ { title: '备注', dataIndex: 'remark',width:200}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - width:200, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue index 70750da8..f12ecdb8 100644 --- a/jshERP-web/src/views/financial/MoneyOutList.vue +++ b/jshERP-web/src/views/financial/MoneyOutList.vue @@ -183,6 +183,13 @@ }, // 表头 columns: [ + { + title: '操作', + dataIndex: 'action', + width:200, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '供应商', dataIndex: 'organName',width:140, ellipsis:true}, { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, @@ -194,13 +201,6 @@ { title: '备注', dataIndex: 'remark',width:200}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } - }, - { - title: '操作', - dataIndex: 'action', - width:200, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/material/MaterialAttributeList.vue b/jshERP-web/src/views/material/MaterialAttributeList.vue index 8489f313..df7ed56c 100644 --- a/jshERP-web/src/views/material/MaterialAttributeList.vue +++ b/jshERP-web/src/views/material/MaterialAttributeList.vue @@ -97,15 +97,15 @@ return parseInt(index)+1; } }, - {title: '属性名', dataIndex: 'attributeName', width: 200}, - {title: '属性值(用竖线隔开)', dataIndex: 'attributeValue', width: 500}, { title: '操作', dataIndex: 'action', width: 100, align:"center", scopedSlots: { customRender: 'action' }, - } + }, + {title: '属性名', dataIndex: 'attributeName', width: 200}, + {title: '属性值(用竖线隔开)', dataIndex: 'attributeValue', width: 500} ], url: { list: "/materialAttribute/list", diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue index 0e3a556c..6b47ac9e 100644 --- a/jshERP-web/src/views/material/MaterialList.vue +++ b/jshERP-web/src/views/material/MaterialList.vue @@ -226,7 +226,14 @@ 'purchaseDecimal','commodityDecimal','wholesaleDecimal','lowDecimal','enabled','enableSerialNumber','enableBatchNumber','action'], // 默认的列 defColumns: [ - {title: '条码', dataIndex: 'mBarCode',scopedSlots: { customRender: 'customBarCode' }}, + { + title: '操作', + dataIndex: 'action', + align:"center", + width: 100, + scopedSlots: { customRender: 'action' }, + }, + {title: '条码', dataIndex: 'mBarCode', width: 140, scopedSlots: { customRender: 'customBarCode' }}, {title: '名称', dataIndex: 'name'}, {title: '规格', dataIndex: 'standard'}, {title: '型号', dataIndex: 'model'}, @@ -261,13 +268,6 @@ }, {title: '状态', dataIndex: 'enabled', align: "center", width: 60, scopedSlots: { customRender: 'customRenderEnabled' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", - width: 100, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/material/MaterialPropertyList.vue b/jshERP-web/src/views/material/MaterialPropertyList.vue index e5f9533c..5ec3053f 100644 --- a/jshERP-web/src/views/material/MaterialPropertyList.vue +++ b/jshERP-web/src/views/material/MaterialPropertyList.vue @@ -85,20 +85,20 @@ return parseInt(index)+1; } }, - {title: '名称', dataIndex: 'nativeName', width: 100}, - { - title: '是否启用', dataIndex: 'enabled', width: 100, align: "center", - scopedSlots: { customRender: 'customRenderFlag' } - }, - {title: '排序', dataIndex: 'sort', width: 100}, - {title: '别名', dataIndex: 'anotherName', width: 100}, { title: '操作', dataIndex: 'action', width: 200, align:"center", scopedSlots: { customRender: 'action' }, - } + }, + {title: '名称', dataIndex: 'nativeName', width: 100}, + { + title: '是否启用', dataIndex: 'enabled', width: 100, align: "center", + scopedSlots: { customRender: 'customRenderFlag' } + }, + {title: '排序', dataIndex: 'sort', width: 100}, + {title: '别名', dataIndex: 'anotherName', width: 100} ], url: { list: "/materialProperty/list", diff --git a/jshERP-web/src/views/system/AccountList.vue b/jshERP-web/src/views/system/AccountList.vue index 97f0232c..d5b3aaf6 100644 --- a/jshERP-web/src/views/system/AccountList.vue +++ b/jshERP-web/src/views/system/AccountList.vue @@ -125,6 +125,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + width: 150, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '名称', dataIndex: 'name', width: 100, align: "left"}, { title: '编号', dataIndex: 'serialNo', width: 150, align: "left"}, { title: '期初金额', dataIndex: 'initialAmount', width: 100, align: "left"}, @@ -136,13 +143,6 @@ }, { title: '是否默认',dataIndex: 'isDefault',width:80,align:"center", scopedSlots: { customRender: 'customRenderFlag' } - }, - { - title: '操作', - dataIndex: 'action', - width: 150, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/system/CustomerList.vue b/jshERP-web/src/views/system/CustomerList.vue index dd9947e6..9a94d8fd 100644 --- a/jshERP-web/src/views/system/CustomerList.vue +++ b/jshERP-web/src/views/system/CustomerList.vue @@ -129,6 +129,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + width: 100, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '名称',dataIndex: 'supplier',width:150,align:"left"}, { title: '联系人', dataIndex: 'contacts',width:70,align:"left"}, { title: '手机号码', dataIndex: 'telephone',width:100,align:"left"}, @@ -140,13 +147,6 @@ { title: '排序', dataIndex: 'sort', width: 60,align:"left"}, { title: '状态',dataIndex: 'enabled',width:60, align:"center", scopedSlots: { customRender: 'customRenderFlag' } - }, - { - title: '操作', - dataIndex: 'action', - width: 100, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/system/DepotList.vue b/jshERP-web/src/views/system/DepotList.vue index 18730952..9be17b3b 100644 --- a/jshERP-web/src/views/system/DepotList.vue +++ b/jshERP-web/src/views/system/DepotList.vue @@ -120,6 +120,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + align:"center", + width: 200, + scopedSlots: { customRender: 'action' }, + }, {title: '仓库名称', dataIndex: 'name', width: 200}, {title: '仓库地址', dataIndex: 'address', width: 200}, {title: '仓储费', dataIndex: 'warehousing', width: 80}, @@ -132,13 +139,6 @@ }, {title: '是否默认',dataIndex: 'isDefault',width:80,align:"center", scopedSlots: { customRender: 'customRenderFlag' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", - width: 200, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/system/FunctionList.vue b/jshERP-web/src/views/system/FunctionList.vue index 197285c7..c4a03718 100644 --- a/jshERP-web/src/views/system/FunctionList.vue +++ b/jshERP-web/src/views/system/FunctionList.vue @@ -103,6 +103,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + width: 150, + align:"center", + scopedSlots: { customRender: 'action' }, + }, {title: '编号 ', dataIndex: 'number', width: 80}, {title: '名称', dataIndex: 'name', width: 120, ellipsis:true}, {title: '上级编号', dataIndex: 'parentNumber', width: 80}, @@ -114,14 +121,7 @@ title: '是否启用', dataIndex: 'enabled', width: 80, align: "center", scopedSlots: { customRender: 'customRenderFlag' } }, - {title: '图标', dataIndex: 'icon', width: 120}, - { - title: '操作', - dataIndex: 'action', - width: 150, - align:"center", - scopedSlots: { customRender: 'action' }, - } + {title: '图标', dataIndex: 'icon', width: 120} ], url: { list: "/function/list", diff --git a/jshERP-web/src/views/system/InOutItemList.vue b/jshERP-web/src/views/system/InOutItemList.vue index efd574a3..f036f44a 100644 --- a/jshERP-web/src/views/system/InOutItemList.vue +++ b/jshERP-web/src/views/system/InOutItemList.vue @@ -119,19 +119,19 @@ return parseInt(index)+1; } }, - { title: '名称', dataIndex: 'name', width: 200}, - { title: '类型', dataIndex: 'type', width: 100}, - { title: '备注', dataIndex: 'remark', width: 200}, - { title: '排序', dataIndex: 'sort', width: 60}, - { title: '状态',dataIndex: 'enabled',width:60,align:"center", - scopedSlots: { customRender: 'customRenderFlag' } - }, { title: '操作', dataIndex: 'action', width: 100, align:"center", scopedSlots: { customRender: 'action' }, + }, + { title: '名称', dataIndex: 'name', width: 200}, + { title: '类型', dataIndex: 'type', width: 100}, + { title: '备注', dataIndex: 'remark', width: 200}, + { title: '排序', dataIndex: 'sort', width: 60}, + { title: '状态',dataIndex: 'enabled',width:60,align:"center", + scopedSlots: { customRender: 'customRenderFlag' } } ], url: { diff --git a/jshERP-web/src/views/system/MemberList.vue b/jshERP-web/src/views/system/MemberList.vue index 45c078a7..b604dfad 100644 --- a/jshERP-web/src/views/system/MemberList.vue +++ b/jshERP-web/src/views/system/MemberList.vue @@ -128,6 +128,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + width: 100, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '名称',dataIndex: 'supplier',width:150,align:"left"}, { title: '联系人', dataIndex: 'contacts',width:70,align:"left"}, { title: '手机号码', dataIndex: 'telephone',width:100,align:"left"}, @@ -137,13 +144,6 @@ { title: '排序', dataIndex: 'sort', width: 60,align:"left"}, { title: '状态',dataIndex: 'enabled',width:60,align:"center", scopedSlots: { customRender: 'customRenderFlag' } - }, - { - title: '操作', - dataIndex: 'action', - width: 100, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/system/PersonList.vue b/jshERP-web/src/views/system/PersonList.vue index 4c9076c8..cf477f4a 100644 --- a/jshERP-web/src/views/system/PersonList.vue +++ b/jshERP-web/src/views/system/PersonList.vue @@ -115,18 +115,18 @@ return parseInt(index)+1; } }, - { title: '姓名', align:"left", dataIndex: 'name', width: 200, }, - { title: '类型', align:"left", dataIndex: 'type', width: 150, }, - { title: '排序', dataIndex: 'sort', width: 60}, - { title: '状态',dataIndex: 'enabled',width:60,align:"center", - scopedSlots: { customRender: 'customRenderFlag' } - }, { title: '操作', dataIndex: 'action', align:"center", width: 100, scopedSlots: { customRender: 'action' }, + }, + { title: '姓名', align:"left", dataIndex: 'name', width: 200, }, + { title: '类型', align:"left", dataIndex: 'type', width: 150, }, + { title: '排序', dataIndex: 'sort', width: 60}, + { title: '状态',dataIndex: 'enabled',width:60,align:"center", + scopedSlots: { customRender: 'customRenderFlag' } } ], url: { diff --git a/jshERP-web/src/views/system/PlatformConfigList.vue b/jshERP-web/src/views/system/PlatformConfigList.vue index fff95676..3717d6da 100644 --- a/jshERP-web/src/views/system/PlatformConfigList.vue +++ b/jshERP-web/src/views/system/PlatformConfigList.vue @@ -61,6 +61,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + align:"center", + width: 100, + scopedSlots: { customRender: 'action' }, + }, { title: '配置名称', dataIndex: 'platformKeyInfo', @@ -70,13 +77,6 @@ title: '配置值', dataIndex: 'platformValue', width: 500 - }, - { - title: '操作', - dataIndex: 'action', - align:"center", - width: 100, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/system/PluginList.vue b/jshERP-web/src/views/system/PluginList.vue index fe09411a..3981c942 100644 --- a/jshERP-web/src/views/system/PluginList.vue +++ b/jshERP-web/src/views/system/PluginList.vue @@ -118,6 +118,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + width: 200, + align:"center", + scopedSlots: { customRender: 'action' }, + }, {title: '名称', dataIndex: '', width: 120, customRender:function (t,r,index) { if (r) { @@ -155,13 +162,6 @@ }, {title: '状态', dataIndex: 'pluginState', width: 60, align: "center", scopedSlots: { customRender: 'customRenderFlag' } - }, - { - title: '操作', - dataIndex: 'action', - width: 200, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue index d979638e..09a3126d 100644 --- a/jshERP-web/src/views/system/RoleList.vue +++ b/jshERP-web/src/views/system/RoleList.vue @@ -121,6 +121,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + align:"center", + width: 150, + scopedSlots: { customRender: 'action' }, + }, { title: '角色名称', align:"left", dataIndex: 'name', width: 120 }, @@ -133,13 +140,6 @@ { title: '排序', align:"left", dataIndex: 'sort', width: 50}, { title: '状态',dataIndex: 'enabled',width:60,align:"center", scopedSlots: { customRender: 'customRenderFlag' } - }, - { - title: '操作', - dataIndex: 'action', - align:"center", - width: 150, - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/system/TenantList.vue b/jshERP-web/src/views/system/TenantList.vue index 7f112411..7d0405b1 100644 --- a/jshERP-web/src/views/system/TenantList.vue +++ b/jshERP-web/src/views/system/TenantList.vue @@ -121,6 +121,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + scopedSlots: {customRender: 'action'}, + align: "center", + width: 100 + }, { title: '登录名称', dataIndex: 'loginName', width: 100, align: "center"}, { title: '用户数量限制', dataIndex: 'userNumLimit', width: 100, align: "center"}, { title: '租户类型',dataIndex: 'type',width:70,align:"center", @@ -131,14 +138,7 @@ }, { title: '创建时间', dataIndex: 'createTimeStr', width: 100, align: "center"}, { title: '到期时间', dataIndex: 'expireTimeStr', width: 100, align: "center"}, - { title: '描述', dataIndex: 'remark', width: 200, align: "center", ellipsis:true}, - { - title: '操作', - dataIndex: 'action', - scopedSlots: {customRender: 'action'}, - align: "center", - width: 100 - } + { title: '描述', dataIndex: 'remark', width: 200, align: "center", ellipsis:true} ], url: { list: "/tenant/list", diff --git a/jshERP-web/src/views/system/UnitList.vue b/jshERP-web/src/views/system/UnitList.vue index 3efbf17f..fcd1700c 100644 --- a/jshERP-web/src/views/system/UnitList.vue +++ b/jshERP-web/src/views/system/UnitList.vue @@ -105,6 +105,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + width:100, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '计量单位', align:"left", dataIndex: 'name', width:200 }, { title: '基本单位', align:"left", dataIndex: 'basicUnit', width:80 }, { title: '副单位', align:"left", dataIndex: 'otherUnit', width:100, @@ -134,13 +141,6 @@ }, { title: '状态',dataIndex: 'enabled',width:60,align:"center", scopedSlots: { customRender: 'customRenderFlag' } - }, - { - title: '操作', - dataIndex: 'action', - width:100, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: { diff --git a/jshERP-web/src/views/system/UserList.vue b/jshERP-web/src/views/system/UserList.vue index b1b5696f..84ddf008 100644 --- a/jshERP-web/src/views/system/UserList.vue +++ b/jshERP-web/src/views/system/UserList.vue @@ -125,6 +125,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + scopedSlots: {customRender: 'action'}, + align: "center", + width: 260 + }, { title: '登录名称', dataIndex: 'loginName', width: 100, align: "left"}, { title: '用户姓名', dataIndex: 'username', width: 100, align: "left"}, { title: '用户类型', dataIndex: 'userType', width: 80, align: "left" }, @@ -134,13 +141,6 @@ { title: '排序', dataIndex: 'userBlngOrgaDsplSeq', width: 60, align: "left"}, { title: '状态',dataIndex: 'status',width:70,align:"center", scopedSlots: { customRender: 'customRenderFlag' } - }, - { - title: '操作', - dataIndex: 'action', - scopedSlots: {customRender: 'action'}, - align: "center", - width: 260 } ], url: { diff --git a/jshERP-web/src/views/system/VendorList.vue b/jshERP-web/src/views/system/VendorList.vue index b9048549..0bc2bc4e 100644 --- a/jshERP-web/src/views/system/VendorList.vue +++ b/jshERP-web/src/views/system/VendorList.vue @@ -128,6 +128,13 @@ return parseInt(index)+1; } }, + { + title: '操作', + dataIndex: 'action', + width: 100, + align:"center", + scopedSlots: { customRender: 'action' }, + }, { title: '名称',dataIndex: 'supplier',width:150,align:"left"}, { title: '联系人', dataIndex: 'contacts',width:70,align:"left"}, { title: '手机号码', dataIndex: 'telephone',width:100,align:"left"}, @@ -139,13 +146,6 @@ { title: '排序', dataIndex: 'sort', width: 60,align:"left"}, { title: '状态',dataIndex: 'enabled',width:60,align:"center", scopedSlots: { customRender: 'customRenderFlag' } - }, - { - title: '操作', - dataIndex: 'action', - width: 100, - align:"center", - scopedSlots: { customRender: 'action' }, } ], url: {