diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue index 5700ef4..d95bed6 100644 --- a/src/views/basicData/jobTransferManagement.vue +++ b/src/views/basicData/jobTransferManagement.vue @@ -340,6 +340,11 @@ export default { width: 200, hide: true, addDisabled: true, + type: 'select', + dicData: [ + { label: "班组1", value: "班组1" }, + { label: "班组2", value: "班组2" }, + ], rules: [ { required: true, @@ -420,6 +425,7 @@ export default { search: true, hide: true, width: 200, + type: 'date', rules: [ { required: true, @@ -584,23 +590,23 @@ export default { }, ], }, - { - label: "所属班组", - prop: "deptName", - span: 8, - labelWidth: 150, - search: true, - width: 200, - addDisabled: true, - addDisplay: false, - rules: [ - { - required: true, - message: "请输入所属班组", - trigger: "click", - }, - ], - }, + // { + // label: "所属班组", + // prop: "deptName", + // span: 8, + // labelWidth: 150, + // search: true, + // width: 200, + // addDisabled: true, + // addDisplay: false, + // rules: [ + // { + // required: true, + // message: "请输入所属班组", + // trigger: "click", + // }, + // ], + // }, { label: "所属岗位", prop: "station", @@ -624,6 +630,7 @@ export default { labelWidth: 150, search: false, width: 200, + type: 'date', rules: [ { required: true, @@ -719,6 +726,7 @@ export default { labelWidth: 150, search: false, width: 200, + type: 'date', rules: [ { required: true, @@ -801,6 +809,11 @@ export default { message: "请输入手机号码", trigger: "click", }, + { + pattern: /^1[3-9]\d{9}$/, + message: "请输入正确的11位手机号码", + trigger: "blur", + }, ], }, { @@ -859,6 +872,7 @@ export default { labelWidth: 150, search: true, width: 200, + type: 'date', rules: [ { required: true, @@ -874,6 +888,7 @@ export default { labelWidth: 150, search: false, width: 200, + type: 'date', rules: [ { required: true, @@ -891,6 +906,7 @@ export default { width: 200, addDisplay: false, editDisplay: false, + type: 'date', rules: [ { required: true, diff --git a/src/views/costManagement/subjectFeeMaintenance.vue b/src/views/costManagement/subjectFeeMaintenance.vue index 8e8183f..d52565a 100644 --- a/src/views/costManagement/subjectFeeMaintenance.vue +++ b/src/views/costManagement/subjectFeeMaintenance.vue @@ -1,29 +1,15 @@ @@ -124,7 +108,7 @@ export default { }, data() { return { - isShowImport:false, + isShowImport: false, data: [], form: {}, distributeType: "", @@ -135,11 +119,20 @@ export default { addForm: {}, selectionList: [], showMaintain: false, + showCostCalculation: false, + costForm: { + month: '' + }, + costRules: { + month: [{ required: true, message: "请选择月份", trigger: "change" }] + }, + calculatedMonths: ['2023-10', '2023-11'], // 模拟已计算成本的月份列表 addRules: { expenseAccount: [{ required: true, message: "请输入费用科目", trigger: "blur" }], }, maintainForm: {}, maintainRules: { + month: [{ required: true, message: "请选择月份", trigger: "change" }], totalCost: [{ required: true, message: "请输入总费用金额", trigger: "blur" }], }, page: { @@ -184,7 +177,6 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, - searchLabelPosition: "left", searchLabelPosition: "left", searchGutter: 24, @@ -278,7 +270,7 @@ export default { }, }; }, - mounted() {}, + mounted() { }, methods: { // 点击导入按钮 handleImport() { @@ -298,7 +290,7 @@ export default { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", - }).then((res) => {}); + }).then((res) => { }); }, // 点击新增按钮 handleAdd() { @@ -323,17 +315,78 @@ export default { // 详情 viewRow(row) { this.title = "详情"; - this.maintainForm = row; + this.maintainForm = { ...row, month: row.month || this.getCurrentMonth() }; this.tableData = row.tableData; this.showMaintain = true; }, // 维护 maintainRow(row) { this.title = "维护"; - this.maintainForm = row; + this.maintainForm = { ...row, month: row.month || this.getCurrentMonth() }; this.tableData = row.tableData; this.showMaintain = true; }, + // 获取当前月份 + getCurrentMonth() { + const now = new Date(); + const year = now.getFullYear(); + const month = String(now.getMonth() + 1).padStart(2, '0'); + return `${year}-${month}`; + }, + // 成本计算按钮点击事件 + handleCostCalculation() { + this.costForm.month = this.getCurrentMonth(); + this.showCostCalculation = true; + }, + // 提交成本计算 + submitCostCalculation() { + this.$refs.costForm.validate((valid) => { + if (valid) { + const selectedMonth = this.costForm.month; + const year = selectedMonth.split('-')[0]; + const month = selectedMonth.split('-')[1]; + + // 检查是否已计算过成本 + if (this.calculatedMonths.includes(selectedMonth)) { + this.$confirm(`${year}年${month}月已计算成本，是否重新计算？`, { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.performCostCalculation(selectedMonth); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消成本计算' + }); + }); + } else { + this.performCostCalculation(selectedMonth); + } + } + }); + }, + // 执行成本计算 + performCostCalculation(month) { + // 模拟API调用 + this.$message({ + type: 'success', + message: `${month}成本计算中，请稍候...` + }); + + setTimeout(() => { + // 添加到已计算月份列表 + if (!this.calculatedMonths.includes(month)) { + this.calculatedMonths.push(month); + } + + this.showCostCalculation = false; + this.$message({ + type: 'success', + message: `${month}成本计算完成` + }); + }, 2000); + }, onLoad() { this.data = [ { diff --git a/src/views/costStatistics/index.vue b/src/views/costStatistics/index.vue index 83d146c..f33e6ce 100644 --- a/src/views/costStatistics/index.vue +++ b/src/views/costStatistics/index.vue @@ -37,7 +37,7 @@ @on-load="onLoad" > @@ -311,3 +312,4 @@ export default { + diff --git a/src/views/flowManagement/managementOfKeyTasks.vue b/src/views/flowManagement/managementOfKeyTasks.vue index b7cca65..be4a383 100644 --- a/src/views/flowManagement/managementOfKeyTasks.vue +++ b/src/views/flowManagement/managementOfKeyTasks.vue @@ -240,11 +240,11 @@
- 插入一行 删除选择行 - 保存 +
@@ -329,13 +329,20 @@ - + + + +