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

 Conflicts:
	src/views/core/edu/task/index.vue

src/components/K-FileUpload/index.vue

@@ -0,0 +1,251 @@
+<template>
+  <div class="upload-file">
+    <el-upload
+      multiple
+      :action="uploadFileUrl"
+      :before-upload="handleBeforeUpload"
+      :file-list="fileList"
+      :limit="limit"
+      :http-request="uploadFile"
+      :show-file-list="false"
+      :headers="headers"
+      class="upload-file-uploader"
+      ref="fileUpload"
+    >
+      <!-- 上传按钮 -->
+      <el-button size="mini" type="primary">{{ btnName }}</el-button>
+      <!-- 上传提示 -->
+      <div class="el-upload__tip" slot="tip" v-if="showTip">
+        请上传
+        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b></template>
+        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b></template>
+        的文件
+      </div>
+    </el-upload>
+
+    <!-- 文件列表 -->
+    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+      <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
+        <el-link :href="getFileUrl(file.name)" :underline="false" target="_blank">
+          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+        </el-link>
+        <div class="ele-upload-list__item-content-action">
+          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
+        </div>
+      </li>
+    </transition-group>
+  </div>
+</template>
+
+<script>
+import {getToken} from "@/utils/auth";
+import {upload} from "@/api/system/public";
+
+export default {
+  name: "K-FileUpload",
+  props: {
+
+    // 值
+    value: [String, Object, Array],
+    // 数量限制
+    limit: {
+      type: Number,
+      default: 5,
+    },
+    // 大小限制(MB)
+    fileSize: {
+      type: Number,
+      default: 5,
+    },
+    // 文件类型, 例如['png', 'jpg', 'jpeg']
+    fileType: {
+      type: Array,
+      default: () => ["doc", "xls", "ppt", "txt", "pdf", "et", "zip"],
+    },
+    // 是否显示提示
+    isShowTip: {
+      type: Boolean,
+      default: true
+    },
+    btnName: {
+      type: String,
+      default: "选取文件",
+    },
+  },
+  data() {
+    return {
+      number: 0,
+      uploadList: [],
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传文件服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      fileList: [],
+    };
+  },
+  watch: {
+    value: {
+      handler(val) {
+        if (val) {
+          let temp = 1;
+          // 首先将值转为数组
+          const list = Array.isArray(val) ? val : this.value.split(',');
+          // 然后将数组转为对象数组
+          this.fileList = list.map(item => {
+            if (typeof item === "string") {
+              item = {name: item, url: item};
+            }
+            item.uid = item.uid || new Date().getTime() + temp++;
+            return item;
+          });
+        } else {
+          this.fileList = [];
+          return [];
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  computed: {
+    // 是否显示提示
+    showTip() {
+      return this.isShowTip && (this.fileType || this.fileSize);
+    },
+  },
+  methods: {
+    // 上传前校检格式和大小
+    handleBeforeUpload(file) {
+      // 校检文件类型
+      if (this.fileType) {
+        const fileName = file.name.split('.');
+        const fileExt = fileName[fileName.length - 1];
+        const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
+        if (!isTypeOk) {
+          this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
+          return false;
+        }
+      }
+      // 校检文件大小
+      if (this.fileSize) {
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        if (!isLt) {
+          this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
+          return false;
+        }
+      }
+      this.$modal.loading("正在上传文件，请稍候...");
+      this.number++;
+      return true;
+    },
+    // 文件个数超出
+    handleExceed() {
+      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
+    },
+    // 上传失败
+    handleUploadError(err) {
+      this.$modal.msgError("上传文件失败，请重试");
+      this.$modal.closeLoading()
+    },
+    // 上传成功回调
+    handleUploadSuccess(res, file) {
+      if (res.code === 200) {
+        this.uploadList.push({name: res.data.url, url: res.data.url});
+        this.uploadedSuccessfully();
+      } else {
+        this.number--;
+        this.$modal.closeLoading();
+        this.$modal.msgError(res.msg);
+        this.$refs.fileUpload.handleRemove(file);
+        this.uploadedSuccessfully();
+      }
+    },
+    // 删除文件
+    handleDelete(index) {
+      this.fileList.splice(index, 1);
+      this.$emit("input", this.listToString(this.fileList));
+    },
+    // 上传结束处理
+    uploadedSuccessfully() {
+      if (this.number > 0 && this.uploadList.length === this.number) {
+        this.fileList = this.fileList.concat(this.uploadList);
+        this.uploadList = [];
+        this.number = 0;
+        this.$emit("input", this.listToString(this.fileList));
+        this.$modal.closeLoading();
+      }
+    },
+    // 获取文件名称
+    getFileName(name) {
+      // 将字符串的 JSON 转换为对象
+      const fileObj = JSON.parse(name);
+      // 返回 name 属性
+      return fileObj.name;
+    },
+    // 获取文件url
+    getFileUrl(name) {
+      // 将字符串的 JSON 转换为对象
+      const fileObj = JSON.parse(name);
+      // 返回 name 属性
+      return fileObj.url;
+    },
+
+    //自定义上传方式(自带的成功回调及失败回调会失效)
+    uploadFile(fileObj) {
+      console.log(fileObj, '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.name, url: res.data.url})
+        this.fileList = arr;
+        this.$emit("input", this.listToString(this.fileList));
+      }).catch(err => {
+        /*上传失败*/
+        this.$modal.closeLoading();
+        this.uploadedSuccessfully();
+        //this.$modal.msgError(res.msg);
+        //this.$refs.imageUpload.handleRemove(fileObj.file);
+        //this.uploadedSuccessfully();
+      })
+    },
+    // 对象转成指定字符串分隔
+    listToString(list, separator) {
+      let strs = "";
+      separator = separator || ",";
+      for (let i in list) {
+        strs += list[i].url + separator;
+      }
+
+      return strs != '' ? strs.substring(0, strs.length - 1) : '';
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.upload-file-uploader {
+  margin-bottom: 5px;
+}
+
+.upload-file-list .el-upload-list__item {
+  border: 1px solid #e4e7ed;
+  line-height: 2;
+  margin-bottom: 10px;
+  position: relative;
+}
+
+.upload-file-list .ele-upload-list__item-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
+}
+
+.ele-upload-list__item-content-action .el-link {
+  margin-right: 10px;
+}
+</style>

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

@@ -96,7 +96,7 @@
           >删除
           </el-button>
         </el-col>
-        <el-col :span="1.5">
+<!--        <el-col :span="1.5">
           <el-button
             type="warning"
             plain
@@ -106,12 +106,14 @@
             v-hasPermi="['core:plan:export']"
           >导出
           </el-button>
-        </el-col>
+        </el-col>-->
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
-      <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"/>
+      <el-table  :data="planList"
+                @selection-change="handleSelectionChange"
+                row-key="id"
+                :tree-props="{ children: 'children'}">
         <el-table-column label="序号" align="center" prop="no"/>
         <el-table-column label="计划名称" align="center" prop="planName"/>
         <el-table-column label="计划创建机构" align="center" prop="createOrgName"/>
@@ -189,7 +191,7 @@
       />
     </el-col>
     <!-- 添加或修改教育培训计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-dialog :title="title" :visible.sync="open" width="800px" height="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -297,11 +299,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-col :span="14">
           <el-form-item label="上传文件" prop="fileList">
-            <file-upload v-model="form.file"/>
+            <K-file-upload  ref="upload" v-model="form.fileList" @input="getFileList"/>
           </el-form-item>
-        </el-col>
       </el-form>
 
       <div slot="footer" class="dialog-footer">
@@ -325,12 +325,12 @@ import {
 } from "@/api/core/edu/plan";
 import OrgTree from "@/components/orgTree";
 import {deptTreeSelect} from "@/api/system/public";
-import {formatTime} from "@/utils/ruoyi";
+import KFileUpload  from "@/components/K-FileUpload/index.vue";
 
 export default {
   name: "Plan",
   dicts: ['plan_cycle', 'sys_org_type', 'plan_status', 'edu_plan_cycle'],
-  components: {OrgTree},
+  components: {OrgTree,KFileUpload},
   data() {
     return {
       // 遮罩层
@@ -351,6 +351,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      isUnfold: false,
       // 查询参数
       queryParams: {
         execOrgType: null,
@@ -366,7 +367,26 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        planName: [
+          { required: true, message: "计划名称不能为空", trigger: "blur" }
+        ],
+        planCycle: [
+          { required: true, message: "计划周期不能为空", trigger: "blur" }
+        ],
+        execTimes: [
+          { required: true, message: "培训次数不能为空", trigger: "blur" }
+        ],
+        planStatus: [
+          { required: true, message: "计划状态不能为空", trigger: "blur" }
+        ],
+        execOrgType: [
+          { required: true, message: "培训机构类型不能为空", trigger: "blur" }
+        ],
+        planRoleId: [
+          { required: true, message: "培训角色不能为空", trigger: "blur" }
+        ],
+      },
       planRoleList: [],
       roleList: [],
       //修改新增中的机构树
@@ -397,6 +417,12 @@ export default {
         this.loading = false;
       });
     },
+    getFileList() {
+      //循环获取this.$refs.upload.fileList中的name和url，放到 this.form.fileList中去
+      this.form.fileList = this.$refs.upload.fileList.map(file => {
+        return JSON.stringify({ name: file.name, url: file.url });
+      });
+    },
     //初始化与计划相关的角色信息
     initPlanRoleList() {
       listPlanRole({}).then(response => {
@@ -438,15 +464,15 @@ export default {
     },
     checkCanDel(row) {
       //计划创建机构为当前机构且不是顶级机构创建的计划才显示“删除”按钮
-      return row.belongOrgId == this.$store.getters.orgId && row.createByTopOrg == 0
+      return row.belongOrgId == this.$store.getters.orgId && row.createByTopOrg == 1 && row.issue == 0
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {
       return row.createByTopOrg !== 1
     },
     execOrgTypeChanged(row) {
-      console.log("this.form.execOrgType", this.form.execOrgType);
       this.initRoleList(this.form.execOrgType);
+      this.form.planExecOrgIdList = [];
     },
     /** 查询机构树数据 */
     getDeptTree() {
@@ -468,6 +494,7 @@ export default {
         execTimes: null,
         planStatus: null,
         execOrgType: null,
+        planExecOrgIdList: [],
         startDate: null,
         endDate: null,
         buildTaskNow: null,

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

@@ -7,7 +7,7 @@
     </el-col>
     <el-col :span="20" :xs="24">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      
+
       <el-form-item label="培训主题" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -35,12 +35,6 @@
           </el-select>
       </el-form-item>
       <el-form-item label="培训状态" prop="status">
-        <!-- <el-input
-          v-model="queryParams.status"
-          placeholder=""
-          clearable
-          @keyup.enter.native="handleQuery"
-        /> -->
         <el-select v-model="queryParams.status" placeholder="请选择培训状态" clearable>
             <el-option
               v-for="dict in dict.type.edu_task_status"
@@ -50,151 +44,14 @@
             />
           </el-select>
       </el-form-item>
-      
-      <!-- <el-form-item label="截止日期" prop="endDate">
-        <el-date-picker clearable
-          v-model="queryParams.endDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择截止日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="实到人数" prop="actualCount">
-        <el-input
-          v-model="queryParams.actualCount"
-          placeholder="请输入实到人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="培训岗位名称" prop="roleName">
-        <el-input
-          v-model="queryParams.roleName"
-          placeholder="请输入培训岗位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="时间" prop="dateTime">
-        <el-date-picker clearable
-          v-model="queryParams.dateTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="应到人数" prop="dueCount">
-        <el-input
-          v-model="queryParams.dueCount"
-          placeholder="请输入应到人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="主持人" prop="hostId">
-        <el-input
-          v-model="queryParams.hostId"
-          placeholder="请输入主持人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="机构" prop="orgId">
-        <el-input
-          v-model="queryParams.orgId"
-          placeholder="请输入机构"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="记录人" prop="recorderId">
-        <el-input
-          v-model="queryParams.recorderId"
-          placeholder="请输入记录人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="机构名称" prop="orgName">
-        <el-input
-          v-model="queryParams.orgName"
-          placeholder="请输入机构名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="机构" prop="orgPath">
-        <el-input
-          v-model="queryParams.orgPath"
-          placeholder="请输入机构"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="pdf下载地址" prop="pdfUrl">
-        <el-input
-          v-model="queryParams.pdfUrl"
-          placeholder="请输入pdf下载地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <!-- <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:eduTask:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:eduTask:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:eduTask:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:eduTask:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row> -->
+
 
     <el-table height="550px" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <!-- <el-table-column label="id" align="center" prop="id" /> -->
-      <!-- <el-table-column label="教育培训计划Id" align="center" prop="planId" /> -->
-      
       <el-table-column label="培训机构" align="center" prop="orgName" />
       <el-table-column label="培训角色" align="center" >
         <template slot-scope="scope">
@@ -203,7 +60,7 @@
                       :key="index">
                 {{ item }}
               </el-tag>
-            </template>          
+            </template>
           </template>
       </el-table-column>
       <el-table-column label="培训主题" align="center" prop="title" />
@@ -215,21 +72,12 @@
 
       <el-table-column label="主持人" align="center" prop="hostName" />
       <el-table-column label="开始日期" align="center" prop="startDate" width="180">
-        <!-- <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
-        </template> -->
       </el-table-column>
       <el-table-column label="截止日期" align="center" prop="endDate" width="180">
-        <!-- <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
-        </template> -->
+
       </el-table-column>
       <el-table-column label="培训时间" align="center" prop="trainingStartDateTime" width="180">
-        <!-- <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.trainingStartDateTime, '{y}-{m}-{d}') }}</span>
-        </template> -->
       </el-table-column>
-      <!-- <el-table-column label="应到人数" align="center" prop="dueCount" /> -->
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
             <dict-tag :options="dict.type.edu_task_status" :value="scope.row.status"/>
@@ -429,7 +277,7 @@ export default {
   created() {
     this.getList();
   },
-  
+
   methods: {
     /** 查询教育任务列表 */
     getList() {
@@ -449,7 +297,7 @@ export default {
     reset() {
       this.form = {
         range:[],
-        title: null,       
+        title: null,
         type: null,
         status : null,
       };

src/views/core/knowledge/index.vue

@@ -51,14 +51,14 @@
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+<!--        <el-button
           type="warning"
           plain
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['core:knowledge:export']"
-        >导出</el-button>
+        >导出</el-button>-->
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

src/views/core/materials/index.vue

@@ -79,7 +79,7 @@
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+<!--            <el-button
               type="warning"
               plain
               icon="el-icon-download"
@@ -87,7 +87,7 @@
               @click="handleExport"
               v-hasPermi="['core:materials:export']"
             >导出
-            </el-button>
+            </el-button>-->
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -179,7 +179,7 @@
           <el-input v-model="form.remark" placeholder="请输入备注"  maxlength="200" show-word-limit/>
         </el-form-item>
         <el-form-item label="附件" prop="fileList">
-          <file-upload ref="upload" @input="getFileList" v-model="form.fileList"/>
+          <K-file-upload ref="upload" @input="getFileList" v-model="form.fileList"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -187,7 +187,6 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    c
   </div>
 </template>
 
@@ -205,10 +204,10 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {queryKnowledgeList} from "@/api/core/edu/knowledge";
 import OrgTree from "@/components/orgTree/index.vue";
 import kOrgTree from "@/components/k-orgTree/index.vue";
-
+import KFileUpload  from "@/components/K-FileUpload/index.vue";
 export default {
   name: "Materials",
-  components: {OrgTree, kOrgTree},
+  components: {OrgTree, kOrgTree,KFileUpload},
   data() {
     return {
       // 遮罩层
@@ -253,7 +252,17 @@ export default {
       form: {},
 
       // 表单校验
-      rules: {},
+      rules: {
+        title: [
+          { required: true, message: "资料标题不能为空", trigger: "blur" }
+        ],
+        knowledgeId: [
+          { required: true, message: "资料类型不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "资料内容不能为空", trigger: "blur" }
+        ],
+      },
       //默认选中节点
       defaultKeys: [],
       knowledgeList: [],

src/views/system/menu/index.vue

@@ -238,9 +238,9 @@
                   />
                 </el-input>
               </el-popover>
-        
+
                 <imgUpload  v-else  type="radioIcon" :value="form.icon" @input="inputHandler"></imgUpload>
-             
+
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -622,4 +622,4 @@ export default {
     width: 100%;
     height: 100%;
   }
-</style>
+</style>