添加缺陷

定时通知

src/views/ToConfigure/components/modifyNotice.vue

@@ -67,13 +67,13 @@
             <el-option v-for="key in statusList" :key="'status'+key.code" :label="key.msg" :value="key.code" />
           </el-select>
           <el-select v-show="item.type === 103 || item.type === 203" v-model="item.status" placeholder="请选择状态" size="small" class="condition-select" :disabled="disabled">
-            <el-option v-for="key in statusList" :key="'status'+key.code" :label="key.msg" :value="key.code" />
+            <el-option v-for="key in noticeConditionScheduleTypeList" :key="'statu'+key.code" :label="key.name" :value="key.code" />
           </el-select>
           <el-select v-show="item.type === 1 || item.type === 3 || item.type === 5" v-model="item.triggerEvent" placeholder="请选择" size="small" class="condition-select" :disabled="disabled">
             <el-option v-for="key in triggerList" :key="'trigger'+key.code" :label="key.name" :value="key.code" />
           </el-select>
-          <el-select v-show="item.type === 103 || item.type === 203" v-model="item.triggerEvent" placeholder="请选择111" size="small" class="condition-select" :disabled="disabled">
-            <el-option v-for="key in triggerList" :key="'trigger'+key.code" :label="key.name" :value="key.code" />
+          <el-select v-show="item.type === 103 || item.type === 203" v-model="item.triggerEvent" placeholder="请选择" size="small" class="condition-select" :disabled="disabled">
+            <el-option v-for="key in noticeScheduleOpList" :key="'trigge'+key.code" :label="key.name" :value="key.code" />
           </el-select>
           <el-select v-show="item.type === 2 || item.type === 4" v-model="item.triggerEvent" placeholder="请选择" size="small" class="condition-select" :disabled="disabled">
             <el-option v-for="key in noticeEventList" :key="'event'+key.code" :label="key.name" :value="key.code" />
@@ -293,6 +293,8 @@ export default {
         { label: '1天前开始提醒', value: 1 },
         { label: '过期提醒', value: 0 }
       ], // 提前几天提醒
+      noticeScheduleOpList: [],
+      noticeConditionScheduleTypeList: [], // 全周期
       rangDaysList: [], // 条件中大于天数列表
       DaysList: [], // 排期天数
       continuityDaysList: [] // 通知时刻频次列表
@@ -397,7 +399,6 @@ export default {
   },
   methods: {
     initData(data) {
-      console.log(data)
       this.formData = {
         type: data.type,
         id: data.id,
@@ -434,6 +435,8 @@ export default {
     async getBizNoticeSettingEnum() { // 任务需求事件列表
       const res = await getBizNoticeSettingEnum(this.bizId)
       if (res.code === 200) {
+        this.noticeConditionScheduleTypeList = res.data.noticeConditionScheduleTypeList
+        this.noticeScheduleOpList = res.data.noticeScheduleOpList
         this.triggerList = res.data.noticeConditionOpList
         this.type === 'require'
           ? this.noticeEventList = res.data.noticeEventRequireOpList
@@ -461,9 +464,7 @@ export default {
         newArr.push(this.s(h) + ':' + this.s(min))
         total = total + seconds
       }
-      console.log(newArr)
       this.timeDateEnum = newArr
-      // return newArr
     },
     s(n) {
       return n < 10 ? '0' + n : n
@@ -551,9 +552,12 @@ export default {
         item.triggerEvent = this.triggerList[0].code
       } else if (item.type === 2 || item.type === 4) {
         item.triggerEvent = this.noticeEventList[0].code
+      } else if (item.type === 103 || item.type === 203) {
+        item.triggerEvent = this.noticeScheduleOpList[0].code
+        item.lessTime = 1
       }
     },
-    addCondition() { // 添加条件
+    addCondition(val) { // 添加条件
       this.formData.noticeConditionList.push({
         type: this.typeList[0].value, // 1 需求状态 2 需求事件 3 任务状态 4 任务事件
         status: 0,

src/views/ToConfigure/components/noticeConfig.vue

@@ -201,7 +201,6 @@ export default {
       const res = await getBizNoticeSettingList(params)
       if (res.code === 200) {
         this.noticeList = res.data
-        console.log(this.noticeList, '才不会觉得是vss')
         this.total = res.total
       }
     },

src/views/projectManage/taskList/taskIndex.vue

@@ -90,7 +90,7 @@
               </div>
               <div class="Layout marginLeft">
                 <div class="queryName">状态</div>
-                <el-select v-model="form_task.status" size="small" clearable filterable placeholder="请选择">
+                <el-select v-model="form_task.statusList" size="small" multiple clearable filterable placeholder="请选择">
                   <el-option v-for="item in daStatus" :key="item.code" :label="item.msg" :value="item.code" />
                 </el-select>
               </div>