From de560abae03c26a9cc5b90b7c3ecc30262595c0f Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Wed, 25 Mar 2026 14:36:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.js | 13 ++++++++++-- .../components/assignDaialog.vue | 2 +- .../processMainte/dsPartBasicInfo.vue | 5 +++-- src/views/processManagement/sinTer/index.vue | 13 ++++++++---- .../productionMonitoring/index.vue | 3 +++ .../qualityManagement/similarParts/index.vue | 20 +++++++++---------- src/views/zhgd-work/workReport/index.vue | 4 ++-- 7 files changed, 39 insertions(+), 21 deletions(-) diff --git a/public/config.js b/public/config.js index eb3980e..945f455 100644 --- a/public/config.js +++ b/public/config.js @@ -2,9 +2,15 @@ window.LOAD_Remind = 86400000 window.TIMED_Trigger=86400000 window.YINGDU_Trigger=3000 //硬度检测 轮巡时间 -window.PROCESS_FLOW_CARD_HEAT_METER="http://192.168.169.172:9000/jmreport/view/1154214123878776832"//工艺流程卡地址 热表公用 +window.PROCESS_FLOW_CARD_HEAT_METER="http://192.168.169.172:9000/jmreport/view/1179931264832327680"//工艺流程卡地址 热表公用 + +window.PROCESS_FLOW_CARD_HEAT_SINTER="http://192.168.169.172:9000/jmreport/view/1179931277666897920"//工艺流程卡地址 烧结 + +// 车间订单 标签打印 ?wold=20215636716975144988num=12 +window.PROCESS_FLOW_CARD_PRINT="http://192.168.169.172:9000/jmreport/view/11963457061889843202" +// 车间订单 配套单打印 192.168.169.172:9000/jmreport/view/1196345720432840704?yold=2021505360038002689 +window.PROCESS_FLOW_CARD_PRINT_SUPPORT="http://192.168.169.172:9000/jmreport/view/11963457061889843202" -window.PROCESS_FLOW_CARD_HEAT_SINTER="http://192.168.169.172:9000/jmreport/view/1154632438942031872"//工艺流程卡地址 烧结 window.SCHEDULING_DASHBOARD = "http://192.168.169.172:8088/SCHEDULING_DASHBOARD" //排产看板地址 window.SCHEDULING_EXCEPTION = "http://192.168.169.172:8088/SCHEDULING_EXCEPTION" //排产异常地址 @@ -14,6 +20,9 @@ window.PROCESS_QUALITY_RECORD = "http://192.168.169.172:9000/jmreport/view/11531 window.WARE_MATERIAL_STOCK = "http://192.168.169.172:9000/jmreport/view/1186917825215324160" //仓管-库存汇总-存料登记卡打印 + + + // 配套单打印 /jmreport/view/1188705683594706944?yoId=2008439579960193026 window.COMPANION = "http://192.168.169.172:9000/jmreport/view/1188705683594706944" diff --git a/src/views/processManagement/components/assignDaialog.vue b/src/views/processManagement/components/assignDaialog.vue index 6a19b67..0d14aae 100644 --- a/src/views/processManagement/components/assignDaialog.vue +++ b/src/views/processManagement/components/assignDaialog.vue @@ -55,7 +55,7 @@ export default { type: 'select', filterable:true, clearable: true, - dicUrl: '/blade-system/user/page?current=1&&size=99999', + dicUrl: '/blade-system/user/list-process-engineer', props: { label: 'realName', value: 'id', diff --git a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue index dc54eaf..c2b7736 100644 --- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue +++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue @@ -691,6 +691,7 @@ export default { search: false, sortable: true, overHidden: true, + cell: true, }, { label: '面积(d㎡)', @@ -698,13 +699,13 @@ export default { search: false, sortable: true, overHidden: true, - cell: true, + cell: false, }, { label: '总面积', prop: 'totalArea', - cell: true, + cell: false, search: false, sortable: true, overHidden: true, diff --git a/src/views/processManagement/sinTer/index.vue b/src/views/processManagement/sinTer/index.vue index 6bdbcd0..5e7367b 100644 --- a/src/views/processManagement/sinTer/index.vue +++ b/src/views/processManagement/sinTer/index.vue @@ -237,15 +237,18 @@ export default { symbol: 'roundRect', itemStyle: { color: '#284c89', + borderWidth: 2, + borderColor: '#fff', + borderRadius: 4, // 圆角半径，值越大圆角越明显 }, // 动态计算节点大小：宽度=最长文本宽度，高度=行数*行高+内边距 - symbolSize: params => { + symbolSize: (val, params) => { // 容错：params为空/无name时给默认值 const nodeName = params?.name || '未知节点'; const childCount = params?.children?.length || 0; const childText = `${childCount}个子件`; // 计算文本宽度 - const textWidth = Math.max(nodeName.length * 12, childText.length * 12) + 20; + const textWidth = Math.max(nodeName.length * 12, childText.length * 12) + 30; return [Math.max(textWidth, 100), 60]; // 高度设为60px（适配两行文本） }, @@ -258,9 +261,11 @@ export default { lineHeight: 20, color: '#fff', formatter: params => { - const childText =params.data.quota>=0?`${params.data.quota}个`:'' + const childText = params.data.quota >= 0 ? `${params.data.quota}个` : ''; // 去掉模板字符串缩进，用\n换行，避免多余空白 - return `${params.name}${childText ? '\n' + childText : ''}`; + return `${params.data.partCode}\n${params.name}${ + childText ? '\n' + childText : '' + }`; }, }, }, diff --git a/src/views/productionManagement/productionMonitoring/index.vue b/src/views/productionManagement/productionMonitoring/index.vue index f7df05c..a52f222 100644 --- a/src/views/productionManagement/productionMonitoring/index.vue +++ b/src/views/productionManagement/productionMonitoring/index.vue @@ -341,6 +341,7 @@ export default { sortable: true, overHidden: true, width: 150, + searchOrder:19, }, { label: '批次号', @@ -349,6 +350,7 @@ export default { sortable: true, overHidden: true, width: 150, + searchOrder:18, }, { label: '流程卡号', @@ -357,6 +359,7 @@ export default { sortable: true, overHidden: true, width: 150, + searchOrder:20, }, { label: '产品型号', diff --git a/src/views/qualityManagement/similarParts/index.vue b/src/views/qualityManagement/similarParts/index.vue index bb3aabd..679c9b1 100644 --- a/src/views/qualityManagement/similarParts/index.vue +++ b/src/views/qualityManagement/similarParts/index.vue @@ -40,7 +40,7 @@ :isShow="isShowImport" templateUrl="/blade-desk/dsSimilarParts/import-template" templateName="相似零件导入模板.xls" - importUrl="/blade-desk//dsSimilarParts/import-excel-simple" + importUrl="/blade-desk/dsSimilarParts/import-excel-simple" @closeDialog="closeDialog" > @@ -131,17 +131,17 @@ export default { column: [ { label: '零件', - prop: 'partOne', + prop: 'partOneCode', search: true, sortable: true, span: 24, - type: 'select', - filterable: true, - dicUrl: '/blade-desk/dsPart/getPartList', - props: { - label: 'partCode', - value: 'id', - }, + // type: 'select', + // filterable: true, + // dicUrl: '/blade-desk/dsPart/getPartList', + // props: { + // label: 'partCode', + // value: 'id', + // }, rules: [ { required: true, @@ -155,7 +155,7 @@ export default { }, { label: '相似零件', - prop: 'partTwo', + prop: 'partTwoCode', search: true, sortable: true, span: 24, diff --git a/src/views/zhgd-work/workReport/index.vue b/src/views/zhgd-work/workReport/index.vue index 3ba6060..c4c7232 100644 --- a/src/views/zhgd-work/workReport/index.vue +++ b/src/views/zhgd-work/workReport/index.vue @@ -16,10 +16,10 @@ From 243549edfef29c1787dbf29b6e8bc110dcefd16f Mon Sep 17 00:00:00 2001 From: jinna Date: Wed, 25 Mar 2026 14:36:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remindRedeem/remindRedeem.js | 9 ++ .../basicData/components/addRuleDialog.vue | 20 ++-- .../components/addEditDialog.vue | 2 +- .../returnReceiving.vue | 4 +- .../outsourcingAssignmentControl/index.vue | 4 - .../basic/qualityGrade.vue | 91 +++++++++++++++---- .../remindRedeem/components/batchAdd.vue | 20 +++- .../qualityManagement/remindRedeem/index.vue | 28 ++++-- .../warehouseManagement/materialPreserve.vue | 14 ++- 9 files changed, 140 insertions(+), 52 deletions(-) diff --git a/src/api/qualityManagement/remindRedeem/remindRedeem.js b/src/api/qualityManagement/remindRedeem/remindRedeem.js index 7c408e1..849f634 100644 --- a/src/api/qualityManagement/remindRedeem/remindRedeem.js +++ b/src/api/qualityManagement/remindRedeem/remindRedeem.js @@ -50,4 +50,13 @@ export const getPartList = () =>{ url:'/api/blade-desk/dsPart/getPartList', method:'get' }) +} + +// 子件下拉 +export const getSubPartList = (params) =>{ + return request({ + url:'/api/blade-desk/dsPartRelation/getSubParts', + method:'get', + params + }) } \ No newline at end of file diff --git a/src/views/basicData/components/addRuleDialog.vue b/src/views/basicData/components/addRuleDialog.vue index ddf3a7c..a0d841d 100644 --- a/src/views/basicData/components/addRuleDialog.vue +++ b/src/views/basicData/components/addRuleDialog.vue @@ -64,13 +64,6 @@ - - - - + @@ -92,6 +85,13 @@ + + + - + + @@ -113,13 +118,13 @@ export default { sortable: true, span: 12, type:'select', - rules: [ - { - required: true, - message: '请选择', - trigger: 'blur', - }, - ], + // rules: [ + // { + // required: true, + // message: '请选择', + // trigger: 'blur', + // }, + // ], dicData:[ { label:'军品', @@ -143,13 +148,13 @@ export default { sortable: true, span: 12, type:'select', - rules: [ - { - required: true, - message: '请选择', - trigger: 'blur', - }, - ], + // rules: [ + // { + // required: true, + // message: '请选择', + // trigger: 'blur', + // }, + // ], dicData:[ { label:'军品', @@ -165,7 +170,50 @@ export default { } ] }, - + { + label:"局部镀", + prop:"isLocal", + type:'radio', + rules:[ + { + required: true, + message: '请选择', + trigger: 'blur', + }, + ], + dicData:[ + { + label:'是', + value:1 + }, + { + label:'否', + value:0 + } + ] + }, + { + label:"厚金区固定厚度", + prop:"isThickness", + type:'radio', + dicData:[ + { + label:'是', + value:1 + }, + { + label:'否', + value:0 + } + ], + rules:[ + { + required: true, + message: '请选择', + trigger: 'blur', + }, + ], + } ], }, @@ -175,15 +223,20 @@ export default { methods: { beforeOpen(done, type) { if (['edit', 'view'].includes(type)) { - + done(); + }else if(['add'].includes(type)){ + this.form.isLocal = 0 + this.form.isThickness = 0 + done(); } - done(); }, rowSave(row, done, loading) { console.log(row); let params = { qualityGrade:row.qualityGrade, - types:row.type + types:row.type, + isLocal:row.isLocal, + isThickness:row.isThickness } addGualityGrade(params).then( () => { diff --git a/src/views/qualityManagement/remindRedeem/components/batchAdd.vue b/src/views/qualityManagement/remindRedeem/components/batchAdd.vue index 0d95457..b15d942 100644 --- a/src/views/qualityManagement/remindRedeem/components/batchAdd.vue +++ b/src/views/qualityManagement/remindRedeem/components/batchAdd.vue @@ -80,13 +80,13 @@ --> @@ -175,7 +175,7 @@