Merge branch 'ol_12_30' of http://git.dayaedu.com/molingzhide/dy-admin-manager into ol_12_30

src/views/businessManager/resetList/index.vue

@@ -108,8 +108,11 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="studentId"
-                           label="原教辅"
-                           :formatter="(row)=>{return accessoriesFormatter(row.originalAccessoriesGoods)}">
+                           label="原教辅">
+                           <!-- :formatter="(row)=>{return accessoriesFormatter(row.originalAccessoriesGoods)}" -->
+            <template slot-scope="scope">
+              <overflow-text width="100%" :text="accessoriesFormatter(scope.row.originalAccessoriesGoods)"></overflow-text>
+            </template>
           </el-table-column>
           <el-table-column align="center"
                            prop="studentId"
@@ -130,8 +133,12 @@
             </template>
           </el-table-column>
           <el-table-column align="center"
-                           label="更换教辅"
-                           :formatter="(row)=>{return accessoriesFormatter(row.changeAccessoriesGoods)}"></el-table-column>
+                           label="更换教辅">
+            <!-- :formatter="(row)=>{return accessoriesFormatter(row.changeAccessoriesGoods)}" -->
+            <template slot-scope="scope">
+              <overflow-text width="100%" :text="accessoriesFormatter(scope.row.changeAccessoriesGoods)"></overflow-text>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="studentId"
                            label="差价(元)">

src/views/editionManager/editionList.vue

@@ -57,7 +57,11 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="description"
-                           label="描述"></el-table-column>
+                           label="描述">
+            <template slot-scope="scope">
+              <overflow-text :text="scope.row.description"></overflow-text>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="downloadUrl"
                            width="120"
@@ -243,8 +247,6 @@ export default {
     createEdition () {
       this.$refs.sectionForm.validate(v => {
         if (v) {
-          console.log(this.sectionForm)
-          return
           addAppVersionInfo(this.sectionForm).then(res => {
             if (res.code == 200) {
               this.$message.success('新增成功')