diff --git a/src/api/base.js b/src/api/base.js index a01e263..c28b0a3 100644 --- a/src/api/base.js +++ b/src/api/base.js @@ -32,5 +32,6 @@ export const getCalendarExceptionData = data => createAPI(`/base/getCalendarExce export const batchSaveCDData = data => createAPI(`/base/batchSaveCDData`,'post',data) +export const getCalendarExceptionShiftData = data => createAPI(`/base/getCalendarExceptionShiftData`,'post',data) - +export const updateCESShift = data => createAPI(`/base/updateCESShift`,'post',data) diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index dcd0c42..70e191e 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -351,10 +351,13 @@ a:hover{ margin-left: 0px; } -.bigTable1 .el-table .cell { - height: 24px; +.inputTable input.el-input__inner { + height: 14px !important; } +.inputTable .el-input--medium .el-input__icon { + line-height: 14px; +} .mainTable .el-table .customer-row-gray{ background: #7e819e; } @@ -381,3 +384,12 @@ a:hover{ .mainTable .el-table .customer-row-3 { background: #0000CD; } +.sl-input { + background-color: transparent; + border: 1px !important; + font-size: 12px !important; + height: 14px !important; + line-height: 14px !important; + background-color: transparent !important; + +} diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue index 438994b..f2d178b 100644 --- a/src/views/modules/base/calendar.vue +++ b/src/views/modules/base/calendar.vue @@ -120,6 +120,15 @@ :data="dataList2" border style="width: 100%;"> + + + -
+
关闭 + + + + + + + + + + + 关闭 + + + + + + + + + + + + + + + + + + + + + 保存 + 关闭 + +
@@ -328,11 +405,99 @@ getCalendarExceptionData, calendarDatetypeInfo, batchSaveCDData, + getCalendarExceptionShiftData, + updateCESShift }from "@/api/base.js" export default { name: "calendar", data () { return { + newShiftData:{ + shiftno:'', + shiftdesc:'', + startexacttime:'', + endexacttime:'', + datetype:'', + id:'', + site:'', + }, + updateShiftFlag:false, + shiftFlag:false, + dataList4:[], + columnList4: [ + { + userId: this.$store.state.user.name, + functionId: 6038, + serialNumber: '6038Table2Shiftno', + tableId: "6038Table2", + tableName: "班次表", + columnProp: "shiftno", + headerAlign: "center", + align: "left", + columnLabel: "班次编码", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth: 100 + }, + { + userId: this.$store.state.user.name, + functionId: 6038, + serialNumber: '6038Table2Shiftdesc', + tableId: "6038Table2", + tableName: "班次表", + columnProp: "shiftdesc", + headerAlign: "center", + align: "left", + columnLabel: "班次名称", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth: 100 + }, + { + userId: this.$store.state.user.name, + functionId: 6038, + serialNumber: '6038Table2Startexacttime', + tableId: "6038Table2", + tableName: "班次表", + columnProp: "startexacttime", + headerAlign: "center", + align: "left", + columnLabel: "上班时间", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth: 100 + }, + { + userId: this.$store.state.user.name, + functionId: 6038, + serialNumber: '6038Table2Endexacttime', + tableId: "6038Table2", + tableName: "班次表", + columnProp: "endexacttime", + headerAlign: "center", + align: "left", + columnLabel: "下班时间", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth: 100 + } + ], // 导出 start exportData: [], exportName: "工厂日历"+this.dayjs().format('YYYYMMDDHHmmss'), @@ -1161,6 +1326,43 @@ return s }, // 导出 end + shiftModal(row){ + let inData={ + site:row.site, + scheduledate:row.scheduledate, + calendarId:row.calendarId + } + getCalendarExceptionShiftData(inData).then(({data}) => { + this.dataList4=data.rows; + this.shiftFlag=true; + }) + }, + editShift(row){ + this.newShiftData=row; + this.updateShiftFlag=true; + }, + updateCESShift(){ + updateCESShift(this.newShiftData).then(({data}) => { + if(data.code===0){ + getCalendarExceptionData(this.CESearchData).then(({data}) => { + this.dataList2 = data.rows + }) + this.updateShiftFlag=false; + this.$message({ + message: '保存成功', + type: 'success', + duration: 1500, + + onClose: () => { + } + }) + }else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + } }, created() { this.getData() diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue index 7bf40eb..014c4c3 100644 --- a/src/views/modules/production/dailyPlan.vue +++ b/src/views/modules/production/dailyPlan.vue @@ -295,13 +295,13 @@ min-width="80" label="单位产出"> - - + + + + + + + 关闭 -
+
-
+