zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix conflict

This commit is contained in:
caoqianming 2021-05-11 13:37:30 +08:00
parent 6c21b1eaf6 9605d2eef4
commit d73188e882
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/.env.development
View File

@ -2,7 +2,7 @@
ENV = 'development' ENV = 'development'
# base api # base api
# VUE_APP_BASE_API = 'http://10.0.11.127:8000/api' #VUE_APP_BASE_API = 'http://10.0.11.127:8000/api'
VUE_APP_BASE_API = 'http://127.0.0.1:8000/api' VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

6
client/src/views/qualityinspect/inspectTable.vue
View File

@ -97,14 +97,14 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:disabled="!checkPermission(['inspectTable'])" :disabled="!checkPermission(['qualityinspect'])"
type="primary" type="primary"
size="small" size="small"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleEdit(scope)" @click="handleEdit(scope)"
/> />
<el-button <el-button
:disabled="!checkPermission(['inspectTable'])" :disabled="!checkPermission(['qualityinspect'])"
type="danger" type="danger"
size="small" size="small"
icon="el-icon-delete" icon="el-icon-delete"
@ -406,6 +406,7 @@ export default {
updateQualityinspect(this.inspectTable.id, this.inspectTable).then((res) => { updateQualityinspect(this.inspectTable.id, this.inspectTable).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.dialogVisible = false; this.dialogVisible = false;
this.getLists();
this.$message.success("成功"); this.$message.success("成功");
} }
}); });
@ -414,6 +415,7 @@ export default {
createQualityinspect(this.inspectTable).then((res) => { createQualityinspect(this.inspectTable).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.dialogVisible = false; this.dialogVisible = false;
this.getLists();
this.$message.success("成功"); this.$message.success("成功");
} }
}); });

2
client/src/views/qualityinspect/inspecttaskdo.vue
View File

@ -315,7 +315,7 @@ export default {
async confirm(form) { async confirm(form) {
this.inspecttask.inspecttask=this.$route.params.id; this.inspecttask.inspecttask=this.$route.params.id;
console.log(this.inspecttask)
createsubinspecttask(this.inspecttask).then((res) => { createsubinspecttask(this.inspecttask).then((res) => {
this.dialogVisible = false; this.dialogVisible = false;