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

@@ -448,8 +448,8 @@ export default {
       return row.belongOrgId == this.$store.getters.orgId
     },
     checkCanDel(row) {
-      //    计划所属机构=当前登陆人机构  && 创建机构为省联社  && 不是被下发的  && 计划下不存在已有执行任务的情况
-      return row.belongOrgId == this.$store.getters.orgId && row.createByTopOrg != 1 && row.issue == 0 && row.done != 1
+      // 计划所属机构=当前登陆人机构  && 创建机构为省联社  && 不是被下发的  && 计划下不存在已有执行任务的情况
+      return row.belongOrgId == this.$store.getters.orgId && row.issue != 1 && row.done != 1
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {
@@ -471,7 +471,7 @@ export default {
       //console.log("xxx")
       this.open = false;
       this.reset();
-      this.$refs['orgTreeSelect'].clear();      
+      this.$refs['orgTreeSelect'].clear();
       this.$refs["upload"].clearFiles();
     },
     // 表单重置

src/views/core/materials/index.vue

@@ -102,7 +102,7 @@
           </el-table-column>
           <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="fileNames"/>
           <el-table-column scoped-slot="remark" align="center" prop="remark" label="备注">
             <template slot-scope="scope">
               <div class="ellipsis" :title="scope.row.remark">{{ scope.row.remark }}</div>

src/views/resumption/plan/dialog.edit.vue

@@ -407,8 +407,11 @@ export default {
       // api.getPointIds(this.id).then((res) => {
       //   this.defaultSelect = res.data;
       // });
-
-      return this.tableData.map((d) => d.id);
+      if (!this.tableData) {
+        return [];
+      } else {
+        return this.tableData.map((d) => d.id);
+      }
     },
     openSelect() {
       this.$refs.DialogSelect.show(this.getIteamF());