机构下拉选择使用简称；解决 缺陷

src/components/orgTreeSelect/index.vue

@@ -5,7 +5,7 @@
     <div slot="reference" class="tags-box" :class="!disabled|| 'tags-box-disabled'">
       <span v-show="sNodeList.length > 0" class="tags-num">{{sNodeList.length}}</span>
       <i v-if="sNodeList.length > 0 && !disabled" class="el-icon-circle-close close-icon" @click="clear"></i>
-      <el-tag type="success" v-for="v in sNodeList" :key="v.id">{{ v.name }}</el-tag>
+      <el-tag type="success" v-for="v in sNodeList" :key="v.id">{{ v.shortName }}</el-tag>
     </div>
     <!--  文本框    -->
     <el-input style="width: 100%; margin-bottom: 20px" v-model="queryForm.value" @input="serchTreeHandler"
@@ -53,7 +53,7 @@ export default {
       default: () => {
         return {
           children: "children",
-          label: "name",
+          label: "shortName",
         };
       },
     },
@@ -107,7 +107,7 @@ export default {
       treeProps:{
           disabled: this.getNodedisabled,
           children: "children",
-          label: "name",
+          label: "shortName",
       }
     };
   },

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

@@ -453,7 +453,8 @@ export default {
     },
     checkCanDel(row) {
       // 计划所属机构=当前登陆人机构  && 创建机构为省联社  && 不是被下发的  && 计划下不存在已有执行任务的情况
-      return row.belongOrgId == this.$store.getters.orgId && row.issue != 1 && row.done != 1
+      console.log("checkCanDel",row,row.belongOrgId == this.$store.getters.orgId,row.issue != 1,row.done != 1)
+      return row.belongOrgId == this.$store.getters.orgId && (row.issue != 1 || (row.issue == 1 && row.done != 1))
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {

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

@@ -67,7 +67,7 @@
             <el-col :span="24">
 
               <el-form-item v-if="formData.id" prop="absenceList" label="参与人员">
-                <k-select :multiple="true" :value="formData.absenceList"  url="/user/find/all"
+                <k-select :multiple="true" v-model="formData.absenceList"  url="/user/find/all"
                   :params="{ orgId: formData.orgId }" placeholder="请选择参与人员" @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
@@ -212,11 +212,11 @@ export default {
     absentUserSelectChanged(list) {
       console.log(list);
       // 将类型为2的数据删除
-      if (this.formData.absentList) {
-        this.formData.absentList = this.formData.absentList.filter(x => x.type == 1);
+      if (this.formData.taskUserList) {
+        this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 1);
       }
       else {
-        this.formData.absentList = [];
+        this.formData.taskUserList = [];
       }
       let tempList = list.map(x => {
         return {
@@ -226,16 +226,16 @@ export default {
         }
       })
       if (!tempList) return;
-      this.formData.absentList = this.formData.absentList.concat(tempList);
-      console.log("absentUserSelectChanged", list, this.formData.absentList);
+      this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
+      console.log("absentUserSelectChanged", list, this.formData.taskUserList);
     },
     absenceUserSelectChanged(list) {
       // 将类型为1的数据删除
-      if (this.formData.absenceList) {
-        this.formData.absenceList = this.formData.absenceList.filter(x => x.type == 2);
+      if (this.formData.taskUserList) {
+        this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 2);
       }
       else {
-        this.formData.absenceList = [];
+        this.formData.taskUserList = [];
       }
       let tempList = list.map(x => {
         return {
@@ -245,10 +245,11 @@ export default {
         }
       });
       if (!tempList) return;
-      this.formData.absenceList = this.formData.absenceList.concat(tempList);
-      // this.formData.absenceList=list.map(item=>item.id)
-
-      console.log("absenceUserSelectChanged", list, this.formData.absenceList);
+      this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
+      // console.log("absenceUserSelectChanged", list, this.formData.taskUserList,this.formData.absenceList);
+      // this.formData.absenceList=list.map(item=>item.id);
+      
+      // console.log("absenceUserSelectChanged", list, this.formData.taskUserList,this.formData.absenceList);
     },
     // 事件
     onHide() {
@@ -266,7 +267,10 @@ export default {
         this.$message.error("培训开始时间不能大于培训结束时间!");
         return;
       }
-      let request = { submitType: 1, ...this.formData };
+      let request = { submitType: 1, ...this.formData };      
+      delete request.absenceList;
+      delete request.absentList;
+
       if (request.trainingStartDateTime)
         request.trainingStartDateTime = dayjs(request.trainingStartDateTime).format('YYYY-MM-DD HH:mm:ss')
 
@@ -274,7 +278,7 @@ export default {
         request.trainingEndDateTime = dayjs(request.trainingEndDateTime).format('YYYY-MM-DD HH:mm:ss')
       // if(request.imageList)
       //   request.imageList=request.imageList.split(',').map(x=>{return x;});
-      request.taskUserList = [];
+      // request.taskUserList = [];
       recordEduTask(request).then((v) => {
         this.$emit("success", this.formData);
         this.onHide();
@@ -289,26 +293,28 @@ export default {
         this.$message.error("培训开始时间不能大于培训结束时间!");
         return;
       }
-      this.formData.taskUserList=[];
+      // this.formData.taskUserList=[];
       console.log("onSubmit this.formData", this.formData)
       console.log(this.formData.taskUserList);
-      this.formData.taskUserList=this.formData.taskUserList? this.formData.taskUserList:[]
-      let due = this.formData.dueCount;
-      let actual = this.formData.actualCount;
-      if (actual > due) {
-        this.$message.error("实到人数不能大于应到人数!");
-      }else if(this.formData.absenceList.length==0||this.formData.absenceList.filter(item=>item.type==1).length==0){
+      this.formData.taskUserList=this.formData.taskUserList? this.formData.taskUserList:[]      
+      if(this.formData.taskUserList.length==0||this.formData.taskUserList.filter(item=>item.type==1).length==0){
         this.$message.error("参与人员不能为空，请重新选择!");
       } else if (!this.validatePerson()) {
         this.$message.error("参与人员与缺席人员重复，请重新选择!");
       } else {
         let request = { submitType: 2, ...this.formData };
-        if (request.trainingStartDateTime)
-        request.trainingStartDateTime = dayjs(request.trainingStartDateTime).format('YYYY-MM-DD HH:mm:ss')
+        delete request.absenceList;
+        delete request.absentList;
 
-      if (request.trainingEndDateTime)
-        request.trainingEndDateTime = dayjs(request.trainingEndDateTime).format('YYYY-MM-DD HH:mm:ss')
-        request.taskUserList = [];
+        if (request.trainingStartDateTime){
+          request.trainingStartDateTime = dayjs(request.trainingStartDateTime).format('YYYY-MM-DD HH:mm:ss')
+        }       
+
+        if (request.trainingEndDateTime){
+          request.trainingEndDateTime = dayjs(request.trainingEndDateTime).format('YYYY-MM-DD HH:mm:ss')
+        }
+        
+        // request.taskUserList = [];
         recordEduTask(request).then((v) => {
           this.$emit("success", this.formData);
           this.onHide();

src/views/core/materials/index.vue

@@ -192,7 +192,7 @@
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="200" show-word-limit/>
         </el-form-item>
         <el-form-item label="资料附件" prop="fileList">
-          <K-file-upload  ref="upload"
+          <K-file-upload  ref="upload" :isShowUploadBtn="title!='学习资料详情'"
           :defaultValue="formFileListDefualtValue"
           v-model="form.fileList"/>
         </el-form-item>