Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

 Conflicts:
	src/views/core/edu/plan/dialog.select.file.vue

src/views/core/edu/plan/dialog.select.file.vue

@@ -75,7 +75,7 @@ export default {
       isShow: false,
       selectList: [],
       // ruleList: [],
-      search: this.emptySearch(),      
+      search: this.emptySearch(),
     };
   },
   computed: {},
@@ -90,7 +90,7 @@ export default {
       type:Array
     },
     orgId:{
-      
+
     },
   },
   methods: {
@@ -98,14 +98,14 @@ export default {
       this.search= this.emptySearch();
       console.log("this.search",this.search)
       this.isShow = true;
-      this.selectList =this.defaultSelect; 
-      //this.$refs.st.search();
+      this.selectList =this.defaultSelect;
+      // TODO: 处理第一次进入弹窗时，表格数据不加载
     },
     onHide() {
       this.isShow = false;
       this.search=this.emptySearch();
     },
-    onSelect(item) {      
+    onSelect(item) {
       this.selectList = item;
     },
     onSubmit() {
@@ -123,7 +123,7 @@ export default {
     },
   },
   mounted() {
-    
+
   },
 };
 </script>

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

@@ -220,17 +220,17 @@
               <el-input v-model="form.remark" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
-        </el-row> 
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="上传文件" prop="fileList">
               <K-file-upload ref="upload" v-model="form.fileList" @input="getKUploadFileList" />
-            </el-form-item> 
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="">
               <el-button type="primary" @click="showSelectFile" >从学习资料中选择</el-button>
-            </el-form-item> 
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -246,7 +246,7 @@
           @select="fileSelected"
           :orgId="orgId"
         ></DialogSelectFile>
-    
+
   </div>
 </template>
 
@@ -398,7 +398,7 @@ export default {
     },
     //所属机构为当前用户登录机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {
-      return row.belongOrgId === this.$store.getters.orgId
+      return row.belongOrgId === this.$store.getters.orgId && row.issue == 0
     },
     checkCanDel(row) {
       //计划创建机构为当前机构且不是顶级机构创建的计划才显示“删除”按钮
@@ -567,7 +567,7 @@ export default {
       list.forEach(x=>{
         this.form.fileList= this.form.fileList.concat(x.fileList);
       })
-      
+
     },
   }
 };