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

src/components/orgTreeSelect/index.vue

@@ -173,6 +173,7 @@ export default {
   },
   methods: {
     clear() {
+      this.queryForm.value=null;
       this.sNodeList = [];
       this.$refs.tree.setCheckedKeys([]);
       this.$refs.tree.setCurrentKey(null);

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

@@ -384,10 +384,8 @@ export default {
     },
     //已完成下发的计划不显示下发按钮
     checkCanPublish(row) {
-      if (row.issue === 0 && row.standard === 1) {
-        return true
-      }
-      return false;
+      return row.issue == 0 && row.standard == 1;
+
     },
     //所属机构为当前用户登录机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {

src/views/core/drill/task/dialog.info.vue

@@ -85,12 +85,12 @@
                 <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="24" class="block">
               <el-form-item prop="commentScore" label="评分">
                 <el-rate
                   v-model="formData.commentScore"
-                  :icon-classes="iconClasses"
-                  void-icon-class="icon-rate-face-off"
+                  :max="10"
+                  :disabled="true"
                   :colors="['#99A9BF', '#F7BA2A', '#FF9900']">
                 </el-rate>
               </el-form-item>

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

@@ -20,7 +20,7 @@
               <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
-          </el-form-item>          
+          </el-form-item>
           <el-form-item label="计划状态" prop="planStatus">
             <el-select v-model="queryParams.planStatus" placeholder="请选择计划状态" clearable>
               <el-option v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.label"
@@ -38,7 +38,7 @@
               <el-option v-for="dict in dict.type.edu_plan_cycle" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
-          </el-form-item>       
+          </el-form-item>
 
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -114,8 +114,8 @@
             <template slot-scope="scope">
               <dict-tag :options="dict.type.plan_status" :value="scope.row.planStatus"/>
             </template>
-          </el-table-column>          
-          <el-table-column label="修改人" align="center" prop="updateBy"/>          
+          </el-table-column>
+          <el-table-column label="修改人" align="center" prop="updateBy"/>
           <el-table-column label="备注" align="center" prop="remark"/>
           <el-table-column label="操作" width="160" fixed="right" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
@@ -477,6 +477,7 @@ export default {
       this.reset();
       this.$refs['orgTreeSelect'].clear();
       this.$refs["upload"].clearFiles();
+      this
     },
     // 表单重置
     reset() {
@@ -639,7 +640,7 @@ export default {
       else{
         this.formFileListDefualtValue =tempArry;
       }
-      
+
     },
   },
   mounted() {