|
|
@@ -277,12 +277,12 @@
|
|
|
</el-table>
|
|
|
|
|
|
</el-tab-pane> -->
|
|
|
- <el-tab-pane label="质检方案" name="3">
|
|
|
+ <el-tab-pane label="检测方案" name="3">
|
|
|
<el-button
|
|
|
@click="addInspectionTemplate(baseForm.type)"
|
|
|
type="primary"
|
|
|
style="margin-top: 5px"
|
|
|
- >选择质检方案</el-button
|
|
|
+ >选择检测方案</el-button
|
|
|
>
|
|
|
<el-table
|
|
|
v-show="activeName === '3'"
|
|
|
@@ -301,31 +301,31 @@
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="质检方案编码"
|
|
|
+ label="检测方案编码"
|
|
|
prop="qualitySchemeTemplateCode"
|
|
|
align="center"
|
|
|
width="170"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="质检方案名称"
|
|
|
+ label="检测方案名称"
|
|
|
prop="qualitySchemeTemplateName"
|
|
|
align="center"
|
|
|
width="170"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="质检类型"
|
|
|
+ label="检测类型"
|
|
|
prop="categoryLevelClassName"
|
|
|
align="center"
|
|
|
width="170"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="质检项编码"
|
|
|
+ label="检测项编码"
|
|
|
prop="inspectionCode"
|
|
|
align="center"
|
|
|
width="170"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="质检项名称"
|
|
|
+ label="检测项名称"
|
|
|
prop="inspectionName"
|
|
|
align="center"
|
|
|
width="150"
|
|
|
@@ -404,7 +404,7 @@
|
|
|
@click="handleIssued"
|
|
|
>下发</el-button
|
|
|
>
|
|
|
- <!-- 选择质检方案 -->
|
|
|
+ <!-- 选择检测方案 -->
|
|
|
<inspectionTemplateDialog
|
|
|
v-if="baseForm"
|
|
|
:type="baseForm.type"
|
|
|
@@ -418,7 +418,7 @@
|
|
|
<script>
|
|
|
// import baseInfo from './baseInfo.vue';
|
|
|
import baseInfo from './new-baseInfo.vue';
|
|
|
- // 质检方案的弹窗
|
|
|
+ // 检测方案的弹窗
|
|
|
import inspectionTemplateDialog from '@/views/inspectionTemplate/components/inspectionTemplateDialog.vue';
|
|
|
import { getCode, getCodeList } from '@/api/login';
|
|
|
import {
|
|
|
@@ -813,7 +813,7 @@
|
|
|
// const end = start + pageSize;
|
|
|
// return this.sampleList.slice(start, end);
|
|
|
},
|
|
|
- // 分页后的质检方案列表
|
|
|
+ // 分页后的检测方案列表
|
|
|
paginatedSchemeList() {
|
|
|
// if (this.rowIds && this.isScheme) {
|
|
|
// console.log(this.schemeList, 'test');
|
|
|
@@ -999,7 +999,7 @@
|
|
|
size: limit
|
|
|
});
|
|
|
},
|
|
|
- // 切换质检内容
|
|
|
+ // 切换检测内容
|
|
|
handleClick(tab) {
|
|
|
this.activeName = tab.name;
|
|
|
},
|
|
|
@@ -1076,7 +1076,7 @@
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- // 如果是编辑或者详情,则查询物料清单、质检方案和样品列表
|
|
|
+ // 如果是编辑或者详情,则查询物料清单、检测方案和样品列表
|
|
|
if (row.id) {
|
|
|
this.rowIds = row.id;
|
|
|
this.isScheme = true;
|
|
|
@@ -1101,7 +1101,7 @@
|
|
|
await this.reload({ planId: row.id });
|
|
|
//操作行点击时查询样品
|
|
|
await this.getSampleList(row.id);
|
|
|
- //操作行点击时查询质检
|
|
|
+ //操作行点击时查询检测
|
|
|
await this.getTemplateList(row.id);
|
|
|
}
|
|
|
|
|
|
@@ -1201,7 +1201,7 @@
|
|
|
supplierMark
|
|
|
);
|
|
|
|
|
|
- //通过来源和产品 获取质检方案
|
|
|
+ //通过来源和产品 获取检测方案
|
|
|
await this.getQualityTemplate(productCode);
|
|
|
},
|
|
|
async getGoodsList(
|
|
|
@@ -1236,7 +1236,7 @@
|
|
|
console.log('this.isCheck=true', this.isCheck);
|
|
|
} else {
|
|
|
res = [];
|
|
|
- this.$message.error('此数据已质检,无需再次质检!');
|
|
|
+ this.$message.error('此数据已检测,无需再次检测!');
|
|
|
return;
|
|
|
}
|
|
|
} else {
|
|
|
@@ -1252,7 +1252,7 @@
|
|
|
res = [resData];
|
|
|
} else {
|
|
|
res = [];
|
|
|
- this.$message.error('此数据已质检,无需再次质检!');
|
|
|
+ this.$message.error('此数据已检测,无需再次检测!');
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
@@ -1636,7 +1636,7 @@
|
|
|
combinedList = combinedList.concat(
|
|
|
res.qualityTemplateVOList[i].inspectionItemVOList
|
|
|
);
|
|
|
- console.log(combinedList, '质检方案');
|
|
|
+ console.log(combinedList, '检测方案');
|
|
|
this.schemeList = combinedList;
|
|
|
this.schemePagination.currentPage = 1;
|
|
|
this.schemePagination.total = this.schemeList.length;
|
|
|
@@ -2104,7 +2104,7 @@
|
|
|
console.log(params, 'params');
|
|
|
|
|
|
if (this.btnType == 'issued' && this.schemeList.length < 1) {
|
|
|
- this.$message.warning('质检方案不能为空!');
|
|
|
+ this.$message.warning('检测方案不能为空!');
|
|
|
this.loading = false;
|
|
|
return;
|
|
|
}
|
|
|
@@ -2158,7 +2158,7 @@
|
|
|
console.log(params, 'params');
|
|
|
|
|
|
if (this.btnType == 'issued' && this.schemeList.length < 1) {
|
|
|
- this.$message.warning('质检方案不能为空!');
|
|
|
+ this.$message.warning('检测方案不能为空!');
|
|
|
this.loading = false;
|
|
|
return;
|
|
|
}
|
|
|
@@ -2190,18 +2190,18 @@
|
|
|
await this.getSampleList(this.rowIds);
|
|
|
}
|
|
|
},
|
|
|
- // 质检方案分页方法
|
|
|
+ // 检测方案分页方法
|
|
|
async handleSchemeSizeChange(val) {
|
|
|
this.schemePagination.pageSize = val;
|
|
|
this.schemePagination.currentPage = 1;
|
|
|
- //操作行点击时查询质检
|
|
|
+ //操作行点击时查询检测
|
|
|
if (this.rowIds && this.isScheme) {
|
|
|
await this.getTemplateList(this.rowIds);
|
|
|
}
|
|
|
},
|
|
|
async handleSchemeCurrentChange(val) {
|
|
|
this.schemePagination.currentPage = val;
|
|
|
- //操作行点击时查询质检
|
|
|
+ //操作行点击时查询检测
|
|
|
if (this.rowIds && this.isScheme) {
|
|
|
await this.getTemplateList(this.rowIds);
|
|
|
}
|