Эх сурвалжийг харах

Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_test

wangziqian 4 жил өмнө
parent
commit
12420e0806

+ 1 - 0
src/views/workbench/person/index.vue

@@ -466,6 +466,7 @@ export default {
       const res = await deleteSelfSchedule(this.nowDetailData.id)
       if (res.code === 200) {
         this.showDetail = false
+        this.dialog_schedule_visible = false
         this.queryWorkListByTime(this.calendarView)
         this.$message({ type: 'success', message: '删除成功!' })
       }

+ 57 - 7
src/views/workbench/team/index.vue

@@ -182,6 +182,26 @@
       @update="queryTeamWorkListByTime(calendarView)"
     />
     <!-- 排期操作弹框 -->
+    <el-dialog title="删除日程" class="public_task" :visible.sync="dialog_team_visible" width="30%">
+      <div class="blueStripe" />
+      <el-container>
+        <el-aside width="80px" style="text-align: center;">
+          <div class="el-icon-warning icon-style-i" />
+        </el-aside>
+        <el-main style="padding: 0;">
+          <div class="scheduleTip">执行删除后,将无法恢复。请谨慎操作!</div>
+          <div class="schedulePeople">
+            <div class="scheduleLabel">参与人:
+              <span style="color: #333;">{{ nowDetailData.peopleObjectList ? nowDetailData.peopleObjectList.map(item=>item.name).join(','): '' }}</span>
+            </div>
+          </div>
+        </el-main>
+      </el-container>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" plain @click="dialog_team_visible = false">取 消</el-button>
+        <el-button size="small" type="danger" plain @click="deleteSchedule_1">确 定</el-button>
+      </span>
+    </el-dialog>
   </el-container>
 </template>
 
@@ -243,6 +263,7 @@ export default {
         teams: [],
         businesslines: []
       },
+      dialog_team_visible: false, // 删除日程弹窗
       teamName: '团队', // 团队名字
       bizName: '业务线', // 业务线名字
       filtrate: {// 筛选区域
@@ -446,19 +467,21 @@ export default {
         this.isDelete = true
         this.visibleSchedule = true
       } else if (this.nowDetailData.origin === 1) {
-        this.$confirm('是否删除此日程', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.deleteSchedule_1()
-        }).catch(() => {})
+        this.dialog_team_visible = true
+        // this.$confirm('是否删除此日程', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // }).then(() => {
+        //   this.deleteSchedule_1()
+        // }).catch(() => {})
       }
     },
     async deleteSchedule_1() { // 删除日程
       const res = await deleteSelfSchedule(this.nowDetailData.id)
       if (res.code === 200) {
         this.showDetail = false
+        this.dialog_team_visible = false
         this.queryTeamWorkListByTime(this.calendarView)
         this.$message({ type: 'success', message: '删除成功!' })
       }
@@ -551,6 +574,33 @@ export default {
 .el-container{
   width: 100%;
 }
+
+.icon-style-i {
+  color: #F5222D;
+  font-size: 53px;
+}
+
+.scheduleTip{
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  line-height: 19px;
+  color: #333B4A;
+  opacity: 1;
+}
+
+.schedulePeople{
+  display: flex;
+  justify-content:space-between;
+  margin: 20px 0 0;
+}
+
+.scheduleLabel{
+  font-size: 12px;
+  font-family: MicrosoftYaHei;
+  line-height: 14px;
+  color: #666;
+  opacity: 1;
+}
 // .hideSidebar .main-header {
 //   width: calc(100% - 54px);
 // }