mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

bugfix zentao 1

Browse Source
This commit is contained in:
lb
2023-09-15 14:30:19 +08:00
parent 27ebe39a96
commit 772a4b0633
29 changed files with 594 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/views/quality/base/qualityInspectionBoxBtn/index.vue
View File

@@ -176,40 +176,36 @@ export default {
width: 128,
prop: 'productionName',
label: '产线',
align: 'center',
},
{
width: 128,
prop: 'sectionName',
label: '工段',
align: 'center',
},
{
width: 128,
prop: 'inspectionDetContent',
label: '检测内容',
align: 'center',
},
{
width: 160,
prop: 'buttonId',
label: '按钮盒识别码',
align: 'center',
},
// {
// width: 256,
// prop: 'productionId',
// label: '按钮盒所在产线ID',
// align: 'center',
// ,
// },
// {
// width: 256,
// prop: 'sectionId',
// label: '按钮盒所在工段ID',
// align: 'center',
// ,
// },
{ width: 90, prop: 'keyValue', label: '按钮值', align: 'center' },
{ width: 128, prop: 'model', label: '按钮盒模式', align: 'center' },
{ width: 90, prop: 'keyValue', label: '按钮值' },
{ width: 128, prop: 'model', label: '按钮盒模式' },
],
// 查询参数
queryParams: {
@@ -220,13 +216,13 @@ export default {
// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
searchBarKeys: ['inspectionDetContent'],
form: {
id: undefined,
inspectionDetId: undefined,
inspectionDetContent: undefined,
productionId: undefined,
sectionId: undefined,
model: undefined,
keyValue: undefined,
id: null,
inspectionDetId: null,
inspectionDetContent: null,
productionId: null,
sectionId: null,
model: null,
keyValue: null,
},
};
},
@@ -247,13 +243,13 @@ export default {
/** 表单重置 */
reset() {
this.form = {
id: undefined,
inspectionDetId: undefined,
inspectionDetContent: undefined,
productionId: undefined,
sectionId: undefined,
model: undefined,
keyValue: undefined,
id: null,
inspectionDetId: null,
inspectionDetContent: null,
productionId: null,
sectionId: null,
model: null,
keyValue: null,
};
this.resetForm('form');
},

8
src/views/quality/base/qualityInspectionDet/index.vue
View File

@@ -172,10 +172,10 @@ export default {
width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{ prop: 'typeName', label: '类型名称', align: 'center' },
{ prop: 'content', label: '检测内容', align: 'center' },
{ prop: 'code', label: '检测编码', align: 'center' },
{ prop: 'remark', label: '备注', align: 'center' },
{ prop: 'typeName', label: '类型名称', },
{ prop: 'content', label: '检测内容', },
{ prop: 'code', label: '检测编码', },
{ prop: 'remark', label: '备注', },
],
// 查询参数
queryParams: {

8
src/views/quality/base/qualityInspectionType/index.vue
View File

@@ -106,9 +106,9 @@ export default {
width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{ prop: 'name', label: '检测类型名称', align: 'center' },
{ prop: 'code', label: '检测类型编码', align: 'center' },
{ prop: 'remark', label: '备注', align: 'center' },
{ prop: 'name', label: '检测类型名称' },
{ prop: 'code', label: '检测类型编码' },
{ prop: 'remark', label: '备注' },
// {
// label: '操作',
// alignt: 'center',
@@ -321,7 +321,7 @@ export default {
handleDelete(row) {
const id = row.id;
this.$modal
.confirm('是否确认删除质量检测类型基础编号为"' + id + '"的数据项?')
.confirm('是否确认删除该质量检测类型?')
.then(function () {
return deleteQualityInspectionType(id);
})

5
src/views/quality/monitoring/qualityInspectionRecord/index.vue
View File

@@ -213,32 +213,27 @@ export default {
width: 128,
prop: 'inspectionDetContent',
label: '检测内容',
align: 'center',
},
{
// width: 128,
prop: 'lineName',
label: '产线',
align: 'center',
},
{
// width: 128,
prop: 'checkPerson',
label: '检测人员',
align: 'center',
},
{
// width: 160,
prop: 'checkTime',
label: '检测时间',
align: 'center',
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{
width: 90,
prop: 'source',
label: '来源',
align: 'center',
filter: (val) => ['未知', '手动', '自动'][val],
},
],

1
src/views/quality/monitoring/qualityRecentHours/index.vue
View File

@@ -56,7 +56,6 @@ export default {
{
prop: 'inspectionContent',
label: '检测内容',
align: 'center',
},
],
};

5
src/views/quality/monitoring/qualityStatistics/components/summaryTable.vue
View File

@@ -35,27 +35,22 @@ export default {
{
prop: 'lineName',
label: '产线',
align: 'center',
},
{
prop: 'sumUp',
label: '上片总数',
align: 'center',
},
{
prop: 'sumDown',
label: '下片总数',
align: 'center',
},
{
prop: 'sumCheck',
label: '检测总数',
align: 'center',
},
{
prop: 'scrapRatio',
label: '比例(%)',
align: 'center',
},
],
};

19
src/views/quality/monitoring/qualityStatistics/index.vue
View File

@@ -171,20 +171,17 @@ export default {
// width: 160,
prop: 'inspectionContent',
label: '检测内容',
align: 'center',
},
...this.dynamicProps,
{
// width: 128,
prop: 'sumInput',
label: '检测类型总数',
align: 'center',
},
{
// width: 128,
prop: 'ratio',
label: '比例',
align: 'center',
// subcomponent: {
// name: 'TextOnly',
// props: {
@@ -381,47 +378,47 @@ export default {
// width: 128,
// prop: 'line1',
// label: '产线1',
// align: 'center',
// ,
// },
// {
// width: 128,
// prop: 'line2',
// label: '产线2',
// align: 'center',
// ,
// },
// {
// width: 128,
// prop: 'line3',
// label: '产线3',
// align: 'center',
// ,
// },
// {
// width: 128,
// prop: 'line4',
// label: '产线4',
// align: 'center',
// ,
// },
// {
// width: 128,
// prop: 'line5',
// label: '产线5',
// align: 'center',
// ,
// },
// {
// width: 128,
// prop: 'line6',
// label: '产线6',
// align: 'center',
// ,
// },
// {
// width: 128,
// prop: 'line7',
// label: '产线7',
// align: 'center',
// ,
// },
// {
// width: 128,
// prop: 'line8',
// label: '产线8',
// align: 'center',
// ,
// }, -->