coys

src/components/dateCell/index.vue

@@ -15,6 +15,7 @@
         :columns="columns"
         @cancel="cancelPicker"
         @confirm="pickerConfirm"
+        confirm-button-text="确定"
       />
     </van-popup>
   </div>

src/views/menu/monitoringCall/components/monitoringList.vue

@@ -144,7 +144,7 @@ export default {
 }
 .abnorText{
   font-size: 20px;
-  color: #aeaeae;
+  // color: #aeaeae;
   padding-left: 10px;
   word-wrap:break-word;
 }

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

@@ -3,7 +3,7 @@
     <NavBar :go="{ type: 'push', path: '/training' }" />
     <van-form class="bigbox" ref="form">
       <div class="mainItem">
-        <div class="label">标题</div>
+        <div class="label">培训主题</div>
         <div>{{ trainingData.title }}</div>
       </div>
       <div class="mainItem">
@@ -72,9 +72,9 @@
           
             <div v-for="item in studyList" :key="item.name">
 
-              <van-tag type="primary"  class="tagCls" plain @click="tagHandler(item)">{{
+              <van-tag type="primary" @click="tagHandler(item)"     class="tagCls" plain >{{
                 item.name
-              }}</van-tag>
+              }}</van-tag><span class="deleteCls"  @click="close(item)">删除</span>
               </div>
          
         </div>
@@ -139,7 +139,7 @@
         <van-button type="info" @click="submitHandler(2)">提交</van-button>
       </div>
       <!-- 选择资料 -->
-      <SelectData ref="SelectData" :organizationId="trainingData.orgId" @dataList="dataList"></SelectData>
+      <SelectData ref="SelectData" :organizationId="trainingData.orgId" :listLength="studyList.length" @dataList="dataList"></SelectData>
     </van-form>
   </div>
 </template>
@@ -261,6 +261,8 @@ export default {
     //从资料里选取
     selectData() {
       this.$refs.SelectData.show = true
+      this.studyList=this.studyList.filter(item=>item.type!=undefined)
+      
     },
     clikHadner() {
       this.$refs.PDFAndImgLook.show = true
@@ -462,6 +464,10 @@ export default {
         document.body.removeChild(tempLink)
       }
     },
+    //清除
+    close(item){
+      this.studyList=this.studyList.filter(i=> item.name!=i.name)
+    }
     
   }
 }
@@ -518,4 +524,9 @@ export default {
   margin-bottom: 20px;
   margin-left: 10px;
 }
+.deleteCls{
+  color: #3095fb;
+  text-decoration: dashed;
+  margin-left: 30px;
+}
 </style>

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

@@ -3,7 +3,7 @@
     <NavBar :go="{ type: 'push', path: '/training' }" />
 
     <div class="mainItem">
-      <div class="label">标题</div>
+      <div class="label">培训主题</div>
       <div>{{ trainingData.title }}</div>
     </div>
     <div class="mainItem">

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

@@ -10,18 +10,17 @@
 
       <van-row>
         <van-col span="24">
-          <van-collapse v-model="activeNames" @change="checkedHandler" accordion>
+          <van-collapse v-model="activeNames" @change="checkedHandler">
             <van-checkbox-group v-model="result" >
               <van-collapse-item
-                :ref="item.id"
-                :name="item.id"
                 v-for="item in peopleListCpoy"
+                :name="item.id"
                 :key="item.id"
                 :title="`${item.title}-(${item.orgName})`"
               >
                 <!-- :title="item.defaultCause" -->
                 <template #right-icon>
-                  <van-checkbox :name="item.id" ref="checkboxes" class="checkboxList" />
+                  <van-checkbox :name="item.id" > </van-checkbox>
                 </template>
                 <van-row>
                   <van-col class="colCls" span="24" v-for="i in item.fileList" :key="i.name">
@@ -45,6 +44,7 @@
 import { deptTreeList } from '@/api/toConsult.js'
 import { materialsFileList } from '@/api/training.js'
 import OrgTree from '@/components/orgTree'
