From c0da06aa4c40cdc04da2780756aa6d3c23f0cb33 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Tue, 17 Mar 2026 19:24:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processMainte/dsPartBasicInfo.vue | 722 +++++++++++------- .../components/processMainte/dsPartIndex.vue | 4 - .../processManagement/procepssPlanning.vue | 3 +- src/views/processManagement/sinTer/index.vue | 3 +- src/views/processManagement/taskDispatch.vue | 31 +- .../processManagement/taskProcessing.vue | 36 +- 6 files changed, 470 insertions(+), 329 deletions(-) diff --git a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue index 5d5c691..ea8c2a5 100644 --- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue +++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue @@ -8,160 +8,356 @@ ref="testForm" :model="formData" :rules="rules" - label-width="120px" + label-width="90px" label-position="right" :validate-on-rule-change="false" class="vd-form-three" > - - - - - - - - - - - - - - - - - - - - - - - - - - 单 - 双 - 否 - - - 是 - 否 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
子件信息
@@ -645,15 +802,16 @@ export default { if (this.data.length > 0) { this.data.forEach(item => { item.$cellEdit = true; - item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串） - // if (item.sinTerType == 1 && item.partName.indexOf('A1') > -1) { - // item.isElectroplating = '1'; - // } + if (item.area < 0) { + item.totalArea = 0; + } else { + item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串） + } }); } this.partType = res.data.data.dsPartEntity.isSintering == '1' ? '烧结' : '热表'; - + // this.partType = '烧结'; if (this.formData.sinTerType == 3) { this.formData.glassCake = true; } else if (this.formData.sinTerType == 5) { diff --git a/src/views/processManagement/components/processMainte/dsPartIndex.vue b/src/views/processManagement/components/processMainte/dsPartIndex.vue index 5bc7f27..9b8adb8 100644 --- a/src/views/processManagement/components/processMainte/dsPartIndex.vue +++ b/src/views/processManagement/components/processMainte/dsPartIndex.vue @@ -33,10 +33,6 @@ import dsPartBasicInfo from './dsPartBasicInfo.vue'; import dsCraftPage from './dsCraft.vue' import processPlanning from './processPlanning.vue' -import { - getPartDetail,getModelList -} from '@/api/processManagement/taskProcessing'; - export default { name: 'DsPartIndex', components: { diff --git a/src/views/processManagement/procepssPlanning.vue b/src/views/processManagement/procepssPlanning.vue index 107d435..3fb196f 100644 --- a/src/views/processManagement/procepssPlanning.vue +++ b/src/views/processManagement/procepssPlanning.vue @@ -233,7 +233,7 @@ export default { sortable: true, search: false, overHidden: true, - width: 120, + headerAlign: 'center', align: 'center', }, @@ -245,6 +245,7 @@ export default { overHidden: true, headerAlign: 'center', align: 'center', + width: 120, }, ], }, diff --git a/src/views/processManagement/sinTer/index.vue b/src/views/processManagement/sinTer/index.vue index 09fa676..8eee091 100644 --- a/src/views/processManagement/sinTer/index.vue +++ b/src/views/processManagement/sinTer/index.vue @@ -82,7 +82,6 @@ export default { height: 'auto', calcHeight: 32, tip: false, - size: 'medium', simplePage: true, searchShow: true, searchMenuSpan: 6, @@ -183,7 +182,7 @@ export default { if (this.form.zijian != '') { this.isComponentOpen = false; this.isSubOpen = true; - getSinteringPart({ partCode: this.form.bujian, zPartCode: this.form.zijian }).then(res => { + getSinteringPart({ bPartCode: this.form.bujian, zPartCode: this.form.zijian }).then(res => { this.data = res.data.data; }); } else if (this.form.bujian != '') { diff --git a/src/views/processManagement/taskDispatch.vue b/src/views/processManagement/taskDispatch.vue index 132a83d..7d293f8 100644 --- a/src/views/processManagement/taskDispatch.vue +++ b/src/views/processManagement/taskDispatch.vue @@ -220,13 +220,13 @@ export default { return; } this.updateRow = this.selectionList; - this.selectionList.forEach(item => { - if (item.children && item.children.length > 0) { - item.children.forEach(element => { - this.updateRow.push(element); - }); - } - }); + // this.selectionList.forEach(item => { + // if (item.children && item.children.length > 0) { + // item.children.forEach(element => { + // this.updateRow.push(element); + // }); + // } + // }); // console.log(5555, this.updateRow); this.setCrewOpen = true; this.title = '批量分派'; @@ -234,28 +234,25 @@ export default { // 设置班组人员 setCrew(row) { this.updateRow = [row]; - if (row.children.length > 0) { - row.children.forEach(element => { - this.updateRow.push(element); - }); - } + // if (row.children.length > 0) { + // row.children.forEach(element => { + // this.updateRow.push(element); + // }); + // } // console.log(999999, this.updateRow); this.setCrewOpen = true; this.title = '分派'; }, // 设置班组人员弹框关闭 setCrewOpeSancel(isRefresh) { - // if (isRefresh) { - // this.$refs.myTable.load(); - // } this.setCrewOpen = false; - this.onLoad(this.page); + this.onLoad(this.page,this.query); }, // 重置 searchReset() { this.query = {}; this.parentId = 0; - this.onLoad(this.page); + this.onLoad(this.page,this.query); }, // 搜索 searchChange(params, done) { diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue index d586443..7635503 100644 --- a/src/views/processManagement/taskProcessing.vue +++ b/src/views/processManagement/taskProcessing.vue @@ -31,7 +31,7 @@ type="primary" link @click="organization(scope.row.partId, scope.row)" - v-if="scope.row.taskStatus == 2" + v-if="scope.row.taskStatus == 2|| scope.row.sinTerType != -1" >编制