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

@@ -12,7 +12,7 @@
           <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-          <el-form-item label="培训主题" prop="planName">
+          <el-form-item label="任务名称" prop="planName">
             <el-input v-model="queryParams.planName" placeholder="请输入关键字" clearable
                       maxlength="50"
                       @keyup.enter.native="handleQuery"/>
@@ -93,7 +93,7 @@
           size="small" :data="planList" @selection-change="handleSelectionChange" row-key="id">
           <!-- :tree-props="{ children: 'children' }" -->
           <el-table-column label="序号" align="center" prop="no" width="60"/>
-          <el-table-column label="培训主题" align="left" header-align="center" width="240" prop="planName"/>
+          <el-table-column label="任务名称" align="left" header-align="center" width="240" prop="planName"/>
           <el-table-column label="创建机构" align="left" header-align="center" width="240" prop="createOrgName"/>
           <el-table-column label="行社名称" align="left" header-align="center" width="240" prop="belongOrgName"/>
           <!-- <el-table-column label="所属机构" align="left" width="180" prop="belongOrgName"/> -->
@@ -156,11 +156,11 @@
     <!-- 添加或修改教育培训计划对话框 -->
     <DialogCom :title="title" :visible.sync="open" :before-close="closeDialog" @close="cancel" width="850px"
                height="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="培训主题" prop="planName" class="endItem">
-              <el-input v-model="form.planName" maxlength="50" placeholder="请输入培训主题"/>
+            <el-form-item label="任务名称" prop="planName" class="endItem">
+              <el-input v-model="form.planName" maxlength="50" placeholder="请输入任务名称"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -358,7 +358,7 @@ export default {
       // 表单校验
       rules: {
         planName: [
-          {required: true, message: "培训主题不能为空", trigger: "blur"}
+          {required: true, message: "培训名称不能为空", trigger: "blur"}
         ],
         planCycle: [
           {required: true, message: "计划周期不能为空", trigger: "blur"}

src/views/core/edu/task/dialog.perform.vue

@@ -7,7 +7,7 @@
           <el-row>
             <!-- 培训主题 -->
             <el-col :span="24">
-              <el-form-item prop="title" label="培训主题">
+              <el-form-item prop="title" label="任务名称">
                 <!-- <el-input
                         v-model="formData.title"
                         :maxlength="32"
@@ -83,6 +83,12 @@
                 </k-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item prop="imageList" label="培训图片">
+                <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
+                           @input="imageListChanged"></imgUpload>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="培训资料" prop="fileList">
                 <K-file-upload ref="upload"
@@ -95,12 +101,7 @@
                 <el-button type="primary" @click="showSelectFile">选取知识库文件</el-button>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item prop="imageList" label="培训图片">
-                <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
-                           @input="imageListChanged"></imgUpload>
-              </el-form-item>
-            </el-col>
+            
           </el-row>
         </el-form>
       </div>