✨ feat(质检): 调整部分UI
This commit is contained in:
@@ -1556,8 +1556,8 @@ body {
|
|||||||
background: $--metal-gradient-light;
|
background: $--metal-gradient-light;
|
||||||
border-color: $--border-color-light;
|
border-color: $--border-color-light;
|
||||||
color: $--color-text-regular;
|
color: $--color-text-regular;
|
||||||
padding: 2px 8px;
|
padding: 2px 4px;
|
||||||
border-radius: 2px;
|
border-radius: 4px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
height: auto;
|
height: auto;
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
@@ -1573,7 +1573,7 @@ body {
|
|||||||
.cell & {
|
.cell & {
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
padding: 1px !important;
|
padding: 1px !important;
|
||||||
border-radius: 0 !important;
|
border-radius: 4px !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -38,9 +38,12 @@
|
|||||||
<el-table-column label="机组" align="center" prop="unitGroup" />
|
<el-table-column label="机组" align="center" prop="unitGroup" />
|
||||||
<el-table-column label="检验结果" align="center" prop="inspectionResult">
|
<el-table-column label="检验结果" align="center" prop="inspectionResult">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag :type="scope.row.inspectionResult === 1 ? 'success' : (scope.row.inspectionResult === 2 ? 'danger' : 'info')">
|
<span>
|
||||||
{{ scope.row.inspectionResult === 0 ? '未检验' : (scope.row.inspectionResult === 1 ? '合格' : (scope.row.inspectionResult === 2 ? '不合格' : '')) }}
|
<span v-if="scope.row.inspectionResult == 0" style="color: grey;">未检验</span>
|
||||||
</el-tag>
|
<span v-else-if="scope.row.inspectionResult == 1" style="color: #67C23A;">合格</span>
|
||||||
|
<span v-else-if="scope.row.inspectionResult == 2" style="color: #FF4949;">不合格</span>
|
||||||
|
<span v-else style="color: grey;">未知</span>
|
||||||
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="检验类型" align="center" prop="inspectionType" />
|
<el-table-column label="检验类型" align="center" prop="inspectionType" />
|
||||||
@@ -96,14 +99,12 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="状态" align="center">
|
<el-table-column label="状态" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag
|
<span>
|
||||||
:type="scope.row.status == 1 ? 'success' : (scope.row.status == 2 ? 'danger' : 'info')"
|
<span v-if="scope.row.status == 0" style="color: gray;">未检测</span>
|
||||||
>
|
<span v-else-if="scope.row.status == 1" style="color: #67C23A;">通过</span>
|
||||||
<span v-if="scope.row.status == 0">未检测</span>
|
<span v-else-if="scope.row.status == 2" style="color: #FF4949;">不通过</span>
|
||||||
<span v-else-if="scope.row.status == 1">通过</span>
|
<span v-else style="color: gray;">未知</span>
|
||||||
<span v-else-if="scope.row.status == 2">不通过</span>
|
</span>
|
||||||
<span v-else>未知</span>
|
|
||||||
</el-tag>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</KLPTable>
|
</KLPTable>
|
||||||
|
|||||||
@@ -49,13 +49,12 @@
|
|||||||
<el-table-column label="规格型号" align="center" prop="verifyTarget.specificationModel" />
|
<el-table-column label="规格型号" align="center" prop="verifyTarget.specificationModel" />
|
||||||
<el-table-column label="检验结果" align="center">
|
<el-table-column label="检验结果" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag
|
<span>
|
||||||
:type="scope.row.inspectionResult == 1 ? 'success' : (scope.row.inspectionResult == 2 ? 'danger' : 'info')">
|
<span v-if="scope.row.inspectionResult == 0" style="color: grey;">未检验</span>
|
||||||
<span v-if="scope.row.inspectionResult == 0">未检验</span>
|
<span v-else-if="scope.row.inspectionResult == 1" style="color: #67C23A;">合格</span>
|
||||||
<span v-else-if="scope.row.inspectionResult == 1">合格</span>
|
<span v-else-if="scope.row.inspectionResult == 2" style="color: #FF4949;">不合格</span>
|
||||||
<span v-else-if="scope.row.inspectionResult == 2">不合格</span>
|
<span v-else style="color: grey;">未知</span>
|
||||||
<span v-else>未知</span>
|
</span>
|
||||||
</el-tag>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="备注" align="center" prop="remark" />
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
@@ -103,19 +102,19 @@
|
|||||||
<el-table-column label="单位" align="center" prop="unit"></el-table-column>
|
<el-table-column label="单位" align="center" prop="unit"></el-table-column>
|
||||||
<el-table-column label="状态" align="center">
|
<el-table-column label="状态" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag :type="scope.row.status == 1 ? 'success' : (scope.row.status == 2 ? 'danger' : 'info')">
|
<span>
|
||||||
<span v-if="scope.row.status == 0">未检测</span>
|
<span v-if="scope.row.status == 0" style="color: gray;">未检测</span>
|
||||||
<span v-else-if="scope.row.status == 1">通过</span>
|
<span v-else-if="scope.row.status == 1" style="color: #67C23A;">通过</span>
|
||||||
<span v-else-if="scope.row.status == 2">不通过</span>
|
<span v-else-if="scope.row.status == 2" style="color: #FF4949;">不通过</span>
|
||||||
<span v-else>未知</span>
|
<span v-else style="color: gray;">未知</span>
|
||||||
</el-tag>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button v-if="scope.row.status == 0" size="mini" type="success"
|
<el-button v-if="scope.row.status == 0" size="mini" type="text" style="color: #67C23A;"
|
||||||
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
|
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
|
||||||
<el-button v-if="scope.row.status == 0" size="mini" type="danger" style="margin-left: 8px;"
|
<el-button v-if="scope.row.status == 0" size="mini" type="text" style="margin-left: 8px; color: #FF4949;"
|
||||||
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
|
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@@ -45,13 +45,12 @@
|
|||||||
<el-table-column label="机组" align="center" prop="unitGroup" />
|
<el-table-column label="机组" align="center" prop="unitGroup" />
|
||||||
<el-table-column label="检验结果" align="center">
|
<el-table-column label="检验结果" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag
|
<span>
|
||||||
:type="scope.row.inspectionResult == 1 ? 'success' : (scope.row.inspectionResult == 2 ? 'danger' : 'info')">
|
<span v-if="scope.row.inspectionResult == 0" style="color: grey;">未检验</span>
|
||||||
<span v-if="scope.row.inspectionResult == 0">未检验</span>
|
<span v-else-if="scope.row.inspectionResult == 1" style="color: #67C23A;">合格</span>
|
||||||
<span v-else-if="scope.row.inspectionResult == 1">合格</span>
|
<span v-else-if="scope.row.inspectionResult == 2" style="color: #FF4949;">不合格</span>
|
||||||
<span v-else-if="scope.row.inspectionResult == 2">不合格</span>
|
<span v-else style="color: grey;">未知</span>
|
||||||
<span v-else>未知</span>
|
</span>
|
||||||
</el-tag>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="备注" align="center" prop="remark" />
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
@@ -99,19 +98,19 @@
|
|||||||
<el-table-column label="单位" align="center" prop="unit"></el-table-column>
|
<el-table-column label="单位" align="center" prop="unit"></el-table-column>
|
||||||
<el-table-column label="状态" align="center">
|
<el-table-column label="状态" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag :type="scope.row.status == 1 ? 'success' : (scope.row.status == 2 ? 'danger' : 'info')">
|
<span>
|
||||||
<span v-if="scope.row.status == 0">未检测</span>
|
<span v-if="scope.row.status == 0" style="color: gray;">未检测</span>
|
||||||
<span v-else-if="scope.row.status == 1">通过</span>
|
<span v-else-if="scope.row.status == 1" style="color: #67C23A;">通过</span>
|
||||||
<span v-else-if="scope.row.status == 2">不通过</span>
|
<span v-else-if="scope.row.status == 2" style="color: #FF4949;">不通过</span>
|
||||||
<span v-else>未知</span>
|
<span v-else style="color: gray;">未知</span>
|
||||||
</el-tag>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button v-if="scope.row.status == 0" size="mini" type="success"
|
<el-button v-if="scope.row.status == 0" size="mini" type="text" style="color: #67C23A;"
|
||||||
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
|
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
|
||||||
<el-button v-if="scope.row.status == 0" size="mini" type="danger" style="margin-left: 8px;"
|
<el-button v-if="scope.row.status == 0" size="mini" type="text" style="margin-left: 8px; color: #FF4949;"
|
||||||
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
|
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@@ -51,13 +51,12 @@
|
|||||||
<el-table-column label="重量" align="center" prop="verifyTarget.weight" />
|
<el-table-column label="重量" align="center" prop="verifyTarget.weight" />
|
||||||
<el-table-column label="检验结果" align="center">
|
<el-table-column label="检验结果" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag
|
<span>
|
||||||
:type="scope.row.inspectionResult == 1 ? 'success' : (scope.row.inspectionResult == 2 ? 'danger' : 'info')">
|
<span v-if="scope.row.inspectionResult == 0" style="color: grey;">未检验</span>
|
||||||
<span v-if="scope.row.inspectionResult == 0">未检验</span>
|
<span v-else-if="scope.row.inspectionResult == 1" style="color: #67C23A;">合格</span>
|
||||||
<span v-else-if="scope.row.inspectionResult == 1">合格</span>
|
<span v-else-if="scope.row.inspectionResult == 2" style="color: #FF4949;">不合格</span>
|
||||||
<span v-else-if="scope.row.inspectionResult == 2">不合格</span>
|
<span v-else style="color: grey;">未知</span>
|
||||||
<span v-else>未知</span>
|
</span>
|
||||||
</el-tag>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="备注" align="center" prop="remark" />
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
@@ -105,19 +104,19 @@
|
|||||||
<el-table-column label="单位" align="center" prop="unit"></el-table-column>
|
<el-table-column label="单位" align="center" prop="unit"></el-table-column>
|
||||||
<el-table-column label="状态" align="center">
|
<el-table-column label="状态" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag :type="scope.row.status == 1 ? 'success' : (scope.row.status == 2 ? 'danger' : 'info')">
|
<span>
|
||||||
<span v-if="scope.row.status == 0">未检测</span>
|
<span v-if="scope.row.status == 0" style="color: gray;">未检测</span>
|
||||||
<span v-else-if="scope.row.status == 1">通过</span>
|
<span v-else-if="scope.row.status == 1" style="color: #67C23A;">通过</span>
|
||||||
<span v-else-if="scope.row.status == 2">不通过</span>
|
<span v-else-if="scope.row.status == 2" style="color: #FF4949;">不通过</span>
|
||||||
<span v-else>未知</span>
|
<span v-else style="color: gray;">未知</span>
|
||||||
</el-tag>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button v-if="scope.row.status == 0" size="mini" type="success"
|
<el-button v-if="scope.row.status == 0" size="mini" type="text" style="color: #67C23A;"
|
||||||
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
|
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
|
||||||
<el-button v-if="scope.row.status == 0" size="mini" type="danger" style="margin-left: 8px;"
|
<el-button v-if="scope.row.status == 0" size="mini" type="text" style="margin-left: 8px; color: #FF4949;"
|
||||||
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
|
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@@ -45,13 +45,12 @@
|
|||||||
<el-table-column label="机组" align="center" prop="unitGroup" />
|
<el-table-column label="机组" align="center" prop="unitGroup" />
|
||||||
<el-table-column label="检验结果" align="center">
|
<el-table-column label="检验结果" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag
|
<span>
|
||||||
:type="scope.row.inspectionResult == 1 ? 'success' : (scope.row.inspectionResult == 2 ? 'danger' : 'info')">
|
<span v-if="scope.row.inspectionResult == 0" style="color: grey;">未检验</span>
|
||||||
<span v-if="scope.row.inspectionResult == 0">未检验</span>
|
<span v-else-if="scope.row.inspectionResult == 1" style="color: #67C23A;">合格</span>
|
||||||
<span v-else-if="scope.row.inspectionResult == 1">合格</span>
|
<span v-else-if="scope.row.inspectionResult == 2" style="color: #FF4949;">不合格</span>
|
||||||
<span v-else-if="scope.row.inspectionResult == 2">不合格</span>
|
<span v-else style="color: grey;">未知</span>
|
||||||
<span v-else>未知</span>
|
</span>
|
||||||
</el-tag>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="备注" align="center" prop="remark" />
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
@@ -99,19 +98,19 @@
|
|||||||
<el-table-column label="单位" align="center" prop="unit"></el-table-column>
|
<el-table-column label="单位" align="center" prop="unit"></el-table-column>
|
||||||
<el-table-column label="状态" align="center">
|
<el-table-column label="状态" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag :type="scope.row.status == 1 ? 'success' : (scope.row.status == 2 ? 'danger' : 'info')">
|
<span>
|
||||||
<span v-if="scope.row.status == 0">未检测</span>
|
<span v-if="scope.row.status == 0" style="color: gray;">未检测</span>
|
||||||
<span v-else-if="scope.row.status == 1">通过</span>
|
<span v-else-if="scope.row.status == 1" style="color: #67C23A;">通过</span>
|
||||||
<span v-else-if="scope.row.status == 2">不通过</span>
|
<span v-else-if="scope.row.status == 2" style="color: #FF4949;">不通过</span>
|
||||||
<span v-else>未知</span>
|
<span v-else style="color: gray;">未知</span>
|
||||||
</el-tag>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button v-if="scope.row.status == 0" size="mini" type="success"
|
<el-button v-if="scope.row.status == 0" size="mini" type="text" style="color: #67C23A;"
|
||||||
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
|
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
|
||||||
<el-button v-if="scope.row.status == 0" size="mini" type="danger" style="margin-left: 8px;"
|
<el-button v-if="scope.row.status == 0" size="mini" type="text" style="margin-left: 8px; color: #FF4949;"
|
||||||
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
|
@click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
Reference in New Issue
Block a user