zhonghuizhen 1 an în urmă
părinte
comite
ad015c4d61

+ 10 - 4
src/views/business/​scheduleManage/edit.vue

@@ -1238,23 +1238,29 @@ export default {
                     }
                     // 如果有班次变化,将其与userId记录到结果中
                     if (changes.length > 0) {
-                        const userNameObj = this.userNameList.filter(item => item.userId === newItem.userId)
+                        const userNameObj = this.userList.filter(item => item.userId === newItem.userId)
                         const perOverView = userNameObj[0]?.userName + changes.join(',')
                         result.push(perOverView)
                     }
                 }
             })
-            return '排班管理员调整如下:' + result.join('。')
+            return result.join('。')
         },
         // 提交调班申请数据
         submitAdjust (submitData) {
-            const overView = this.getOverViews(this.responseData, submitData.staffScheduleDetailPoList)
+            let overView = ''
+            if (submitData.id) {
+                overView = this.getOverViews(this.responseData || null, submitData.staffScheduleDetailPoList)
+            }
+            if (overView === '') {
+                return
+            }
             const { first, second } = this.$store.getters.level || {}
             const adjustData = {
                 scheduleId: submitData.id,
                 reason: '排班管理员调整排班',
                 diDian: second || first,
-                overview: overView,
+                overview: '排班管理员调整:' + overView,
                 status: '已通过',
                 updateTime: Date.now(),
                 adjustmentDetailPoList: []

+ 1 - 1
src/views/system/homepage/components/banciDialog.vue

@@ -1,12 +1,12 @@
 <template>
     <div>
-        <el-button type="primary" @click="openDialog">查看班次详情</el-button>
         <el-dialog
             title="班次详情"
             :visible.sync="dialogVisible"
             width="30%"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
+            :show-close="false"
         >
             <div class="containerDiv">
                 <div>

+ 2 - 0
src/views/system/homepage/index.vue

@@ -649,6 +649,7 @@ export default {
          */
         // 关闭指定弹框
         handleClose (state) {
+            debugger
             switch (state) {
                 case 'calendar':
                     this.calendarDialogVisible = false
@@ -662,6 +663,7 @@ export default {
         },
         // 打开指定弹框
         handleOpen (state, dateArr, events, clickId) {
+            debugger
             const status = ['急', '重', '轻', '缓']
             const eventTrees = []
             switch (state) {