Browse Source

日程下删除排期

wangziqian 5 years ago
parent
commit
3ec50faf4e

+ 5 - 2
src/views/workbench/person/components/calenderDetail.vue

@@ -23,7 +23,7 @@
         <div>{{ nowDetailData.seperateDaysNoHoliday }}(用时<span>{{ nowDetailData.needDays }}</span>天)</div>
       </div>
       <div class="detail-people item"><div class="label">参与人:</div>
-        {{ nowDetailData.peopleObjectList.map(item=>item.name).join(',') }}
+        {{ nowDetailData.peopleObject.name }}
       </div>
       <div class="detail-needs item"><div class="label">同步到团队:</div>{{ nowDetailData.syncTeam === 0?'否':'是' }}</div>
       <div class="detail-tasks item"><div class="label">日程描述:</div>{{ nowDetailData.desc }}</div>
@@ -70,7 +70,10 @@ export default {
     },
     data: {
       handler(newV) {
-        this.nowDetailData = newV
+        console.log(newV)
+        if (newV) {
+          this.nowDetailData = newV
+        }
       },
       deep: true
     },

+ 18 - 9
src/views/workbench/person/index.vue

@@ -149,8 +149,9 @@
       <modify-schedule
         v-if="visibleSchedule"
         :visible.sync="visibleSchedule"
-        :detail-data="updateSchedule.data"
-        :title="'修改排期'"
+        :is-delete.sync="isDelete"
+        :detail-data="nowDetailData"
+        :title="DialogTitle"
         @update="queryWorkListByTime(calendarView)"
       />
       <!-- 排期操作弹框 -->
@@ -214,6 +215,8 @@ export default {
         visible: false,
         data: null
       },
+      DialogTitle: '新建排期', // 排期弹框标题
+      isDelete: false, // 删除排期操作
       teamAndMemberEnum: {},
       teamAndMemberMap: {},
       teamInfo: null, // 团队信息数据
@@ -291,13 +294,19 @@ export default {
       if (data) {
         this.nowDetailData = data
       }
-      this.$confirm('是否删除此日程', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.nowDetailData.origin === 0 ? this.deleteSchedule_0() : this.deleteSchedule_1()
-      }).catch(() => {})
+      if (this.nowDetailData.origin === 0) {
+        this.DialogTitle = '删除排期'
+        this.isDelete = true
+        this.visibleSchedule = true
+      } else if (this.nowDetailData.origin === 1) {
+        this.$confirm('是否删除此日程', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.deleteSchedule_0()
+        }).catch(() => {})
+      }
     },
     async deleteSchedule_1() { // 删除日程
       const res = await deleteSelfSchedule(this.nowDetailData.id)