Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

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

@@ -65,14 +65,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-             
-              <el-form-item v-if="formData.id"   label="参与人员">
-                <k-select :multiple="true" :value="formData.absenceList" url="/user/find/all"
+
+              <el-form-item v-if="formData.id" prop="absenceList" 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>
             <el-col :span="24">
-              <el-form-item v-if="formData.id" label="缺席人员">
+              <el-form-item v-if="formData.id" prop="absentList"  label="缺席人员">
                 <k-select :multiple="true" v-model="formData.absentList" url="/user/find/all"
                   :params="{ orgId: formData.orgId }" @select="absentUserSelectChanged" placeholder="请选择缺席人员">
                 </k-select>
@@ -114,10 +114,11 @@ export default {
       formDataRules: {
         type: [{ required: true, message: "请选择类型" }],
         content: [{ required: true, message: "请输入内容" }],
-        absenceList: [{ required: true, type: "array",message: "请选择参与人员",trigger: ['blur','change'] }],
+        absenceList: [{ required: true, type: "array",message: "请选择参与人员"}],
         trainingStartDateTime: [{ required: true, message: "请输入培训时间" }],
         trainingEndDateTime: [{ required: true, message: "请输入培训时间" }],
         note: [{ required: true, message: "请输入总结" }],
+        imageList: [{ required: true, message: "请上传图片" }],
       },
       startDatepickerOptions: {
         disabledDate(time) {
@@ -188,7 +189,7 @@ export default {
           response.data.absenceList = [];
           response.data.absentList = [];
         }
-        
+
         if (response.data.imageList == null) {
           response.data.imageList = "";
         }
@@ -211,11 +212,11 @@ export default {
     absentUserSelectChanged(list) {
       console.log(list);
       // 将类型为2的数据删除
-      if (this.formData.taskUserList) {
-        this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 1);
+      if (this.formData.absentList) {
+        this.formData.absentList = this.formData.absentList.filter(x => x.type == 1);
       }
       else {
-        this.formData.taskUserList = [];
+        this.formData.absentList = [];
       }
       let tempList = list.map(x => {
         return {
@@ -225,16 +226,16 @@ export default {
         }
       })
       if (!tempList) return;
-      this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
-      console.log("absentUserSelectChanged", list, this.formData.taskUserList);
+      this.formData.absentList = this.formData.absentList.concat(tempList);
+      console.log("absentUserSelectChanged", list, this.formData.absentList);
     },
     absenceUserSelectChanged(list) {
       // 将类型为1的数据删除
-      if (this.formData.taskUserList) {
-        this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 2);
+      if (this.formData.absenceList) {
+        this.formData.absenceList = this.formData.absenceList.filter(x => x.type == 2);
       }
       else {
-        this.formData.taskUserList = [];
+        this.formData.absenceList = [];
       }
       let tempList = list.map(x => {
         return {
@@ -244,10 +245,10 @@ export default {
         }
       });
       if (!tempList) return;
-      this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
+      this.formData.absenceList = this.formData.absenceList.concat(tempList);
       // this.formData.absenceList=list.map(item=>item.id)
-      
-      console.log("absenceUserSelectChanged", list, this.formData.taskUserList);
+
+      console.log("absenceUserSelectChanged", list, this.formData.absenceList);
     },
     // 事件
     onHide() {
@@ -273,7 +274,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 = [];
       recordEduTask(request).then((v) => {
         this.$emit("success", this.formData);
         this.onHide();
@@ -288,6 +289,7 @@ export default {
         this.$message.error("培训开始时间不能大于培训结束时间!");
         return;
       }
+      this.formData.taskUserList=[];
       console.log("onSubmit this.formData", this.formData)
       console.log(this.formData.taskUserList);
       this.formData.taskUserList=this.formData.taskUserList? this.formData.taskUserList:[]
@@ -295,7 +297,7 @@ export default {
       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){
+      }else if(this.formData.absenceList.length==0||this.formData.absenceList.filter(item=>item.type==1).length==0){
         this.$message.error("参与人员不能为空，请重新选择!");
       } else if (!this.validatePerson()) {
         this.$message.error("参与人员与缺席人员重复，请重新选择!");

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

@@ -24,7 +24,7 @@
           placeholder="请选择开始日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="培训类型" prop="type">
+<!--      <el-form-item label="培训类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择培训类型" clearable>
             <el-option
               v-for="dict in dict.type.edu_type"
@@ -33,7 +33,7 @@
               :value="dict.value"
             />
           </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="培训状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择培训状态" clearable>
             <el-option
@@ -68,11 +68,11 @@
           </template>
       </el-table-column>
       <el-table-column label="培训主题" width="200" align="left" prop="title" />
-      <el-table-column label="培训类型" width="180" align="center"  >
+<!--      <el-table-column label="培训类型" width="180" align="center"  >
         <template slot-scope="scope">
             <dict-tag :options="dict.type.edu_type" :value="scope.row.type"/>
           </template>
-      </el-table-column>
+      </el-table-column>-->
 
       <el-table-column label="主持人" width="140" align="center" prop="hostName" />
       <el-table-column label="开始时间" align="center" prop="startDate" width="180">
@@ -289,6 +289,7 @@ export default {
       }, `eduTask_${new Date().getTime()}.xlsx`)
     },
     canPerform(row) {
+      return  true;
       // debugger
       let flag = 0;
       if(row.status>0) return false;

src/views/resumption/rule/dialog.edit.vue

@@ -22,16 +22,17 @@
               :maxlength="50"
               placeholder="请输入履职内容库名称"
               clearable
+              style="width: 280px"
             />
           </el-form-item>
 
           <el-form-item prop="type" label="履职类型:">
             <el-select
               label="履职类型"
-              style="width: 100%"
               v-model="formData.type"
               placeholder="请选择履职类型"
               clearable
+              style="width: 280px"
             >
               <el-option
                 v-for="item in ruleTypeOptions"
@@ -45,7 +46,7 @@
 
           <el-form-item prop="orgType" label="履职机构类型:">
             <el-select
-              style="width: 100%"
+              style="width: 280px"
               prop="orgType"
               label="履职机构类型"
               v-model="formData.orgType"
@@ -64,7 +65,7 @@
 
           <el-form-item prop="status" label="状态:">
             <el-select
-              style="width: 100%"
+              style="width: 280px"
               prop="status"
               label="状态"
               v-model="formData.status"
@@ -81,13 +82,13 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="remark" label="备注">
-            <el-input v-model="formData.remark" :maxlength="255" clearable />
+            <el-input v-model="formData.remark" :maxlength="255" clearable  style="width:280px;" type="textarea" :rows="3"/>
           </el-form-item>
         </el-form>
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="isShow=false">取消</el-button>
+        <el-button @click="isShow = false">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
     </DialogCom>
@@ -150,14 +151,14 @@ export default {
 
     // 事件
     onHide() {
-      this.formData=this.reset();
+      this.formData = this.reset();
       this.$refs.form.resetFields();
     },
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {
         if (!isValidate) return;
         await api.update(this.formData);
-        this.$message.info("保存成功")
+        this.$message.info("保存成功");
         this.$emit("success");
         this.isShow = false;
       });

src/views/safetycheck/rule/dialog.edit.vue

@@ -22,6 +22,7 @@
               :maxlength="50"
               placeholder="请输入检查内容库名称"
               clearable
+              style="width:280px;"
             />
           </el-form-item>
 
@@ -31,6 +32,7 @@
               v-model="formData.type"
               placeholder="请选择检查类型"
               clearable
+              style="width:280px;"
             >
               <el-option
                 v-for="item in ruleTypeOptions"
@@ -49,6 +51,7 @@
               v-model="formData.orgType"
               placeholder="请选择受检机构类型"
               clearable
+              style="width:280px;"
             >
               <el-option
                 v-for="item in orgTypeOptions"
@@ -67,6 +70,7 @@
               v-model="formData.status"
               placeholder="请选择状态"
               clearable
+              style="width:280px;"
             >
               <el-option
                 v-for="item in statusOptions"
@@ -78,7 +82,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="remark" label="备注">
-            <el-input v-model="formData.remark" :maxlength="255" clearable />
+            <el-input type="textarea" v-model="formData.remark" :maxlength="255" clearable  style="width:280px;" :rows="3"/>
           </el-form-item>
         </el-form>
       </div>

src/views/safetycheck/taskManager/components/register.vue

@@ -200,7 +200,8 @@ export default {
   computed: {
     ...mapGetters(["orgId", "roleList", "userId"]),
     isRegister() {
-      return this.mode === "register";
+      let r = this.mode === "register";
+      return r;
     },
   },
   mounted() {
@@ -209,22 +210,22 @@ export default {
     if (!mode) {
       mode = "info";
     }
-    this.mode = mode;
 
     api.info(id).then((r) => {
-      if (this.mode != "register") {
+      this.mode = mode;
+      if (mode != "register") {
         this.info = r.data;
         return;
       }
 
       if (r.data.status == 3) {
-        this.mode == "info";
+        this.mode = "info";
         this.info = r.data;
         this.$message.info("任务已完成,将显示详情");
         return;
       }
 
-      let userRoleIds = this.roleList.map((r) => r.roleId+'');
+      let userRoleIds = this.roleList.map((r) => r.roleId + "");
       let taskRoleIds = r.data.checkRoles.map((r) => r.id);
 
       if (
@@ -234,9 +235,8 @@ export default {
       ) {
         this.info = r.data;
       } else {
-        debugger
         this.$message.warning("用户不能执行该任务");
-        this.mode='info'
+        this.mode = "info";
       }
     });
   },