bug修改

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

@@ -36,7 +36,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="记录人">{{
+              <el-form-item label="登记人">{{
                   formData.recorderName
                 }}
               </el-form-item>

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

@@ -390,13 +390,12 @@ export default {
       window.open(pdfUrl);
     },
     handleAddTask(id) {
-      console.log(123123123)
       this.$refs["newTaskDialog"].show(id, {});
     },
     handleExport() {
       this.download('core/drill/task/export', {
         ...this.queryParams
-      }, `${this.selectedOrgName}_${this.$tab.getCurrentTabName()}_${dayjs().format("YYYYMMDD")}.xlsx`)
+      }, `${this.selectedOrgName}-${this.$tab.getCurrentTabName()}-${dayjs().format("YYYYMMDD")}.xlsx`)
     }
   }
 };

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

@@ -158,11 +158,19 @@
                height="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="任务名称" prop="planName" class="endItem">
               <el-input v-model="form.planName" maxlength="50" placeholder="请输入任务名称"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="培训类型" prop="type">
+              <el-select style="width: 100%" v-model="form.type" placeholder="请选择培训类型"  @change="eduTypeSelected()">
+                <el-option v-for="dict in dict.type.edu_training_type" :key="dict.value" :label="dict.label"
+                           :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -311,7 +319,7 @@ import KTextarea from "@/components/common/textarea.vue";
 
 export default {
   name: "Plan",
-  dicts: ['sys_org_type', 'edu_plan_cycle', 'edu_plan_status'],
+  dicts: ['sys_org_type', 'edu_plan_cycle', 'edu_plan_status','edu_training_type'],
   components: {OrgTreeSelect, OrgTree, KFileUpload, DialogSelectFile,KTextarea},
   mixins: [tableList],
   data() {
@@ -482,9 +490,14 @@ export default {
     checkCreateByTopOrg(row) {
       return row.createByTopOrg !== 1 && this.checkCanEdit(row);
     },
+    eduTypeSelected(row) {
+      this.form.planCycle =3;
+      this.form.execTimes =1;
+
+    },
     execOrgTypeChanged(row) {
       this.$refs['orgTreeSelect'].clear();
-      this.initRoleList(this.form.execOrgType);
+      //this.initRoleList(this.form.execOrgType);
       // this.form.planExecOrgIdList = [];
     },
     /** 查询机构树数据 */

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

@@ -25,7 +25,7 @@
 
                         <!-- 机构 -->
                       <el-col :span="12">
-                            <el-form-item label="培训机构">{{
+                            <el-form-item label="受训机构">{{
                                 formData.orgName
                             }}</el-form-item>
                         </el-col>

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

@@ -379,7 +379,7 @@ export default {
     handleExport() {
       this.download('core/eduTask/export', {
         ...this.queryParams
-      }, `${this.selectedOrgName}_${this.$tab.getCurrentTabName()}_${dayjs().format("YYYYMMDD")}.xlsx`)
+      }, `${this.selectedOrgName}-${this.$tab.getCurrentTabName()}-${dayjs().format("YYYYMMDD")}.xlsx`)
     },
     canPerform(row) {
       console.log("row.status", row.status)

src/views/core/task/index.vue

@@ -122,7 +122,7 @@
       @pagination="getList"
     />
         </div>
-   
+
 
       </el-col>
     </el-row>
@@ -136,6 +136,7 @@ import DialogInfo from "./dialog.info";
 import {listPlanRole} from "@/api/core/edu/plan";
 import {formatTime} from "@/utils/ruoyi";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
+import dayjs from "dayjs";
 export default {
   components: {OrgTree,DialogInfo, DataRangePicker,},
   name: "Task",
@@ -171,6 +172,7 @@ export default {
         roleId:null,
         checkSub: true,
       },
+      selectedOrgName:'',
       // 表单参数
       form: {},
       // 表单校验
@@ -207,6 +209,7 @@ export default {
     },*/
     getDefaultOrg(org){
       this.orgName = org.name;
+      this.selectedOrgName=org.shortName;
     },
     initRoleList() {
       roleList({}).then(response => {
@@ -302,7 +305,7 @@ export default {
      console.log(this);
       this.download('core/retrievalTask/export', {
         ...this.queryParams
-      }, `${'【'+this.orgName+'】-【调阅情况跟踪】-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${this.selectedOrgName}-${this.$tab.getCurrentTabName()}-${dayjs().format("YYYYMMDD")}.xlsx`)
     },
     statusColor(status) {
       let color = "";