This commit is contained in:
““shijing 2021-09-08 10:44:38 +08:00
parent 46629a064c
commit 05c707fb24
1 changed files with 644 additions and 213 deletions

View File

@ -1,14 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div style="margin-top: 10px"> <div slot="header" class="clearfix">
<span style="font-size: 16px;
font-weight: 700;
">子工序列表</span>
</div>
<el-button type="primary" icon="el-icon-plus" @click="handleCreate" <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增工序</el-button >新增子工序</el-button>
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-table <el-table
v-loading="listLoading" v-loading="listLoading"
:data="stepList" :data="stepList"
@ -17,247 +17,678 @@
stripe stripe
highlight-current-row highlight-current-row
max-height="600" max-height="600"
@row-click="rowClick"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="工序步骤名称"> <el-table-column label="工序步骤名称">
<template slot-scope="scope">{{ scope.row.name }}</template> <template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="步骤编号"> <el-table-column label="步骤编号">
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column> </el-table-column>
<el-table-column label="相关设备">
<template slot-scope="scope" v-if="scope.row.equipments">
<el-tag v-for="item in scope.row.equipments_"
:key="item.number"
:label="item.name"
:value="item.number">{{item.name}}</el-tag>
</template>
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="操作" label="操作"
width="220px" width="220px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-link
type="primary"
@click="handlesearch(scope)"
>查看</el-link
>
<el-link <el-link
v-if="checkPermission(['step_update'])" v-if="checkPermission(['step_update'])"
@click="handleEdit(scope)" @click="handleEditStep(scope)"
>编辑</el-link >编辑</el-link
> >
<el-link <el-link
v-if="checkPermission(['step_delete'])" v-if="checkPermission(['step_delete'])"
type="danger" type="danger"
@click="handleDelete(scope)" @click="handleDeleteStep(scope)"
>删除</el-link >删除</el-link
> >
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog
</el-card> :visible.sync="dialogVisibles"
<el-dialog :title="dialogTypes === 'edit' ? '编辑工序' : '新增工序'"
:visible.sync="dialogVisible"
:title="dialogType === 'edit' ? '编辑工序' : '新增工序'"
>
<el-form
ref="Form"
:model="step"
label-width="100px"
label-position="right"
:rules="rule1"
> >
<el-form-item label="工序名称" prop="name"> <el-form
<el-input v-model="step.name" placeholder="工序名称" /> ref="Form"
</el-form-item> :model="step"
<el-form-item label="步骤编号" prop="number"> label-width="100px"
<el-input v-model="step.number" placeholder="工序编号" /> label-position="right"
</el-form-item> :rules="rule1"
>
<el-form-item label="工序名称" prop="name">
<el-input v-model="step.name" placeholder="工序名称" />
</el-form-item>
<el-form-item label="步骤编号" prop="number">
<el-input v-model="step.number" placeholder="工序编号" />
</el-form-item>
<el-form-item label="工序设备" prop="equipments"> <el-form-item label="工序设备" prop="equipments">
<el-select style="width: 100%" multiple v-model="step.equipments" placeholder="请选择"> <el-select style="width: 100%" multiple v-model="step.equipments" placeholder="请选择">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="指导书内容" prop="instruction_content"> <el-form-item label="指导书内容" prop="instruction_content">
<el-input type="textarea" :rows="3" v-model="step.instruction_content" placeholder="指导书内容" /> <el-input type="textarea" :rows="3" v-model="step.instruction_content" placeholder="指导书内容" />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
<el-input-number <el-input-number
v-model="step.sort" v-model="step.sort"
:min="-2147483648" :min="-2147483648"
:max="2147483647" :max="2147483647"
></el-input-number> ></el-input-number>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="text-align: right"> <div style="text-align: right">
<el-button type="danger" @click="dialogVisible = false">取消</el-button> <el-button type="danger" @click="dialogVisibles = false">取消</el-button>
<el-button type="primary" @click="confirm('Form')">确认</el-button> <el-button type="primary" @click="confirm('Form')">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</el-card>
<el-card>
<el-row :gutter="24">
<el-col :span="6" >
<el-card >
<div slot="header" class="clearfix">
<span style="font-size: 16px;
font-weight: 700;
">过程记录表</span>
</div>
<el-button type="primary" icon="el-icon-plus" @click="handleCreateStep"
>新增</el-button>
<el-table
:data="recordformList.results"
border
fit
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 50}"
@current-change="handleCurrentChange"
>
<el-table-column type="index" width="50" />
<el-table-column label="表名称">
<template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
>
<template slot-scope="scope">
<el-link
v-if="checkPermission(['material_update'])"
@click="handleEdit(scope)"
>编辑</el-link>
<el-link
v-if="checkPermission(['material_delete'])"
type="danger"
@click="handleDelete(scope)"
>删除</el-link>
</template>
</el-table-column>
</el-table>
<el-dialog
:visible.sync="dialogVisible"
:title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'"
>
<el-form
ref="Forms"
:model="recordform"
label-width="80px"
label-position="right"
>
<el-form-item label="表格名称" prop="name">
<el-input v-model="recordform.name" placeholder="表格名称" />
</el-form-item>
<el-form-item label="表格类型" prop="type">
<el-select style="width: 100%" v-model="recordform.type" placeholder="请选择">
<el-option
v-for="item in typeoptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div style="text-align: right">
<el-button type="danger" @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="recordformconfirm('Forms')">确认</el-button>
</div>
</el-dialog>
</el-card>
</el-col>
<el-col :span="18" >
<el-card >
<div slot="header" class="clearfix">
<span style="font-size: 16px;
font-weight: 700;
">记录字段</span>
</div>
<el-button type="primary" icon="el-icon-plus" @click="handlefieldCreate"
>新增</el-button>
<el-table
:data="fieldList.results"
border
fit
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50" />
<el-table-column label="字段类型">
<template slot-scope="scope">{{ options_[scope.row.field_type] }}</template>
</el-table-column>
<el-table-column label="字段名称">
<template slot-scope="scope">{{ scope.row.field_name }}</template>
</el-table-column>
<el-table-column label="字段标识">
<template slot-scope="scope">{{ scope.row.field_key }}</template>
</el-table-column>
<el-table-column label="布尔类型显示名">
<template slot-scope="scope">{{ scope.row.boolean_field_display }}</template>
</el-table-column>
<el-table-column label="选项显示名">
<template slot-scope="scope">{{ scope.row.field_choice }}</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
>
<template slot-scope="scope">
<el-link
v-if="checkPermission(['material_update'])"
@click="handlefieldEdit(scope)"
>编辑</el-link
>
<el-link
v-if="checkPermission(['material_delete'])"
type="danger"
@click="handlefieldDelete(scope)"
>删除</el-link
>
</template>
</el-table-column>
</el-table>
<el-dialog :visible.sync="dialogVisible1" :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'">
<el-form ref="Form" :model="field" label-width="80px" label-position="right">
<el-form-item label="字段类型" prop="field_type">
<el-select style="width: 100%" v-model="field.field_type" placeholder="请选择">
<el-option
v-for="item in fieldtypeoptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="字段标识" prop="field_key">
<el-input v-model="field.field_key" placeholder="字段标识" onkeyup="value=value.replace(/[^A-Za-z_\/]/ig,'')"/>
</el-form-item>
<el-form-item label="字段名称" prop="field_name">
<el-input v-model="field.field_name" placeholder="字段名称" />
</el-form-item>
<el-form-item label="选项" v-show="field.field_type=='radio'||field.field_type=='checkbox'||field.field_type=='select'||field.field_type=='selects'">
<el-button @click.prevent="addDomain" style="border: none;">
<i class="el-icon-circle-plus-outline"></i>
<span style="font-size:14px;">添加</span>
</el-button>
<el-row v-for="(domain, $index) in field_choice" :key=domain+$index style="margin-bottom: 10px">
<el-col :span="20">
<el-input v-model="field_choice[$index]" auto-complete="off"></el-input>
</el-col>
<el-col :span="3" style="text-align: center" v-if="$index!==0">
<i class="el-icon-remove-outline" @click.prevent="removeDomain($index,'1')" style="color: red;font-size: 16px;"></i>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="field.sort" :min="1" placeholder="排序"></el-input-number>
</el-form-item>
</el-form>
<div style="text-align: right">
<el-button type="danger" @click="dialogVisible1 = false">取消</el-button>
<el-button type="primary" @click="fieldconfirm('Form')">确认</el-button>
</div>
</el-dialog>
</el-card>
</el-col>
</el-row>
</el-card>
</div> </div>
</template> </template>
<script> <script>
import { getStepList, createStep,updateStep,deleteStep } from "@/api/mtm"; import { getStepList, createStep,updateStep,deleteStep } from "@/api/mtm";
import checkPermission from "@/utils/permission"; import checkPermission from "@/utils/permission";
import { getEquipmentAll } from "@/api/equipment"; import { getEquipmentAll } from "@/api/equipment";
import { upUrl, upHeaders } from "@/api/file"; import { upUrl, upHeaders } from "@/api/file";
import { getStep,getrecordformList,createrecordform,updaterecordform,deleterecordform,getrffieldList,createrffield,updaterffield,
deleterffield} from "@/api/mtm";
import { genTree } from "@/utils"; import vueJsonEditor from 'vue-json-editor'
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination import { genTree } from "@/utils";
const defaultstep = { import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
name: "", const defaultstep = {
number: "", name: "",
}; number: "",
export default { };
components: { Pagination },
data() {
return {
step: defaultstep,
stepList:[],
upHeaders: upHeaders(),
upUrl: upUrl(),
fileList:[],
listLoading: true,
dialogVisible: false,
dialogType: "new",
options:[],
rule1: {
name: [{ required: true, message: "请输入", trigger: "blur" }],
number: [{ required: true, message: "请输入", trigger: "blur" }],
},
};
},
computed: {},
watch: {},
created() {
this.step.process = this.$route.params.id;
this.getList();
this.getequipments()
},
methods: {
checkPermission,
//子工序列表
getList() {
this.listLoading = true;
getStepList(this.step.process).then((response) => {
if (response.data) {
this.stepList = response.data;
}
this.listLoading = false;
});
},
//工序设备
getequipments() {
getEquipmentAll().then(response => {
this.options = genTree(response.data.results);
});
},
handlePreview(file) {
if ("url" in file) {
window.open(file.url);
} else {
window.open(file.response.data.path);
}
},
handleUpSuccess(res, file, filelist) {
this.step.instruction = res.data.id;
},
handleRemove(file, filelist){
this.step.instruction = null;
},
const defaultrecordform = {
handleFilter() {
this.listQuery.page = 1;
this.getList();
},
resetFilter() {
this.listQuery = {
page: 1,
page_size: 20,
}
this.getList();
},
handleCreate() {
this.step = Object.assign({}, defaultstep);
this.dialogType = "new";
this.dialogVisible = true;
this.$nextTick(() => {
this.$refs["Form"].clearValidate();
});
},
handlesearch(scope) {
this.$router.push({name: "StepDo", params: { id: scope.row.id }, }) };
const defaultfield = {
}, };
export default {
handleEdit(scope) { components: { Pagination,vueJsonEditor },
this.step = Object.assign({}, scope.row); // copy obj data() {
this.dialogType = "edit"; return {
this.dialogVisible = true; step: defaultstep,
stepList:[],
this.$nextTick(() => { upHeaders: upHeaders(),
this.$refs["Form"].clearValidate(); upUrl: upUrl(),
}); fileList:[],
}, listLoading: true,
handleDelete(scope) { dialogVisibles: false,
this.$confirm("确认删除?", "警告", { dialogTypes: "new",
confirmButtonText: "确认", field: {
cancelButtonText: "取消", field_type:'',
type: "error", field_key:'',
}) field_name:'',
.then(async () => { sort:'',
await deleteStep(scope.row.id); field_choice:[""],
this.getList(); },
this.$message.success("成功"); field_choice:[''],
}) options:[],
.catch((err) => { rule1: {
console.error(err); name: [{ required: true, message: "请输入", trigger: "blur" }],
}); number: [{ required: true, message: "请输入", trigger: "blur" }],
}, },
recordform: defaultrecordform,
async confirm(form) { dialogType: "new",
this.$refs[form].validate((valid) => { dialogVisible:false,
if (valid) { dialogType1: "new",
const isEdit = this.dialogType === "edit"; dialogVisible1:false,
listQueryrecordform: {
if (isEdit) { page: 1,
updateStep(this.step.id, this.step).then((res) => { page_size: 20,
if (res.code >= 200) { },
this.getList(); recordformList: {
this.dialogVisible = false; count: 0,
this.$message.success("成功"); },
} fieldList: {
}); count: 0,
} else { },
console.log(this.step) listQueryfield: {
createStep(this.step).then((res) => { page: 1,
if (res.code >= 200) { page_size: 20,
this.getList(); },
this.dialogVisible = false; options_: {
this.$message.success("成功"); 'string':'文本',
} 'number':'数字',
}); 'date': '日期',
'datetime': '日期时间',
'radio': '单选',
'checkbox': '多选',
},
fieldtypeoptions: [{
value: 'string',
label: '文本'
},
{
value: 'number',
label: '数字'
},
{
value: 'date',
label: '日期'
},
{
value: 'time',
label: '时间'
},
{
value: 'datetime',
label: '日期时间'
},
{
value: 'radio',
label: '单选'
},
{
value: 'checkbox',
label: '多选'
} }
} else { ],
return false; typeoptions: [{
} value: 1,
}); label: '生产记录'
}],
};
}, },
}, computed: {},
}; watch: {},
created() {
this.step.process = this.$route.params.id;
this.getList();
this.getequipments()
},
methods: {
//添加
addDomain() {
this.field_choice.push('')
},
//删除
removeDomain(index){
this.field_choice.splice(index, 1)
},
checkPermission,
//子工序列表
getList() {
this.listLoading = true;
getStepList(this.step.process).then((response) => {
if (response.data) {
this.stepList = response.data;
}
this.listLoading = false;
});
},
//工序设备
getequipments() {
getEquipmentAll().then(response => {
this.options = genTree(response.data.results);
});
},
handlePreview(file) {
if ("url" in file) {
window.open(file.url);
} else {
window.open(file.response.data.path);
}
},
handleUpSuccess(res, file, filelist) {
this.step.instruction = res.data.id;
},
handleRemove(file, filelist){
this.step.instruction = null;
},
handleFilter() {
this.listQuery.page = 1;
this.getList();
},
resetFilter() {
this.listQuery = {
page: 1,
page_size: 20,
}
this.getList();
},
handleCreateStep() {
this.step = Object.assign({}, defaultstep);
this.dialogTypes = "new";
this.dialogVisibles = true;
this.$nextTick(() => {
this.$refs["Form"].clearValidate();
});
},
rowClick(row) {
this.stepid= row.id ;
this.recordformLists();
},
handleEditStep(scope) {
this.step = Object.assign({}, scope.row); // copy obj
this.dialogTypes = "edit";
this.dialogVisibles = true;
this.$nextTick(() => {
this.$refs["Form"].clearValidate();
});
},
handleDeleteStep(scope) {
this.$confirm("确认删除?", "警告", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "error",
})
.then(async () => {
await deleteStep(scope.row.id);
this.getList();
this.$message.success("成功");
})
.catch((err) => {
console.error(err);
});
},
async confirm(form) {
this.$refs[form].validate((valid) => {
if (valid) {
const isEdit = this.dialogTypes === "edit";
if (isEdit) {
updateStep(this.step.id, this.step).then((res) => {
if (res.code >= 200) {
this.getList();
this.dialogVisibles = false;
this.$message.success("成功");
}
});
} else {
console.log(this.step)
createStep(this.step).then((res) => {
if (res.code >= 200) {
this.getList();
this.dialogVisibles = false;
this.$message.success("成功");
}
});
}
} else {
return false;
}
});
},
handleCurrentChange(row){
this.formID=row.id;
this.fieldLists();
},
recordformLists()
{
this.listQueryrecordform.step=this.stepid;
getrecordformList(this.listQueryrecordform).then((response) => {
if (response.data) {
this.recordformList = response.data;
}
});
},
fieldLists()
{
this.listQueryfield.form=this.formID
getrffieldList(this.listQueryfield).then((response) => {
if (response.data) {
this.fieldList = response.data;
}
});
},
handleCreate() {
this.recordform = Object.assign({}, defaultrecordform);
this.dialogType = "new";
this.dialogVisible = true;
this.$nextTick(() => {
this.$refs["Forms"].clearValidate();
});
},
handlefieldCreate() {
this.field = Object.assign({}, defaultfield);
this.dialogType1 = "new";
this.dialogVisible1 = true;
this.$nextTick(() => {
this.$refs["Form"].clearValidate();
});
},
handleEdit(scope) {
this.recordform = Object.assign({}, scope.row); // copy obj
this.dialogType = "edit";
this.dialogVisible = true;
this.$nextTick(() => {
this.$refs["Forms"].clearValidate();
});
},
handlefieldEdit(scope) {
this.field = Object.assign({}, scope.row); // copy obj
this.field_choice = this.field.field_choice;
this.dialogType1 = "edit";
this.dialogVisible1 = true;
this.$nextTick(() => {
this.$refs["Form"].clearValidate();
});
},
handleDelete(scope) {
this.$confirm("确认删除?", "警告", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "error",
})
.then(async () => {
await deleterecordform(scope.row.id);
this.recordformLists()
this.$message.success("成功");
})
.catch((err) => {
console.error(err);
});
},
handlefieldDelete(scope) {
this.$confirm("确认删除?", "警告", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "error",
})
.then(async () => {
await deleterffield(scope.row.id);
this.fieldLists()
this.$message.success("成功");
})
.catch((err) => {
console.error(err);
});
},
async recordformconfirm(form) {
this.$refs[form].validate((valid) => {
if (valid) {
const isEdit = this.dialogType === "edit";
if (isEdit) {
this.recordform.step=this.stepid
updaterecordform(this.recordform.id, this.recordform).then((res) => {
if (res.code >= 200) {
this.recordformLists()
this.dialogVisible = false;
this.$message.success("成功");
}
});
} else {
this.recordform.step=this.stepid
createrecordform(this.recordform).then((res) => {
if (res.code >= 200) {
this.recordformLists()
this.dialogVisible = false;
this.$message.success("成功");
}
});
}
} else {
return false;
}
});
},
async fieldconfirm(form) {
this.$refs[form].validate((valid) => {
if (valid) {
const isEdit = this.dialogType1 === "edit";
if (isEdit) {
this.field.form=this.formID;
this.field.field_choice = this.options;
updaterffield(this.field.id, this.field).then((res) => {
if (res.code >= 200) {
this.fieldLists()
this.dialogVisible1 = false;
this.$message.success("成功");
}
});
} else {
this.field.form=this.formID;
this.field.field_choice = this.options;
createrffield(this.field).then((res) => {
if (res.code >= 200) {
this.fieldLists()
this.dialogVisible1 = false;
this.$message.success("成功");
}
});
}
} else {
return false;
}
});
},
},
};
</script> </script>
<style>
.my-label {
background: #E1F3D8;
}
.my-content {
background: #FDE2E2;
}
</style>