混料新增修改

This commit is contained in:
shijing 2023-12-05 10:23:46 +08:00
parent 1f1d96528a
commit c0ea8b80a9
2 changed files with 43 additions and 18 deletions

View File

@ -43,17 +43,16 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="60"> <!-- <el-table-column label="操作" fixed="right" width="60">
<template #default="scope"> <template #default="scope">
<el-link type="primary" @click="table_submit(scope.row)" v-auth="'mtask.submit'" <el-link type="primary" @click="table_submit(scope.row)" v-auth="'mtask.submit'"
v-if="scope.row.state != 40">提交 v-if="scope.row.state != 40">提交
</el-link> </el-link>
</template> </template>
</el-table-column> </el-table-column> -->
</scTable> </scTable>
</el-main> </el-main>
</el-container> </el-container>
</el-aside> </el-aside>
<el-main class="nopadding"> <el-main class="nopadding">
<el-container> <el-container>

View File

@ -81,7 +81,7 @@
<span v-else></span> <span v-else></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="left"> <el-table-column label="操作" fixed="right" align="left" width="100">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="handover_edit(scope.row)" v-auth="'handover.update'" <el-button link type="primary" @click="handover_edit(scope.row)" v-auth="'handover.update'"
v-if="scope.row.submit_time == null"> v-if="scope.row.submit_time == null">
@ -152,11 +152,23 @@
<el-button type="primary" @click="submitHandover">提交</el-button> <el-button type="primary" @click="submitHandover">提交</el-button>
</el-footer> </el-footer>
</el-dialog> </el-dialog>
<save-dialog v-if="dialogSave"
ref="saveDialog" :mtask="mtask"
:brothersList="brothersList"
:activeType="activeName"
@success="handleSaveSuccess"
@closed="dialogSave = false">
</save-dialog>
</template> </template>
<script> <script>
import saveDialog from "./worktask_form.vue";
export default { export default {
components: {
saveDialog,
},
data() { data() {
return { return {
activeName:'8车间',
currentMgroup: {}, currentMgroup: {},
apiObj: null, apiObj: null,
params: {}, params: {},
@ -164,9 +176,11 @@ export default {
paramsHandover: {}, paramsHandover: {},
handoverForm: {}, handoverForm: {},
handoverVisible: false, handoverVisible: false,
dialogSave:false,
deptOptions: [], deptOptions: [],
userList: [], userList: [],
userList2: [] userList2: [],
mtask:'',
} }
}, },
mounted() { mounted() {
@ -174,22 +188,34 @@ export default {
this.getDepts() this.getDepts()
}, },
methods: { methods: {
add() {
this.dialogSave = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
});
},
//
table_edit(row) {
this.dialogSave = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit").setData(row);
});
},
async table_del(row) { async table_del(row) {
this.$confirm(`确定删除吗?`, "提示", { this.$confirm(`确定删除吗?`, "提示", {
type: "warning", type: "warning",
}) }).then(() => {
.then(() => { this.$API.wpm.mlog.delete.req(row.id).then((res) => {
this.$API.wpm.mlog.delete
.req(row.id)
.then((res) => {
this.$message.success("删除成功"); this.$message.success("删除成功");
return res; return res;
}) }).catch((err) => {
.catch((err) => {
return err; return err;
}); });
}) }).catch(() => { });
.catch(() => { }); },
handleSaveSuccess(){
this.$refs.table.refresh();
}, },
getDepts() { getDepts() {
this.$API.system.dept.list.req({ page: 0, name__in: '7车间,10车间' }).then(res => { this.$API.system.dept.list.req({ page: 0, name__in: '7车间,10车间' }).then(res => {