diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue
index e8ef05b..56382e9 100644
--- a/src/views/modules/base/calendar.vue
+++ b/src/views/modules/base/calendar.vue
@@ -13,11 +13,14 @@
- {{ buttons.search }}
+ {{
+ buttons.search
+ }}
+
- {{ buttons.newCalendarModel}}
+ {{ buttons.newCalendarModel }}
- {{buttons.maintainCalendar}}
+ {{ buttons.maintainCalendar }}
- {{ buttons.update }}
+ {{ buttons.update }}
{{ buttons.getCEModel }}
- {{ buttons.delete }}
+ {{ buttons.delete }}
- {{buttons.save}}
- {{buttons.close}}
+ {{ buttons.save }}
+ {{ buttons.close }}
@@ -131,8 +134,8 @@
width="80"
:label="labels.do">
- {{buttons.shift}}
- {{buttons.update2}}
+ {{ buttons.shift }}
+ {{ buttons.update2 }}
- {{buttons.close}}
+ {{ buttons.close }}
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{buttons.search}}
- {{buttons.saveCalendar}}
-
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ {{ buttons.search }}
+ {{ buttons.saveCalendar }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 包含
+ 不包含
+
+
+
+
-
@@ -256,7 +269,7 @@
- {{buttons.close}}
+ {{ buttons.close }}
@@ -287,12 +300,12 @@
width="50"
:label="labels.do">
- {{buttons.update3}}
+ {{ buttons.update3 }}
- {{buttons.close}}
+ {{ buttons.close }}
@@ -324,8 +337,8 @@
- {{buttons.save}}
- {{buttons.close}}
+ {{ buttons.save }}
+ {{ buttons.close }}
@@ -427,8 +440,8 @@
- {{buttons.save}}
- {{buttons.close}}
+ {{ buttons.save }}
+ {{ buttons.close }}
@@ -459,7 +472,8 @@ import {
searchFunctionButtonList,
} from "@/api/sysLanguage.js"
-var functionId='103002';
+
+var functionId = '103002';
export default {
name: "calendar",
@@ -481,78 +495,78 @@ export default {
languageCode: this.$i18n.locale
},
labels: {
- site:'工厂编号:',
- calendarId:'日历编码:',
- status:'状态:',
- all:'全部',
- useing:'使用中',
- stopUse:'停用',
- do:'操作',
- error:'错误',
- true:'确定',
- point:'提示',
- cancel:'取消',
- doYes:'操作成功',
- calendar:'维护工作日历',
- site2:'工厂编号:',
- calendarId2:'日历编号:',
- calendarDesc2:'日历描述:',
- site3:'工厂编号:',
- calendarId3:'日历编号:',
- calendarDesc3:'日历描述:',
- status2:'状态:',
- calendarOut:'工作日历例外',
- choose:'请选择',
- calendars:'批量维护工作日历',
- calendarId4:'日历编号:',
- calendarDesc4:'日历描述:',
- chooseDate:'选择日期',
- datetype:'工作日类型:',
- shiftInfo:'班次信息',
- shiftNo:'班次编码:',
- shiftDesc:'班次名称:',
- startexacttime:'上班时间:',
- endexacttime:'下班时间:',
- calendarId5:'日历编码:',
- scheduledate:'日期:',
- site5:'工厂编号:',
- datetype5:'工作日类型:',
- chooseTime:'请选择时间',
- exceptexacttime1:'休息时间点1:',
- exceptduration1:'休息时长1:',
- exceptexacttime2:'休息时间点2:',
- exceptduration2:'休息时长2:',
- exceptexacttime3:'休息时间点3:',
- exceptduration3:'休息时长3:',
- exceptexacttime4:'休息时间点4:',
- exceptduration4:'休息时长4:',
- exceptexacttime5:'休息时间点5:',
- exceptduration5:'休息时长5:',
- exceptexacttime6:'休息时间点6:',
- exceptduration6:'休息时长6:',
- worktime:'累计工作时间:',
- calendarDeleteAsk:'是否删除此条工作日历?',
- warning:'批量维护工作日历天数为 [1-31] 天，且开始日期不能晚于结束日期!',
- endWaring:'结束时间不能在开始时间之前',
- timeWaring:'时间不得相差10天！',
+ site: '工厂编号:',
+ calendarId: '日历编码:',
+ status: '状态:',
+ all: '全部',
+ useing: '使用中',
+ stopUse: '停用',
+ do: '操作',
+ error: '错误',
+ true: '确定',
+ point: '提示',
+ cancel: '取消',
+ doYes: '操作成功',
+ calendar: '维护工作日历',
+ site2: '工厂编号:',
+ calendarId2: '日历编号:',
+ calendarDesc2: '日历描述:',
+ site3: '工厂编号:',
+ calendarId3: '日历编号:',
+ calendarDesc3: '日历描述:',
+ status2: '状态:',
+ calendarOut: '工作日历例外',
+ choose: '请选择',
+ calendars: '批量维护工作日历',
+ calendarId4: '日历编号:',
+ calendarDesc4: '日历描述:',
+ chooseDate: '选择日期',
+ datetype: '工作日类型:',
+ shiftInfo: '班次信息',
+ shiftNo: '班次编码:',
+ shiftDesc: '班次名称:',
+ startexacttime: '上班时间:',
+ endexacttime: '下班时间:',
+ calendarId5: '日历编码:',
+ scheduledate: '日期:',
+ site5: '工厂编号:',
+ datetype5: '工作日类型:',
+ chooseTime: '请选择时间',
+ exceptexacttime1: '休息时间点1:',
+ exceptduration1: '休息时长1:',
+ exceptexacttime2: '休息时间点2:',
+ exceptduration2: '休息时长2:',
+ exceptexacttime3: '休息时间点3:',
+ exceptduration3: '休息时长3:',
+ exceptexacttime4: '休息时间点4:',
+ exceptduration4: '休息时长4:',
+ exceptexacttime5: '休息时间点5:',
+ exceptduration5: '休息时长5:',
+ exceptexacttime6: '休息时间点6:',
+ exceptduration6: '休息时长6:',
+ worktime: '累计工作时间:',
+ calendarDeleteAsk: '是否删除此条工作日历?',
+ warning: '批量维护工作日历天数为 [1-31] 天，且开始日期不能晚于结束日期!',
+ endWaring: '结束时间不能在开始时间之前',
+ timeWaring: '时间不得相差10天！',
startDate: '日期'
},
- buttons:{
- search:'查询',
+ buttons: {
+ search: '查询',
download: '导出',
download2: '导出',
- newCalendarModel:'新增工作日历',
- maintainCalendar:'批量维护工作日历',
- update:'编辑',
- update3:'编辑',
- delete:'删除',
- add:'新增',
- close:'关闭',
- save:'保存',
- getCEModel:'工作日历例外',
- shift:'班次',
- update2:' | 编辑',
- saveCalendar:'保存日历',
+ newCalendarModel: '新增工作日历',
+ maintainCalendar: '批量维护工作日历',
+ update: '编辑',
+ update3: '编辑',
+ delete: '删除',
+ add: '新增',
+ close: '关闭',
+ save: '保存',
+ getCEModel: '工作日历例外',
+ shift: '班次',
+ update2: ' | 编辑',
+ saveCalendar: '保存日历',
},
queryButton: {
functionId: functionId,
@@ -1103,6 +1117,7 @@ export default {
startDate: '',
endDate: '',
datetype: '',
+ isIncluding: true,
},
dataList: [],
dataList2: [],
@@ -1210,7 +1225,7 @@ export default {
this.getData()
this.$message.success(this.labels.doYes)
} else {
- this.$alert(data.msg, this.labels.error, {
+ this.$alert(data.msg, this.labels.error, {
confirmButtonText: this.labels.true
})
}
@@ -1241,6 +1256,7 @@ export default {
site: this.$store.state.user.site.toString(),
calendarId: this.maintainCalendarSearchData.calendarId,
calendarDesc: this.maintainCalendarSearchData.calendarDesc,
+ isIncluding: this.maintainCalendarSearchData.isIncluding?' Like ':' Not Like ',
}
await getCalendarData(mainData).then(({data}) => {
let list = data.rows;
@@ -1326,7 +1342,7 @@ export default {
var endNum = parseInt(end.replace(/-/g, ''), 10);
if (startNum > endNum) {
this.$alert(this.labels.endWaring, this.labels.point, {
- confirmButtonText: this.labels.true
+ confirmButtonText: this.labels.true
})
return false;
}
@@ -1630,7 +1646,7 @@ export default {
// 获取 tableDefault 列
async getColumnList(tableId, columnId) {
this.queryTable.tableId = tableId
- let queryTable= {
+ let queryTable = {
functionId: this.$route.meta.menuId,
tableId: tableId,
languageCode: this.$i18n.locale
@@ -1666,13 +1682,13 @@ export default {
this.getMultiLanguageList()//刷新按钮
- this.getTableUserColumn('103002Table',1)
+ this.getTableUserColumn('103002Table', 1)
- this.getTableUserColumn('103002Table2',2)
+ this.getTableUserColumn('103002Table2', 2)
- this.getTableUserColumn('103002Table3',3)
+ this.getTableUserColumn('103002Table3', 3)
- this.getTableUserColumn('103002Table4',4)
+ this.getTableUserColumn('103002Table4', 4)
}
}