From 0dcccfcc831e4f8a1e00a7b4e02f990c5d1266ae Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 26 Oct 2026 13:20:34 +0800
Subject: [PATCH] =?UTF-8?q?2026-10-26=20=E4=BC=98=E5=8C=96=E7=8E=B0?=
=?UTF-8?q?=E5=9C=BA=E5=8A=A8=E6=8E=A7=E6=A8=A1=E5=9E=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/base.js | 2 +
src/views/modules/qc/FAIResultEntry.vue | 18 +-
src/views/modules/qc/FQCResultEntry.vue | 18 +-
src/views/modules/qc/IPQCResultEntry.vue | 18 +-
src/views/modules/qc/controlScope.js | 33 ++
.../modules/sys/sceneDynamicControlModel.vue | 345 +++++++++++++++++-
.../yieldReport/com_process_inspection.vue | 18 +-
.../modules/yieldReport/com_separate_roll.vue | 43 ++-
8 files changed, 467 insertions(+), 28 deletions(-)
create mode 100644 src/views/modules/qc/controlScope.js
diff --git a/src/api/base.js b/src/api/base.js
index 1277197..065410d 100644
--- a/src/api/base.js
+++ b/src/api/base.js
@@ -44,7 +44,9 @@ export const controlData = data => createAPI(`/sysSceneDynamicControlModel/contr
export const sysControlModelSearch = data => createAPI(`/sysSceneDynamicControlModel/sysControlModelSearch`,'post',data)
+export const sysControlModelSave = data => createAPI(`/sysSceneDynamicControlModel/sysControlModelSave`,'post',data)
export const sysControlModelUpdate = data => createAPI(`/sysSceneDynamicControlModel/sysControlModelUpdate`,'post',data)
+export const searchControlDimensionValue = data => createAPI(`/sysSceneDynamicControlModel/searchControlDimensionValue`,'post',data)
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index fd6fc93..5d3ff2b 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -265,7 +265,7 @@
- 检验模板
+ 检验模板
检验模板
@@ -936,6 +936,7 @@
dataAcquisitionByItem, // 根据项目数据采集
cancelApproval2, // 取消审核
} from "@/api/qc/qc.js"
+ import {unwrapControl, isControlActive} from "./controlScope"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getInspectionFile} from '@/api/eam/eam_object_list.js'
@@ -3066,7 +3067,7 @@
this.$message.warning('请选择单位!')
return
}
- if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) {
+ if (this.templateControlActive() && (this.modalData.templateId == null || this.modalData.templateId === '')) {
this.$message.warning('请选择检验模板!')
return
}
@@ -3105,7 +3106,7 @@
}
queryController(tempData).then(({data}) => {
if (data && data.code === 0) {
- this.controlData = data.rows
+ this.controlData = unwrapControl(data.rows)
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@@ -3114,6 +3115,17 @@
})
},
+ templateControlActive () {
+ return isControlActive(this.controlData, {
+ PART: this.modalData.partNo,
+ WORK_CENTER: this.modalData.workCenterNo,
+ RESOURCE: this.modalData.resourceId,
+ OPERATION: this.modalData.operationDesc,
+ INSPECTION_TYPE: this.modalData.inspectionTypeNo,
+ PERSON: this.modalData.operator || this.modalData.inspectorNo
+ })
+ },
+
// 新增
addModal () {
this.modalData = {
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 5284b4f..869b57d 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -402,7 +402,7 @@
- 检验模板
+ 检验模板
检验模板
@@ -1300,6 +1300,7 @@
importFQCTemplateItems
} from "@/api/qc/qc.js"
import {mergeCollectCounts, validateCollectControl} from "./qcCollectValidate"
+ import {unwrapControl, isControlActive} from "./controlScope"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getInspectionFile} from '@/api/eam/eam_object_list.js'
@@ -3505,7 +3506,7 @@
this.$message.warning('请选择单位!')
return
}
- if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) {
+ if (this.templateControlActive() && (this.modalData.templateId == null || this.modalData.templateId === '')) {
this.$message.warning('请选择检验模板!')
return
}
@@ -3537,13 +3538,24 @@
}
queryController(tempData).then(({data}) => {
if (data && data.code === 0) {
- this.controlData = data.rows
+ this.controlData = unwrapControl(data.rows)
} else {
this.$message.error(data.msg)
}
})
},
+ templateControlActive () {
+ return isControlActive(this.controlData, {
+ PART: this.modalData.partNo,
+ WORK_CENTER: this.modalData.workCenterNo,
+ RESOURCE: this.modalData.resourceId,
+ OPERATION: this.modalData.operationDesc,
+ INSPECTION_TYPE: this.modalData.inspectionTypeNo,
+ PERSON: this.modalData.operator || this.modalData.inspectorNo
+ })
+ },
+
// 新增
addModal () {
this.modalData = {
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 545d320..8ee7e2f 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -459,7 +459,7 @@
- 检验模板
+ 检验模板
检验模板
@@ -1527,6 +1527,7 @@
importIPQCTemplateItems // 导入IPQC模板项目
} from "@/api/qc/qc.js"
import {mergeCollectCounts, validateCollectControl} from "./qcCollectValidate"
+ import {unwrapControl, isControlActive} from "./controlScope"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import { getWorkCenterList } from "@/api/orderIssure/soIssueNotify.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -3877,13 +3878,24 @@
}
queryController(tempData).then(({data}) => {
if (data && data.code === 0) {
- this.controlData = data.rows
+ this.controlData = unwrapControl(data.rows)
} else {
this.$message.error(data.msg)
}
})
},
+ templateControlActive () {
+ return isControlActive(this.controlData, {
+ PART: this.modalData.partNo,
+ WORK_CENTER: this.modalData.workCenterNo,
+ RESOURCE: this.modalData.resourceId,
+ OPERATION: this.modalData.operationDesc,
+ INSPECTION_TYPE: this.modalData.inspectionTypeNo,
+ PERSON: this.modalData.operator || this.modalData.inspectorNo
+ })
+ },
+
addModal () {
this.modalData = {
flag: '1',
@@ -4103,7 +4115,7 @@
this.$message.warning('请选择单位!')
return
}
- if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) {
+ if (this.templateControlActive() && (this.modalData.templateId == null || this.modalData.templateId === '')) {
this.$message.warning('请选择检验模板!')
return
}
diff --git a/src/views/modules/qc/controlScope.js b/src/views/modules/qc/controlScope.js
new file mode 100644
index 0000000..2cb6859
--- /dev/null
+++ b/src/views/modules/qc/controlScope.js
@@ -0,0 +1,33 @@
+export function unwrapControl (rows) {
+ if (Array.isArray(rows)) {
+ return rows[0] || {}
+ }
+ return rows || {}
+}
+
+export function isControlActive (control, context) {
+ if (!control || control.baseData !== '控制') {
+ return false
+ }
+ const scopes = control.scopeList || []
+ if (scopes.length === 0) {
+ return true
+ }
+ const groups = {}
+ scopes.forEach(row => {
+ const key = row.dimensionCode
+ if (!groups[key]) {
+ groups[key] = { matchType: row.matchType, values: [] }
+ }
+ groups[key].values.push(row.valueCode == null ? '' : String(row.valueCode).trim())
+ })
+ const currentContext = context || {}
+ return Object.keys(groups).every(code => {
+ const current = currentContext[code] == null ? '' : String(currentContext[code]).trim()
+ const hit = groups[code].values.indexOf(current) >= 0
+ if (groups[code].matchType === '不包含') {
+ return !hit
+ }
+ return current !== '' && hit
+ })
+}
diff --git a/src/views/modules/sys/sceneDynamicControlModel.vue b/src/views/modules/sys/sceneDynamicControlModel.vue
index 82b3fe2..ffb95cd 100644
--- a/src/views/modules/sys/sceneDynamicControlModel.vue
+++ b/src/views/modules/sys/sceneDynamicControlModel.vue
@@ -9,7 +9,7 @@
-
+
@@ -21,6 +21,7 @@
查询
+ 新增
-
+
+
+
+
+
+
+
-
+
@@ -91,22 +98,85 @@
-
+
-
+
-
+
+
+
可用维度
+
+ {{ item.dimensionName }}
+
+
+
+
生效范围
+
先勾选本控制要使用的维度。不配置生效范围时,开关打开即对全部生效。同一维度只能选择包含或不包含。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ val.valueName || val.valueCode }}
+ 选择
+
+
+
+
+ 删除
+
+
+
+
添加条件
+
保存
关闭
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+ 确定
+ 关闭
+
+
@@ -114,7 +184,9 @@
import {
sysControlModelSearch, // 列表查询
controlData, // 控制
+ sysControlModelSave,
sysControlModelUpdate, // 编辑
+ searchControlDimensionValue,
} from "@/api/base.js"
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default {
@@ -152,8 +224,28 @@ export default {
thirdType: '',
secondType: '',
controlStyle: '',
- parameterTable: ''
+ parameterTable: '',
+ scopeList: []
},
+ dimensionCatalog: [
+ { dimensionCode: 'PART', dimensionName: '物料' },
+ { dimensionCode: 'WORK_CENTER', dimensionName: '加工中心' },
+ { dimensionCode: 'RESOURCE', dimensionName: '机台' },
+ { dimensionCode: 'OPERATION', dimensionName: '工序' },
+ { dimensionCode: 'INSPECTION_TYPE', dimensionName: '检验类型' },
+ { dimensionCode: 'PERSON', dimensionName: '人员' }
+ ],
+ selectedDimensionCodes: [],
+ dimensionList: [],
+ scopeGroups: [],
+ valueDialogFlag: false,
+ valueKeyword: '',
+ valueList: [],
+ valueSelection: [],
+ valuePageIndex: 1,
+ valuePageSize: 20,
+ valueTotal: 0,
+ currentScopeRow: null,
// 检验项目展示标头
columnList: [
{
@@ -204,6 +296,18 @@ export default {
status: true,
fixed: '',
},
+ {
+ columnProp: 'scopeDesc',
+ headerAlign: 'center',
+ align: 'left',
+ columnLabel: '生效范围',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
{
columnProp: 'thirdType',
headerAlign: 'center',
@@ -317,9 +421,34 @@ export default {
})
},
+ addModal () {
+ this.modalData = {
+ flag: '1',
+ controlNo: '',
+ site: this.$store.state.user.site,
+ updateBy: this.$store.state.user.name,
+ createBy: this.$store.state.user.name,
+ type: '',
+ baseData: '未控制',
+ baseDesc: '',
+ status: 1,
+ remark: '',
+ thirdType: '',
+ secondType: '',
+ controlStyle: '强制',
+ parameterTable: 'N',
+ scopeList: []
+ }
+ this.selectedDimensionCodes = []
+ this.dimensionList = []
+ this.scopeGroups = []
+ this.modalFlag = true
+ },
+
// 编辑
updateModal (row) {
this.modalData = {
+ flag: '2',
controlNo: row.controlNo,
site: this.$store.state.user.site,
updateBy: this.$store.state.user.name,
@@ -331,21 +460,197 @@ export default {
thirdType: row.thirdType,
secondType: row.secondType,
controlStyle: row.controlStyle,
- parameterTable: row.parameterTable
+ parameterTable: row.parameterTable,
+ scopeList: row.scopeList || []
}
- this.modalDisableFlag = true
+ this.dimensionList = row.dimensionList || []
+ this.selectedDimensionCodes = this.dimensionList.map(item => item.dimensionCode)
+ this.scopeGroups = this.buildScopeGroups(row.scopeList)
this.modalFlag = true
},
+ onDimensionChecked () {
+ this.dimensionList = this.dimensionCatalog.filter(item => this.selectedDimensionCodes.indexOf(item.dimensionCode) >= 0)
+ this.scopeGroups = this.scopeGroups.filter(group => this.selectedDimensionCodes.indexOf(group.dimensionCode) >= 0)
+ },
+
+ buildScopeGroups (list) {
+ const nameMap = {}
+ this.dimensionList.forEach(item => {
+ nameMap[item.dimensionCode] = item.dimensionName
+ })
+ const groups = []
+ const index = {}
+ ;(list || []).forEach(row => {
+ if (index[row.dimensionCode] == null) {
+ index[row.dimensionCode] = groups.length
+ groups.push({
+ dimensionCode: row.dimensionCode,
+ dimensionName: row.dimensionName || nameMap[row.dimensionCode] || row.dimensionCode,
+ matchType: row.matchType || '包含',
+ values: []
+ })
+ }
+ if (row.valueCode) {
+ groups[index[row.dimensionCode]].values.push({
+ valueCode: row.valueCode,
+ valueName: row.valueName || row.valueCode
+ })
+ }
+ })
+ return groups
+ },
+
+ dimensionOptions (row) {
+ const used = this.scopeGroups
+ .filter(item => item !== row && item.dimensionCode)
+ .map(item => item.dimensionCode)
+ return this.dimensionList.filter(item => used.indexOf(item.dimensionCode) < 0 || item.dimensionCode === row.dimensionCode)
+ },
+
+ onDimensionChange (row) {
+ const dimension = this.dimensionList.find(item => item.dimensionCode === row.dimensionCode)
+ row.dimensionName = dimension ? dimension.dimensionName : row.dimensionCode
+ row.values = []
+ },
+
+ addScopeGroup () {
+ this.scopeGroups.push({
+ dimensionCode: '',
+ dimensionName: '',
+ matchType: '包含',
+ values: []
+ })
+ },
+
+ openValueDialog (row) {
+ this.currentScopeRow = row
+ this.valueKeyword = ''
+ this.valueList = []
+ this.valueSelection = []
+ this.valuePageIndex = 1
+ this.valuePageSize = 20
+ this.valueTotal = 0
+ this.valueDialogFlag = true
+ this.$nextTick(() => {
+ if (this.$refs.valueTable) {
+ this.$refs.valueTable.clearSelection()
+ }
+ })
+ this.searchDimensionValue(true)
+ },
+
+ searchDimensionValue (resetPage) {
+ if (!this.currentScopeRow || !this.currentScopeRow.dimensionCode) {
+ return
+ }
+ if (resetPage) {
+ this.valuePageIndex = 1
+ }
+ searchControlDimensionValue({
+ site: this.$store.state.user.site,
+ dimensionCode: this.currentScopeRow.dimensionCode,
+ keyword: this.valueKeyword || '',
+ page: this.valuePageIndex,
+ limit: this.valuePageSize
+ }).then(({data}) => {
+ if (data && data.code === 0) {
+ this.valueList = data.rows || []
+ this.valueTotal = data.total || 0
+ } else {
+ this.$alert(data.msg, '错误', { confirmButtonText: '确定' })
+ }
+ })
+ },
+
+ valueSizeChange (val) {
+ this.valuePageSize = val
+ this.valuePageIndex = 1
+ this.searchDimensionValue()
+ },
+
+ valueCurrentChange (val) {
+ this.valuePageIndex = val
+ this.searchDimensionValue()
+ },
+
+ valueSelectionChange (rows) {
+ this.valueSelection = rows
+ },
+
+ confirmValues () {
+ if (!this.currentScopeRow) {
+ return
+ }
+ const exists = {}
+ this.currentScopeRow.values.forEach(item => {
+ exists[item.valueCode] = true
+ })
+ this.valueSelection.forEach(item => {
+ if (!exists[item.valueCode]) {
+ this.currentScopeRow.values.push({
+ valueCode: item.valueCode,
+ valueName: item.valueName || item.valueCode
+ })
+ }
+ })
+ this.valueDialogFlag = false
+ },
+
+ flattenScopeGroups () {
+ const list = []
+ this.scopeGroups.forEach(group => {
+ ;(group.values || []).forEach(item => {
+ list.push({
+ dimensionCode: group.dimensionCode,
+ matchType: group.matchType,
+ valueCode: item.valueCode,
+ valueName: item.valueName
+ })
+ })
+ })
+ return list
+ },
+
// 保存编辑
saveData () {
+ if (this.modalData.flag === '1' && (this.modalData.controlNo === '' || this.modalData.controlNo == null)) {
+ this.$alert('请输入编码!', '错误', { confirmButtonText: '确定' })
+ return false
+ }
+ if (this.modalData.baseDesc === '' || this.modalData.baseDesc == null) {
+ this.$alert('请输入控制内容!', '错误', { confirmButtonText: '确定' })
+ return false
+ }
if (this.modalData.controlStyle === '' || this.modalData.controlStyle == null) {
this.$alert('请选择控制方式!', '错误', {
confirmButtonText: '确定'
})
return false
}
- sysControlModelUpdate(this.modalData).then(({data}) => {
+ for (let i = 0; i < this.scopeGroups.length; i++) {
+ const group = this.scopeGroups[i]
+ if (!group.dimensionCode) {
+ this.$alert('请选择控制维度!', '错误', { confirmButtonText: '确定' })
+ return false
+ }
+ if (!group.matchType) {
+ this.$alert('请选择条件!', '错误', { confirmButtonText: '确定' })
+ return false
+ }
+ if (!group.values || group.values.length === 0) {
+ this.$alert('请选择参数!', '错误', { confirmButtonText: '确定' })
+ return false
+ }
+ }
+ this.onDimensionChecked()
+ this.modalData.dimensionList = this.dimensionList.map(item => ({
+ dimensionCode: item.dimensionCode,
+ dimensionName: item.dimensionName
+ }))
+ this.modalData.scopeList = this.flattenScopeGroups()
+ const request = this.modalData.flag === '1' ? sysControlModelSave : sysControlModelUpdate
+ request(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.modalFlag = false
@@ -441,3 +746,23 @@ export default {
},
}
+
diff --git a/src/views/modules/yieldReport/com_process_inspection.vue b/src/views/modules/yieldReport/com_process_inspection.vue
index 36383aa..8106942 100644
--- a/src/views/modules/yieldReport/com_process_inspection.vue
+++ b/src/views/modules/yieldReport/com_process_inspection.vue
@@ -191,7 +191,7 @@
- 检验模板
+ 检验模板
检验模板
@@ -1128,6 +1128,7 @@ import {
selectIPQCSubDetailedRecord, // 子明细记录信息查询
saveIPQCSubDetailed, // 保存子明细信息
} from "@/api/qc/qc.js"
+import {unwrapControl, isControlActive} from "../qc/controlScope"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import { getInspectionFile } from '@/api/eam/eam_object_list.js'
import { searchQcSopFileList, downloadSopFile } from '@/api/qc/qc.js'
@@ -1903,13 +1904,24 @@ export default {
}
queryController(tempData).then(({data}) => {
if (data && data.code === 0) {
- this.controlData = data.rows
+ this.controlData = unwrapControl(data.rows)
} else {
this.$message.error(data.msg)
}
})
},
+ templateControlActive () {
+ return isControlActive(this.controlData, {
+ PART: this.modalData.partNo,
+ WORK_CENTER: this.modalData.workCenterNo,
+ RESOURCE: this.modalData.resourceId,
+ OPERATION: this.modalData.operationDesc,
+ INSPECTION_TYPE: this.modalData.inspectionTypeNo,
+ PERSON: this.modalData.operator || this.modalData.inspectorNo
+ })
+ },
+
// 获取用户BU列表
getSiteAndBuByUserName2() {
let tempData = {
@@ -2317,7 +2329,7 @@ export default {
return
}
// 验证检验模板(动控开启时)
- if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) {
+ if (this.templateControlActive() && (this.modalData.templateId == null || this.modalData.templateId === '')) {
this.$message.warning('请选择检验模板!')
return
}
diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue
index cc772b7..3232662 100644
--- a/src/views/modules/yieldReport/com_separate_roll.vue
+++ b/src/views/modules/yieldReport/com_separate_roll.vue
@@ -24,7 +24,7 @@
- 固定载具
+ 固定载具
- 查询
+ 查询
批量编辑
批量保存
新增
@@ -503,8 +503,18 @@
+
+
-
+
关闭
@@ -720,6 +730,9 @@ export default {
},
carrierModelFlag: false, // 固定载具对话框标记
carrierList: [], // 固定载具列表
+ carrierPage: 1,
+ carrierLimit: 20,
+ carrierTotal: 0,
carrierSearchData: { // 固定载具查询条件
carrierNo: '',
carrierTypeName: '',
@@ -1743,16 +1756,23 @@ export default {
// ===================== 分卷优化方法结束 =====================
// 查询固定载具列表
- queryFixedCarrierList() {
+ queryFixedCarrierList(resetPage) {
+ if (resetPage === true) {
+ this.carrierPage = 1
+ }
const params = {
site: this.scheduleData.site,
carrierNo: this.carrierSearchData.carrierNo,
carrierTypeName: this.carrierSearchData.carrierTypeName,
- specification: this.carrierSearchData.specification
+ specification: this.carrierSearchData.specification,
+ page: this.carrierPage,
+ limit: this.carrierLimit
}
getFixedCarrierList(params).then(({data}) => {
if (data && data.code === 0) {
- this.carrierList = data.data
+ const page = data.page || {}
+ this.carrierList = page.list || []
+ this.carrierTotal = page.totalCount || 0
this.carrierModelFlag = true
} else {
this.$message.error(data.msg || '获取固定载具列表失败')
@@ -1762,6 +1782,17 @@ export default {
})
},
+ carrierSizeChange(val) {
+ this.carrierLimit = val
+ this.carrierPage = 1
+ this.queryFixedCarrierList(false)
+ },
+
+ carrierCurrentChange(val) {
+ this.carrierPage = val
+ this.queryFixedCarrierList(false)
+ },
+
// 选中固定载具
selectCarrier(row) {
this.pageData.fixture = row.carrierNo