|
|
@@ -254,7 +254,7 @@
|
|
|
</el-radio-group>
|
|
|
</div>
|
|
|
</template>
|
|
|
- <template v-slot:errorMsg="{ row }">
|
|
|
+ <!-- <template v-slot:errorMsg="{ row }">
|
|
|
<div>
|
|
|
<el-input
|
|
|
type="text"
|
|
|
@@ -267,16 +267,16 @@
|
|
|
</template>
|
|
|
</el-input>
|
|
|
</div></template
|
|
|
- >
|
|
|
+ > -->
|
|
|
<template v-slot:num="{ row }">
|
|
|
<div>
|
|
|
- <el-input type="number" placeholder="请输入" v-model="row.num">
|
|
|
+ <el-input type="text" placeholder="请输入" v-model="row.num">
|
|
|
<template v-if="row.unitName" slot="append">
|
|
|
<div>{{ row.unitName }}</div>
|
|
|
</template>
|
|
|
</el-input>
|
|
|
- </div></template
|
|
|
- >
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
<template v-slot:checkResult="{ row }">
|
|
|
<div>
|
|
|
<el-radio-group v-model="row.checkResult">
|
|
|
@@ -521,11 +521,15 @@
|
|
|
slot: 'paramValue'
|
|
|
},
|
|
|
{
|
|
|
- label: '数量',
|
|
|
+ label: '设备名称',
|
|
|
+ prop: 'substanceName',
|
|
|
+ minWidth: 120
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: this.pageName == 'qualityTestRecords' ? '描述' : '数量',
|
|
|
prop: 'num',
|
|
|
minWidth: 120,
|
|
|
- slot: 'num',
|
|
|
- isNone: this.pageName == 'qualityTestRecords'
|
|
|
+ slot: 'num'
|
|
|
},
|
|
|
{
|
|
|
label: '检查人',
|
|
|
@@ -534,13 +538,13 @@
|
|
|
slot: 'checkUsersIds',
|
|
|
isNone: this.pageName != 'qualityTestRecords'
|
|
|
},
|
|
|
- {
|
|
|
- label: '描述',
|
|
|
- prop: 'errorMsg',
|
|
|
- minWidth: 120,
|
|
|
- slot: 'errorMsg',
|
|
|
- isNone: this.pageName != 'qualityTestRecords'
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // label: '描述',
|
|
|
+ // prop: 'errorMsg',
|
|
|
+ // minWidth: 120,
|
|
|
+ // slot: 'errorMsg',
|
|
|
+ // isNone: this.pageName != 'qualityTestRecords'
|
|
|
+ // },
|
|
|
{
|
|
|
label: '检查情况',
|
|
|
prop: 'checkStatus',
|
|
|
@@ -710,7 +714,7 @@
|
|
|
if (this.pageName != 'productionRecords') {
|
|
|
// 验证检查项目
|
|
|
const detailRequired = this.addForm.detailList.some((i) => {
|
|
|
- return i.checkResult == null || !i.checkStatus;
|
|
|
+ return i.checkResult == null || i.checkStatus == null;
|
|
|
});
|
|
|
|
|
|
if (detailRequired) {
|
|
|
@@ -721,7 +725,7 @@
|
|
|
}
|
|
|
|
|
|
const body = JSON.parse(JSON.stringify(this.addForm));
|
|
|
- console.log(body)
|
|
|
+ console.log(body);
|
|
|
// return
|
|
|
|
|
|
this.butLoading = true;
|
|
|
@@ -824,7 +828,7 @@
|
|
|
} else {
|
|
|
this.addForm.executeUsersIds = [];
|
|
|
}
|
|
|
- this.changeId()
|
|
|
+ this.changeId();
|
|
|
},
|
|
|
|
|
|
// 批量检查
|