diff --git a/src/views/processManagement/procepssPlanning.vue b/src/views/processManagement/procepssPlanning.vue index 59f2836..e12cffd 100644 --- a/src/views/processManagement/procepssPlanning.vue +++ b/src/views/processManagement/procepssPlanning.vue @@ -25,7 +25,7 @@ 有效期维护 @@ -107,7 +107,7 @@ export default { tip: false, simplePage: true, searchShow: true, - searchMenuSpan: 18, + searchMenuSpan: 6, searchIcon: true, searchIndex: 3, tree: false, @@ -148,7 +148,7 @@ export default { { label: '零件号', prop: 'partCode', - search: false, + search: true, sortable: true, overHidden: true, width: 210, @@ -160,7 +160,7 @@ export default { label: '零件名称', prop: 'partName', sortable: true, - search: false, + search: true, overHidden: true, width: 170, headerAlign: 'center', @@ -348,3 +348,10 @@ export default { }, }; + diff --git a/src/views/processManagement/sinTer/index.vue b/src/views/processManagement/sinTer/index.vue index 5e7367b..2acdb8f 100644 --- a/src/views/processManagement/sinTer/index.vue +++ b/src/views/processManagement/sinTer/index.vue @@ -31,7 +31,8 @@
-
+
+
{ let resData = res.data.data; + this.dataTree = res.data.data; let arr = JSON.parse(JSON.stringify(resData).replace(/partName/g, 'name')); this.$nextTick(() => { this.createBarChart(arr); @@ -201,8 +204,6 @@ export default { this.isComponentOpen = false; } }, - // 获取组织树 - // 获取子件列表 resetFn() { @@ -240,6 +241,7 @@ export default { borderWidth: 2, borderColor: '#fff', borderRadius: 4, // 圆角半径,值越大圆角越明显 + paddingLeft: 10, }, // 动态计算节点大小:宽度=最长文本宽度,高度=行数*行高+内边距 symbolSize: (val, params) => { @@ -247,9 +249,18 @@ export default { const nodeName = params?.name || '未知节点'; const childCount = params?.children?.length || 0; const childText = `${childCount}个子件`; + const nodeQuota = nodeData?.quota !== undefined ? nodeData.quota : ''; + // 计算文本宽度 const textWidth = Math.max(nodeName.length * 12, childText.length * 12) + 30; - return [Math.max(textWidth, 100), 60]; // 高度设为60px(适配两行文本) + // 动态计算行数 + let lineCount = 2; // 默认 2 行(partCode + name) + if (nodeQuota !== '' && nodeQuota !== null) { + lineCount = 3; // 有 quota 时 3 行 + } + // 计算高度:每行 20px + 上下内边距 20px + const height = lineCount * 20 + 10; + return [Math.max(textWidth, 100), height]; // 高度设为60px(适配两行文本) }, label: { diff --git a/src/views/productionManagement/components/outsourceDialog.vue b/src/views/productionManagement/components/outsourceDialog.vue index fdc8d00..6513332 100644 --- a/src/views/productionManagement/components/outsourceDialog.vue +++ b/src/views/productionManagement/components/outsourceDialog.vue @@ -142,7 +142,9 @@ export default { this.$message.error('当前数据列表为空'); return; } - + this.itemData.forEach(item=>{ + item.runType = 1 + }) let query={ workOrderRuns:this.itemData, workPlanRuns:this.outsourceData diff --git a/src/views/productionManagement/productionMonitoring/index.vue b/src/views/productionManagement/productionMonitoring/index.vue index a52f222..4616832 100644 --- a/src/views/productionManagement/productionMonitoring/index.vue +++ b/src/views/productionManagement/productionMonitoring/index.vue @@ -37,46 +37,22 @@ 流程卡 - 优先级 + 优先级 - - 分批 + + 分批 - 异常申报 + 异常申报 - 转外协 + 转外协 - 转烧结 + 转烧结 - 关闭 + 关闭 @@ -191,7 +167,7 @@ export default { option: { height: 'auto', calcHeight: 32, - rowKey: 'cardNo', + rowKey: 'woId', tip: false, simplePage: true, searchShow: true, @@ -341,7 +317,7 @@ export default { sortable: true, overHidden: true, width: 150, - searchOrder:19, + searchOrder: 19, }, { label: '批次号', @@ -350,7 +326,7 @@ export default { sortable: true, overHidden: true, width: 150, - searchOrder:18, + searchOrder: 18, }, { label: '流程卡号', @@ -359,7 +335,7 @@ export default { sortable: true, overHidden: true, width: 150, - searchOrder:20, + searchOrder: 20, }, { label: '产品型号', @@ -658,7 +634,6 @@ export default { handleClose(row) { this.itemData = [row]; this.showClose = true; - }, // 转烧结 @@ -698,6 +673,14 @@ export default { submitPrint() { this.$refs.printForm.validate(valid => { if (valid) { + let ids = this.selectionList.map(item => item.woId); + window.open( + window.PROCESS_FLOW_CARD_PRINT + + '?wolds' + + ids.join(',') + + '&num=' + + this.printForm.quantity + ); this.printDialog = false; } }); diff --git a/src/views/productionSchedulingPlan/basic/components/addEquipment.vue b/src/views/productionSchedulingPlan/basic/components/addEquipment.vue index 158c063..878172f 100644 --- a/src/views/productionSchedulingPlan/basic/components/addEquipment.vue +++ b/src/views/productionSchedulingPlan/basic/components/addEquipment.vue @@ -113,13 +113,13 @@ -