From 05a7dba0af9bd330628d55532cdd94bd6d706bb3 Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Tue, 8 Jul 2025 15:30:19 +0800
Subject: [PATCH] 2025/7/8
---
src/api/part/bomManagement.js | 6 +
src/views/modules/part/bomManagement.vue | 268 +++++++++++++++++-
src/views/modules/part/recipeManagement.vue | 130 ++++++++-
.../com_bm_printingIndigo.vue | 19 +-
4 files changed, 410 insertions(+), 13 deletions(-)
diff --git a/src/api/part/bomManagement.js b/src/api/part/bomManagement.js
index 9ba7769..4538576 100644
--- a/src/api/part/bomManagement.js
+++ b/src/api/part/bomManagement.js
@@ -203,6 +203,12 @@ export const queryPartListBom = data => createAPI(`/plm/bomManagement/queryPartL
* @returns {*}
*/
export const queryPartListAll = data => createAPI(`/plm/bomManagement/queryPartListAll`,'post',data)
+/**
+ * 查出计划人
+ * @param data
+ * @returns {*}
+ */
+export const queryProductGroupId4 = data => createAPI(`/plm/bomManagement/queryProductGroupId4`,'post',data)
/**
* 查子物料BOM
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 79743d3..0e68d70 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -158,6 +158,10 @@
+
+ 计划人
+
+
@@ -499,6 +503,16 @@
+
+ 计划人
+
+
+
+
+
+
+
+
查询
@@ -945,6 +959,111 @@
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+ 关闭
+
+
+
@@ -990,7 +1109,9 @@ import ChooseList from '@/views/modules/common/Chooselist'
import {isAuth} from "../../../utils";
import FilterSearch from "../../common/filterSearch.vue";
import {partAllInfoSearchAny} from "../../../api/part/partAllInfoSearch";
-import {bomManagementSearchAny} from "../../../api/part/bomManagement";
+import {bomManagementSearchAny, queryProductGroupId4} from "../../../api/part/bomManagement";
+import {queryWorkCenterList} from "../../../api/part/workCenter";
+import {queryWorkerLevelList} from "../../../api/base/laborClass";
export default {
// 组件
@@ -1042,6 +1163,18 @@ export default {
this.partData.partNo = this.partData.partNo.toUpperCase()
}
},
+ 'componentPartProductGroupId4Data.productGroupId4': {
+ deep: true,
+ handler: function (newV, oldV) {
+ this.componentPartData.productGroupId4 = this.componentPartProductGroupId4Data.productGroupId4
+ }
+ },
+ 'componentPartProductGroupId4SaveData.productGroupId4': {
+ deep: true,
+ handler: function (newV, oldV) {
+ this.modalData.productGroupId4 = this.componentPartProductGroupId4SaveData.productGroupId4
+ }
+ }
},
// 对象
@@ -1069,6 +1202,12 @@ export default {
pageIndex4: 1,
pageSize4: 20,
totalPage4: 0,
+ pageIndex5: 1,
+ pageSize5: 20,
+ totalPage5: 0,
+ pageIndex6: 1,
+ pageSize6: 20,
+ totalPage6: 0,
selectedDataNum: 0,
// 条件查询
searchData: {
@@ -1115,7 +1254,8 @@ export default {
updateBy: '',
printUnit: '',
printUnitName: '',
- officialFlag: ''
+ officialFlag: '',
+ productGroupId4: ''
},
detailData: {
site: this.$store.state.user.site,
@@ -1179,9 +1319,25 @@ export default {
plmPartNo: '',
partDesc: '',
status: '',
+ productGroupId4: '',
+ partStatus: 'all',
page: 1,
limit: 10
},
+ componentPartProductGroupId4Data: {
+ productGroupId4: '',
+ productGroupName4: '',
+ site: this.$store.state.user.site,
+ page: 1,
+ limit: 20
+ },
+ componentPartProductGroupId4SaveData: {
+ productGroupId4: '',
+ productGroupName4: '',
+ site: this.$store.state.user.site,
+ page: 1,
+ limit: 20
+ },
copyPartData: {
type: '',
site: this.$store.state.user.site,
@@ -1278,6 +1434,8 @@ export default {
operationList: [],
multiLevelStructureList: [],
componentPartBomList: [],
+ productGroupId4List: [],
+ productGroupId4SaveList: [],
// ======== 列表表头 ========
columnList: [
{
@@ -1688,7 +1846,7 @@ export default {
columnWidth: 130
},
{
- columnProp: 'partStatus',
+ columnProp: 'partStatusDesc',
headerAlign: "center",
align: "left",
columnLabel: '零件状态',
@@ -2672,6 +2830,30 @@ export default {
columnWidth: 80
},
],
+ productGroupId4ColumnList: [
+ {
+ columnProp: 'productGroupId4',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '计划人编码',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 80
+ },
+ {
+ columnProp: 'productGroupName4',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '计划人名称',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ }
+ ],
// ======== 必填规则 ========
rules: {
partNo: [
@@ -2808,6 +2990,8 @@ export default {
copyAlternativeModelFlag: false,
headerSaveFlag: false,
manufStructCostDistribModal: false,
+ productGroupId4ModelFlag: false,
+ productGroupId4SaveModelFlag: false,
filterVisible: false,
isFilterSearch: false,
filterSearchData: {},
@@ -3517,7 +3701,8 @@ export default {
status: this.detailData.status,
createBy: this.$store.state.user.name,
updateBy: this.$store.state.user.name,
- informationList: this.subDetailList
+ informationList: this.subDetailList,
+ productGroupId4: this.modalData.productGroupId4
}
if (this.modalData.flag === '1') {
this.saveAllLoading = true
@@ -4747,6 +4932,81 @@ export default {
this.isFilterSearch = true
this.filterVisible = false
},
+
+ queryProductGroupId4(){
+ this.componentPartProductGroupId4Data.productGroupId4 = this.componentPartData.productGroupId4
+ this.componentPartProductGroupId4Data.limit = this.pageSize5
+ this.componentPartProductGroupId4Data.page = this.pageIndex5
+ this.componentPartProductGroupId4Data.site = this.$store.state.user.site
+ queryProductGroupId4(this.componentPartProductGroupId4Data).then(({data}) => {
+ if (data && data.code === 0) {
+ this.productGroupId4List = data.rows.list
+ this.pageIndex5 = data.rows.currPage
+ this.pageSize5 = data.rows.pageSize
+ this.totalPage5 = data.rows.totalCount
+ this.productGroupId4ModelFlag = true
+ } else {
+ this.productGroupId4List = []
+ }
+ })
+ },
+
+ getProductGroupId4RowData(row) {
+ this.componentPartData.productGroupId4 = row.productGroupId4
+ queryPartListAll(this.componentPartData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.componentPartList = data.page.list
+ } else {
+ this.componentPartList = []
+ }
+ })
+ this.productGroupId4ModelFlag = false
+ },
+
+ sizeChangeHandle5(val){
+ this.pageSize5 = val
+ this.pageIndex5 = 1
+ this.queryProductGroupId4()
+ },
+
+ currentChangeHandle5(val) {
+ this.pageIndex5 = val
+ this.queryProductGroupId4()
+ },
+
+ sizeChangeHandle6(val){
+ this.pageSize6 = val
+ this.pageIndex6 = 1
+ this.queryProductGroupId4Save()
+ },
+
+ currentChangeHandle6(val) {
+ this.pageIndex6 = val
+ this.queryProductGroupId4Save()
+ },
+
+ queryProductGroupId4Save(){
+ this.componentPartProductGroupId4SaveData.productGroupId4 = this.modalData.productGroupId4
+ this.componentPartProductGroupId4SaveData.limit = this.pageSize6
+ this.componentPartProductGroupId4SaveData.page = this.pageIndex6
+ this.componentPartProductGroupId4SaveData.site = this.$store.state.user.site
+ queryProductGroupId4(this.componentPartProductGroupId4SaveData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.productGroupId4SaveList = data.rows.list
+ this.pageIndex6 = data.rows.currPage
+ this.pageSize6 = data.rows.pageSize
+ this.totalPage6 = data.rows.totalCount
+ this.productGroupId4SaveModelFlag = true
+ } else {
+ this.productGroupId4SaveList = []
+ }
+ })
+ },
+
+ getProductGroupId4SaveRowData(row){
+ this.modalData.productGroupId4 = row.productGroupId4
+ this.productGroupId4SaveModelFlag = false
+ }
}
}
diff --git a/src/views/modules/part/recipeManagement.vue b/src/views/modules/part/recipeManagement.vue
index babe92d..1e0a45a 100644
--- a/src/views/modules/part/recipeManagement.vue
+++ b/src/views/modules/part/recipeManagement.vue
@@ -152,6 +152,10 @@
+
+ 计划人
+
+
保存
Copy
@@ -835,6 +839,58 @@
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+ 关闭
+
+
+
@@ -879,6 +935,7 @@ import {isAuth} from "../../../utils";
import FilterSearch from "../../common/filterSearch.vue";
import {bomSearchHeaderAny} from "../../../api/part/bomSearch3";
import {recipeManagementSearchAny} from "../../../api/part/recipeManagement";
+import {queryProductGroupId4} from "../../../api/part/bomManagement";
export default {
// 组件
@@ -957,6 +1014,9 @@ export default {
pageIndex4: 1,
pageSize4: 20,
totalPage4: 0,
+ pageIndex5: 1,
+ pageSize5: 20,
+ totalPage5: 0,
selectedDataNum: 0,
// 条件查询
searchData: {
@@ -1002,7 +1062,15 @@ export default {
updateBy: '',
printUnit: '',
printUnitName: '',
- officialFlag: ''
+ officialFlag: '',
+ productGroupId4: '',
+ },
+ componentPartProductGroupId4SaveData: {
+ productGroupId4: '',
+ productGroupName4: '',
+ site: this.$store.state.user.site,
+ page: 1,
+ limit: 20
},
detailData: {
site: this.$store.state.user.site,
@@ -1176,6 +1244,7 @@ export default {
componentPartCurrentRow: {},
// ======== 数据列表 ========
dataList: [],
+ productGroupId4SaveList: [],
partList: [],
componentPartList: [],
copyPartList: [],
@@ -1426,6 +1495,30 @@ export default {
columnWidth: 100
}
],
+ productGroupId4ColumnList: [
+ {
+ columnProp: 'productGroupId4',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '计划人编码',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 80
+ },
+ {
+ columnProp: 'productGroupName4',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '计划人名称',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ }
+ ],
partColumnList: [
{
columnProp: 'plmPartNo',
@@ -2780,6 +2873,7 @@ export default {
copyAlternativeModelFlag: false,
headerSaveFlag: false,
manufStructCostDistribModal: false,
+ productGroupId4SaveModelFlag: false,
filterVisible: false,
isFilterSearch: false,
filterSearchData: {},
@@ -4585,6 +4679,40 @@ export default {
this.isFilterSearch = true
this.filterVisible = false
},
+
+ sizeChangeHandle5(val){
+ this.pageSize5 = val
+ this.pageIndex5 = 1
+ this.queryProductGroupId4Save()
+ },
+
+ currentChangeHandle5(val) {
+ this.pageIndex5 = val
+ this.queryProductGroupId4Save()
+ },
+
+ queryProductGroupId4Save(){
+ this.componentPartProductGroupId4SaveData.productGroupId4 = this.modalData.productGroupId4
+ this.componentPartProductGroupId4SaveData.limit = this.pageSize5
+ this.componentPartProductGroupId4SaveData.page = this.pageIndex5
+ this.componentPartProductGroupId4SaveData.site = this.$store.state.user.site
+ queryProductGroupId4(this.componentPartProductGroupId4SaveData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.productGroupId4SaveList = data.rows.list
+ this.pageIndex5 = data.rows.currPage
+ this.pageSize5 = data.rows.pageSize
+ this.totalPage5 = data.rows.totalCount
+ this.productGroupId4SaveModelFlag = true
+ } else {
+ this.productGroupId4SaveList = []
+ }
+ })
+ },
+
+ getProductGroupId4SaveRowData(row){
+ this.modalData.productGroupId4 = row.productGroupId4
+ this.productGroupId4SaveModelFlag = false
+ }
}
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue
index 940dfd6..c441554 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue
@@ -36,7 +36,7 @@
-
-
+
+
-
+
+
油墨代号/颜色IFS No
@@ -261,6 +262,7 @@
codeNo:'',
printSide:'',
order:'',
+ showOrder: null,
colorReference:'',
inkCode:'',
colorMatch:'',
@@ -331,8 +333,8 @@
}
let number = 1
for (let i = 0; i < this.colorTable.length; i++) {
- if (number <= this.colorTable[i].order) {
- number = Number(this.colorTable[i].order) + 1
+ if (number <= this.colorTable[i].showOrder) {
+ number = Number(this.colorTable[i].showOrder) + 1
}
}
this.colorData = {
@@ -340,7 +342,8 @@
site: this.searchData.site,
codeNo: this.searchData.codeNo,
order: number,
- printSide: 'front',
+ showOrder: null,
+ printSide: 'Front',
colorReference: '',
inkCode: '',
colorMatch: '',
@@ -398,7 +401,7 @@
let tempData = {
site: this.searchData.site,
codeNo: this.searchData.codeNo,
- printSide: 'front',
+ printSide: 'Front',
}
saveBMPrintIndigoColorBatch(tempData).then(({data}) => {
if (data && data.code === 0) {