diff --git a/src/api/base.js b/src/api/base.js
index a01e263..a99ed8b 100644
--- a/src/api/base.js
+++ b/src/api/base.js
@@ -32,5 +32,8 @@ 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 271ef0d..dd056bd 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -349,3 +349,5 @@ a:hover{
+
+
diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue
index a78055b..2291503 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%;">
+
+
+ 班次
+
+
关闭
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ 编辑
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
@@ -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()