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

src/views/workbench/person/index.vue

@@ -193,6 +193,26 @@
       />
       <!-- 排期操作弹框 -->
     </el-container>
+    <el-dialog title="删除日程" class="public_task" :visible.sync="dialog_schedule_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_schedule_visible = false">取 消</el-button>
+        <el-button size="small" type="danger" plain @click="deleteSchedule_1">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -228,6 +248,7 @@ import createDialog from '@/views/workbench/components/createDialog'
 import searchSection from '@/views/workbench/components/searchSection'
 import websocket from '@/views/workbench/mixins/websocket'
 import { getAllTime } from '@/utils/global.js'
+import '@/styles/PublicStyle/index.scss'
 
 export default {
   components: {
@@ -281,6 +302,7 @@ export default {
         teamId: null,
         bizId: null
       },
+      dialog_schedule_visible: false, // 删除日程弹窗
       DialogTitle: '编辑排期', // 排期弹框标题
       isDelete: false, // 删除排期操作
       teamAndMemberEnum: {},
@@ -419,13 +441,14 @@ 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_schedule_visible = true
+        // this.$confirm('是否删除此日程', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // }).then(() => {
+        //   this.deleteSchedule_1()
+        // }).catch(() => {})
       }
     },
     async deleteSchedule_1() { // 删除日程
@@ -483,7 +506,7 @@ export default {
           }
           return {
             id: item.id,
-            title: `${title}：${item.peopleObject.name}：${item.name}-${item.desc || '无'}；${item.origin ? '' : require}`,
+            title: `${title}：【${item.peopleObject.name}】：${item.name}-${item.desc || '无'}；${item.origin ? '' : require}`,
             start: moment(item.startTime).toDate(),
             end: moment(item.endTime).add(1, 'day').toDate(),
             detailData: item,
@@ -635,6 +658,33 @@ export default {
     right: 0;
   }
 }
+.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;
+}
+
+.icon-style-i {
+  color: #F5222D;
+  font-size: 53px;
+}
+
 .main-section {
   @include main-section;
   margin-right: 0;