diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue index 2bab6142..db8239bf 100644 --- a/jshERP-web/src/views/report/AccountReport.vue +++ b/jshERP-web/src/views/report/AccountReport.vue @@ -117,12 +117,12 @@ return (t !== '合计') ? (parseInt(index) + 1) : t } }, - { title: '名称', dataIndex: 'name', width: 100}, + { title: '名称', dataIndex: 'name', width: 150}, { title: '编号', dataIndex: 'serialNo', width: 150}, { title: '期初金额', dataIndex: 'initialAmount', sorter: (a, b) => a.initialAmount - b.initialAmount, width: 100}, { title: '本月发生额', dataIndex: 'thisMonthAmount', sorter: (a, b) => a.thisMonthAmount - b.thisMonthAmount, width: 100}, { title: '当前余额', dataIndex: 'currentAmount', sorter: (a, b) => a.currentAmount - b.currentAmount, width: 100}, - { title: '账户流水', dataIndex: 'action', align:"center", width: 200, + { title: '账户流水', dataIndex: 'action', align:"center", width: 120, scopedSlots: { customRender: 'action' } } ], diff --git a/jshERP-web/src/views/system/AccountList.vue b/jshERP-web/src/views/system/AccountList.vue index eb019ae7..97f0232c 100644 --- a/jshERP-web/src/views/system/AccountList.vue +++ b/jshERP-web/src/views/system/AccountList.vue @@ -125,12 +125,12 @@ return parseInt(index)+1; } }, - { title: '名称', dataIndex: 'name', width: 100}, - { title: '编号', dataIndex: 'serialNo', width: 150, align: "center"}, - { title: '期初金额', dataIndex: 'initialAmount', width: 100, align: "center"}, - { title: '当前余额', dataIndex: 'currentAmount', width: 100, align: "center"}, - { title: '备注', dataIndex: 'remark', width: 100}, - { title: '排序', dataIndex: 'sort', width: 60}, + { title: '名称', dataIndex: 'name', width: 100, align: "left"}, + { title: '编号', dataIndex: 'serialNo', width: 150, align: "left"}, + { title: '期初金额', dataIndex: 'initialAmount', width: 100, align: "left"}, + { title: '当前余额', dataIndex: 'currentAmount', width: 100, align: "left"}, + { title: '备注', dataIndex: 'remark', width: 100, align: "left"}, + { title: '排序', dataIndex: 'sort', width: 60, align: "left"}, { title: '状态',dataIndex: 'enabled',width:60,align:"center", scopedSlots: { customRender: 'customRenderEnabledFlag' } }, diff --git a/jshERP-web/src/views/system/CustomerList.vue b/jshERP-web/src/views/system/CustomerList.vue index 6b76812f..dd9947e6 100644 --- a/jshERP-web/src/views/system/CustomerList.vue +++ b/jshERP-web/src/views/system/CustomerList.vue @@ -129,22 +129,22 @@ return parseInt(index)+1; } }, - { title: '名称',dataIndex: 'supplier',width:150}, - { title: '联系人', dataIndex: 'contacts',width:70,align:"center"}, - { title: '手机号码', dataIndex: 'telephone',width:100,align:"center"}, - { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"}, - { title: '电子邮箱', dataIndex: 'email',width:150,align:"center"}, - { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"}, - { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"}, - { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"}, - { title: '排序', dataIndex: 'sort', width: 60}, + { title: '名称',dataIndex: 'supplier',width:150,align:"left"}, + { title: '联系人', dataIndex: 'contacts',width:70,align:"left"}, + { title: '手机号码', dataIndex: 'telephone',width:100,align:"left"}, + { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"left"}, + { title: '电子邮箱', dataIndex: 'email',width:150,align:"left"}, + { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"left"}, + { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"left"}, + { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"left"}, + { title: '排序', dataIndex: 'sort', width: 60,align:"left"}, { title: '状态',dataIndex: 'enabled',width:60, align:"center", scopedSlots: { customRender: 'customRenderFlag' } }, { title: '操作', dataIndex: 'action', - width: 200, + width: 100, align:"center", scopedSlots: { customRender: 'action' }, } diff --git a/jshERP-web/src/views/system/InOutItemList.vue b/jshERP-web/src/views/system/InOutItemList.vue index 0432e8d2..efd574a3 100644 --- a/jshERP-web/src/views/system/InOutItemList.vue +++ b/jshERP-web/src/views/system/InOutItemList.vue @@ -129,7 +129,7 @@ { title: '操作', dataIndex: 'action', - width: 200, + width: 100, align:"center", scopedSlots: { customRender: 'action' }, } diff --git a/jshERP-web/src/views/system/LogList.vue b/jshERP-web/src/views/system/LogList.vue index e545a08c..b2ce9d76 100644 --- a/jshERP-web/src/views/system/LogList.vue +++ b/jshERP-web/src/views/system/LogList.vue @@ -119,12 +119,12 @@ return parseInt(index)+1; } }, - {title: '操作模块', dataIndex: 'operation', width: 120}, - {title: '操作详情', align:"left", dataIndex: 'content', scopedSlots: { customRender: 'content' }, width: 350 }, - {title: '操作员账号', dataIndex: 'loginName', width: 80, align: "center"}, - {title: '操作员姓名', dataIndex: 'userName', width: 80, align: "center"}, + {title: '操作模块', dataIndex: 'operation', width: 120, align: "left"}, + {title: '操作详情', dataIndex: 'content', scopedSlots: { customRender: 'content' }, width: 350, align:"left" }, + {title: '操作员账号', dataIndex: 'loginName', width: 80, align: "left"}, + {title: '操作员姓名', dataIndex: 'userName', width: 80, align: "left"}, { - title: '操作状态', dataIndex: 'status',width:80, align:"center", + title: '操作状态', dataIndex: 'status',width:80, align:"left", customRender:function (text) { if(text){ return "失败"; @@ -133,8 +133,8 @@ } } }, - {title: '操作IP', dataIndex: 'clientIp', width: 110, align: "center"}, - {title: '操作时间', dataIndex: 'createTimeStr', width: 120, align: "center"} + {title: '操作IP', dataIndex: 'clientIp', width: 110, align: "left"}, + {title: '操作时间', dataIndex: 'createTimeStr', width: 120, align: "left"} ], operateColumn: { diff --git a/jshERP-web/src/views/system/MemberList.vue b/jshERP-web/src/views/system/MemberList.vue index 81e0abef..45c078a7 100644 --- a/jshERP-web/src/views/system/MemberList.vue +++ b/jshERP-web/src/views/system/MemberList.vue @@ -128,20 +128,20 @@ return parseInt(index)+1; } }, - { title: '名称',dataIndex: 'supplier',width:150}, - { title: '联系人', dataIndex: 'contacts',width:70,align:"center"}, - { title: '手机号码', dataIndex: 'telephone',width:100,align:"center"}, - { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"}, - { title: '电子邮箱', dataIndex: 'email',width:150,align:"center"}, - { title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"}, - { title: '排序', dataIndex: 'sort', width: 60}, + { title: '名称',dataIndex: 'supplier',width:150,align:"left"}, + { title: '联系人', dataIndex: 'contacts',width:70,align:"left"}, + { title: '手机号码', dataIndex: 'telephone',width:100,align:"left"}, + { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"left"}, + { title: '电子邮箱', dataIndex: 'email',width:150,align:"left"}, + { title: '预付款',dataIndex: 'advanceIn',width:70,align:"left"}, + { title: '排序', dataIndex: 'sort', width: 60,align:"left"}, { title: '状态',dataIndex: 'enabled',width:60,align:"center", scopedSlots: { customRender: 'customRenderFlag' } }, { title: '操作', dataIndex: 'action', - width: 200, + width: 100, align:"center", scopedSlots: { customRender: 'action' }, } diff --git a/jshERP-web/src/views/system/PersonList.vue b/jshERP-web/src/views/system/PersonList.vue index da5a27c3..4c9076c8 100644 --- a/jshERP-web/src/views/system/PersonList.vue +++ b/jshERP-web/src/views/system/PersonList.vue @@ -115,12 +115,8 @@ return parseInt(index)+1; } }, - { - title: '姓名', align:"center", dataIndex: 'name', width: 100, - }, - { - title: '类型', align:"center", dataIndex: 'type', width: 100, - }, + { 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' } @@ -129,7 +125,7 @@ title: '操作', dataIndex: 'action', align:"center", - width: 150, + width: 100, scopedSlots: { customRender: 'action' }, } ], diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue index 1630a93e..d979638e 100644 --- a/jshERP-web/src/views/system/RoleList.vue +++ b/jshERP-web/src/views/system/RoleList.vue @@ -122,15 +122,15 @@ } }, { - title: '角色名称', align:"center", dataIndex: 'name', width: 100 + title: '角色名称', align:"left", dataIndex: 'name', width: 120 }, { - title: '数据类型', align:"center", dataIndex: 'type', width: 100 + title: '数据类型', align:"left", dataIndex: 'type', width: 100 }, { - title: '描述', align:"center", dataIndex: 'description', width: 100 + title: '描述', align:"left", dataIndex: 'description', width: 150 }, - { title: '排序', dataIndex: 'sort', width: 60}, + { title: '排序', align:"left", dataIndex: 'sort', width: 50}, { title: '状态',dataIndex: 'enabled',width:60,align:"center", scopedSlots: { customRender: 'customRenderFlag' } }, diff --git a/jshERP-web/src/views/system/UnitList.vue b/jshERP-web/src/views/system/UnitList.vue index 51d8f12f..3efbf17f 100644 --- a/jshERP-web/src/views/system/UnitList.vue +++ b/jshERP-web/src/views/system/UnitList.vue @@ -105,16 +105,16 @@ return parseInt(index)+1; } }, - { title: '计量单位', align:"center", dataIndex: 'name', width:200 }, - { title: '基本单位', align:"center", dataIndex: 'basicUnit', width:80 }, - { title: '副单位', align:"center", dataIndex: 'otherUnit', width:100, + { title: '计量单位', align:"left", dataIndex: 'name', width:200 }, + { title: '基本单位', align:"left", dataIndex: 'basicUnit', width:80 }, + { title: '副单位', align:"left", dataIndex: 'otherUnit', width:100, customRender:function (t,r,index) { if (r) { return r.otherUnit + '=' + r.ratio + r.basicUnit; } } }, - { title: '副单位2', align:"center", dataIndex: 'otherUnitTwo', width:100, + { title: '副单位2', align:"left", dataIndex: 'otherUnitTwo', width:100, customRender:function (t,r,index) { if (r) { if(r.otherUnitTwo) { @@ -123,7 +123,7 @@ } } }, - { title: '副单位3', align:"center", dataIndex: 'otherUnitThree', width:100, + { title: '副单位3', align:"left", dataIndex: 'otherUnitThree', width:100, customRender:function (t,r,index) { if (r) { if(r.otherUnitThree) { diff --git a/jshERP-web/src/views/system/UserList.vue b/jshERP-web/src/views/system/UserList.vue index 0443ec01..b1b5696f 100644 --- a/jshERP-web/src/views/system/UserList.vue +++ b/jshERP-web/src/views/system/UserList.vue @@ -125,13 +125,13 @@ return parseInt(index)+1; } }, - { title: '登录名称', dataIndex: 'loginName', width: 100, align: "center"}, - { title: '用户姓名', dataIndex: 'username', width: 100, align: "center"}, - { title: '用户类型', dataIndex: 'userType', width: 80, align: "center" }, - { title: '角色', dataIndex: 'roleName', width: 100, align: "center"}, - { title: '机构', dataIndex: 'orgAbr', width: 115, align: "center"}, - { title: '电话号码', dataIndex: 'phonenum', width: 120, align: "center"}, - { title: '排序', dataIndex: 'userBlngOrgaDsplSeq', width: 60, align: "center"}, + { title: '登录名称', dataIndex: 'loginName', width: 100, align: "left"}, + { title: '用户姓名', dataIndex: 'username', width: 100, align: "left"}, + { title: '用户类型', dataIndex: 'userType', width: 80, align: "left" }, + { title: '角色', dataIndex: 'roleName', width: 100, align: "left"}, + { title: '机构', dataIndex: 'orgAbr', width: 115, align: "left"}, + { title: '电话号码', dataIndex: 'phonenum', width: 120, align: "left"}, + { title: '排序', dataIndex: 'userBlngOrgaDsplSeq', width: 60, align: "left"}, { title: '状态',dataIndex: 'status',width:70,align:"center", scopedSlots: { customRender: 'customRenderFlag' } }, diff --git a/jshERP-web/src/views/system/VendorList.vue b/jshERP-web/src/views/system/VendorList.vue index dd161879..b9048549 100644 --- a/jshERP-web/src/views/system/VendorList.vue +++ b/jshERP-web/src/views/system/VendorList.vue @@ -128,22 +128,22 @@ return parseInt(index)+1; } }, - { title: '名称',dataIndex: 'supplier',width:150}, - { title: '联系人', dataIndex: 'contacts',width:70,align:"center"}, - { title: '手机号码', dataIndex: 'telephone',width:100,align:"center"}, - { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"}, - { title: '电子邮箱', dataIndex: 'email',width:150,align:"center"}, - { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"}, - { title: '期末应付',dataIndex: 'allNeedPay',width:80,align:"center"}, - { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"}, - { title: '排序', dataIndex: 'sort', width: 60}, + { title: '名称',dataIndex: 'supplier',width:150,align:"left"}, + { title: '联系人', dataIndex: 'contacts',width:70,align:"left"}, + { title: '手机号码', dataIndex: 'telephone',width:100,align:"left"}, + { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"left"}, + { title: '电子邮箱', dataIndex: 'email',width:150,align:"left"}, + { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"left"}, + { title: '期末应付',dataIndex: 'allNeedPay',width:80,align:"left"}, + { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"left"}, + { title: '排序', dataIndex: 'sort', width: 60,align:"left"}, { title: '状态',dataIndex: 'enabled',width:60,align:"center", scopedSlots: { customRender: 'customRenderFlag' } }, { title: '操作', dataIndex: 'action', - width: 200, + width: 100, align:"center", scopedSlots: { customRender: 'action' }, }