Merge remote-tracking branch 'origin/dev' into dev

src/views/financialManagementF/balancecycle/index.vue

@@ -22,6 +22,21 @@
                @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 308)"
                @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 308)"
                @on-load="onLoad">
+            <template slot="balanceCycleName" slot-scope="scope">
+                <avue-text-ellipsis :text="scope.row.balanceCycleName" :height="30" use-tooltip placement="top">
+                    <small slot="more">...</small>
+                </avue-text-ellipsis>
+            </template>
+            <template slot="balanceCycleDescribe" slot-scope="scope">
+                <avue-text-ellipsis :text="scope.row.balanceCycleDescribe" :height="30" use-tooltip placement="top">
+                    <small slot="more">...</small>
+                </avue-text-ellipsis>
+            </template>
+            <template slot="remarks" slot-scope="scope">
+                <avue-text-ellipsis :text="scope.row.remarks" :height="30" use-tooltip placement="top">
+                    <small slot="more">...</small>
+                </avue-text-ellipsis>
+            </template>
       <template slot="menuLeft">
         <el-button type="danger"
                    size="small"
@@ -72,6 +87,7 @@ import {
             {
               label: "结算周期类型",
               prop: "balanceCycleType",
+              width: "140",
                 search: true,
               rules: [{
                 required: true,
@@ -82,6 +98,7 @@ import {
             {
               label: "中文名称",
               prop: "balanceCycleName",
+                        width: "180",
                 search: true,
               rules: [{
                 required: true,
@@ -92,6 +109,7 @@ import {
             {
               label: "结算周期描述",
               prop: "balanceCycleDescribe",
+              width: "240",
                 search: true,
               rules: [{
                 required: true,
@@ -121,6 +139,7 @@ import {
             {
               label: "备注",
               prop: "remarks",
+                width: "180",
                 span:24,
                 type: 'textarea',
                 width: "180",
@@ -140,6 +159,7 @@ import {
               {
                   label: "创建时间",
                   prop: "createTime",
+                  width: "160",
                   display:false,
               },
               {
@@ -150,6 +170,7 @@ import {
               {
                   label: "修改时间",
                   prop: "updateTime",
+                  width: "160",
                   display:false,
               },
           ]