diff --git a/src/util/util.js b/src/util/util.js index 8929541..fcda374 100644 --- a/src/util/util.js +++ b/src/util/util.js @@ -91,4 +91,11 @@ const formattedTime = (dateTime) =>{ return `${year}-${month}-${day} ${hour}:${minute}:${second}`; } +const alignNames = (name) =>{ + if(name.length == 2){ + name = name.substring(0,1) + " " + name.substring(1,2); + } + return name; +} + export { setGoodsNum, isObject, comparisonObject, isElementHidden ,formattedTimeYYYYmmdd,formattedTime}; diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 5a8f290..d75d56e 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -232,6 +232,7 @@ @@ -312,6 +313,7 @@ ga_columns: [], item_columns: [], currentDate: [], + minDate: [], checked: false, deptChecked: false, deptContent: '', @@ -391,6 +393,7 @@ const month = (now.getMonth() + 1).toString().padStart(2, '0'); const day = now.getDate().toString().padStart(2, '0'); data.currentDate = [year, month, day] + data.minDate = new Date(year, month-1, day); } const onConfirm = (time) => { diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue index 00d3a0e..c2fd9e1 100644 --- a/src/views/administrative/deptFilter.vue +++ b/src/views/administrative/deptFilter.vue @@ -73,7 +73,7 @@