coys

.env.development

@@ -13,7 +13,7 @@ ENV = 'development'
  VUE_APP_BASE_API = 'http://10.87.10.47:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
-VUE_APP_BASE_API = 'http://localhost:8080'
+# VUE_APP_BASE_API = 'http://localhost:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/components/common/userselect.vue

@@ -170,7 +170,7 @@ export default {
       // this.$set(this.value, 0, val);
       console.log("onChange",val,this.value,item)
       this.$emit("input", val);
-      this.$emit("change", val);
+      this.$emit("select", val);
       this.$emit(
         "select",
         this.multiple? this.items.filter((v) =>val.indexOf(v[this.valueName])>-1): this.items.filter((v) => v[this.valueName] == val)[0]

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

@@ -2,8 +2,15 @@
   <div class="edu-training-edit">
     <el-dialog :title="'培训登记'" :visible.sync="isShow" width="960px">
       <div class="page-body">
-        <el-form :model="formData" :rules="formDataRules" size="small" ref="form" label-position="right"
-                 label-width="120px" label-prefix=":">
+        <el-form
+          :model="formData"
+          :rules="formDataRules"
+          size="small"
+          ref="form"
+          label-position="right"
+          label-width="120px"
+          label-prefix=":"
+        >
           <el-row>
             <!-- 培训主题 -->
             <el-col :span="12">
@@ -18,22 +25,33 @@
             </el-col>
             <el-col :span="12">
               <el-form-item prop="dateTime" label="演练时间">
-                <el-date-picker v-model="formData.drillTime" :picker-options="startDatepickerOptions"
-                                type="datetime" placeholder="选择日期">
+                <el-date-picker
+                  v-model="formData.drillTime"
+                  :picker-options="startDatepickerOptions"
+                  type="datetime"
+                  placeholder="选择日期"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item prop="content" label="演练地点">
-                <el-input v-model="formData.drillSite" placeholder="请输入演练地点" :length="2000"/>
+                <el-input
+                  v-model="formData.drillSite"
+                  placeholder="请输入演练地点"
+                  :length="2000"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="演练类型" prop="type">
                 <el-select v-model="formData.type" placeholder="请选择演练类型">
-                  <el-option v-for="dict in dict.type.core_drill_type" :key="dict.value" :label="dict.label"
-                             :value="parseInt(dict.value)">
-
+                  <el-option
+                    v-for="dict in dict.type.core_drill_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -41,37 +59,62 @@
 
             <el-col :span="24">
               <el-form-item prop="presetCase" label="预设案由">
-                <k-textarea v-model="formData.presetCase" placeholder="请输入预设案由" :length="2000"/>
+                <k-textarea
+                  v-model="formData.presetCase"
+                  placeholder="请输入预设案由"
+                  :length="2000"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
-              <el-form-item v-if="formData.id" prop="drillSituation" label="演练情况">
-                <k-textarea v-model="formData.drillSituation" placeholder="请输入演练情况" :length="1000"/>
+              <el-form-item
+                v-if="formData.id"
+                prop="drillSituation"
+                label="演练情况"
+              >
+                <k-textarea
+                  v-model="formData.drillSituation"
+                  placeholder="请输入演练情况"
+                  :length="1000"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item v-if="formData.id" label="参与人员">
-                <k-select :multiple="true" v-model="formData.taskUserList" url="/user/find/all"
-                          :params="{ orgId: formData.orgId }" placeholder="请选择缺席人员"
-                          @select="absenceUserSelectChanged"></k-select>
+                <k-select
+                  :multiple="true"
+                  v-model="formData.taskUserList"
+                  url="/user/find/all"
+                  :params="{ orgId: formData.orgId }"
+                  placeholder="请选择缺席人员"
+                  @select="absenceUserSelectChanged"
+                ></k-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item v-if="formData.id" label="缺席人员">
-                <k-select :multiple="true" v-model="formData.taskUserList" url="/user/find/all"
-                          :params="{ orgId: formData.orgId }" @select="absentUserSelectChanged"
-                          placeholder="请选择缺席人员">
+                <k-select
+                  :multiple="true"
+                  v-model="formData.taskUserList"
+                  url="/user/find/all"
+                  :params="{ orgId: formData.orgId }"
+                  @select="absentUserSelectChanged"
+                  placeholder="请选择缺席人员"
+                >
                 </k-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item prop="imageList" label="上传图片">
-                <imgUpload type="more" :value="formData.imageList" @input="imageListChanged"></imgUpload>
+                <imgUpload
+                  type="more"
+                  :value="formData.imageList"
+                  @input="imageListChanged"
+                ></imgUpload>
               </el-form-item>
             </el-col>
-
           </el-row>
         </el-form>
       </div>
@@ -86,17 +129,17 @@
 </template>
 
 <script>
-import {mapState, mapMutations} from "vuex";
-import {getEduTask, recordEduTask} from "@/api/core/edu/eduTask";
+import { mapState, mapMutations } from "vuex";
+import { getEduTask, recordEduTask } from "@/api/core/edu/eduTask";
 import dayjs from "dayjs";
 import KTextarea from "@/components/common/textarea.vue";
 import KSelect from "@/components/common/userselect.vue";
 import imgUpload from "@/components/ImageUpload/index.vue";
-import {initList} from "@/api/core/drill/drillDictionary";
-import {getDrillTask} from "@/api/core/drill/drillTask";
+import { initList } from "@/api/core/drill/drillDictionary";
+import { getDrillTask } from "@/api/core/drill/drillTask";
 
 export default {
-  components: {KTextarea, KSelect, imgUpload},
+  components: { KTextarea, KSelect, imgUpload },
   data() {
     const params = this.$route.params;
     return {
@@ -104,11 +147,11 @@ export default {
       isShow: false,
       formData: this.reset(),
       formDataRules: {
-        drillTime: [{required: true, message: "请选择演练时间"}],
-        drillSite: [{required: true, message: "请输入演练地点"}],
-        type: [{required: true, message: "请选择演练类型"}],
-        presetCase: [{required: true, message: "请输入预设案由"}],
-        drillSituation: [{required: true, message: "请输入预设案由"}],
+        drillTime: [{ required: true, message: "请选择演练时间" }],
+        drillSite: [{ required: true, message: "请输入演练地点" }],
+        type: [{ required: true, message: "请选择演练类型" }],
+        presetCase: [{ required: true, message: "请输入预设案由" }],
+        drillSituation: [{ required: true, message: "请输入预设案由" }],
       },
       startDatepickerOptions: {
         disabledDate(time) {
@@ -121,7 +164,7 @@ export default {
       drillTypeOptions: [],
     };
   },
-  dicts: ['core_drill_type', 'edu_task_status'],
+  dicts: ["core_drill_type", "edu_task_status"],
   props: {},
   watch: {},
   computed: {
@@ -149,7 +192,7 @@ export default {
         this.reset(other);
         return;
       }
-      getDrillTask(id).then(response => {
+      getDrillTask(id).then((response) => {
         this.formData = response.data;
         this.loading = false;
         if (this.formData.imageList == null) {
@@ -159,28 +202,30 @@ export default {
           this.formData.fileList = [];
         }
         if (this.formData.taskUserList) {
-          let list1 = this.formData.taskUserList.filter((element) =>
-            element.type === 1
+          let list1 = this.formData.taskUserList.filter(
+            (element) => element.type === 1
           );
-          console.log("list1", list1)
-          this.formData.absenceList = list1 ? list1.map((a) => {
-              return a.userId;
-            })
+          console.log("list1", list1);
+          this.formData.absenceList = list1
+            ? list1.map((a) => {
+                return a.userId;
+              })
             : [];
 
-          let list2 = this.formData.taskUserList.filter((element) =>
-            element.type === 2
+          let list2 = this.formData.taskUserList.filter(
+            (element) => element.type === 2
           );
-          console.log("list2", list2)
-          this.formData.absentList = list2 ? list2.map((a) => {
-              return a.userId;
-            })
+          console.log("list2", list2);
+          this.formData.absentList = list2
+            ? list2.map((a) => {
+                return a.userId;
+              })
             : [];
         } else {
           this.formData.absenceList = [];
           this.formData.absentList = [];
         }
-      })
+      });
       console.log("getEduTask", this.formData);
     },
     async show(id, other = {}) {
@@ -195,17 +240,19 @@ export default {
     absentUserSelectChanged(list) {
       // 将类型为2的数据删除
       if (this.formData.taskUserList) {
-        this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 1);
+        this.formData.taskUserList = this.formData.taskUserList.filter(
+          (x) => x.type == 1
+        );
       } else {
         this.formData.taskUserList = [];
       }
-      let tempList = list.map(x => {
+      let tempList = list.map((x) => {
         return {
           userId: x.id,
           userName: x.name,
-          type: 2
-        }
-      })
+          type: 2,
+        };
+      });
       if (!tempList) return;
       this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
       console.log("absentUserSelectChanged", list, this.formData.taskUserList);
@@ -213,16 +260,18 @@ export default {
     absenceUserSelectChanged(list) {
       // 将类型为1的数据删除
       if (this.formData.taskUserList) {
-        this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 2);
+        this.formData.taskUserList = this.formData.taskUserList.filter(
+          (x) => x.type == 2
+        );
       } else {
         this.formData.taskUserList = [];
       }
-      let tempList = list.map(x => {
+      let tempList = list.map((x) => {
         return {
           userId: x.id,
           userName: x.name,
-          type: 1
-        }
+          type: 1,
+        };
       });
       if (!tempList) return;
       this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
@@ -238,12 +287,16 @@ export default {
         this.$message.error("参与人员与缺席人员重复，请重新选择!");
         return;
       }
-      let request = {submitType: 1, ...this.formData};
+      let request = { submitType: 1, ...this.formData };
       if (request.trainingStartDateTime)
-        request.trainingStartDateTime = dayjs(request.trainingStartDateTime).format('YYYY-MM-DD HH:mm:ss')
+        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.trainingEndDateTime = dayjs(request.trainingEndDateTime).format(
+          "YYYY-MM-DD HH:mm:ss"
+        );
       // if(request.imageList)
       //   request.imageList=request.imageList.split(',').map(x=>{return x;});
 
@@ -255,7 +308,7 @@ export default {
     },
     async onSubmit() {
       await this.$refs.form.validate();
-      console.log("onSubmit this.formData", this.formData)
+      console.log("onSubmit this.formData", this.formData);
       let due = this.formData.dueCount;
       let actual = this.formData.actualCount;
       if (actual > due) {
@@ -263,12 +316,16 @@ export default {
       } else if (!this.validatePerson()) {
         this.$message.error("参与人员与缺席人员重复，请重新选择!");
       } else {
-        let request = {submitType: 2, ...this.formData};
+        let request = { submitType: 2, ...this.formData };
         if (request.trainingStartDateTime)
-          request.trainingStartDateTime = dayjs(request.trainingStartDateTime).format('YYYY-MM-DD HH:mm:ss')
+          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.trainingEndDateTime = dayjs(
+            request.trainingEndDateTime
+          ).format("YYYY-MM-DD HH:mm:ss");
 
         recordEduTask(request).then((v) => {
           this.$emit("success", this.formData);
@@ -288,31 +345,38 @@ export default {
       }
       return true;
     },
-    uploadTriggerEvent(value) {
-    },
+    uploadTriggerEvent(value) {},
 
     endDisabledDate(time) {
       //小于开始日期禁止选择
       let startDate = new Date();
       startDate.setTime(startDate.getTime() - 3600 * 1000 * 24);
       if (this.formData.trainingStartDateTime) {
-        startDate = new Date(dayjs(this.formData.trainingStartDateTime).format('YYYY-MM-DD'));
+        startDate = new Date(
+          dayjs(this.formData.trainingStartDateTime).format("YYYY-MM-DD")
+        );
         startDate.setTime(startDate.getTime() - 3600 * 1000 * 24);
       }
-      return time.getTime() < new Date(startDate).getTime()
-
+      return time.getTime() < new Date(startDate).getTime();
     },
     startDateChanged(time) {
-      console.log("startDateChanged", time, this.formData.trainingStartDateTime, this.formData.trainingEndDateTime)
-      if (dayjs(this.formData.trainingStartDateTime).isAfter(dayjs(this.formData.trainingEndDateTime))) {
+      console.log(
+        "startDateChanged",
+        time,
+        this.formData.trainingStartDateTime,
+        this.formData.trainingEndDateTime
+      );
+      if (
+        dayjs(this.formData.trainingStartDateTime).isAfter(
+          dayjs(this.formData.trainingEndDateTime)
+        )
+      ) {
         this.formData.trainingEndDateTime = this.formData.trainingStartDateTime;
-        console.log("trainingEndDateTime", this.formData.trainingEndDateTime)
+        console.log("trainingEndDateTime", this.formData.trainingEndDateTime);
       }
     },
   },
-  mounted() {
-
-  },
+  mounted() {},
 };
 </script>
 

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

@@ -65,8 +65,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item v-if="formData.id" prop="absenceList"  label="参与人员">
-                <k-select :multiple="true" v-model="formData.absenceList" url="/user/find/all"
+             
+              <el-form-item v-if="formData.id"   label="参与人员">
+                <k-select :multiple="true" :value="formData.absenceList" url="/user/find/all"
                   :params="{ orgId: formData.orgId }" placeholder="请选择参与人员" @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
@@ -205,6 +206,7 @@ export default {
       console.log("imageListChanged", this.formData.imageList);
     },
     absentUserSelectChanged(list) {
+      console.log(list);
       // 将类型为2的数据删除
       if (this.formData.taskUserList) {
         this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 1);
@@ -240,6 +242,8 @@ export default {
       });
       if (!tempList) return;
       this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
+      // this.formData.absenceList=list.map(item=>item.id)
+      
       console.log("absenceUserSelectChanged", list, this.formData.taskUserList);
     },
     // 事件
@@ -281,10 +285,14 @@ export default {
         return;
       }
       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.taskUserList.length==0||this.formData.taskUserList.filter(item=>item.type==1).length==0){
+        this.$message.error("参与人员不能为空，请重新选择!");
       } else if (!this.validatePerson()) {
         this.$message.error("参与人员与缺席人员重复，请重新选择!");
       } else {