Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量检测项增加两个属性

Browse Source
master
zhaoxiaolin 11 months ago
parent c17426e454
commit b894ecc328
3 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File

21
src/views/quality/checkType/index.vue
Unescape Escape View File

@ -1,10 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="名称" prop="checkName"> <el-form-item label="节点名称" prop="checkName">
<el-input <el-input
v-model="queryParams.checkName" v-model="queryParams.checkName"
placeholder="请输入名称" placeholder="请输入检验节点名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -63,9 +63,9 @@
<el-table v-loading="loading" :data="checkTypeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="checkTypeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="流程编号" align="center" type="index" width="100"/> <el-table-column label="检验节点编码" align="center" prop="orderCode" width="150"/>
<el-table-column label="名称" align="center" prop="checkName" /> <el-table-column label="检验节点名称" align="center" prop="checkName"/>
<el-table-column label="类型名称" align="center" prop="typeCode" > <el-table-column label="类型名称" align="center" prop="typeCode" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.check_type" :options="dict.type.check_type"
@ -106,8 +106,15 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="15"> <el-col :span="15">
<el-form-item label="名称" prop="checkName"> <el-form-item label="节点编码" prop="orderCode">
<el-input v-model="form.checkName" placeholder="请输入名称" /> <el-input v-model="form.orderCode" placeholder="请输入检验节点编码" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="15">
<el-form-item label="节点名称" prop="checkName">
<el-input v-model="form.checkName" placeholder="请输入检验节点名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

5
src/views/quality/checkTypeProject/MaterialGroupAdd.vue
Unescape Escape View File

@ -308,9 +308,8 @@ export default {
}, },
//物料选择确认 //物料选择确认
onSelectMaterial(obj) { onSelectMaterial(obj) {
debugger this.form.materialCode = obj.code;
this.form.materialCode = obj.code[0]; this.form.materialName = obj.name;
this.form.materialName = obj.name[0];
console.log(this.form.groupId); console.log(this.form.groupId);
if(this.form.materialCode != null) { if(this.form.materialCode != null) {
addMaterialGroupDetail(this.form).then((response) => { addMaterialGroupDetail(this.form).then((response) => {

59
src/views/quality/project/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="检验规则名称" prop="ruleName"> <el-form-item label="检验规则名称" prop="ruleName">
<el-input <el-input
v-model="queryParams.ruleName" v-model="queryParams.ruleName"
@ -93,8 +93,8 @@
<el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="检验规则编号" align="center" prop="orderNum" width="100"/> <el-table-column label="检验规则编号" align="center" prop="orderNum" width="100"/>
<el-table-column label="检验规则名称" align="center" prop="ruleName" /> <el-table-column label="检验规则名称" align="center" prop="ruleName" width="100"/>
<el-table-column label="检验规则属性" align="center" prop="propertyCode" > <el-table-column label="检验规则属性" align="center" prop="propertyCode" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.qc_rule_prop" :options="dict.type.qc_rule_prop"
@ -102,18 +102,16 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验方式" align="center" prop="checkMode" /> <el-table-column label="检验方式" align="center" prop="checkMode" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="检验工具" align="center" prop="checkTool" /> <el-table-column label="检验工具" align="center" prop="checkTool" />
<el-table-column label="检验标准" align="center" prop="checkStandard" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="单位" align="center" prop="unitCode" > <el-table-column label="单位" align="center" prop="unitCode" >
<template slot-scope="scope"> <template slot-scope="scope"><dict-tag :options="dict.type.unit" :value="scope.row.unitCode"/></template>
<dict-tag
:options="dict.type.unit"
:value="scope.row.unitCode"
/>
</template>
</el-table-column> </el-table-column>
<el-table-column label="检验标准" align="center" prop="checkStandard" /> <el-table-column label="检验标准" align="center" prop="checkStandard" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="抽样方案" align="center" prop="samplePlan" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="合格判定" align="center" prop="judge" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -145,16 +143,16 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px" > <el-form ref="form" :model="form" :rules="rules" label-width="100px" >
<el-row> <el-row>
<el-col :span="15"> <el-col>
<el-form-item label="检验规则名称" prop="ruleName"> <el-form-item label="检验规则名称" prop="ruleName">
<el-input v-model="form.ruleName" placeholder="请输入检验规则名称" /> <el-input v-model="form.ruleName" placeholder="请输入检验规则名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="15"> <el-col>
<el-form-item label="检验规则属性" prop="propertyCode"> <el-form-item label="检验规则属性" prop="propertyCode">
<el-select v-model="form.propertyCode" placeholder="请选择检验规则属性" > <el-select v-model="form.propertyCode" placeholder="请选择检验规则属性" style="width:100%">
<el-option <el-option
v-for="dict in dict.type.qc_rule_prop" v-for="dict in dict.type.qc_rule_prop"
:key="dict.value" :key="dict.value"
@ -165,32 +163,30 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<template v-if="form.propertyCode === '0'">
<el-row> <el-row>
<el-col :span="15"> <el-col>
<el-form-item label="检验标准" prop="checkStandard"> <el-form-item label="检验标准" prop="checkStandard">
<el-input v-model="form.checkStandard" placeholder="请输入检验标准" /> <el-input type='textarea' v-model="form.checkStandard" placeholder="请输入检验标准" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</template>
<template v-if="form.propertyCode === '1'"> <template v-if="form.propertyCode === '1'">
<el-row> <el-row>
<el-col :span="15"> <el-col>
<el-form-item label="检验方式" prop="checkMode"> <el-form-item label="检验方式" prop="checkMode">
<el-input v-model="form.checkMode" placeholder="请输入检验方式" /> <el-input type='textarea' v-model="form.checkMode" placeholder="请输入检验方式" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="15"> <el-col>
<el-form-item label="检验工具" prop="checkTool"> <el-form-item label="检验工具" prop="checkTool">
<el-input v-model="form.checkTool" placeholder="请输入检验工具" /> <el-input type='textarea' v-model="form.checkTool" placeholder="请输入检验工具" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="15"> <el-col>
<el-form-item label="单位" prop="unitCode"> <el-form-item label="单位" prop="unitCode">
<el-select v-model="form.unitCode" placeholder="请选择单位" > <el-select v-model="form.unitCode" placeholder="请选择单位" >
<el-option <el-option
@ -204,7 +200,20 @@
</el-col> </el-col>
</el-row> </el-row>
</template> </template>
<el-row>
<el-col>
<el-form-item label="抽样方案" prop="samplePlan">
<el-input type='textarea' v-model="form.samplePlan" placeholder="抽样方案" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="合格判定" prop="judge">
<el-input type='textarea' v-model="form.judge" placeholder="合格判定" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

Write Preview
Loading…
Cancel
Save