wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-10-19 设备和质量修改

java8
杨奉源 2 years ago
parent
9f3c3dd103
commit
4a45c660ee
3 changed files with 31 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/views/modules/qc/qcItem.vue
  2. 22
      src/views/modules/qc/qcMethod.vue
  3. 30
      src/views/modules/qc/qcTemplate.vue

38
src/views/modules/qc/qcItem.vue
View File

@ -122,16 +122,13 @@
</el-pagination> </el-pagination>
<!-- 新增和修改 --> <!-- 新增和修改 -->
<el-dialog title="检验项目" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
<el-dialog title="检验项目" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="项目编码:" prop="itemNo" :rules="rules.itemNoType">
<el-input v-model="modalData.itemNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="itemDesc" :rules="rules.itemDescType"> <el-form-item label="项目名称:" prop="itemDesc" :rules="rules.itemDescType">
<el-input v-model="modalData.itemDesc" style="width: 120px"></el-input>
<el-input v-model="modalData.itemDesc" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检验值类型:" prop="valueTypeDb" :rules="rules.valueTypeDbType"> <el-form-item label="检验值类型:" prop="valueTypeDb" :rules="rules.valueTypeDbType">
<el-select filterable v-model="modalData.valueTypeDb" style="width: 120px">
<el-select filterable v-model="modalData.valueTypeDb" style="width: 221px">
<el-option label="文本" value="T"></el-option> <el-option label="文本" value="T"></el-option>
<el-option label="数字" value="N"></el-option> <el-option label="数字" value="N"></el-option>
</el-select> </el-select>
@ -140,13 +137,13 @@
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="methodNo" :rules="rules.methodNoType"> <el-form-item prop="methodNo" :rules="rules.methodNoType">
<span slot="label" style="" @click="getBaseList(1036)"><a herf="#">方法编码</a></span> <span slot="label" style="" @click="getBaseList(1036)"><a herf="#">方法编码</a></span>
<el-input v-model="modalData.methodNo" style="width: 120px"></el-input>
<el-input v-model="modalData.methodNo" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="方法名称:" prop="methodName" :rules="rules.methodNameType"> <el-form-item label="方法名称:" prop="methodName" :rules="rules.methodNameType">
<el-input v-model="modalData.methodName" disabled style="width: 120px"></el-input>
<el-input v-model="modalData.methodName" disabled style="width: 143px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检验类型:" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType"> <el-form-item label="检验类型:" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
<el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 120px">
<el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 143px">
<el-option <el-option
v-for = "i in options" v-for = "i in options"
:key = "i.inspectionTypeNo" :key = "i.inspectionTypeNo"
@ -158,16 +155,16 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="参照值:"> <el-form-item label="参照值:">
<el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.defaultValue" style="width: 120px"></el-input>
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.defaultValue" type="number" style="width: 120px"></el-input>
<el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.defaultValue" style="width: 143px"></el-input>
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.defaultValue" type="number" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="最大值:"> <el-form-item label="最大值:">
<el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.maxValue" type="number" disabled style="width: 120px"></el-input>
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.maxValue" type="number" style="width: 120px"></el-input>
<el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.maxValue" type="number" disabled style="width: 143px"></el-input>
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.maxValue" type="number" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="最小值:"> <el-form-item label="最小值:">
<el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.minValue" type="number" disabled style="width: 120px"></el-input>
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.minValue" type="number" style="width: 120px"></el-input>
<el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.minValue" type="number" disabled style="width: 143px"></el-input>
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.minValue" type="number" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center"> <el-footer style="height:40px;margin-top: 20px;text-align:center">
@ -451,13 +448,6 @@
message: ' ', message: ' ',
trigger: 'change' trigger: 'change'
} }
],
itemNoType:[
{
required: true,
message: ' ',
trigger: 'change'
}
] ]
}, },
options: [], options: [],
@ -626,10 +616,6 @@
}) })
}, },
saveData () { saveData () {
if (this.modalData.itemNo === '' || this.modalData.itemNo == null) {
this.$message.warning('请输入检验项目编码！')
return
}
if (this.modalData.itemDesc === '' || this.modalData.itemDesc == null) { if (this.modalData.itemDesc === '' || this.modalData.itemDesc == null) {
this.$message.warning('请输入检验项目名称！') this.$message.warning('请输入检验项目名称！')
return return

22
src/views/modules/qc/qcMethod.vue
View File

@ -112,16 +112,13 @@
</el-pagination> </el-pagination>
<!-- 新增和修改 --> <!-- 新增和修改 -->
<el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="450px">
<el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="方法编码:" prop="methodNo" :rules="rules.methodNoType">
<el-input v-model="modalData.methodNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="方法名称:" prop="methodName" :rules="rules.methodNameType"> <el-form-item label="方法名称:" prop="methodName" :rules="rules.methodNameType">
<el-input v-model="modalData.methodName" style="width: 120px"></el-input>
<el-input v-model="modalData.methodName" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检验类型:" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType"> <el-form-item label="检验类型:" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
<el-select v-model="modalData.inspectionTypeNo" placeholder="请选择">
<el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 221px">
<el-option <el-option
v-for = "i in options" v-for = "i in options"
:key = "i.inspectionTypeNo" :key = "i.inspectionTypeNo"
@ -133,7 +130,7 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item :label="'检验方法说明:'"> <el-form-item :label="'检验方法说明:'">
<el-input v-model="modalData.methodRemark" style="width: 407px"></el-input>
<el-input v-model="modalData.methodRemark" style="width: 456px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center"> <el-footer style="height:40px;margin-top: 20px;text-align:center">
@ -297,13 +294,6 @@
}, },
], ],
rules:{ rules:{
methodNoType:[
{
required: true,
message: ' ',
trigger: 'change'
}
],
methodNameType:[ methodNameType:[
{ {
required: true, required: true,
@ -449,10 +439,6 @@
}, },
// 新增/修改方法 // 新增/修改方法
saveData () { saveData () {
if (this.modalData.methodNo === '' || this.modalData.methodNo == null) {
this.$message.warning('请输入检验方法编码！')
return
}
if (this.modalData.methodName === '' || this.modalData.methodName == null) { if (this.modalData.methodName === '' || this.modalData.methodName == null) {
this.$message.warning('请输入检验方法名称！') this.$message.warning('请输入检验方法名称！')
return return

30
src/views/modules/qc/qcTemplate.vue
View File

@ -125,13 +125,13 @@
</el-pagination> </el-pagination>
<!-- 检验模板新增/修改 --> <!-- 检验模板新增/修改 -->
<el-dialog title="检验模板" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
<el-dialog title="检验模板" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="检验模板名称" prop="templateName" :rules="rules.templateNameType"> <el-form-item label="检验模板名称" prop="templateName" :rules="rules.templateNameType">
<el-input v-model="modalData.templateName" style="width: 120px"></el-input>
<el-input v-model="modalData.templateName" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType"> <el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
<el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 120px">
<el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 221px">
<el-option <el-option
v-for = "i in options" v-for = "i in options"
:key = "i.inspectionTypeNo" :key = "i.inspectionTypeNo"
@ -144,49 +144,49 @@
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item> <el-form-item>
<span slot="label" @click="getBaseList(1051)"><a herf="#">抽样方案编码</a></span> <span slot="label" @click="getBaseList(1051)"><a herf="#">抽样方案编码</a></span>
<el-input v-model="modalData.samplingProgrammeNo" style="width: 120px"></el-input>
<el-input v-model="modalData.samplingProgrammeNo" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="抽样方案名称"> <el-form-item label="抽样方案名称">
<el-input v-model="modalData.samplingProgrammeDesc" disabled style="width: 120px"></el-input>
<el-input v-model="modalData.samplingProgrammeDesc" disabled style="width: 221px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item> <el-form-item>
<span slot="label" style="" @click="getBaseList(1048)"><a herf="#">检验水平编码</a></span> <span slot="label" style="" @click="getBaseList(1048)"><a herf="#">检验水平编码</a></span>
<el-input v-model="modalData.samplingLevelNo" style="width: 120px"></el-input>
<el-input v-model="modalData.samplingLevelNo" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检验水平名称"> <el-form-item label="检验水平名称">
<el-input v-model="modalData.samplingLevelDesc" disabled style="width: 120px"></el-input>
<el-input v-model="modalData.samplingLevelDesc" disabled style="width: 221px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="检验周期(h)"> <el-form-item label="检验周期(h)">
<el-input v-model="modalData.inspectionCycle" type="number" style="width: 120px"></el-input>
<el-input v-model="modalData.inspectionCycle" type="number" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="默认抽样数量"> <el-form-item label="默认抽样数量">
<el-input v-model="modalData.defaultSamplingQuantity" type="number" style="width: 120px"></el-input>
<el-input v-model="modalData.defaultSamplingQuantity" type="number" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="默认抽样比例"> <el-form-item label="默认抽样比例">
<el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 120px"></el-input>
<el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="AQL:"> <el-form-item label="AQL:">
<el-input v-model="modalData.aql" type="number" style="width: 120px"></el-input>
<el-input v-model="modalData.aql" type="number" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="AC:"> <el-form-item label="AC:">
<el-input v-model="modalData.ac" type="number" style="width: 120px"></el-input>
<el-input v-model="modalData.ac" type="number" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="RE:"> <el-form-item label="RE:">
<el-input v-model="modalData.re" type="number" style="width: 120px"></el-input>
<el-input v-model="modalData.re" type="number" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="版本号"> <el-form-item label="版本号">
<el-input v-model="modalData.templateVersion" :disabled="modalDisableFlag" style="width: 120px"></el-input>
<el-input v-model="modalData.templateVersion" :disabled="modalDisableFlag" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检验模板备注"> <el-form-item label="检验模板备注">
<el-input v-model="modalData.templateRemark" style="width: 255px"></el-input>
<el-input v-model="modalData.templateRemark" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center"> <el-footer style="height:40px;margin-top: 10px;text-align:center">

Write Preview
Loading…
Cancel
Save