+import { Toast } from 'vant'
 export default {
   name: 'SocAppIndex',
   components: {
@@ -55,31 +55,9 @@ export default {
     organizationId: {
       //机构ID
     },
-    userList: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    isRequired: {
-      //是否必填
-      type: Boolean,
-      default: false
-    },
-    inpitLabel: {
-      type: String,
-      default: '参与资料'
-    },
-    fieldNames: {
-      //树行配置映射项
-      type: Object,
-      default: () => {
-        return {
-          text: 'name',
-          value: 'id',
-          children: 'children'
-        }
-      }
+    //培训资料数量
+    listLength: {
+      type: Number
     }
   },
   data() {
@@ -171,7 +149,9 @@ export default {
       })
 
       // this.peoples = list.map(item => item.name).join(',')
-
+      if (list.length + this.listLength > 5) {
+        return Toast('资料附件数量不能超过5个,请修改!')
+      }
       this.$set(this.$data, 'peoples', list.map(item => item.name).join(','))
       // 抛出已选择资料信息
       this.$emit('dataList', list)
@@ -184,10 +164,11 @@ export default {
     //   }
     // },
     checkedHandler(id) {
-      this.result.push(id)
+     
+      this.result=id
+      
     },
     tagHandler(i) {
-        
       const filePath = `${process.env.NODE_ENV === 'development' ? '/dev' : window.origin}${i.url}`
       const tempLink = document.createElement('a')
       tempLink.style.display = 'none'
@@ -197,6 +178,9 @@ export default {
       document.body.appendChild(tempLink)
       tempLink.click()
       document.body.removeChild(tempLink)
+    },
+    clickHandler() {
+      console.log('哈哈哈哈')
     }
   }
 }

src/views/menu/training/index.vue

@@ -41,6 +41,7 @@
             placeholder=""
             :disabled="showDate"
             @click="showDate = true"
+            
           >
             <van-icon name="arrow-down" slot="button"
           /></van-field>
@@ -49,6 +50,7 @@
               v-model="presentDate"
               @cancel="onCancel"
               @confirm="onDateConfirm"
+              confirm-button-text="确定"
               type="year-month"
               title="月份"
             />
@@ -190,7 +192,7 @@ export default {
       showDate: false, //月份显示隐藏
       fieldValue: '全部', //状态名称
       statusValue: ' ', //状态值
-      columns: ['全部', '待记录', '待签名', '已完成'], //状态数组
+      columns: ['全部', '待培训', '待提交', '待签名','已逾期','已完成'], //状态数组
       typeColumns: ['全部', '每月安全培训教育', '专项安全培训教育'], //类型数组
       currentDate: newDateMonth(), //月份值
       conditionShow: false //机构弹框显示隐藏
@@ -265,7 +267,6 @@ export default {
       }
       if (list.userList && list.userList.length > 0) {
         list.userList.forEach(item => {
-         
           if (this.value1 == item.userId && item.sign === 0 && item.type == 1) {
             falg = true
           }
@@ -284,7 +285,7 @@ export default {
       let date = new Date().getTime()
       let startDate = Date.parse(new Date(list.startDate))
       let endDate = Date.parse(new Date(list.endDate))
-      //任务处于待记录状态，且任务在规定完成时间范围内，登录人所在机构和角色与任务培训角色、培训机构一致才显示
+      //任务处于待记录状态，且任务在规定完成时间范围内，登录人所在机构和与任务培训机构一致才显示
 
       if (list.startDate && list.endDate && (list.status == 0 || list.status == 4)) {
         if (date >= startDate && date <= endDate) {
@@ -292,15 +293,15 @@ export default {
         }
       }
       //cascaderValue  当前机构ID
-      //当前用户角色ID
-      // let roleL = JSON.parse(sessionStorage.getItem('SET_USER_ROLELIST'))
-      // roleL.forEach(i => {
-      //   list.taskRoleList.forEach(item => {
-      //     if (this.cascaderValue == list.orgId && i.roleId == item.roleId) {
-      //       falg = true
-      //     }
-      //   })
-      // })
+      // 当前用户角色ID
+      if (list.taskRoleList && list.taskRoleList.length > 0) {
+        list.taskRoleList.forEach(item => {
+          if (this.cascaderValue == list.orgId) {
+            falg = true
+          }
+        })
+      }
+
       if (date > endDate) {
         //当前时间大于结束时间表示已超期
 
@@ -388,7 +389,7 @@ export default {
       this.fieldValue = value
 
       switch (value) {
-        case '待记录':
+        case '待培训':
           this.statusValue = '0'
 
           break
@@ -399,6 +400,14 @@ export default {
         case '已完成':
           this.statusValue = '2'
           break
+
+        case '已逾期':
+          this.statusValue = '3'
+          break
+
+        case '待提交':
+          this.statusValue = '4'
+          break
         case '全部':
           this.statusValue = ' '
           break
@@ -566,7 +575,7 @@ export default {
   }
 }
 .topBox {
-  overflow: hidden;
+  // overflow: hidden;
 }
 :deep.van-field--disabled {
   color: #323233;