From e7c4832ac0c5cd7631065a421f231c6bdfeef37c Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 25 Oct 2023 17:44:12 +0800 Subject: [PATCH] 1025 --- src/views/wpm/flog_form.vue | 3 +- src/views/wpm/task2flog_form.vue | 341 ++++++++++++++++++++++++++----- src/views/wpm/worktask.vue | 131 ++++++++---- src/views/wpm/worktask2.vue | 22 +- src/views/wpm/worktaskFlog.vue | 26 ++- 5 files changed, 413 insertions(+), 110 deletions(-) diff --git a/src/views/wpm/flog_form.vue b/src/views/wpm/flog_form.vue index baceec51..fc18a608 100644 --- a/src/views/wpm/flog_form.vue +++ b/src/views/wpm/flog_form.vue @@ -225,8 +225,9 @@ if (this.mode == "add") { res = await this.$API.wpm.mlog.create.req(this.formList); } else if (this.mode == "edit") { - res = await this.$API.wpm.mlog.update.req(this.recordId,this.formList); + res = await this.$API.wpm.mlog.update.req('bulk',this.formList); } + this.$emit('success') this.isSaveing = false; this.visible = false; this.$message.success("操作成功"); diff --git a/src/views/wpm/task2flog_form.vue b/src/views/wpm/task2flog_form.vue index 58cb18ef..680bf336 100644 --- a/src/views/wpm/task2flog_form.vue +++ b/src/views/wpm/task2flog_form.vue @@ -7,59 +7,283 @@ destroy-on-close @closed="$emit('closed')" > - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取消 @@ -74,9 +298,11 @@ import { index } from 'd3'; emits: ["success", "closed"], props:{ mtask: { type: String, default: '' }, + activeType:{ type: String, default: '' }, }, data() { return { + yseorno:['是','否'], loading: false, mode: "add", titleMap: { @@ -86,6 +312,7 @@ import { index } from 'd3'; }, form:{}, options:[], + userList:[], cateOptions:[], shiftOptions:['白班','夜班'], visible: false, @@ -96,8 +323,15 @@ import { index } from 'd3'; }; }, mounted() { + this.getUserList(); }, methods: { + getUserList(){ + let that = this; + this.$API.system.user.list.req({belong_dept__name:this.activeType,page:0}).then(res=>{ + that.userList = res; + }); + }, getReceptionist(data) { this.form.handle_user=data.id; this.handle_name=data.name @@ -110,6 +344,7 @@ import { index } from 'd3'; open(mode = "add") { this.mode = mode; this.visible = true; + return this; }, getList(){ diff --git a/src/views/wpm/worktask.vue b/src/views/wpm/worktask.vue index ed9a074d..8537b5a6 100644 --- a/src/views/wpm/worktask.vue +++ b/src/views/wpm/worktask.vue @@ -2,44 +2,100 @@ - +
新增 任务下达 导出
- - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + @@ -58,7 +114,7 @@
新增 - 合计 + 合计
+ + @@ -80,13 +138,13 @@ - + @@ -144,11 +144,13 @@ //删除 table_del(row) { - this.$confirm(`确定删除该计划详情吗?`, "提示", { + this.$confirm(`确定删除吗?`, "提示", { type: "warning", }).then(() => { - this.$API.pum.planitem.delete.req(row.id).then((res) => { + debugger; + this.$API.wpm.mlog.delete.req(row.id).then((res) => { this.$message.success("删除成功"); + this.$refs.mlogTable.refresh(); return res; }).catch((err) => { return err; @@ -157,22 +159,18 @@ }, //本地更新数据 - handleSaveSuccess(data, mode) { - if (mode == "add") { - this.$refs.table.refresh(); - } else if (mode == "edit") { - this.$refs.table.refresh(); - } + handleSaveSuccess() { + this.$refs.mlogTable.refresh(); }, handleQuery() { - this.$refs.table.queryData(this.query) + this.$refs.mlogTable.queryData(this.query) }, resetQuery() { this.query = {}; }, submitForm(){ this.$API.pm.mtask.submitSameDay.req(this.orderObj.id).then(re=>{ - console.log(res) + // console.log(res) }) }, },