From 3275a59f0a107cfe05bbd7bb4fbafca9b032ec09 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 15 Aug 2025 12:53:40 +0800
Subject: [PATCH] =?UTF-8?q?2025-08-15=20=E7=89=A9=E6=96=99=E6=A1=A3?=
=?UTF-8?q?=E6=A1=88=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/qc/qc.js | 8 +
src/views/modules/qc/qcPartAttribute.vue | 1440 ++++++++++++++--------
2 files changed, 925 insertions(+), 523 deletions(-)
diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js
index 97d6456..1456234 100644
--- a/src/api/qc/qc.js
+++ b/src/api/qc/qc.js
@@ -77,6 +77,14 @@ export const getManufacturerList = data => createAPI(`/pms/qc/getManufacturerLis
export const getPartTemplateLists = data => createAPI(`/pms/qc/getPartTemplateLists`,'post',data)
export const qcPartAttributeEdit = data => createAPI(`/pms/qc/qcPartAttributeEdit`,'post',data)
export const queryFileId = data => createAPI(`/pms/qc/queryFileId`,'post',data)
+export const getPartDefectTracking = data => createAPI(`/pms/qc/getPartDefectTracking`,'post',data)
+export const saveDefectTracking = data => createAPI(`/pms/qc/saveDefectTracking`,'post',data)
+export const deleteDefectTracking = data => createAPI(`/pms/qc/deleteDefectTracking`,'post',data)
+export const updateDefectTracking = data => createAPI(`/pms/qc/updateDefectTracking`,'post',data)
+export const getPartLabelTemplate = data => createAPI(`/pms/qc/getPartLabelTemplate`,'post',data)
+export const saveLabelTemplate = data => createAPI(`/pms/qc/saveLabelTemplate`,'post',data)
+export const deleteLabelTemplate = data => createAPI(`/pms/qc/deleteLabelTemplate`,'post',data)
+export const updateLabelTemplate = data => createAPI(`/pms/qc/updateLabelTemplate`,'post',data)
// ===================================== FAI检验 =====================================
export const qcFAIInspectionSearch = data => createAPI(`/pms/qc/qcFAIInspectionSearch`,'post',data)
diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index 800a78d..291493c 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -73,9 +73,8 @@
width="100"
label="操作">
-
编辑
- 详情
+ 详情
@@ -101,164 +100,192 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 保存
+ 保存
关闭
@@ -266,17 +293,23 @@
-
+
+
+
+
+
- 新增
+ 新增模板
+ 批量编辑
+ 批量保存
+ min-width="180"
+ label="检验水平">
- 删除
+
+ 选择
+
+
+
+ {{scope.row[scope.column.property]}}
+
-
-
-
-
-
- 新增
-
-
+ prop="inspectionCycle"
+ header-align="center"
+ align="center"
+ min-width="100"
+ label="检验周期(h)">
- {{scope.row[item.columnProp]}}
-
+
+ scope.row.inspectionCycle= value.match(/^[1-9]\d*$/) ? value.match(/^[1-9]\d*$/)[0] : ''"
+ style="height: 11px; width: 98%;">
+
+
+
+ {{scope.row[scope.column.property]}}
+
+ min-width="180"
+ label="抽样方案">
- 删除
+
+ 选择
+
+
+
+ {{scope.row[scope.column.property]}}
+
-
-
-
-
-
- 新增
-
-
+ prop="aql"
+ header-align="center"
+ align="center"
+ min-width="80"
+ label="AQL">
- {{scope.row[item.columnProp]}}
-
+
+ scope.row.aql= value.match(/^[1-9]\d*$/) ? value.match(/^[1-9]\d*$/)[0] : ''"
+ style="height: 11px; width: 98%;">
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+ scope.row.ac= value.match(/^[1-9]\d*$/) ? value.match(/^[1-9]\d*$/)[0] : ''"
+ style="height: 11px; width: 98%;">
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+ scope.row.re= value.match(/^[1-9]\d*$/) ? value.match(/^[1-9]\d*$/)[0] : ''"
+ style="height: 11px; width: 98%;">
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
- 删除
+ 删除
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 新增
+ 批量编辑
+ 批量保存
+
@@ -426,168 +472,129 @@
-
+ min-width="100"
+ label="不合格阈值">
-
-
- 选择
-
-
+
+ scope.row.defectThreshold= value.match(/^[1-9]\d*$/) ? value.match(/^[1-9]\d*$/)[0] : ''"
+ style="height: 11px; width: 98%;">
-
+
+
+ {{scope.row[scope.column.property]}}
+
-
+ label="连续合格批次数量">
-
-
-
-
-
-
-
-
-
- 选择
-
-
+
+ scope.row.recoveryBatchCount = value.match(/^[1-9]\d*$/) ? value.match(/^[1-9]\d*$/)[0] : ''"
+ style="height: 11px; width: 98%;">
-
+
+
+ {{scope.row[scope.column.property]}}
+
-
+ min-width="100"
+ label="当前不合格次数">
-
-
+
+ scope.row.currentDefectCount = value.match(/^[1-9]\d*$/) ? value.match(/^[1-9]\d*$/)[0] : ''"
+ style="height: 11px; width: 98%;">
+
+
+
+ {{scope.row[scope.column.property]}}
+
-
+ min-width="100"
+ label="上次不合格次数">
-
-
+
+ scope.row.lastDefectCount = value.match(/^[1-9]\d*$/) ? value.match(/^[1-9]\d*$/)[0] : ''"
+ style="height: 11px; width: 98%;">
+
+
+
+ {{scope.row[scope.column.property]}}
+
-
+ width="80"
+ label="操作">
-
-
+ 删除
-
+
+
+
+
+
+ 新增
+
+
+ v-for="(item,index) in columnLabelTemplateList" :key="index"
+ :sortable="item.columnSortable"
+ :prop="item.columnProp"
+ :header-align="item.headerAlign"
+ :show-overflow-tooltip="item.showOverflowTooltip"
+ :align="item.align"
+ :fixed="item.fixed==''?false:item.fixed"
+ :min-width="item.columnWidth"
+ :label="item.columnLabel">
-
-
+ {{scope.row[item.columnProp]}}
+
-
-
- 删除
-
+ 编辑
+ 删除
-
-
-
- 保存
- 关闭
-
-
+
+
+
+
@@ -919,59 +926,55 @@
-
-
-
-
-
+
+
+
+
+ 供应商
+ 供应商
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
+
- 查询
+ 标签类型
+ 标签类型
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- 关闭
+
+ 保存
+ 关闭
@@ -1000,6 +1003,15 @@
getAllResourceList, // 查询机台列表
getSiteAndBuByUserName,
searchPartInfo, // 查询物料信息
+ getPartDefectTracking, // 查询跟踪缺陷
+ saveDefectTracking, // 新增跟踪缺陷
+ deleteDefectTracking, // 删除跟踪缺陷
+ updateDefectTracking, // 编辑跟踪缺陷
+
+ getPartLabelTemplate, // 查询标签模版设置
+ saveLabelTemplate, // 新增标签模版设置
+ deleteLabelTemplate, // 删除标签模版设置
+ updateLabelTemplate, // 编辑标签模版设置
} from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -1050,7 +1062,6 @@
totalPage: 0,
modalFlag: false,
modalDisableFlag: false,
- partDisableFlag: false,
modalData: {
site: '',
bu: '',
@@ -1083,7 +1094,12 @@
firstInspectionDuration: '',
nextInspectionDuration: '',
totalInspectionDuration: '',
- lastUpdateBy: this.$store.state.user.name
+ lastUpdateBy: this.$store.state.user.name,
+ partDescEn: '',
+ standardValue: '',
+ defaultValue: '',
+ maxValue: '',
+ minValue: ''
},
detailData: {
site: '',
@@ -1099,6 +1115,33 @@
templateName: '',
createBy: this.$store.state.user.name
},
+ defectTrackingData: {
+ site: '',
+ buNo: '',
+ partNo: '',
+ supplierId: '',
+ supplierName: '',
+ defectThreshold: '',
+ recoveryBatchCount: '',
+ currentDefectCount: '',
+ lastDefectCount: '',
+ },
+ labelTemplateData: {
+ flag: '',
+ site: '',
+ buNo: '',
+ partNo: '',
+ labelTypeTb: '',
+ labelType: '',
+ defaultFlag: '',
+ createBy: '',
+ },
+ dataList: [],
+ detailList: [],
+ defectTrackingList: [],
+ labelTemplateList: [],
+ dataListLoading: false,
+ // 展示列集
columnList: [
{
userId: this.$store.state.user.name,
@@ -1353,11 +1396,6 @@
columnWidth: 100,
},
],
- detailModelFlag: false,
- detailList: [],
- dataList: [],
- dataListLoading: false,
- // 展示列集
columnDetailList: [
{
userId: this.$store.state.user.name,
@@ -1522,14 +1560,83 @@
columnWidth: 200,
},
],
+ columnDefectTrackingList: [
+ {
+ columnProp: 'supplierId',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '供应商编码',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
+ {
+ columnProp: 'supplierName',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '供应商名称',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 200,
+ },
+ ],
+ columnLabelTemplateList: [
+ {
+ columnProp: 'labelTypeTb',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '标签编码',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
+ {
+ columnProp: 'labelType',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '标签类型',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120,
+ },
+ {
+ columnProp: 'defaultFlagDesc',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '默认标识',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
+ ],
// 快速添加
fastAddFlag: false,
itemList1: [],
itemList2: [],
itemListRow1: {},
itemListRow2: {},
- tempLevelRow: '',
- tempProgrammeRow: '',
+ tempLevelRow: {},
+ tempProgrammeRow: {},
options: [],
itemSelections1: [],
itemSelections2: [],
@@ -1665,7 +1772,13 @@
partCurrentRow: {},
secondHeight: 200,
searchLoading: false,
- saveLoading: false
+ saveLoading: false,
+ editBatchVisible: false,
+ batchLoading: false,
+ defectTrackingModal: false,
+ defectTrackingDisableFlag: false,
+ labelTemplateModal: false,
+ labelTemplateDisableFlag: false
}
},
@@ -1702,27 +1815,10 @@
username: this.$store.state.user.name,
}
getSiteAndBuByUserName(tempData).then(({data}) => {
- if (data.code === 0) {
- this.userBuList = data.rows
- }
- })
- },
-
- searchPartInfo () {
- this.partDetailData.bu = this.modalData.bu
- if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) {
- this.partInfoList = []
- this.partDisableFlag = true
- } else {
- searchPartInfo(this.partDetailData).then(({data}) => {
- if (data.code === 0) {
- this.partInfoList = data.rows
- this.partDisableFlag = true
- } else {
- this.$message.error(data.msg)
- }
- })
- }
+ if (data.code === 0) {
+ this.userBuList = data.rows
+ }
+ })
},
// 查询检验类型
@@ -1758,20 +1854,21 @@
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
+ // 判断是否全部存在数据
+ if (this.dataList.length > 0) {
+ // 设置选中行
+ this.$refs.partTable.setCurrentRow(this.dataList[0])
+ this.partClickRow(this.dataList[0])
+ } else {
+ this.partCurrentRow = {}
+ this.refreshCurrentTabTable()
+ }
}
}).finally(()=>{
this.searchLoading = false
})
},
- getRowData1 (row) {
- this.modalData.sku = row.sku
- this.modalData.cinvSourceCode = row.cinvSourceCode
- this.modalData.partNo = row.partNo
- this.modalData.partDesc = row.partDesc
- this.partDisableFlag = false
- },
-
// 每页数
sizeChangeHandle (val) {
this.pageSize = val
@@ -1818,6 +1915,54 @@
nextInspectionDuration: row.nextInspectionDuration,
totalInspectionDuration: row.totalInspectionDuration,
lastUpdateBy: this.$store.state.user.name,
+ partDescEn: row.partDescEn,
+ standardValue: row.standardValue,
+ defaultValue: row.defaultValue,
+ maxValue: row.maxValue,
+ minValue: row.minValue
+ }
+ this.modalDisableFlag = false
+ this.modalFlag = true
+ },
+
+ updateModal2 (row) {
+ this.modalData = {
+ site: row.site,
+ bu: row.site + '_' + row.buNo,
+ buNo: row.buNo,
+ partNo: row.partNo,
+ partDesc: row.partDesc,
+ partTypeDB: row.partTypeDB,
+ partType: row.partType,
+ umId: row.umId,
+ spec: row.spec,
+ expirationFlag: row.expirationFlag,
+ expirationDay: row.expirationDay,
+ expirationWarningDay: row.expirationWarningDay,
+ exceedInRatio: row.exceedInRatio,
+ exceedOutRatio: row.exceedOutRatio,
+ inboundWarehouseId: row.inboundWarehouseId,
+ inboundWarehouseName: row.inboundWarehouseName,
+ outboundWarehouseId: row.outboundWarehouseId,
+ outboundWarehouseName: row.outboundWarehouseName,
+ inboundLocationId: row.inboundLocationId,
+ inboundLocationName: row.inboundLocationName,
+ active: row.active,
+ iqcExempt: row.iqcExempt,
+ faiExempt: row.faiExempt,
+ ipqcExempt: row.ipqcExempt,
+ pqcExempt: row.pqcExempt,
+ fqcExempt: row.fqcExempt,
+ oqcExempt: row.oqcExempt,
+ firstInspectionDuration: row.firstInspectionDuration,
+ nextInspectionDuration: row.nextInspectionDuration,
+ totalInspectionDuration: row.totalInspectionDuration,
+ lastUpdateBy: this.$store.state.user.name,
+ partDescEn: row.partDescEn,
+ standardValue: row.standardValue,
+ defaultValue: row.defaultValue,
+ maxValue: row.maxValue,
+ minValue: row.minValue
}
this.modalDisableFlag = true
this.modalFlag = true
@@ -1842,33 +1987,60 @@
})
},
- // 保存属性模板
- saveDetail () {
- for (let i = 0; i < this.detailList.length; i++) {
- this.detailList[i].updateBy = this.$store.state.user.name
- saveAttributeDetailed(this.detailList[i]).then(({data}) => {
- if (data && data.code === 0) {
- this.getDataList()
- this.detailModelFlag = false
- this.$message.success('操作成功')
- } else {
- this.$message.error(data.msg)
- }
- })
+ // 列表表格选择替换
+ tabClick (tab, event) {
+ // 刷新列表数据
+ this.refreshCurrentTabTable()
+ },
+
+ // 当前值发生变化的时候修改
+ changeCurrentRow (row, oldRow) {
+ // 判断是否是获取焦点的事件
+ if (row) {
+ this.partCurrentRow = JSON.parse(JSON.stringify(row))
+ //刷新当前页表
+ this.refreshCurrentTabTable()
+ }
+ },
+
+ rowStyle ({row}) {
+ if (this.partCurrentRow.partNo === row.partNo) {
+ return { 'background-color': '#E8F7F6', cursor: 'pointer' }
+ }
+ },
+
+ // 单机选中物料信息
+ partClickRow (row,column) {
+ this.partCurrentRow = JSON.parse(JSON.stringify(row))
+ },
+
+ // 刷新页签的table数据
+ refreshCurrentTabTable () {
+ if (this.activeTable === 'bom') {
+
+ } else if (this.activeTable === 'routing') {
+
+ } else if (this.activeTable === 'qcTemplate') {
+ this.detailModal()
+ } else if (this.activeTable === 'defectTracking') {
+ this.getPartDefectTracking()
+ } else if (this.activeTable === 'labelTemplate') {
+ this.getPartLabelTemplate()
}
},
+ // ==================== 物料模板 ====================
+
// 打开物料模板清单
- detailModal (row) {
- this.detailData.site = row.site
- this.detailData.buNo = row.buNo
- this.detailData.partNo = row.partNo
- this.detailData.attributeNo = row.partNo
- this.detailData.partDesc = row.partDesc
+ detailModal () {
+ this.detailData.site = this.partCurrentRow.site
+ this.detailData.buNo = this.partCurrentRow.buNo
+ this.detailData.partNo = this.partCurrentRow.partNo
+ this.detailData.attributeNo = this.partCurrentRow.partNo
+ this.detailData.partDesc = this.partCurrentRow.partDesc
searchPartAttributeDetails(this.detailData).then(({data}) => {
this.detailList = data.rows
})
- this.detailModelFlag = true
},
checkInspectionType () {
@@ -1880,6 +2052,33 @@
})
},
+ // 批量编辑模态框
+ editBatchModel() {
+ if (this.editBatchVisible) {
+ this.editBatchVisible = false
+ } else {
+ this.editBatchVisible = true
+ }
+ },
+
+ // 批量保存
+ batchModel() {
+ let params = []
+ params = this.detailList
+ this.batchLoading = true
+ saveAttributeDetailed(params).then(({data}) => {
+ if (data && data.code === 0) {
+ this.detailModal()
+ this.$message.success(data.msg)
+ this.editBatchVisible = false
+ } else {
+ this.$message.error(data.msg)
+ }
+ }).finally(() => {
+ this.batchLoading = false
+ })
+ },
+
// 快速新增
addFastModal () {
this.itemSelections1 = null
@@ -2008,9 +2207,200 @@
}).then(() => {
deletePartAttributeDetails(row).then(({data}) => {
if (data && data.code === 0) {
- searchPartAttributeDetails(this.detailData).then(({data}) => {
- this.detailList = data.rows
- })
+ this.detailModal()
+ this.$message.success('操作成功')
+ } else {
+ this.$message.error(data.msg)
+ }
+ })
+ })
+ },
+
+ // ==================== 物料缺陷跟踪 ====================
+
+ // 查询物料缺陷跟踪
+ getPartDefectTracking () {
+ let templateData = {
+ site: this.partCurrentRow.site,
+ buNo: this.partCurrentRow.buNo,
+ partNo: this.partCurrentRow.partNo
+ }
+ getPartDefectTracking(templateData).then(({data}) => {
+ this.defectTrackingList = data.rows
+ })
+ },
+
+ // 新增物料缺陷跟踪
+ addDefectTrackingModal () {
+ this.defectTrackingData = {
+ site: this.partCurrentRow.site,
+ buNo: this.partCurrentRow.buNo,
+ partNo: this.partCurrentRow.partNo,
+ supplierId: '',
+ supplierName: '',
+ defectThreshold: '',
+ recoveryBatchCount: '',
+ currentDefectCount: '',
+ lastDefectCount: '',
+ }
+ this.defectTrackingModal = true
+ this.defectTrackingDisableFlag = false
+ },
+
+ // 新增物料缺陷跟踪
+ saveDefectTracking () {
+ if (this.defectTrackingData.supplierId === '' || this.defectTrackingData.supplierId == null) {
+ this.$message.warning('请选择供应商!')
+ return
+ }
+ this.saveLoading = true
+ saveDefectTracking(this.defectTrackingData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.getPartDefectTracking()
+ this.defectTrackingModal = false
+ this.$message.success('操作成功')
+ } else {
+ this.$message.error(data.msg)
+ }
+ }).finally(()=>{
+ this.saveLoading = false
+ })
+ },
+
+ // 删除物料缺陷跟踪
+ deleteDefectTracking (row) {
+ this.$confirm(`是否删除这个物料缺陷跟踪?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ deleteDefectTracking(row).then(({data}) => {
+ if (data && data.code === 0) {
+ this.getPartDefectTracking()
+ this.$message.success('操作成功')
+ } else {
+ this.$message.error(data.msg)
+ }
+ })
+ })
+ },
+
+ // 批量编辑
+ editDefectTrackingBatchModel () {
+ if (this.editBatchVisible) {
+ this.editBatchVisible = false
+ } else {
+ this.editBatchVisible = true
+ }
+ },
+
+ // 批量保存
+ batchDefectTrackingModel () {
+ let params = []
+ params = this.defectTrackingList
+ this.batchLoading = true
+ updateDefectTracking(params).then(({data}) => {
+ if (data && data.code === 0) {
+ this.getPartDefectTracking()
+ this.$message.success(data.msg)
+ this.editBatchVisible = false
+ } else {
+ this.$message.error(data.msg)
+ }
+ }).finally(() => {
+ this.batchLoading = false
+ })
+ },
+
+ // ==================== 标签模版设置 ====================
+
+ // 查询标签模版设置
+ getPartLabelTemplate () {
+ let templateData = {
+ site: this.partCurrentRow.site,
+ buNo: this.partCurrentRow.buNo,
+ partNo: this.partCurrentRow.partNo
+ }
+ getPartLabelTemplate(templateData).then(({data}) => {
+ this.labelTemplateList = data.rows
+ })
+ },
+
+ // 新增标签模版设置
+ addLabelTemplateModal () {
+ this.labelTemplateData = {
+ flag: '1',
+ site: this.partCurrentRow.site,
+ buNo: this.partCurrentRow.buNo,
+ partNo: this.partCurrentRow.partNo,
+ labelTypeTb: '',
+ labelType: '',
+ defaultFlag: '',
+ createdBy: this.$store.state.user.name,
+ }
+ this.labelTemplateModal = true
+ this.labelTemplateDisableFlag = false
+ },
+
+ // 编辑标签模版设置
+ updateLabelTemplateModal (row) {
+ this.labelTemplateData = {
+ flag: '2',
+ site: row.site,
+ buNo: row.buNo,
+ partNo: row.partNo,
+ labelTypeTb: row.labelTypeTb,
+ labelType: row.labelType,
+ defaultFlag: row.defaultFlag,
+ }
+ this.labelTemplateModal = true
+ this.labelTemplateDisableFlag = true
+ },
+
+ // 新增标签模版设置
+ saveLabelTemplate () {
+ if (this.labelTemplateData.labelTypeTb === '' || this.labelTemplateData.labelTypeTb == null) {
+ this.$message.warning('请选择标签类型!')
+ return
+ }
+ this.saveLoading = true
+ if (this.labelTemplateData.flag === '1') {
+ saveLabelTemplate(this.labelTemplateData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.getPartLabelTemplate()
+ this.labelTemplateModal = false
+ this.$message.success('操作成功')
+ } else {
+ this.$message.error(data.msg)
+ }
+ }).finally(()=>{
+ this.saveLoading = false
+ })
+ } else {
+ updateLabelTemplate(this.labelTemplateData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.getPartLabelTemplate()
+ this.labelTemplateModal = false
+ this.$message.success('操作成功')
+ } else {
+ this.$message.error(data.msg)
+ }
+ }).finally(()=>{
+ this.saveLoading = false
+ })
+ }
+ },
+
+ // 删除标签模版设置
+ deleteLabelTemplate (row) {
+ this.$confirm(`是否删除这个标签模版设置?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ deleteLabelTemplate(row).then(({data}) => {
+ if (data && data.code === 0) {
+ this.getPartLabelTemplate()
this.$message.success('操作成功')
} else {
this.$message.error(data.msg)
@@ -2073,6 +2463,42 @@
})
},
+ // 库位输入校验
+ supplierBlur (tagNo) {
+ let tempData = {
+ tagno: tagNo,
+ conditionSql: " and SupplierID = '" + this.defectTrackingData.supplierId + "'" + " and site = '" + this.defectTrackingData.site + "'"
+ }
+ verifyData(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ if (data.baseListData.length > 0) {
+ this.defectTrackingData.supplierId = data.baseListData[0].SupplierID
+ this.defectTrackingData.supplierName = data.baseListData[0].SupplierName
+ } else {
+ this.defectTrackingData.supplierName = ''
+ }
+ }
+ })
+ },
+
+ // 标签类型输入校验
+ labelTemplateBlur () {
+ let tempData = {
+ tagno: tagNo,
+ conditionSql: " and ReportID = '" + this.labelTemplateData.labelTypeTb + "'"
+ }
+ verifyData(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ if (data.baseListData.length > 0) {
+ this.labelTemplateData.labelTypeTb = data.baseListData[0].ReportID
+ this.labelTemplateData.labelType = data.baseListData[0].ReportFamily
+ } else {
+ this.labelTemplateData.labelType = ''
+ }
+ }
+ })
+ },
+
// 获取基础数据列表S
getBaseList (val, type) {
this.tagNo = val
@@ -2087,10 +2513,6 @@
strVal = this.tempProgrammeRow.samplingProgrammeNo
this.$refs.baseList.init(val, strVal)
}
- if (val === 1056) {
- strVal = this.modalData.supplierNo
- this.$refs.baseList.init(val, strVal)
- }
if (val === 20 && type === 1) {
strVal = this.modalData.inboundWarehouseId
this.$refs.baseList.init(val, strVal)
@@ -2099,15 +2521,19 @@
strVal = this.modalData.outboundWarehouseId
this.$refs.baseList.init(val, strVal)
}
+ if (val === 506) {
+ strVal = this.defectTrackingData.supplierId
+ this.$refs.baseList.init(val, strVal)
+ }
+ if (val === 1099) {
+ strVal = this.labelTemplateData.labelTypeTb
+ this.$refs.baseList.init(val, strVal)
+ }
})
},
// 列表方法的回调
getBaseData (val) {
- if (this.tagNo === 507) {
- this.modalData.partNo = val.part_no
- this.modalData.partDesc = val.part_desc
- }
if (this.tagNo === 208) {
this.tempLevelRow.samplingLevelNo = val.sampling_level_no
this.tempLevelRow.samplingLevelDesc = val.sampling_level_desc
@@ -2116,10 +2542,6 @@
this.tempProgrammeRow.samplingProgrammeNo = val.sampling_programme_no
this.tempProgrammeRow.samplingProgrammeDesc = val.sampling_programme_desc
}
- if (this.tagNo === 1056) {
- this.modalData.supplierNo = val.supplier_id
- this.modalData.supplierDesc = val.supplier_name
- }
if (this.tagNo === 20 && this.tagType === 1) {
this.modalData.inboundWarehouseId = val.WareHouseID
this.modalData.inboundWarehouseName = val.WareHouseName
@@ -2128,6 +2550,14 @@
this.modalData.outboundWarehouseId = val.WareHouseID
this.modalData.outboundWarehouseName = val.WareHouseName
}
+ if (this.tagNo === 506) {
+ this.defectTrackingData.supplierId = val.SupplierID
+ this.defectTrackingData.supplierName = val.SupplierName
+ }
+ if (this.tagNo === 1099) {
+ this.labelTemplateData.labelTypeTb = val.ReportID
+ this.labelTemplateData.labelType = val.ReportFamily
+ }
},
// 校验用户是否收藏
@@ -2416,46 +2846,6 @@
})
},
- // 列表表格选择替换
- tabClick (tab, event) {
- // 刷新列表数据
- this.refreshCurrentTabTable()
- },
-
- // 当前值发生变化的时候修改
- changeCurrentRow (row, oldRow) {
- // 判断是否是获取焦点的事件
- if (row) {
- this.partCurrentRow = JSON.parse(JSON.stringify(row))
- //刷新当前页表
- this.refreshCurrentTabTable()
- }
- },
-
- rowStyle ({row}) {
- if (this.partCurrentRow.partNo === row.partNo) {
- return { 'background-color': '#E8F7F6', cursor: 'pointer' }
- }
- },
-
- // 单机选中物料信息
- partClickRow (row,column) {
- this.partCurrentRow = JSON.parse(JSON.stringify(row))
- },
-
- // 刷新页签的table数据
- refreshCurrentTabTable () {
- if (this.activeTable === 'part_agent') {
- this.getPartAgent()
- } else if (this.activeTable === 'part_file') {
- this.getFileContentData()
- } else if (this.activeTable === 'part_manufacturer') {
- this.getPartManufacturer()
- } else if (this.activeTable === 'default_locations') {
- this.getDefaultLocation()
- }
- },
-
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) {
let queryTableUser = {
@@ -2532,6 +2922,10 @@
}