Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/edu/plan/index.vue

@@ -408,7 +408,8 @@ export default {
     },
     checkCanDel(row) {
       //计划创建机构为当前机构且不是顶级机构创建的计划才显示“删除”按钮
-      return row.belongOrgId == this.$store.getters.orgId && row.createByTopOrg == 1 && row.issue == 0
+      console.log(row,"row");
+      return row.belongOrgId == this.$store.getters.orgId && row.createByTopOrg == 1 && row.issue == 0 || row.done !=1
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {

src/views/core/materials/index.vue

@@ -103,7 +103,11 @@
           <el-table-column label="上传人" align="center" prop="createBy"/>
           <el-table-column label="上传时间" align="center" prop="createTime"/>
           <el-table-column label="附件" align="center" prop="fileList"/>
-          <el-table-column label="备注" align="center" prop="remark"/>
+          <el-table-column scoped-slot="remark" align="center" prop="remark">
+            <template slot-scope="scope">
+              <div class="ellipsis" :title="scope.row.remark">{{ scope.row.remark }}</div>
+            </template>
+          </el-table-column>
 
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
@@ -472,3 +476,10 @@ export default {
   }
 };
 </script>
+<style>
+.ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>