Browse Source

2025-11-24

IQC、FQC、OQC检验增加项目操作
master
fengyuan_yang 2 months ago
parent
commit
0b05cd2218
  1. 561
      src/views/modules/qc/FQCResultEntry.vue
  2. 755
      src/views/modules/qc/IQCResultEntry.vue
  3. 565
      src/views/modules/qc/OQCResultEntry.vue

561
src/views/modules/qc/FQCResultEntry.vue

@ -497,7 +497,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top">
<el-form :inline="true" label-position="top" style="display: flex; align-items: flex-start;">
<el-form-item :label="'检验结论'"> <el-form-item :label="'检验结论'">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择"> <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
<el-option label="合格" value="合格"></el-option> <el-option label="合格" value="合格"></el-option>
@ -512,8 +512,7 @@
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 293px"></el-input> <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 293px"></el-input>
<el-input v-else v-model="detailData.inspectionRemark" style="width: 293px"></el-input> <el-input v-else v-model="detailData.inspectionRemark" style="width: 293px"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="detailData.inspectionResult === '不合格'" style="margin-top: 5px">
<el-form-item :label="'处置措施'">
<el-form-item v-show="detailData.inspectionResult === '不合格'" :label="'处置措施'">
<el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px"> <el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option <el-option
v-for = "i in disposalMeasuresOptions" v-for = "i in disposalMeasuresOptions"
@ -531,10 +530,19 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'处置说明'">
<el-form-item v-show="detailData.inspectionResult === '不合格'" :label="'处置说明'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 293px"></el-input> <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 293px"></el-input>
<el-input v-else v-model="detailData.disposalRemark" style="width: 293px"></el-input> <el-input v-else v-model="detailData.disposalRemark" style="width: 293px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '" style="margin-left: auto; margin-top: -10px">
<el-button class="operation-btn item-operation-btn" @click="openItemOperationDialog">
<i class="el-icon-setting"></i>
<span>项目导入</span>
</el-button>
<el-button class="operation-btn template-import-btn" @click="openTemplateImportDialog">
<i class="el-icon-download"></i>
<span>模板导入</span>
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 展示列表 --> <!-- 展示列表 -->
@ -1018,6 +1026,101 @@
<!-- 打印标签 --> <!-- 打印标签 -->
<qr-code ref="qrCode"></qr-code> <qr-code ref="qrCode"></qr-code>
<!-- 项目操作对话框 -->
<el-dialog
title="检验项目操作"
@close="refreshInspectionDetailList"
:close-on-click-modal="false"
v-drag
:visible.sync="itemOperationDialogFlag"
width="1200px"
custom-class="item-operation-dialog">
<div class="search-container">
<el-form :inline="true" size="small">
<el-form-item label="项目编码">
<el-input v-model="itemOperationQuery.itemNo" placeholder="请输入项目编码" clearable prefix-icon="el-icon-search" style="width: 160px"></el-input>
</el-form-item>
<el-form-item label="项目名称">
<el-input v-model="itemOperationQuery.itemDesc" placeholder="请输入项目名称" clearable prefix-icon="el-icon-search" style="width: 200px"></el-input>
</el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="searchFQCItems">查询</el-button>
</el-form>
</div>
<div class="item-operation-content">
<div class="item-panel available-panel">
<div class="panel-header">
<i class="el-icon-menu"></i>
<span class="panel-title">可选项目列表</span>
<span class="item-count">{{ availableItemList.length }}</span>
</div>
<el-table ref="availableItemTable" :data="availableItemList" @row-click="availableItemClickRow" @selection-change="availableItemSelectionChange" highlight-current-row class="operation-table" height="400" border>
<el-table-column type="selection" width="45" align="center"></el-table-column>
<el-table-column prop="itemNo" label="项目编码" min-width="120"></el-table-column>
<el-table-column prop="itemDesc" label="项目名称" min-width="180" show-overflow-tooltip></el-table-column>
</el-table>
</div>
<div class="operation-buttons">
<el-tooltip content="添加选中项目" placement="left">
<el-button type="primary" icon="el-icon-d-arrow-right" circle @click="addInspectionItems" :disabled="!availableItemSelections || availableItemSelections.length === 0"></el-button>
</el-tooltip>
<el-tooltip content="移除选中项目" placement="right">
<el-button type="danger" icon="el-icon-d-arrow-left" circle @click="deleteInspectionItems" :disabled="!selectedItemSelections || selectedItemSelections.length === 0"></el-button>
</el-tooltip>
</div>
<div class="item-panel selected-panel">
<div class="panel-header">
<i class="el-icon-tickets"></i>
<span class="panel-title">已有项目列表</span>
<span class="item-count">{{ selectedItemList.length }}</span>
</div>
<el-table ref="selectedItemTable" :data="selectedItemList" @row-click="selectedItemClickRow" @selection-change="selectedItemSelectionChange" highlight-current-row class="operation-table" height="400" border>
<el-table-column type="selection" width="45" align="center"></el-table-column>
<el-table-column prop="itemNo" label="项目编码" min-width="120"></el-table-column>
<el-table-column prop="itemDesc" label="项目名称" min-width="180" show-overflow-tooltip></el-table-column>
</el-table>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="itemOperationDialogFlag = false" size="small">关闭</el-button>
</div>
</el-dialog>
<!-- 模板导入对话框 -->
<el-dialog
title="模板导入"
:close-on-click-modal="false"
v-drag
:visible.sync="templateImportDialogFlag"
width="900px"
custom-class="template-import-dialog">
<div class="search-container">
<el-form :inline="true" size="small">
<el-form-item label="模板编码">
<el-input v-model="templateQuery.templateId" placeholder="请输入模板编码" clearable prefix-icon="el-icon-search" style="width: 160px"></el-input>
</el-form-item>
<el-form-item label="模板名称">
<el-input v-model="templateQuery.templateDesc" placeholder="请输入模板名称" clearable prefix-icon="el-icon-search" style="width: 200px"></el-input>
</el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="searchFQCTemplates">查询</el-button>
<el-button icon="el-icon-refresh-left" size="small" @click="resetTemplateQuery">重置</el-button>
</el-form>
</div>
<div class="template-list-container">
<el-table ref="templateTable" :data="templateList" @row-click="templateClickRow" @selection-change="templateSelectionChange" highlight-current-row class="template-table" height="450" border>
<el-table-column type="selection" width="45" align="center"></el-table-column>
<el-table-column prop="templateId" label="模板编码" min-width="120"></el-table-column>
<el-table-column prop="templateName" label="模板名称" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="remark" label="备注" min-width="200" show-overflow-tooltip></el-table-column>
<el-table-column prop="itemCount" label="项目数量" width="100" align="center"></el-table-column>
</el-table>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" icon="el-icon-download" @click="confirmImportTemplate" :disabled="!templateSelections || templateSelections.length === 0" :loading="importLoading" size="small">导入选中模板</el-button>
<el-button @click="templateImportDialogFlag = false" size="small">关闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -1055,7 +1158,13 @@
dataAcquisitionByItem, // dataAcquisitionByItem, //
cancelApproval2, // cancelApproval2, //
getUserRoleList, // getUserRoleList, //
getOperatorList
getOperatorList,
// FQC
getFQCItemList,
addFQCItemDetails,
deleteFQCItemDetails,
getFQCTemplateList,
importFQCTemplateItems
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -2518,7 +2627,26 @@
fileLoading: false, fileLoading: false,
subDetailLoading: false, subDetailLoading: false,
saveLoading: false, saveLoading: false,
searchLoading: false
searchLoading: false,
// FQC
itemOperationDialogFlag: false,
itemOperationQuery: {
itemNo: '',
itemDesc: '',
},
availableItemList: [],
selectedItemList: [],
availableItemSelections: [],
selectedItemSelections: [],
// FQC
templateImportDialogFlag: false,
templateQuery: {
templateId: '',
templateDesc: '',
},
templateList: [],
templateSelections: [],
importLoading: false
} }
}, },
@ -4135,6 +4263,179 @@
this.authFile = !fileFlag this.authFile = !fileFlag
this.authCancelCheck = !cancelCheckFlag this.authCancelCheck = !cancelCheckFlag
}, },
// ======================== FQC ========================
openItemOperationDialog() {
this.itemOperationQuery = { itemNo: '', itemDesc: '' }
this.searchFQCItems()
this.itemOperationDialogFlag = true
},
async searchFQCItems() {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
itemNo: this.itemOperationQuery.itemNo || '',
itemDesc: this.itemOperationQuery.itemDesc || ''
}
const { data } = await getFQCItemList(params)
if (data && data.code === 0) {
this.availableItemList = data.row1 || []
this.selectedItemList = data.row2 || []
}
} catch (error) {
this.$message.error('查询检验项目失败')
}
},
availableItemClickRow(row) {
this.$refs.availableItemTable.toggleRowSelection(row)
},
availableItemSelectionChange(selection) {
this.availableItemSelections = selection
},
selectedItemClickRow(row) {
this.$refs.selectedItemTable.toggleRowSelection(row)
},
selectedItemSelectionChange(selection) {
this.selectedItemSelections = selection
},
async addInspectionItems() {
if (!this.availableItemSelections || this.availableItemSelections.length === 0) {
this.$message.warning('请选择要添加的项目')
return
}
this.$confirm('确认添加选中的检验项目吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
itemList: this.availableItemSelections.map(item => ({ itemNo: item.itemNo }))
}
const { data } = await addFQCItemDetails(params)
if (data && data.code === 0) {
this.$message.success('添加成功')
this.searchFQCItems()
} else {
this.$message.error(data.msg || '添加失败')
}
} catch (error) {
this.$message.error('添加失败,请检查')
}
}).catch(() => {
this.$message.info('已取消添加')
})
},
async deleteInspectionItems() {
if (!this.selectedItemSelections || this.selectedItemSelections.length === 0) {
this.$message.warning('请选择要移除的项目')
return
}
this.$confirm('确认移除选中的检验项目吗?(将同时删除该项目的子明细数据)', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
itemList: this.selectedItemSelections.map(item => ({ itemNo: item.itemNo }))
}
const { data } = await deleteFQCItemDetails(params)
if (data && data.code === 0) {
this.$message.success('移除成功')
this.searchFQCItems()
} else {
this.$message.error(data.msg || '移除失败')
}
} catch (error) {
this.$message.error('移除失败,请检查')
}
}).catch(() => {
this.$message.info('已取消移除')
})
},
refreshInspectionDetailList() {
if (this.detailInformationFlag) {
this.getInspectionFormData()
}
},
// ======================== FQC ========================
openTemplateImportDialog() {
this.templateQuery = { templateId: '', templateDesc: '' }
this.searchFQCTemplates()
this.templateImportDialogFlag = true
},
async searchFQCTemplates() {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
templateId: this.templateQuery.templateId || '',
templateDesc: this.templateQuery.templateDesc || ''
}
const { data } = await getFQCTemplateList(params)
if (data && data.code === 0) {
this.templateList = data.rows || []
}
} catch (error) {
this.$message.error('查询模板失败')
}
},
templateClickRow(row) {
this.$refs.templateTable.toggleRowSelection(row)
},
templateSelectionChange(selection) {
this.templateSelections = selection
},
confirmImportTemplate() {
if (!this.templateSelections || this.templateSelections.length === 0) {
this.$message.warning('请选择要导入的模板')
return
}
this.$confirm(`确认导入选中的 ${this.templateSelections.length} 个模板吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
this.importLoading = true
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
templateList: this.templateSelections.map(item => ({ templateId: item.templateId }))
}
const { data } = await importFQCTemplateItems(params)
if (data && data.code === 0) {
this.$message.success(`导入成功,共导入 ${data.importCount || 0} 个检验项目`)
this.templateImportDialogFlag = false
this.templateSelections = []
this.getInspectionFormData()
} else {
this.$message.error(data.msg || '导入失败')
}
} catch (error) {
this.$message.error('导入失败,请检查')
} finally {
this.importLoading = false
}
}).catch(() => {
this.$message.info('已取消导入')
})
},
resetTemplateQuery() {
this.templateQuery = { templateId: '', templateDesc: '' }
this.searchFQCTemplates()
},
} }
} }
</script> </script>
@ -4370,4 +4671,252 @@
height: auto; height: auto;
line-height: 1.5; line-height: 1.5;
} }
/* ==================== FQC检验项目操作对话框样式 ==================== */
/deep/ .item-operation-dialog {
border-radius: 8px;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.12);
}
/deep/ .item-operation-dialog .el-dialog__header {
background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
padding: 20px 24px;
border-radius: 8px 8px 0 0;
}
/deep/ .item-operation-dialog .el-dialog__title {
color: #ffffff;
font-size: 16px;
font-weight: 600;
letter-spacing: 0.5px;
}
/deep/ .item-operation-dialog .el-dialog__headerbtn .el-dialog__close {
color: #ffffff;
font-size: 20px;
font-weight: bold;
}
/deep/ .item-operation-dialog .el-dialog__headerbtn:hover .el-dialog__close {
color: #f0f0f0;
}
/deep/ .item-operation-dialog .el-dialog__body {
padding: 24px;
background: #f8f9fa;
}
.search-container {
background: #ffffff;
padding: 16px 20px;
border-radius: 6px;
margin-bottom: 20px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
}
.search-container .el-form-item {
margin-bottom: 0;
}
.search-container .el-form-item__label {
font-weight: 500;
color: #606266;
}
.item-operation-content {
display: flex;
gap: 16px;
align-items: stretch;
}
.item-panel {
flex: 1;
background: #ffffff;
border-radius: 6px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
overflow: hidden;
transition: all 0.3s ease;
}
.item-panel:hover {
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
}
.available-panel {
flex: 1.5;
}
.selected-panel {
flex: 1;
}
.panel-header {
padding: 14px 16px;
background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
border-bottom: 2px solid #9ac3d0;
display: flex;
align-items: center;
gap: 8px;
}
.panel-header i {
font-size: 18px;
color: #ffffff;
}
.panel-title {
font-size: 14px;
font-weight: 600;
color: #ffffff;
letter-spacing: 0.5px;
}
.item-count {
margin-left: auto;
font-size: 12px;
color: #ffffff;
background: rgba(255, 255, 255, 0.25);
padding: 2px 10px;
border-radius: 12px;
font-weight: 500;
}
.operation-table {
border: none !important;
}
.operation-table /deep/ .el-table__body tr:hover > td {
background-color: #f0f7ff !important;
}
.operation-table /deep/ .el-table__row.current-row > td {
background-color: #e6f2ff !important;
}
.operation-table /deep/ td {
border-bottom: 1px solid #f0f0f0;
}
.operation-table /deep/ .el-table__body {
font-size: 13px;
}
.operation-buttons {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 20px;
padding: 0 8px;
}
.operation-buttons .el-button {
width: 48px;
height: 48px;
font-size: 20px;
transition: all 0.3s ease;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
}
.operation-buttons .el-button:hover {
transform: scale(1.1);
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.2);
}
.operation-buttons .el-button.is-disabled {
opacity: 0.4;
cursor: not-allowed;
}
.operation-buttons .el-button--primary {
background: linear-gradient(135deg, #409EFF 0%, #66b1ff 100%);
border: none;
}
.operation-buttons .el-button--danger {
background: linear-gradient(135deg, #F56C6C 0%, #f78989 100%);
border: none;
}
@media (max-width: 1200px) {
.item-operation-content {
flex-direction: column;
}
.operation-buttons {
flex-direction: row;
gap: 12px;
}
.operation-buttons .el-button {
width: 42px;
height: 42px;
font-size: 18px;
}
}
/deep/ .template-import-dialog {
border-radius: 8px;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.12);
}
/deep/ .template-import-dialog .el-dialog__header {
background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
padding: 20px 24px;
border-radius: 8px 8px 0 0;
}
/deep/ .template-import-dialog .el-dialog__title {
color: #ffffff;
font-size: 16px;
font-weight: 600;
letter-spacing: 0.5px;
}
/deep/ .template-import-dialog .el-dialog__headerbtn .el-dialog__close {
color: #ffffff;
font-size: 20px;
font-weight: bold;
}
/deep/ .template-import-dialog .el-dialog__headerbtn:hover .el-dialog__close {
color: #f0f0f0;
}
/deep/ .template-import-dialog .el-dialog__body {
padding: 24px;
background: #f8f9fa;
}
.template-list-container {
background: #ffffff;
border-radius: 6px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
overflow: hidden;
transition: all 0.3s ease;
}
.template-list-container:hover {
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
}
.template-table {
border: none !important;
}
.template-table /deep/ .el-table__body tr:hover > td {
background-color: #f0f7ff !important;
}
.template-table /deep/ .el-table__row.current-row > td {
background-color: #e6f2ff !important;
}
.template-table /deep/ td {
border-bottom: 1px solid #f0f0f0;
}
.template-table /deep/ .el-table__body {
font-size: 13px;
}
.operation-btn {
position: relative;
padding: 8px 16px;
border: none;
border-radius: 4px;
font-size: 13px;
font-weight: 500;
cursor: pointer;
transition: all 0.3s ease;
overflow: hidden;
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
}
.operation-btn:hover {
transform: translateY(-1px);
box-shadow: 0 3px 10px rgba(0, 0, 0, 0.15);
}
.operation-btn:active {
transform: translateY(0);
}
.operation-btn i {
margin-right: 4px;
font-size: 13px;
}
.operation-btn span {
position: relative;
z-index: 1;
}
.item-operation-btn {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
}
.item-operation-btn:hover {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
}
.template-import-btn {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
margin-left: 10px;
}
.template-import-btn:hover {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
}
</style> </style>

755
src/views/modules/qc/IQCResultEntry.vue

@ -419,7 +419,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top">
<el-form :inline="true" label-position="top" style="display: flex; align-items: flex-start;">
<el-form-item :label="'检验结论'"> <el-form-item :label="'检验结论'">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择"> <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
<el-option label="合格" value="合格"></el-option> <el-option label="合格" value="合格"></el-option>
@ -434,8 +434,7 @@
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 293px"></el-input> <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 293px"></el-input>
<el-input v-else v-model="detailData.inspectionRemark" style="width: 293px"></el-input> <el-input v-else v-model="detailData.inspectionRemark" style="width: 293px"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="detailData.inspectionResult === '不合格'" style="margin-top: 5px">
<el-form-item :label="'处置措施'">
<el-form-item v-show="detailData.inspectionResult === '不合格'" :label="'处置措施'">
<el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px"> <el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option <el-option
v-for = "i in disposalMeasuresOptions" v-for = "i in disposalMeasuresOptions"
@ -453,10 +452,19 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'处置说明'">
<el-form-item v-show="detailData.inspectionResult === '不合格'" :label="'处置说明'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 293px"></el-input> <el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 293px"></el-input>
<el-input v-else v-model="detailData.disposalRemark" style="width: 293px"></el-input> <el-input v-else v-model="detailData.disposalRemark" style="width: 293px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '" style="margin-left: auto; margin-top: -10px">
<el-button class="operation-btn item-operation-btn" @click="openItemOperationDialog">
<i class="el-icon-setting"></i>
<span>项目导入</span>
</el-button>
<el-button class="operation-btn template-import-btn" @click="openTemplateImportDialog">
<i class="el-icon-download"></i>
<span>模板导入</span>
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 展示列表 --> <!-- 展示列表 -->
@ -791,6 +799,183 @@
<!-- 打印标签 --> <!-- 打印标签 -->
<qr-code ref="qrCode"></qr-code> <qr-code ref="qrCode"></qr-code>
<!-- 项目操作对话框 -->
<el-dialog
title="检验项目操作"
@close="refreshInspectionDetailList"
:close-on-click-modal="false"
v-drag
:visible.sync="itemOperationDialogFlag"
width="1200px"
custom-class="item-operation-dialog">
<!-- 查询区域 -->
<div class="search-container">
<el-form :inline="true" size="small">
<el-form-item label="项目编码">
<el-input
v-model="itemOperationQuery.itemNo"
placeholder="请输入项目编码"
clearable
prefix-icon="el-icon-search"
style="width: 160px">
</el-input>
</el-form-item>
<el-form-item label="项目名称">
<el-input
v-model="itemOperationQuery.itemDesc"
placeholder="请输入项目名称"
clearable
prefix-icon="el-icon-search"
style="width: 200px">
</el-input>
</el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="searchIQCItems">查询</el-button>
</el-form>
</div>
<!-- 主内容区域 -->
<div class="item-operation-content">
<!-- 可选项目列表 -->
<div class="item-panel available-panel">
<div class="panel-header">
<i class="el-icon-menu"></i>
<span class="panel-title">可选项目列表</span>
<span class="item-count">{{ availableItemList.length }}</span>
</div>
<el-table
ref="availableItemTable"
:data="availableItemList"
@row-click="availableItemClickRow"
@selection-change="availableItemSelectionChange"
highlight-current-row
class="operation-table"
height="400"
border>
<el-table-column type="selection" width="45" align="center"></el-table-column>
<el-table-column prop="itemNo" label="项目编码" min-width="120"></el-table-column>
<el-table-column prop="itemDesc" label="项目名称" min-width="180" show-overflow-tooltip></el-table-column>
</el-table>
</div>
<!-- 操作按钮 -->
<div class="operation-buttons">
<el-tooltip content="添加选中项目" placement="left">
<el-button
type="primary"
icon="el-icon-d-arrow-right"
circle
@click="addInspectionItems"
:disabled="!availableItemSelections || availableItemSelections.length === 0">
</el-button>
</el-tooltip>
<el-tooltip content="移除选中项目" placement="right">
<el-button
type="danger"
icon="el-icon-d-arrow-left"
circle
@click="deleteInspectionItems"
:disabled="!selectedItemSelections || selectedItemSelections.length === 0">
</el-button>
</el-tooltip>
</div>
<!-- 已有项目列表 -->
<div class="item-panel selected-panel">
<div class="panel-header">
<i class="el-icon-tickets"></i>
<span class="panel-title">已有项目列表</span>
<span class="item-count">{{ selectedItemList.length }}</span>
</div>
<el-table
ref="selectedItemTable"
:data="selectedItemList"
@row-click="selectedItemClickRow"
@selection-change="selectedItemSelectionChange"
highlight-current-row
class="operation-table"
height="400"
border>
<el-table-column type="selection" width="45" align="center"></el-table-column>
<el-table-column prop="itemNo" label="项目编码" min-width="120"></el-table-column>
<el-table-column prop="itemDesc" label="项目名称" min-width="180" show-overflow-tooltip></el-table-column>
</el-table>
</div>
</div>
<!-- 底部按钮 -->
<div slot="footer" class="dialog-footer">
<el-button @click="itemOperationDialogFlag = false" size="small">关闭</el-button>
</div>
</el-dialog>
<!-- 模板导入对话框 -->
<el-dialog
title="模板导入"
:close-on-click-modal="false"
v-drag
:visible.sync="templateImportDialogFlag"
width="900px"
custom-class="template-import-dialog">
<!-- 查询区域 -->
<div class="search-container">
<el-form :inline="true" size="small">
<el-form-item label="模板编码">
<el-input
v-model="templateQuery.templateId"
placeholder="请输入模板编码"
clearable
prefix-icon="el-icon-search"
style="width: 160px">
</el-input>
</el-form-item>
<el-form-item label="模板名称">
<el-input
v-model="templateQuery.templateDesc"
placeholder="请输入模板名称"
clearable
prefix-icon="el-icon-search"
style="width: 200px">
</el-input>
</el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="searchIQCTemplates">查询</el-button>
<el-button icon="el-icon-refresh-left" size="small" @click="resetTemplateQuery">重置</el-button>
</el-form>
</div>
<!-- 模板列表 -->
<div class="template-list-container">
<el-table
ref="templateTable"
:data="templateList"
@row-click="templateClickRow"
@selection-change="templateSelectionChange"
highlight-current-row
class="template-table"
height="450"
border>
<el-table-column type="selection" width="45" align="center"></el-table-column>
<el-table-column prop="templateId" label="模板编码" min-width="120"></el-table-column>
<el-table-column prop="templateName" label="模板名称" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="remark" label="备注" min-width="200" show-overflow-tooltip></el-table-column>
<el-table-column prop="itemCount" label="项目数量" width="100" align="center"></el-table-column>
</el-table>
</div>
<!-- 底部按钮 -->
<div slot="footer" class="dialog-footer">
<el-button
type="primary"
icon="el-icon-download"
@click="confirmImportTemplate"
:disabled="!templateSelections || templateSelections.length === 0"
:loading="importLoading"
size="small">
导入选中模板
</el-button>
<el-button @click="templateImportDialogFlag = false" size="small">关闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -816,7 +1001,13 @@
dataAcquisitionByItem, // dataAcquisitionByItem, //
cancelApproval, // cancelApproval, //
getUserRoleList, // getUserRoleList, //
getOperatorList
getOperatorList,
// IQC
getIQCItemList,
addIQCItemDetails,
deleteIQCItemDetails,
getIQCTemplateList,
importIQCTemplateItems
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -1992,7 +2183,26 @@
}, },
fileLoading: false, fileLoading: false,
subDetailLoading: false, subDetailLoading: false,
searchLoading: false
searchLoading: false,
// IQC
itemOperationDialogFlag: false,
itemOperationQuery: {
itemNo: '',
itemDesc: '',
},
availableItemList: [],
selectedItemList: [],
availableItemSelections: [],
selectedItemSelections: [],
// IQC
templateImportDialogFlag: false,
templateQuery: {
templateId: '',
templateDesc: '',
},
templateList: [],
templateSelections: [],
importLoading: false
} }
}, },
@ -3220,6 +3430,226 @@
this.authFile = !fileFlag this.authFile = !fileFlag
this.authCancelCheck = !cancelCheckFlag this.authCancelCheck = !cancelCheckFlag
}, },
// ======================== IQC ========================
//
openItemOperationDialog() {
this.itemOperationQuery = {
itemNo: '',
itemDesc: '',
}
this.searchIQCItems()
this.itemOperationDialogFlag = true
},
// IQC
async searchIQCItems() {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
itemNo: this.itemOperationQuery.itemNo || '',
itemDesc: this.itemOperationQuery.itemDesc || ''
}
const { data } = await getIQCItemList(params)
if (data && data.code === 0) {
this.availableItemList = data.row1 || []
this.selectedItemList = data.row2 || []
}
} catch (error) {
this.$message.error('查询检验项目失败')
}
},
//
availableItemClickRow(row) {
this.$refs.availableItemTable.toggleRowSelection(row)
},
//
availableItemSelectionChange(selection) {
this.availableItemSelections = selection
},
//
selectedItemClickRow(row) {
this.$refs.selectedItemTable.toggleRowSelection(row)
},
//
selectedItemSelectionChange(selection) {
this.selectedItemSelections = selection
},
//
async addInspectionItems() {
if (!this.availableItemSelections || this.availableItemSelections.length === 0) {
this.$message.warning('请选择要添加的项目')
return
}
this.$confirm('确认添加选中的检验项目吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
itemList: this.availableItemSelections.map(item => ({
itemNo: item.itemNo
}))
}
const { data } = await addIQCItemDetails(params)
if (data && data.code === 0) {
this.$message.success('添加成功')
this.searchIQCItems()
} else {
this.$message.error(data.msg || '添加失败')
}
} catch (error) {
this.$message.error('添加失败,请检查')
}
}).catch(() => {
this.$message.info('已取消添加')
})
},
//
async deleteInspectionItems() {
if (!this.selectedItemSelections || this.selectedItemSelections.length === 0) {
this.$message.warning('请选择要移除的项目')
return
}
this.$confirm('确认移除选中的检验项目吗?(将同时删除该项目的子明细数据)', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
itemList: this.selectedItemSelections.map(item => ({
itemNo: item.itemNo
}))
}
const { data } = await deleteIQCItemDetails(params)
if (data && data.code === 0) {
this.$message.success('移除成功')
this.searchIQCItems()
} else {
this.$message.error(data.msg || '移除失败')
}
} catch (error) {
this.$message.error('移除失败,请检查')
}
}).catch(() => {
this.$message.info('已取消移除')
})
},
//
refreshInspectionDetailList() {
if (this.detailInformationFlag) {
this.getInspectionFormData()
}
},
// ======================== IQC ========================
//
openTemplateImportDialog() {
this.templateQuery = {
templateId: '',
templateDesc: '',
}
this.searchIQCTemplates()
this.templateImportDialogFlag = true
},
// IQC
async searchIQCTemplates() {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
templateId: this.templateQuery.templateId || '',
templateDesc: this.templateQuery.templateDesc || ''
}
const { data } = await getIQCTemplateList(params)
if (data && data.code === 0) {
this.templateList = data.rows || []
}
} catch (error) {
this.$message.error('查询模板失败')
}
},
//
templateClickRow(row) {
this.$refs.templateTable.toggleRowSelection(row)
},
//
templateSelectionChange(selection) {
this.templateSelections = selection
},
//
confirmImportTemplate() {
if (!this.templateSelections || this.templateSelections.length === 0) {
this.$message.warning('请选择要导入的模板')
return
}
this.$confirm(`确认导入选中的 ${this.templateSelections.length} 个模板吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
this.importLoading = true
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
templateList: this.templateSelections.map(item => ({
templateId: item.templateId
}))
}
const { data } = await importIQCTemplateItems(params)
if (data && data.code === 0) {
this.$message.success(`导入成功,共导入 ${data.importCount || 0} 个检验项目`)
this.templateImportDialogFlag = false
this.templateSelections = []
//
this.getInspectionFormData()
} else {
this.$message.error(data.msg || '导入失败')
}
} catch (error) {
this.$message.error('导入失败,请检查')
} finally {
this.importLoading = false
}
}).catch(() => {
this.$message.info('已取消导入')
})
},
//
resetTemplateQuery() {
this.templateQuery = {
templateId: '',
templateDesc: '',
}
this.searchIQCTemplates()
},
} }
} }
</script> </script>
@ -3455,5 +3885,318 @@
height: auto; height: auto;
line-height: 1.5; line-height: 1.5;
} }
/* ==================== IQC检验项目操作对话框样式 ==================== */
/deep/ .item-operation-dialog {
border-radius: 8px;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.12);
}
/deep/ .item-operation-dialog .el-dialog__header {
background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
padding: 20px 24px;
border-radius: 8px 8px 0 0;
}
/deep/ .item-operation-dialog .el-dialog__title {
color: #ffffff;
font-size: 16px;
font-weight: 600;
letter-spacing: 0.5px;
}
/deep/ .item-operation-dialog .el-dialog__headerbtn .el-dialog__close {
color: #ffffff;
font-size: 20px;
font-weight: bold;
}
/deep/ .item-operation-dialog .el-dialog__headerbtn:hover .el-dialog__close {
color: #f0f0f0;
}
/deep/ .item-operation-dialog .el-dialog__body {
padding: 24px;
background: #f8f9fa;
}
/* 查询区域样式 */
.search-container {
background: #ffffff;
padding: 16px 20px;
border-radius: 6px;
margin-bottom: 20px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
}
.search-container .el-form-item {
margin-bottom: 0;
}
.search-container .el-form-item__label {
font-weight: 500;
color: #606266;
}
/* 主内容区域 */
.item-operation-content {
display: flex;
gap: 16px;
align-items: stretch;
}
/* 项目面板 */
.item-panel {
flex: 1;
background: #ffffff;
border-radius: 6px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
overflow: hidden;
transition: all 0.3s ease;
}
.item-panel:hover {
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
}
.available-panel {
flex: 1.5;
}
.selected-panel {
flex: 1;
}
/* 面板头部 */
.panel-header {
padding: 14px 16px;
background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
border-bottom: 2px solid #9ac3d0;
display: flex;
align-items: center;
gap: 8px;
}
.panel-header i {
font-size: 18px;
color: #ffffff;
}
.panel-title {
font-size: 14px;
font-weight: 600;
color: #ffffff;
letter-spacing: 0.5px;
}
.item-count {
margin-left: auto;
font-size: 12px;
color: #ffffff;
background: rgba(255, 255, 255, 0.25);
padding: 2px 10px;
border-radius: 12px;
font-weight: 500;
}
/* 表格样式优化 */
.operation-table {
border: none !important;
}
.operation-table /deep/ .el-table__body tr:hover > td {
background-color: #f0f7ff !important;
}
.operation-table /deep/ .el-table__row.current-row > td {
background-color: #e6f2ff !important;
}
.operation-table /deep/ td {
border-bottom: 1px solid #f0f0f0;
}
.operation-table /deep/ .el-table__body {
font-size: 13px;
}
/* 操作按钮区域 */
.operation-buttons {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 20px;
padding: 0 8px;
}
.operation-buttons .el-button {
width: 48px;
height: 48px;
font-size: 20px;
transition: all 0.3s ease;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
}
.operation-buttons .el-button:hover {
transform: scale(1.1);
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.2);
}
.operation-buttons .el-button.is-disabled {
opacity: 0.4;
cursor: not-allowed;
}
.operation-buttons .el-button--primary {
background: linear-gradient(135deg, #409EFF 0%, #66b1ff 100%);
border: none;
}
.operation-buttons .el-button--danger {
background: linear-gradient(135deg, #F56C6C 0%, #f78989 100%);
border: none;
}
@media (max-width: 1200px) {
.item-operation-content {
flex-direction: column;
}
.operation-buttons {
flex-direction: row;
gap: 12px;
}
.operation-buttons .el-button {
width: 42px;
height: 42px;
font-size: 18px;
}
}
/* ==================== IQC模板导入对话框样式 ==================== */
/deep/ .template-import-dialog {
border-radius: 8px;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.12);
}
/deep/ .template-import-dialog .el-dialog__header {
background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
padding: 20px 24px;
border-radius: 8px 8px 0 0;
}
/deep/ .template-import-dialog .el-dialog__title {
color: #ffffff;
font-size: 16px;
font-weight: 600;
letter-spacing: 0.5px;
}
/deep/ .template-import-dialog .el-dialog__headerbtn .el-dialog__close {
color: #ffffff;
font-size: 20px;
font-weight: bold;
}
/deep/ .template-import-dialog .el-dialog__headerbtn:hover .el-dialog__close {
color: #f0f0f0;
}
/deep/ .template-import-dialog .el-dialog__body {
padding: 24px;
background: #f8f9fa;
}
/* 模板列表容器 */
.template-list-container {
background: #ffffff;
border-radius: 6px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
overflow: hidden;
transition: all 0.3s ease;
}
.template-list-container:hover {
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
}
/* 模板表格 */
.template-table {
border: none !important;
}
.template-table /deep/ .el-table__body tr:hover > td {
background-color: #f0f7ff !important;
}
.template-table /deep/ .el-table__row.current-row > td {
background-color: #e6f2ff !important;
}
.template-table /deep/ td {
border-bottom: 1px solid #f0f0f0;
}
.template-table /deep/ .el-table__body {
font-size: 13px;
}
/* ==================== 按钮样式优化 ==================== */
.operation-btn {
position: relative;
padding: 8px 16px;
border: none;
border-radius: 4px;
font-size: 13px;
font-weight: 500;
cursor: pointer;
transition: all 0.3s ease;
overflow: hidden;
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
}
.operation-btn:hover {
transform: translateY(-1px);
box-shadow: 0 3px 10px rgba(0, 0, 0, 0.15);
}
.operation-btn:active {
transform: translateY(0);
}
.operation-btn i {
margin-right: 4px;
font-size: 13px;
}
.operation-btn span {
position: relative;
z-index: 1;
}
/* 项目导入按钮 */
.item-operation-btn {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
}
.item-operation-btn:hover {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
}
/* 模板导入按钮 */
.template-import-btn {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
margin-left: 10px;
}
.template-import-btn:hover {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
}
</style> </style>

565
src/views/modules/qc/OQCResultEntry.vue

@ -350,30 +350,33 @@
<el-input v-model="detailData.umId" disabled style="width: 80px"></el-input> <el-input v-model="detailData.umId" disabled style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'发货数量'"> <el-form-item :label="'发货数量'">
<el-input class="inlineNumber numInput" v-model="detailData.rollQty" type="number" disabled style="width: 80px"></el-input>
<el-input class="inlineNumber numInput" v-model="detailData.rollQty" type="number" disabled style="width: 72px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'送检数量'"> <el-form-item :label="'送检数量'">
<el-input class="inlineNumber numInput" v-model="detailData.rollCount" type="number" style="width: 80px"></el-input>
<el-input class="inlineNumber numInput" v-model="detailData.rollCount" type="number" style="width: 72px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'抽样数量'"> <el-form-item :label="'抽样数量'">
<el-input class="inlineNumber numInput" v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input>
<el-input class="inlineNumber numInput" v-model="detailData.samplingQty" type="number" style="width: 72px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'不合格项目数量'"> <el-form-item :label="'不合格项目数量'">
<el-input class="inlineNumber numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
<el-input class="inlineNumber numInput" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
<el-input class="inlineNumber numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 85px"></el-input>
<el-input class="inlineNumber numInput" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" type="number" style="width: 85px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'合格数量'"> <el-form-item :label="'合格数量'">
<el-input class="inlineNumber numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled type="number" style="width: 80px"></el-input>
<el-input class="inlineNumber numInput" v-else @input="handleInput(detailData.passQty,2)" v-model="detailData.passQty" type="number" style="width: 80px"></el-input>
<el-input class="inlineNumber numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled type="number" style="width: 72px"></el-input>
<el-input class="inlineNumber numInput" v-else @input="handleInput(detailData.passQty,2)" v-model="detailData.passQty" type="number" style="width: 72px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'不合格数量'"> <el-form-item :label="'不合格数量'">
<el-input class="inlineNumber numInput" v-model="detailData.notPassQty" type="number" disabled style="width: 80px"></el-input>
<el-input class="inlineNumber numInput" v-model="detailData.notPassQty" type="number" disabled style="width: 72px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '" style="margin-left: 25px">
<el-form-item :label="' '">
<el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button> <el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button>
</el-form-item> </el-form-item>
<el-form-item :label="' '">
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top">
<el-form :inline="true" label-position="top" style="display: flex; align-items: flex-start;">
<el-form-item :label="'检验结论'"> <el-form-item :label="'检验结论'">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择"> <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
<el-option label="合格" value="合格"></el-option> <el-option label="合格" value="合格"></el-option>
@ -401,8 +404,15 @@
<!-- <span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>--> <!-- <span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>-->
<!-- <el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input>--> <!-- <el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input>-->
</el-form-item> </el-form-item>
<el-form-item :label="' '" style="margin-left: 20px">
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
<el-form-item :label="' '" style="margin-left: 31px; margin-top: -10px">
<el-button class="operation-btn item-operation-btn" @click="openItemOperationDialog">
<i class="el-icon-setting"></i>
<span>项目导入</span>
</el-button>
<el-button class="operation-btn template-import-btn" @click="openTemplateImportDialog">
<i class="el-icon-download"></i>
<span>模板导入</span>
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form v-show="detailData.inspectionResult === '不合格'" :inline="true" label-position="top"> <el-form v-show="detailData.inspectionResult === '不合格'" :inline="true" label-position="top">
@ -787,6 +797,87 @@
<!-- 子明细导入 --> <!-- 子明细导入 -->
<subDetailUpload @changeEvent="changeMyString" ref="subDetailUpload" @refreshPageTables="getInspectionFormData" v-drag></subDetailUpload> <subDetailUpload @changeEvent="changeMyString" ref="subDetailUpload" @refreshPageTables="getInspectionFormData" v-drag></subDetailUpload>
<!-- 项目操作对话框 -->
<el-dialog title="检验项目操作" @close="refreshInspectionDetailList" :close-on-click-modal="false" v-drag :visible.sync="itemOperationDialogFlag" width="1200px" custom-class="item-operation-dialog">
<div class="search-container">
<el-form :inline="true" size="small">
<el-form-item label="项目编码">
<el-input v-model="itemOperationQuery.itemNo" placeholder="请输入项目编码" clearable prefix-icon="el-icon-search" style="width: 160px"></el-input>
</el-form-item>
<el-form-item label="项目名称">
<el-input v-model="itemOperationQuery.itemDesc" placeholder="请输入项目名称" clearable prefix-icon="el-icon-search" style="width: 200px"></el-input>
</el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="searchOQCItems">查询</el-button>
</el-form>
</div>
<div class="item-operation-content">
<div class="item-panel available-panel">
<div class="panel-header">
<i class="el-icon-menu"></i>
<span class="panel-title">可选项目列表</span>
<span class="item-count">{{ availableItemList.length }}</span>
</div>
<el-table ref="availableItemTable" :data="availableItemList" @row-click="availableItemClickRow" @selection-change="availableItemSelectionChange" highlight-current-row class="operation-table" height="400" border>
<el-table-column type="selection" width="45" align="center"></el-table-column>
<el-table-column prop="itemNo" label="项目编码" min-width="120"></el-table-column>
<el-table-column prop="itemDesc" label="项目名称" min-width="180" show-overflow-tooltip></el-table-column>
</el-table>
</div>
<div class="operation-buttons">
<el-tooltip content="添加选中项目" placement="left">
<el-button type="primary" icon="el-icon-d-arrow-right" circle @click="addInspectionItems" :disabled="!availableItemSelections || availableItemSelections.length === 0"></el-button>
</el-tooltip>
<el-tooltip content="移除选中项目" placement="right">
<el-button type="danger" icon="el-icon-d-arrow-left" circle @click="deleteInspectionItems" :disabled="!selectedItemSelections || selectedItemSelections.length === 0"></el-button>
</el-tooltip>
</div>
<div class="item-panel selected-panel">
<div class="panel-header">
<i class="el-icon-tickets"></i>
<span class="panel-title">已有项目列表</span>
<span class="item-count">{{ selectedItemList.length }}</span>
</div>
<el-table ref="selectedItemTable" :data="selectedItemList" @row-click="selectedItemClickRow" @selection-change="selectedItemSelectionChange" highlight-current-row class="operation-table" height="400" border>
<el-table-column type="selection" width="45" align="center"></el-table-column>
<el-table-column prop="itemNo" label="项目编码" min-width="120"></el-table-column>
<el-table-column prop="itemDesc" label="项目名称" min-width="180" show-overflow-tooltip></el-table-column>
</el-table>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="itemOperationDialogFlag = false" size="small">关闭</el-button>
</div>
</el-dialog>
<!-- 模板导入对话框 -->
<el-dialog title="模板导入" :close-on-click-modal="false" v-drag :visible.sync="templateImportDialogFlag" width="900px" custom-class="template-import-dialog">
<div class="search-container">
<el-form :inline="true" size="small">
<el-form-item label="模板编码">
<el-input v-model="templateQuery.templateId" placeholder="请输入模板编码" clearable prefix-icon="el-icon-search" style="width: 160px"></el-input>
</el-form-item>
<el-form-item label="模板名称">
<el-input v-model="templateQuery.templateDesc" placeholder="请输入模板名称" clearable prefix-icon="el-icon-search" style="width: 200px"></el-input>
</el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="searchOQCTemplates">查询</el-button>
<el-button icon="el-icon-refresh-left" size="small" @click="resetTemplateQuery">重置</el-button>
</el-form>
</div>
<div class="template-list-container">
<el-table ref="templateTable" :data="templateList" @row-click="templateClickRow" @selection-change="templateSelectionChange" highlight-current-row class="template-table" height="450" border>
<el-table-column type="selection" width="45" align="center"></el-table-column>
<el-table-column prop="templateId" label="模板编码" min-width="120"></el-table-column>
<el-table-column prop="templateName" label="模板名称" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="remark" label="备注" min-width="200" show-overflow-tooltip></el-table-column>
<el-table-column prop="itemCount" label="项目数量" width="100" align="center"></el-table-column>
</el-table>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" icon="el-icon-download" @click="confirmImportTemplate" :disabled="!templateSelections || templateSelections.length === 0" :loading="importLoading" size="small">导入选中模板</el-button>
<el-button @click="templateImportDialogFlag = false" size="small">关闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -810,7 +901,13 @@
downLoadObjectFile, downLoadObjectFile,
deleteObjectFile, deleteObjectFile,
getUserRoleList, getUserRoleList,
getOperatorList
getOperatorList,
// OQC
getOQCItemList,
addOQCItemDetails,
deleteOQCItemDetails,
getOQCTemplateList,
importOQCTemplateItems
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -1829,7 +1926,26 @@
inspectionTypeNo: '' inspectionTypeNo: ''
}, },
changeModalFlag: false, changeModalFlag: false,
overLoading: false
overLoading: false,
// OQC
itemOperationDialogFlag: false,
itemOperationQuery: {
itemNo: '',
itemDesc: '',
},
availableItemList: [],
selectedItemList: [],
availableItemSelections: [],
selectedItemSelections: [],
// OQC
templateImportDialogFlag: false,
templateQuery: {
templateId: '',
templateDesc: '',
},
templateList: [],
templateSelections: [],
importLoading: false
} }
}, },
@ -3191,6 +3307,179 @@
this.authFile = !fileFlag this.authFile = !fileFlag
this.authChange = !changeFlag this.authChange = !changeFlag
}, },
// ======================== OQC ========================
openItemOperationDialog() {
this.itemOperationQuery = { itemNo: '', itemDesc: '' }
this.searchOQCItems()
this.itemOperationDialogFlag = true
},
async searchOQCItems() {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
itemNo: this.itemOperationQuery.itemNo || '',
itemDesc: this.itemOperationQuery.itemDesc || ''
}
const { data } = await getOQCItemList(params)
if (data && data.code === 0) {
this.availableItemList = data.row1 || []
this.selectedItemList = data.row2 || []
}
} catch (error) {
this.$message.error('查询检验项目失败')
}
},
availableItemClickRow(row) {
this.$refs.availableItemTable.toggleRowSelection(row)
},
availableItemSelectionChange(selection) {
this.availableItemSelections = selection
},
selectedItemClickRow(row) {
this.$refs.selectedItemTable.toggleRowSelection(row)
},
selectedItemSelectionChange(selection) {
this.selectedItemSelections = selection
},
async addInspectionItems() {
if (!this.availableItemSelections || this.availableItemSelections.length === 0) {
this.$message.warning('请选择要添加的项目')
return
}
this.$confirm('确认添加选中的检验项目吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
itemList: this.availableItemSelections.map(item => ({ itemNo: item.itemNo }))
}
const { data } = await addOQCItemDetails(params)
if (data && data.code === 0) {
this.$message.success('添加成功')
this.searchOQCItems()
} else {
this.$message.error(data.msg || '添加失败')
}
} catch (error) {
this.$message.error('添加失败,请检查')
}
}).catch(() => {
this.$message.info('已取消添加')
})
},
async deleteInspectionItems() {
if (!this.selectedItemSelections || this.selectedItemSelections.length === 0) {
this.$message.warning('请选择要移除的项目')
return
}
this.$confirm('确认移除选中的检验项目吗?(将同时删除该项目的子明细数据)', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
itemList: this.selectedItemSelections.map(item => ({ itemNo: item.itemNo }))
}
const { data } = await deleteOQCItemDetails(params)
if (data && data.code === 0) {
this.$message.success('移除成功')
this.searchOQCItems()
} else {
this.$message.error(data.msg || '移除失败')
}
} catch (error) {
this.$message.error('移除失败,请检查')
}
}).catch(() => {
this.$message.info('已取消移除')
})
},
refreshInspectionDetailList() {
if (this.detailInformationFlag) {
this.getInspectionFormData()
}
},
// ======================== OQC ========================
openTemplateImportDialog() {
this.templateQuery = { templateId: '', templateDesc: '' }
this.searchOQCTemplates()
this.templateImportDialogFlag = true
},
async searchOQCTemplates() {
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
templateId: this.templateQuery.templateId || '',
templateDesc: this.templateQuery.templateDesc || ''
}
const { data } = await getOQCTemplateList(params)
if (data && data.code === 0) {
this.templateList = data.rows || []
}
} catch (error) {
this.$message.error('查询模板失败')
}
},
templateClickRow(row) {
this.$refs.templateTable.toggleRowSelection(row)
},
templateSelectionChange(selection) {
this.templateSelections = selection
},
confirmImportTemplate() {
if (!this.templateSelections || this.templateSelections.length === 0) {
this.$message.warning('请选择要导入的模板')
return
}
this.$confirm(`确认导入选中的 ${this.templateSelections.length} 个模板吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
this.importLoading = true
try {
const params = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
templateList: this.templateSelections.map(item => ({ templateId: item.templateId }))
}
const { data } = await importOQCTemplateItems(params)
if (data && data.code === 0) {
this.$message.success(`导入成功,共导入 ${data.importCount || 0} 个检验项目`)
this.templateImportDialogFlag = false
this.templateSelections = []
this.getInspectionFormData()
} else {
this.$message.error(data.msg || '导入失败')
}
} catch (error) {
this.$message.error('导入失败,请检查')
} finally {
this.importLoading = false
}
}).catch(() => {
this.$message.info('已取消导入')
})
},
resetTemplateQuery() {
this.templateQuery = { templateId: '', templateDesc: '' }
this.searchOQCTemplates()
},
} }
} }
</script> </script>
@ -3438,4 +3727,252 @@
height: auto; height: auto;
line-height: 1.5; line-height: 1.5;
} }
/* ==================== OQC检验项目操作对话框样式 ==================== */
/deep/ .item-operation-dialog {
border-radius: 8px;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.12);
}
/deep/ .item-operation-dialog .el-dialog__header {
background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
padding: 20px 24px;
border-radius: 8px 8px 0 0;
}
/deep/ .item-operation-dialog .el-dialog__title {
color: #ffffff;
font-size: 16px;
font-weight: 600;
letter-spacing: 0.5px;
}
/deep/ .item-operation-dialog .el-dialog__headerbtn .el-dialog__close {
color: #ffffff;
font-size: 20px;
font-weight: bold;
}
/deep/ .item-operation-dialog .el-dialog__headerbtn:hover .el-dialog__close {
color: #f0f0f0;
}
/deep/ .item-operation-dialog .el-dialog__body {
padding: 24px;
background: #f8f9fa;
}
.search-container {
background: #ffffff;
padding: 16px 20px;
border-radius: 6px;
margin-bottom: 20px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
}
.search-container .el-form-item {
margin-bottom: 0;
}
.search-container .el-form-item__label {
font-weight: 500;
color: #606266;
}
.item-operation-content {
display: flex;
gap: 16px;
align-items: stretch;
}
.item-panel {
flex: 1;
background: #ffffff;
border-radius: 6px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
overflow: hidden;
transition: all 0.3s ease;
}
.item-panel:hover {
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
}
.available-panel {
flex: 1.5;
}
.selected-panel {
flex: 1;
}
.panel-header {
padding: 14px 16px;
background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
border-bottom: 2px solid #9ac3d0;
display: flex;
align-items: center;
gap: 8px;
}
.panel-header i {
font-size: 18px;
color: #ffffff;
}
.panel-title {
font-size: 14px;
font-weight: 600;
color: #ffffff;
letter-spacing: 0.5px;
}
.item-count {
margin-left: auto;
font-size: 12px;
color: #ffffff;
background: rgba(255, 255, 255, 0.25);
padding: 2px 10px;
border-radius: 12px;
font-weight: 500;
}
.operation-table {
border: none !important;
}
.operation-table /deep/ .el-table__body tr:hover > td {
background-color: #f0f7ff !important;
}
.operation-table /deep/ .el-table__row.current-row > td {
background-color: #e6f2ff !important;
}
.operation-table /deep/ td {
border-bottom: 1px solid #f0f0f0;
}
.operation-table /deep/ .el-table__body {
font-size: 13px;
}
.operation-buttons {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 20px;
padding: 0 8px;
}
.operation-buttons .el-button {
width: 48px;
height: 48px;
font-size: 20px;
transition: all 0.3s ease;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
}
.operation-buttons .el-button:hover {
transform: scale(1.1);
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.2);
}
.operation-buttons .el-button.is-disabled {
opacity: 0.4;
cursor: not-allowed;
}
.operation-buttons .el-button--primary {
background: linear-gradient(135deg, #409EFF 0%, #66b1ff 100%);
border: none;
}
.operation-buttons .el-button--danger {
background: linear-gradient(135deg, #F56C6C 0%, #f78989 100%);
border: none;
}
@media (max-width: 1200px) {
.item-operation-content {
flex-direction: column;
}
.operation-buttons {
flex-direction: row;
gap: 12px;
}
.operation-buttons .el-button {
width: 42px;
height: 42px;
font-size: 18px;
}
}
/deep/ .template-import-dialog {
border-radius: 8px;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.12);
}
/deep/ .template-import-dialog .el-dialog__header {
background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
padding: 20px 24px;
border-radius: 8px 8px 0 0;
}
/deep/ .template-import-dialog .el-dialog__title {
color: #ffffff;
font-size: 16px;
font-weight: 600;
letter-spacing: 0.5px;
}
/deep/ .template-import-dialog .el-dialog__headerbtn .el-dialog__close {
color: #ffffff;
font-size: 20px;
font-weight: bold;
}
/deep/ .template-import-dialog .el-dialog__headerbtn:hover .el-dialog__close {
color: #f0f0f0;
}
/deep/ .template-import-dialog .el-dialog__body {
padding: 24px;
background: #f8f9fa;
}
.template-list-container {
background: #ffffff;
border-radius: 6px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
overflow: hidden;
transition: all 0.3s ease;
}
.template-list-container:hover {
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
}
.template-table {
border: none !important;
}
.template-table /deep/ .el-table__body tr:hover > td {
background-color: #f0f7ff !important;
}
.template-table /deep/ .el-table__row.current-row > td {
background-color: #e6f2ff !important;
}
.template-table /deep/ td {
border-bottom: 1px solid #f0f0f0;
}
.template-table /deep/ .el-table__body {
font-size: 13px;
}
.operation-btn {
position: relative;
padding: 8px 16px;
border: none;
border-radius: 4px;
font-size: 13px;
font-weight: 500;
cursor: pointer;
transition: all 0.3s ease;
overflow: hidden;
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
}
.operation-btn:hover {
transform: translateY(-1px);
box-shadow: 0 3px 10px rgba(0, 0, 0, 0.15);
}
.operation-btn:active {
transform: translateY(0);
}
.operation-btn i {
margin-right: 4px;
font-size: 13px;
}
.operation-btn span {
position: relative;
z-index: 1;
}
.item-operation-btn {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
}
.item-operation-btn:hover {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
}
.template-import-btn {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
margin-left: 10px;
}
.template-import-btn:hover {
background: linear-gradient(135deg, #97a9f7 0%, #ac97df 100%);
color: #ffffff;
}
</style> </style>
Loading…
Cancel
Save