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

2024-06-26 功能优化3

master
fengyuan_yang 2 years ago
parent
d69bec4a27
commit
5f0eb51c91
3 changed files with 143 additions and 131 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. 84
      src/views/modules/qc/FQASResultEntry.vue
  2. 98
      src/views/modules/qc/IPQCResultEntry.vue
  3. 92
      src/views/modules/qc/IQCResultEntry.vue

84
src/views/modules/qc/FQASResultEntry.vue
View File

@ -340,7 +340,7 @@
prop="" prop=""
header-align="center" header-align="center"
align="right" align="right"
min-width="75"
min-width="90"
label="项目检验结论"> label="项目检验结论">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px" > <el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px" >
@ -732,7 +732,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -750,7 +750,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 130,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -760,7 +760,7 @@
tableName: "FQAS检验记录表", tableName: "FQAS检验记录表",
columnProp: 'inspectionCycle', columnProp: 'inspectionCycle',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '检验周期(h)', columnLabel: '检验周期(h)',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -768,7 +768,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -804,7 +804,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
columnWidth: 120,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -822,7 +822,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -832,7 +832,7 @@
tableName: "FQAS检验记录表", tableName: "FQAS检验记录表",
columnProp: 'umId', columnProp: 'umId',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '计量单位', columnLabel: '计量单位',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -840,7 +840,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -858,7 +858,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -876,7 +876,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -894,7 +894,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -912,7 +912,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -940,7 +940,7 @@
tableName: "FQAS检验记录表", tableName: "FQAS检验记录表",
columnProp: 'disposalRemark', columnProp: 'disposalRemark',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '处置说明', columnLabel: '处置说明',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -948,7 +948,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -966,7 +966,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 170,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -984,7 +984,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 130,
columnWidth: 170,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1002,7 +1002,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 100,
}, },
], ],
detailColumnList: [ detailColumnList: [
@ -1032,7 +1032,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'itemDesc', columnProp: 'itemDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验项目', columnLabel: '检验项目',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1040,7 +1040,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1050,7 +1050,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'samplingLevelDesc', columnProp: 'samplingLevelDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验水平', columnLabel: '检验水平',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1058,7 +1058,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1068,7 +1068,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'samplingProgrammeDesc', columnProp: 'samplingProgrammeDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验方案', columnLabel: '检验方案',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1076,7 +1076,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1086,7 +1086,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'methodName', columnProp: 'methodName',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验方法', columnLabel: '检验方法',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1094,7 +1094,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1104,7 +1104,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'methodRemark', columnProp: 'methodRemark',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验方法说明', columnLabel: '检验方法说明',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1112,7 +1112,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1122,7 +1122,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'objectDesc', columnProp: 'objectDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检测仪器', columnLabel: '检测仪器',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1130,7 +1130,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1140,7 +1140,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'aql', columnProp: 'aql',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: 'AQL', columnLabel: 'AQL',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1148,7 +1148,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1158,7 +1158,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'ac', columnProp: 'ac',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: 'AC', columnLabel: 'AC',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1166,7 +1166,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1176,7 +1176,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 're', columnProp: 're',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: 'RE', columnLabel: 'RE',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1184,7 +1184,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1194,7 +1194,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'defaultValue', columnProp: 'defaultValue',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '标准值', columnLabel: '标准值',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1212,7 +1212,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'maxValue', columnProp: 'maxValue',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '最大值', columnLabel: '最大值',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1230,7 +1230,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'minValue', columnProp: 'minValue',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '最小值', columnLabel: '最小值',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1256,7 +1256,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
], ],
fileColumnList: [ fileColumnList: [
@ -2562,4 +2562,8 @@
.numInput /deep/ .el-input__inner{ .numInput /deep/ .el-input__inner{
text-align: right; text-align: right;
} }
.el-table /deep/ .cell{
height: auto;
line-height: 1.5;
}
</style> </style>

98
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -481,7 +481,7 @@
prop="" prop=""
header-align="center" header-align="center"
align="right" align="right"
min-width="75"
min-width="90"
label="项目检验结论"> label="项目检验结论">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px"> <el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px">
@ -1035,7 +1035,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
columnWidth: 120,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1053,7 +1053,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1071,7 +1071,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
columnWidth: 120,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1089,7 +1089,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1107,7 +1107,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 170,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1125,7 +1125,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1135,7 +1135,7 @@
tableName: "IPQC检验记录表", tableName: "IPQC检验记录表",
columnProp: 'orderNo', columnProp: 'orderNo',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '工单号', columnLabel: '工单号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1153,7 +1153,7 @@
tableName: "IPQC检验记录表", tableName: "IPQC检验记录表",
columnProp: 'seqNo', columnProp: 'seqNo',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '派工单号', columnLabel: '派工单号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1171,7 +1171,7 @@
tableName: "IPQC检验记录表", tableName: "IPQC检验记录表",
columnProp: 'operationDesc', columnProp: 'operationDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '工序', columnLabel: '工序',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1189,7 +1189,7 @@
tableName: "IPQC检验记录表", tableName: "IPQC检验记录表",
columnProp: 'resourceDesc', columnProp: 'resourceDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '机台', columnLabel: '机台',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1215,7 +1215,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
columnWidth: 120,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1225,7 +1225,7 @@
tableName: "IPQC检验记录表", tableName: "IPQC检验记录表",
columnProp: 'spec', columnProp: 'spec',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '物料类别', columnLabel: '物料类别',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1251,7 +1251,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1269,7 +1269,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1287,7 +1287,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1297,7 +1297,7 @@
tableName: "IPQC检验记录表", tableName: "IPQC检验记录表",
columnProp: 'umName', columnProp: 'umName',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '单位', columnLabel: '单位',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1305,7 +1305,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1323,7 +1323,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1333,7 +1333,7 @@
tableName: "IPQC检验记录表", tableName: "IPQC检验记录表",
columnProp: 'disposalRemark', columnProp: 'disposalRemark',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '处置说明', columnLabel: '处置说明',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1341,7 +1341,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1359,7 +1359,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 170,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1377,7 +1377,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 170,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1405,7 +1405,7 @@
tableName: "IPQC检验记录表", tableName: "IPQC检验记录表",
columnProp: 'specialRequirements', columnProp: 'specialRequirements',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '特殊要求', columnLabel: '特殊要求',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1413,7 +1413,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 200,
}, },
], ],
//项目清单 //项目清单
@ -1495,7 +1495,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'itemDesc', columnProp: 'itemDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验项目', columnLabel: '检验项目',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1503,7 +1503,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1513,7 +1513,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'samplingLevelDesc', columnProp: 'samplingLevelDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验水平', columnLabel: '检验水平',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1521,7 +1521,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1531,7 +1531,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'samplingProgrammeDesc', columnProp: 'samplingProgrammeDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验方案', columnLabel: '检验方案',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1539,7 +1539,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1549,7 +1549,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'methodName', columnProp: 'methodName',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验方法', columnLabel: '检验方法',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1557,7 +1557,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1567,7 +1567,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'methodRemark', columnProp: 'methodRemark',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验方法说明', columnLabel: '检验方法说明',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1575,7 +1575,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1585,7 +1585,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'objectDesc', columnProp: 'objectDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检测仪器', columnLabel: '检测仪器',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1593,7 +1593,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1603,7 +1603,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'aql', columnProp: 'aql',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: 'AQL', columnLabel: 'AQL',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1611,7 +1611,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1621,7 +1621,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'ac', columnProp: 'ac',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: 'AC', columnLabel: 'AC',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1629,7 +1629,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1639,7 +1639,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 're', columnProp: 're',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: 'RE', columnLabel: 'RE',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1647,7 +1647,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1657,7 +1657,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'defaultValue', columnProp: 'defaultValue',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '标准值', columnLabel: '标准值',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1675,7 +1675,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'maxValue', columnProp: 'maxValue',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '上限值', columnLabel: '上限值',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1693,7 +1693,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'minValue', columnProp: 'minValue',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '下限值', columnLabel: '下限值',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1719,7 +1719,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
], ],
fileColumnList: [ fileColumnList: [
@ -3735,4 +3735,8 @@
.numInput /deep/ .el-input__inner{ .numInput /deep/ .el-input__inner{
text-align: right; text-align: right;
} }
.el-table /deep/ .cell{
height: auto;
line-height: 1.5;
}
</style> </style>

92
src/views/modules/qc/IQCResultEntry.vue
View File

@ -371,7 +371,7 @@
prop="" prop=""
header-align="center" header-align="center"
align="right" align="right"
min-width="75"
min-width="90"
label="项目检验结论"> label="项目检验结论">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px" > <el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px" >
@ -755,7 +755,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -773,7 +773,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 130,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -783,7 +783,7 @@
tableName: "IQC检验记录表", tableName: "IQC检验记录表",
columnProp: 'inspectionCycle', columnProp: 'inspectionCycle',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '检验周期(h)', columnLabel: '检验周期(h)',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -791,7 +791,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -827,7 +827,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
columnWidth: 120,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -845,7 +845,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -855,7 +855,7 @@
tableName: "IQC检验记录表", tableName: "IQC检验记录表",
columnProp: 'umId', columnProp: 'umId',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '计量单位', columnLabel: '计量单位',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -863,7 +863,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -881,7 +881,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -899,7 +899,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -917,7 +917,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1043,7 +1043,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1053,7 +1053,7 @@
tableName: "IQC检验记录表", tableName: "IQC检验记录表",
columnProp: 'supplierDesc', columnProp: 'supplierDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '供应商', columnLabel: '供应商',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1061,7 +1061,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1079,7 +1079,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1107,7 +1107,7 @@
tableName: "IQC检验记录表", tableName: "IQC检验记录表",
columnProp: 'disposalRemark', columnProp: 'disposalRemark',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '处置说明', columnLabel: '处置说明',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1115,7 +1115,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1133,7 +1133,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 170,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1151,7 +1151,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 130,
columnWidth: 170,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1169,7 +1169,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 100,
}, },
], ],
detailColumnList: [ detailColumnList: [
@ -1199,7 +1199,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'itemDesc', columnProp: 'itemDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验项目', columnLabel: '检验项目',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1207,7 +1207,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1217,7 +1217,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'samplingLevelDesc', columnProp: 'samplingLevelDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验水平', columnLabel: '检验水平',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1225,7 +1225,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1235,7 +1235,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'samplingProgrammeDesc', columnProp: 'samplingProgrammeDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验方案', columnLabel: '检验方案',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1243,7 +1243,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1253,7 +1253,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'methodName', columnProp: 'methodName',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验方法', columnLabel: '检验方法',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1261,7 +1261,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1271,7 +1271,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'methodRemark', columnProp: 'methodRemark',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检验方法说明', columnLabel: '检验方法说明',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1279,7 +1279,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
columnWidth: 200,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1289,7 +1289,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'defectLevelDescription', columnProp: 'defectLevelDescription',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '缺陷等级名称', columnLabel: '缺陷等级名称',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1307,7 +1307,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'objectDesc', columnProp: 'objectDesc',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "left",
columnLabel: '检测仪器', columnLabel: '检测仪器',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1315,7 +1315,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 150,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1325,7 +1325,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'aql', columnProp: 'aql',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: 'AQL', columnLabel: 'AQL',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1333,7 +1333,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1343,7 +1343,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'ac', columnProp: 'ac',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: 'AC', columnLabel: 'AC',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1351,7 +1351,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1361,7 +1361,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 're', columnProp: 're',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: 'RE', columnLabel: 'RE',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1369,7 +1369,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1379,7 +1379,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'defaultValue', columnProp: 'defaultValue',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '标准值', columnLabel: '标准值',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1397,7 +1397,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'maxValue', columnProp: 'maxValue',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '最大值', columnLabel: '最大值',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1415,7 +1415,7 @@
tableName: "检验单明细表", tableName: "检验单明细表",
columnProp: 'minValue', columnProp: 'minValue',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '最小值', columnLabel: '最小值',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -1441,7 +1441,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
], ],
fileColumnList: [ fileColumnList: [
@ -2783,4 +2783,8 @@
.numInput /deep/ .el-input__inner{ .numInput /deep/ .el-input__inner{
text-align: right; text-align: right;
} }
.el-table /deep/ .cell{
height: auto;
line-height: 1.5;
}
</style> </style>
Write Preview
Loading…
Cancel
Save