coys

src/utils/date.js

@@ -1,5 +1,6 @@
 export function newDateMonth(time) {
-  var date = new Date(time)
+  var date=time? new Date(time):new Date()
+
   var y = date.getFullYear()
   var m = date.getMonth() + 1
   m = m < 10 ? '0' + m : m

src/views/menu/training/components/addTraining.vue

@@ -263,7 +263,8 @@ export default {
     // 表单提交
     submitHandlerConfirm(type) {
       let obj = JSON.parse(JSON.stringify(this.form))
-      obj.imageList = obj.imageList.map(item => item.url).join(',')
+      
+      obj.imageList = obj.imageList.map(item => item.imgPath).join(',')
 
       obj.taskUserList.push(...this.userPeopleList, ...this.lackPeopleList)
       edittrainingInfo({

src/views/menu/training/index.vue

@@ -97,7 +97,7 @@
       </van-col>
     </van-row>
     <!-- //卡片内容区域 -->
-    <van-panel :title="item.title" @click="goInfo(item.id)" v-for="item in taskList" :key="item.id" class="card" status="状态">
+    <van-panel :title="item.title"  v-for="item in taskList" :key="item.id" class="card" status="状态">
       <template #header>
         <div class="titleClass">
           <div class="title">{{ item.title }}</div>
@@ -111,7 +111,8 @@
           </div>
         </div>
       </template>
-      <div class="mainItem">
+      <div @click="goInfo(item.id)">
+        <div class="mainItem">
         <div>单位名称</div>
         <div>{{ item.orgName }}</div>
       </div>
@@ -131,6 +132,8 @@
         <div>签名情况</div>
         <div class="condition" @click="signatureCondition(item.id)">{{ item.signNums }}</div>
       </div>
+      </div>
+      
     </van-panel>
     <!-- 卡片弹框 -->
     <van-dialog v-model="conditionShow" title="签名情况" show-cancel-button>
@@ -149,6 +152,7 @@ import { Col, Row, Cascader, Dialog, DatetimePicker, Icon, Picker } from 'vant'
 import { gettrainingList, getsignUserList } from '@/api/training.js'
 import { deptTreeList } from '@/api/toConsult.js'
 import { Toast } from 'vant'
+import {newDateMonth} from '@/utils/date.js'
 export default {
   data() {
     return {
@@ -162,10 +166,10 @@ export default {
           num: 0
         
       }, // 缺席人员
-      orgName: '', //机构名称
-      orgId: '', //机构ID
+      orgName: JSON.parse(sessionStorage.getItem("SET_USER_ORGNAME"))||'', //机构名称
+      cascaderValue: JSON.parse(sessionStorage.getItem("SET_USER_ORGID"))||'', //机构ID
       show: false, //机构弹框显示隐藏
-      cascaderValue: '',
+      
       options: [], //机构数组
       fieldNames: {
         text: 'name',
@@ -173,16 +177,17 @@ export default {
         children: 'children'
       },
       taskList: [], //列表数据
-      typeValue: '', //类型值
-      typeName: '', //类型名称
-      fieldValue: '', //状态值
+      typeValue: ' ', //类型值
+      typeName: '全部', //类型名称
+      
       typeStatus: false, //类型显示隐藏
       showStatus: false, //状态显示隐藏
       showDate: false, //月份显示隐藏
-      fieldValue: '', //状态名称
-      columns: ['待记录', '待签名', '已完成'], //状态数组
+      fieldValue: '全部', //状态名称
+      statusValue: ' ', //状态值
+      columns: ['全部','待记录', '待签名', '已完成'], //状态数组
       typeColumns: ['每月安全培训教育', '专项安全培训教育'], //类型数组
-      currentDate: '', //月份值
+      currentDate: newDateMonth(), //月份值
       conditionShow: false, //机构弹框显示隐藏
       show: false, //机构弹框显示隐藏
       show: false //机构弹框显示隐藏
@@ -223,6 +228,7 @@ export default {
       return str
     }
   },
+  
   created() {
     this.init()
   },
@@ -323,6 +329,9 @@ export default {
         case '已完成':
           this.statusValue = '2'
           break
+        case '全部':
+          this.statusValue = ' '
+          break
       }
       this.selectListAppHandler()
       this.showStatus = false