Selaa lähdekoodia

教育培训 bug修改

jingyuanchao 2 vuotta sitten
vanhempi
commit
9393a24a74

+ 32 - 27
src/components/K-FileUpload/index.vue

@@ -1,15 +1,16 @@
 <template>
   <div class="upload-file">
-    <el-upload 
+    <el-upload
     multiple
-    drag 
-    :action="uploadFileUrl" 
-    :before-upload="handleBeforeUpload" 
+    drag
+    :action="uploadFileUrl"
+    :before-upload="handleBeforeUpload"
     :on-error="uploadedSuccessfully"
     :on-success="handleUploadSuccess"
-      :file-list="fileList" :limit="limit" 
-      :accept="accept" 
-      :http-request="uploadFile" 
+      :file-list="fileList"
+
+      :accept="accept"
+      :http-request="uploadFile"
       :show-file-list="true"
       :on-remove="handleDelete"
       :headers="headers" class="upload-file-uploader" ref="fileUpload">
@@ -150,7 +151,7 @@ export default {
           return false;
         }
       }
-    
+
 
       // 校检文件大小
       if (this.fileSize) {
@@ -201,10 +202,10 @@ export default {
       }
       //this.fileValueList.splice(item, 1);
       console.log("handleDelete deleted",this.fileValueList)
-      
+
       this.$emit("input", this.listToTagObj(this.fileValueList));
     }
