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

src/layout/components/Navbar.vue

@@ -119,6 +119,7 @@ export default {
       this.sumType = type.name
       settingUserSetBiz({ bizId: type.code }).then(res => {
         localStorage.setItem('bizId', type.code)
+        localStorage.setItem('bizName', type.name)
         const url = window.location.href
         const urlArr = url.split('?')
         const k = urlArr[0]

src/views/projectManage/projectList/components/modifySchedule.vue

@@ -211,7 +211,7 @@ export default {
       taskScheduleEvent: [], // 排期类型选项
       form: {
         bizId: localStorage.getItem('bizId'),
-        bizName: '',
+        bizName: localStorage.getItem('bizName'),
         type: '',
         peopleList: [],
         taskList: [],
@@ -283,8 +283,6 @@ export default {
     this.getType()
     if (this.type === 'task' && this.detailData === null) {
       this.initTask()
-    } else {
-      // this.getNowTask()
     }
   },
   mounted() {
@@ -320,18 +318,19 @@ export default {
       }
     },
     getSomeScheduleData(obj) { // 当传入部分详细信息时候
-      const len = obj.dayList.length
-      this.form = {
-        ...this.form,
-        dayList: [obj.dayList[0], obj.dayList[len - 1]]
+      if (obj.dayList) {
+        const len = obj.dayList.length
+        this.form.dayList = [obj.dayList[0], obj.dayList[len - 1]]
+        this.schedule = obj.dayList[0] === obj.dayList[len - 1] ? `${obj.dayList[0]}` : `${obj.dayList[0]}-${obj.dayList[len - 1]}`
+        this.detailDayList = obj.dayList || []
+      }
+      if (obj.bizId) {
+        this.form.bizId = obj.bizId.code
+        this.form.bizName = obj.bizId.name
       }
       this.$nextTick(() => {
         this.form.peopleList = [localStorage.getItem('username')]
       })
-      this.form.bizId = obj.bizId.code
-      this.form.bizName = obj.bizId.name
-      this.detailDayList = obj.dayList || []
-      this.schedule = obj.dayList[0] === obj.dayList[len - 1] ? `${obj.dayList[0]}` : `${obj.dayList[0]}-${obj.dayList[len - 1]}`
     },
     async getScheduleData(id) { // 当有传入的排期id的时候
       const res = await scheduleGet(id)

src/views/workbench/person/components/calenderDetail.vue

@@ -51,7 +51,7 @@
             {{ nowDetailData.typeName }}
           </div>
           <div class="detail-people item"><div class="label">参与人：</div>
-            {{ nowDetailData.peopleObject.name }}
+            {{ nowDetailData.peopleObjectList.map(item=>item.name).join('，') }}
           </div>
           <!-- <div class="detail-tasks item"><div class="label">日程描述：</div>{{ nowDetailData.desc }}</div> -->
           <div class="footer">

src/views/workbench/person/index.vue

@@ -145,12 +145,15 @@
             @eventClick="showSchedule"
             @select="selectDates"
           >
-            <el-button type="primary" size="small" @click="dateClick()">添加日程</el-button>
+            <div>
+              <el-button type="primary" size="small" @click="addSchedule()">添加排期</el-button>
+              <el-button type="primary" size="small" @click="addCalender()">添加日程</el-button>
+            </div>
           </MyFullCalendar>
           <calender-list
             v-show="activeSchedule === '2'"
             ref="calender-list"
-            @add="dateClick"
+            @add="addCalender"
             @edit="handleEdit"
             @delete="handleDelete"
           />
@@ -392,7 +395,7 @@ export default {
     createSchOrCal(bizId) { // 创建排期或者日程
       this.createDialog = false
       if (!bizId) { // 新建日程
-        this.dateClick({
+        this.addCalender({
           dayList: getAllTime(...this.selectRangeData)
         })
       } else { // 新建排期
@@ -405,10 +408,14 @@ export default {
         this.DialogTitle = '新建排期'
       }
     },
-    dateClick(arg) { // 新建日程弹框
+    addCalender(arg) { // 新建日程弹框
       this.createSchedule.data = arg
       this.createSchedule.visible = true
     },
+    addSchedule() { // 新建排期
+      this.DialogTitle = '新建排期'
+      this.visibleSchedule = true
+    },
     editSchedule(data) { // 编辑日程/排期弹框
       if (data) {
         this.nowDetailData = data
@@ -444,13 +451,6 @@ export default {
         this.visibleSchedule = true
       } else if (this.nowDetailData.origin === 1) {
         this.dialog_schedule_visible = true
-        // this.$confirm('是否删除此日程', '提示', {
-        //   confirmButtonText: '确定',
-        //   cancelButtonText: '取消',
-        //   type: 'warning'
-        // }).then(() => {
-        //   this.deleteSchedule_1()
-        // }).catch(() => {})
       }
     },
     async deleteSchedule_1() { // 删除日程