diff --git a/public/static/tpl/imp_sales_monthly_review.xlsx b/public/static/tpl/imp_sales_monthly_review.xlsx new file mode 100644 index 00000000..320aa01a Binary files /dev/null and b/public/static/tpl/imp_sales_monthly_review.xlsx differ diff --git a/src/utils/dateUtils.js b/src/utils/dateUtils.js index bd850af9..fb209643 100644 --- a/src/utils/dateUtils.js +++ b/src/utils/dateUtils.js @@ -76,4 +76,26 @@ export function excelDateToJSDate(excelDate) { const minutes = String(date.getMinutes()).padStart(2, '0'); const seconds = String(date.getSeconds()).padStart(2, '0'); return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; - } \ No newline at end of file + } + /** + * 获取上个月的年月 格式 yyyy-mm + */ +export function getLastMonthYearMonth() { + const today = new Date(); + const year = today.getFullYear(); + const month = today.getMonth(); + + // 计算上一个月的年月 + let lastMonth, lastYear; + if (month === 0) { + // 如果是1月,上一个月是去年12月 + lastMonth = 11; + lastYear = year - 1; + } else { + lastMonth = month - 1; + lastYear = year; + } + + // 格式化为 YYYY-MM + return `${lastYear}-${String(lastMonth + 1).padStart(2, "0")}`; +} \ No newline at end of file diff --git a/src/views/emis/EmisBaseTools/DepartmentPicker.vue b/src/views/emis/EmisBaseTools/DepartmentPicker.vue index 7aba05f8..ccee3652 100644 --- a/src/views/emis/EmisBaseTools/DepartmentPicker.vue +++ b/src/views/emis/EmisBaseTools/DepartmentPicker.vue @@ -41,7 +41,6 @@ data() { }, watch: { value(newVal) { - console.log('newVal---',newVal) this.svalue = newVal; }, svalue(newVal, oldVal) { diff --git a/src/views/emis/salesCommissionRatio/index.vue b/src/views/emis/salesCommissionRatio/index.vue index 2395303f..a03c15e2 100644 --- a/src/views/emis/salesCommissionRatio/index.vue +++ b/src/views/emis/salesCommissionRatio/index.vue @@ -22,7 +22,7 @@ diff --git a/src/views/emis/salesMonthlyReview/draftSubmitReview.vue b/src/views/emis/salesMonthlyReview/draftSubmitReview.vue new file mode 100644 index 00000000..e6d34d6f --- /dev/null +++ b/src/views/emis/salesMonthlyReview/draftSubmitReview.vue @@ -0,0 +1,328 @@ + + + + + diff --git a/src/views/emis/salesMonthlyReview/index.vue b/src/views/emis/salesMonthlyReview/index.vue index f9155c81..7a81a0b3 100644 --- a/src/views/emis/salesMonthlyReview/index.vue +++ b/src/views/emis/salesMonthlyReview/index.vue @@ -30,7 +30,7 @@ @@ -93,6 +93,7 @@ import PostsPicker from "@/views/emis/EmisBaseTools/PostsPicker.vue"; import NumberRangePicker from '@/components/NumberRange/NumberRangePicker'; import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import DepartmentPicker from "@/views/emis/EmisBaseTools/DepartmentPicker.vue"; +import { getLastMonthYearMonth } from "@/utils/dateUtils"; export default { name: "SalesMonthlyReview", components: { SalesMonthlyReviewForm,Treeselect,PostsPicker,NumberRangePicker,EmpNamePicker,DepartmentPicker }, @@ -126,7 +127,7 @@ export default { employeeName:null, position:null, department:null, - reviewMonth:null, + reviewMonth:getLastMonthYearMonth(), //默认上个月 params:{ scoreRange:null, } @@ -264,7 +265,7 @@ export default { }, getTreeselect() { treeselect().then(response => { - console.log(response.data) + // console.log(response.data) this.deptOptions = response.data; }); },