-    
+
     },
     // 上传失败结束处理 必须调用,否则失败文件也会显示
     uploadedSuccessfully(err,file,fileList) {
@@ -228,20 +229,24 @@ export default {
     uploadFile(fileObj) {
       let formData = new FormData();
       formData.append('file', fileObj.file);
-      upload(formData, 'image').then(res => {
-        /*上传成功*/
-        this.$modal.closeLoading();
-        //let imgUrl = process.env.VUE_APP_BASE_API + res.data.url;
-        let arr = [];        
-        arr.push({ name: res.data.realName, url: res.data.url });        
-        this.fileValueList = this.fileValueList.concat(arr);
-        // console.log("uploadFile", this.fileList)
-        fileObj.onSuccess();
-      }).catch(err => {
-        /*上传失败*/
-        this.$modal.closeLoading();
-        fileObj.onError()
-      })
+      console.log("this.fileValueList.length",this.fileValueList.length)
+      if (this.fileValueList.length<=this.limit){
+        upload(formData, 'image').then(res => {
+          /*上传成功*/
+          this.$modal.closeLoading();
+          //let imgUrl = process.env.VUE_APP_BASE_API + res.data.url;
+          let arr = [];
+          arr.push({ name: res.data.realName, url: res.data.url });
+          this.fileValueList = this.fileValueList.concat(arr);
+          // console.log("uploadFile", this.fileList)
+          fileObj.onSuccess();
+        }).catch(err => {
+          /*上传失败*/
+          this.$modal.closeLoading();
+          fileObj.onError()
+        })
+      }
+
     },
     // 对象转成指定字符串分隔
     listToString(list, separator) {
@@ -254,14 +259,14 @@ export default {
       return strs != '' ? strs.substring(0, strs.length - 1) : '';
     },
 
-    listToTagObj(list) {      
+    listToTagObj(list) {
       let tempArry=[];
-      for (let i in list) {        
+      for (let i in list) {
         // console.log("listToString2 i",i);
         tempArry.push(JSON.stringify( {url:list[i].url,name:list[i].name}));
       }
       console.log("listToString2",tempArry);
-      return tempArry;      
+      return tempArry;
     }
   }
 };

+ 2 - 0
src/components/orgTreeSelect/index.vue

@@ -73,6 +73,7 @@ export default {
       type: Array,
       required: false,
     },
+    //组件禁用
     disabled: {
       type: Boolean,
       default: false,
@@ -83,6 +84,7 @@ export default {
       default: null,
       required: false,
     },
+    // 机构类型筛选条件禁用
     disable: {
       type: Boolean,
       default: false,

+ 6 - 5
src/views/core/edu/plan/index.vue

@@ -140,7 +140,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="培训主题" prop="planName">
-              <el-input v-model="form.planName" placeholder="请输入培训主题"/>
+              <el-input v-model="form.planName" maxlength="50" show-word-limit placeholder="请输入培训主题"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -218,16 +218,16 @@
                                        :normalizer="tenantIdnormalizer" :props="{ checkStrictly: true, label: 'name' }"
                                        placeholder="请选择培训机构"/>
                         </el-form-item>-->
-            <el-form-item label="培训机构" prop="planExecOrgIdList">
-              <org-tree-select :queryData="form.execOrgType" ref="orgTreeSelect" @selectNode="queryNode"
-                               :placeholder="'请选择培训机构'" :disable="true"></org-tree-select>
+            <el-form-item v-show="form.execOrgType" label="培训机构" prop="planExecOrgIdList">
+              <org-tree-select v-model="form.planExecOrgIdList" :queryData="form.execOrgType" ref="orgTreeSelect" @selectNode="queryNode" :disable="true">
+              </org-tree-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注"/>
+              <el-input v-model="form.remark" maxlength="200" show-word-limit placeholder="请输入备注"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -431,6 +431,7 @@ export default {
       return row.createByTopOrg !== 1
     },
     execOrgTypeChanged(row) {
+      this.$refs['orgTreeSelect'].clear();
       this.initRoleList(this.form.execOrgType);
       // this.form.planExecOrgIdList = [];
     },

+ 8 - 8
src/views/core/knowledge/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="标签名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入标签名称"
+          placeholder="请输入名称"
           clearable
           maxlength="50"
           show-word-limit
@@ -65,7 +65,7 @@
 
     <el-table v-loading="loading" :data="knowledgeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="标签名称" align="center" prop="name" />
+      <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -97,8 +97,8 @@
     <!-- 添加或修改知识库标签对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="标签名称" prop="name">
-          <el-input type="text" v-model="form.name" placeholder="请输入标签名称" maxlength="50" show-word-limit/>
+        <el-form-item label="名称" prop="name">
+          <el-input type="text" v-model="form.name" placeholder="请输入名称" maxlength="50" show-word-limit/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -146,7 +146,7 @@ export default {
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "标签名称不能为空", trigger: "blur" }
+          { required: true, message: "名称不能为空", trigger: "blur" }
         ],
       }
     };
@@ -197,7 +197,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加知识库标签";
+      this.title = "添加标签";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -206,7 +206,7 @@ export default {
       getKnowledge(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改知识库标签";
+        this.title = "修改标签";
       });
     },
     /** 提交按钮 */

+ 26 - 3
src/views/core/materials/index.vue

@@ -93,10 +93,10 @@
         </el-row>
         <!-- 表格数据 -->
         <el-table v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="序号" align="center" prop="no"/>
           <el-table-column label="资料标题" align="center" prop="title"/>
           <el-table-column label="资料类型" align="center" prop="knowledgeName"/>
-          <el-table-column label="机构名称" align="center" prop="orgName"/>
+          <el-table-column label="所属机构" align="center" prop="orgName"/>
           <el-table-column label="公开状态" align="center" prop="isOpen">
             <template slot-scope="r">{{ r.row.isOpen == 0 ? '未公开' : '公开' }}</template>
           </el-table-column>
@@ -142,6 +142,15 @@
               >修改
               </el-button>
               <el-button
+                v-if="checkCanShowInfo(scope.row)"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleInfo(scope.row)"
+                v-hasPermi="['core:materials:edit']"
+              >详情
+              </el-button>
+              <el-button
                 v-if="checkCanEditOrDel(scope.row)"
                 size="mini"
                 type="text"
@@ -165,7 +174,7 @@
     </el-row>
     <!-- 添加或修改学习资料对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form :disabled="title=='学习资料详情'" ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="资料标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入资料标题" maxlength="50" show-word-limit/>
         </el-form-item>
@@ -316,6 +325,9 @@ export default {
     checkCanEditOrDel(row) {
       return row.createId == this.$store.getters.userId && row.isOpen == 0;
     },
+    checkCanShowInfo(row) {
+      return row.isOpen == 1;
+    },
     checkCanEditOpen(row) {
       return row.createId == this.$store.getters.userId;
     },
@@ -441,6 +453,17 @@ export default {
         this.title = "修改学习资料";
       });
     },
+    /** 详情按钮操作 */
+    handleInfo(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getMaterials(id).then(response => {
+        this.form = response.data;
+        this.formFileListDefualtValue=this.form.fileList;
+        this.open = true;
+        this.title = "学习资料详情";
+      });
+    },
     /** 提交按钮 */
     submitForm() {