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

src/views/financialManagementF/agreementprice/index.vue

@@ -23,6 +23,28 @@
                        @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 307)"
                        @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 307)"
                        @on-load="onLoad">
+
+
+                      <template slot="billNo" slot-scope="scope">
+                        <avue-text-ellipsis :text="scope.row.billNo" :height="30" use-tooltip placement="top">
+                          <small slot="more">...</small>
+                        </avue-text-ellipsis>
+                      </template>
+                      <template slot="agreementNo" slot-scope="scope">
+                        <avue-text-ellipsis :text="scope.row.agreementNo" :height="30" use-tooltip placement="top">
+                          <small slot="more">...</small>
+                        </avue-text-ellipsis>
+                      </template>
+                      <template slot="corpCnName" slot-scope="scope">
+                        <avue-text-ellipsis :text="scope.row.corpCnName" :height="30" use-tooltip placement="top">
+                          <small slot="more">...</small>
+                        </avue-text-ellipsis>
+                      </template>
+                      <template slot="corpEnName" slot-scope="scope">
+                        <avue-text-ellipsis :text="scope.row.corpEnName" :height="30" use-tooltip placement="top">
+                          <small slot="more">...</small>
+                        </avue-text-ellipsis>
+                      </template>
                 <template slot="menuLeft">
                     <el-button type="primary"
                                size="small"
@@ -90,6 +112,7 @@
             {
               label: "单据编码",
               prop: "billNo",
+              width: "180",
                 search: true,
               rules: [{
                 required: true,
@@ -100,6 +123,7 @@
             {
               label: "单位编码",
               prop: "agreementNo",
+              width: "180",
                 search: true,
               rules: [{
                 required: true,
@@ -116,6 +140,7 @@
             {
               label: "客户名称",
               prop: "corpCnName",
+              width: "180",
                 search: true,
               rules: [{
                 required: true,
@@ -126,7 +151,7 @@
             {
               label: "客户英文名称",
               prop: "corpEnName",
-                width:120,
+                width:180,
               rules: [{
                 required: true,
                 message: "请输入客户英文名称",
@@ -145,12 +170,12 @@
             {
               label: "协议生效日期",
               prop: "effectiveDate",
-                width:120,
+                width:160,
             },
             {
               label: "协议失效日期",
               prop: "expiringDate",
-                width:120,
+                width:160,
 
             },
             {