From a0c661ae699dc4295c94e629288441fbe342ea9b Mon Sep 17 00:00:00 2001 From: jinna Date: Thu, 28 May 2026 10:04:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionArchiving/auditFile/index.vue | 52 +++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue b/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue index 4a927e4c..f0e789b6 100644 --- a/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue +++ b/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue @@ -21,7 +21,29 @@ :permission="getPermission" :before-open="beforeOpen" @sort-change="sortChange" - > + > + + @@ -97,7 +119,7 @@ export default { // }, column: [ { - label: '工序名称', + label: '工序', prop: 'ppsId', labelWidth: 150, // bind: 'bsProcedureSet.ppsName', @@ -114,6 +136,13 @@ export default { value: 'id', res: 'data.records', }, + rules: [ + { + required: true, + message: '请选择工序', + trigger: 'click', + }, + ], }, { label: '作业中心', @@ -138,6 +167,22 @@ export default { }, ], }, + { + label: '工艺能力', + prop: 'caId', + width: 150, + labelWidth: 150, + search: false, + sortable: 'custom', + filterable: true, + span: 24, + // type: 'select', + // dicUrl: '/api/blade-desk/BA/WorkCenter/listForSelect', + // props: { + // label: 'wcName', + // value: 'id', + // }, + }, { label: '生产标识', prop: 'pqId', @@ -294,7 +339,8 @@ export default { referenceFile:row.referenceFile, wcId:row.wcId, papers:row.papers, - prodApplyArea:row.prodApplyArea + prodApplyArea:row.prodApplyArea, + caId:row.caId, } addFile(params).then(res =>{ if(res.data.code == 200){ From daa130c577aa3baa18ac7b8f43c2b45c103646bb Mon Sep 17 00:00:00 2001 From: jinna Date: Thu, 28 May 2026 11:57:17 +0800 Subject: [PATCH 2/3] =?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 --- src/views/costStatistics/index.vue | 28 ++++++++++++++++++- .../components/settlementAnomaly.vue | 4 ++- .../productionTesting/productionQuality.vue | 16 +++++++---- .../ERecord/printDialog.vue | 2 +- 4 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/views/costStatistics/index.vue b/src/views/costStatistics/index.vue index 8e5a2143..d8960fba 100644 --- a/src/views/costStatistics/index.vue +++ b/src/views/costStatistics/index.vue @@ -117,7 +117,7 @@ export default { tip: false, simplePage: true, searchShow: true, - searchMenuSpan: 18, + searchMenuSpan: 12, searchIcon: true, searchIndex: 3, tree: false, @@ -178,6 +178,18 @@ export default { overHidden: true, width:80, }, + { + label:"交付中心", + prop:"jcId", + type:'select', + dicUrl:"/api/blade-system/dict/dictionary?code=workCenterJfCenter", + props:{ + label:"dictValue", + value:"dictKey" + }, + search: true, + width:110 + }, { label: '制造费用(元)', prop: 'productCost', @@ -214,6 +226,15 @@ export default { sortable: 'custom', overHidden: true, }, + { + label:'erp作业中心材料费用(元)', + prop:'erpWorkCenterMaterialCost', + search:false, + width: 180, + sortable: false, + sortable: 'custom', + overHidden: true, + }, { label: '单位成本(元)', prop: 'unitCost', @@ -586,7 +607,11 @@ export default { size:this.page.pageSize, ...this.query }).then(res =>{ + res.data.data.records.map(item =>{ + item.jcId = item.jcId != -1 ? item.jcId + '' : '' + }) this.data = res.data.data.records + console.log('data---------',this.data) this.page.total = res.data.data.total this.loading = false @@ -599,6 +624,7 @@ export default { workCenterId:this.data[0].workCenterId }).then(res =>{ console.log('res---------',res) + this.detailData = res.data.data this.$refs.crud.setCurrentRow(this.data[0]); // this.handleCurrentRowChange(this.data[0]); diff --git a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue index 024adb26..e827c9ef 100644 --- a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue +++ b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue @@ -566,7 +566,9 @@ export default { price: this.form && this.form.price, postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[0], postPlatingStorageTimeEnd:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[1], - memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'), + memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? + this.query.memo.join(';') : this.query.memo && this.query.memo.indexOf(',') != -1 ? this.query.memo.split(',').join(';') : this.query.memo, + // memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'), }; if(params.putStoreTime) delete params.putStoreTime; diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue index 9dd9b510..70b3a25b 100644 --- a/src/views/productionTesting/productionQuality.vue +++ b/src/views/productionTesting/productionQuality.vue @@ -144,6 +144,7 @@ :expand-row-keys="expandedRowKeys" @expand-change="handleExpandChange" :default-expand-all="false" + :cell-class-name="tableClassName" > @@ -442,7 +443,7 @@ align="center" > this.dialogData.poQty * 0.01){ + return 'high_td'; + } + } + }, cellClassName({ row, column, rowIndex, columnIndex }) { - console.log('row=============',row) - console.log('column=============',column) - console.log('rowIndex=============',rowIndex) - console.log('columnIndex=============',columnIndex) if(column.property == 'gaugeValue7'){ if(row.codeStatus == true){ return 'high_td'; diff --git a/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue b/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue index 7a2c44ed..80527f73 100644 --- a/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue +++ b/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue @@ -638,7 +638,7 @@ export default { if (this.modelTwo[i].procedureSet.ppsName.indexOf('检验') != -1) { if (testWorkPlan == null) { testWorkPlan = this.modelTwo[i]; - if (this.modelThree && this.modelThree.checkList) { + if (this.modelThree && this.modelThree.checkList && this.modelThree.checkList.length > 0) { const item = this.modelThree.checkList.find( (item) => item.testOrders.indexOf(testWorkPlan.orders + '-') != -1 From e179bdd76b702eb714521da7f23d8cce49a8df16 Mon Sep 17 00:00:00 2001 From: jinna Date: Thu, 28 May 2026 17:33:02 +0800 Subject: [PATCH 3/3] =?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 --- .../productionTesting/productionQuality.js | 9 +++ .../productionTesting/productionQuality.vue | 79 +++++++++++++------ .../ERecord/printDialog.vue | 4 +- .../components/batchDialog.vue | 7 +- 4 files changed, 71 insertions(+), 28 deletions(-) diff --git a/src/api/qualityManagement/productionTesting/productionQuality.js b/src/api/qualityManagement/productionTesting/productionQuality.js index 87c98645..45dad55a 100644 --- a/src/api/qualityManagement/productionTesting/productionQuality.js +++ b/src/api/qualityManagement/productionTesting/productionQuality.js @@ -142,4 +142,13 @@ export const getParamRemind = (data) =>{ method:'post', data }) +} + +// 获取零件子件 +export const getPartChild = (params) =>{ + return request({ + url:'/api/blade-desk/dsPart/detail', + method:'get', + params + }) } \ No newline at end of file diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue index 70b3a25b..98eb0df9 100644 --- a/src/views/productionTesting/productionQuality.vue +++ b/src/views/productionTesting/productionQuality.vue @@ -180,6 +180,9 @@ + - - + + - + - + + + - + - +