From 1b9c40a43faddab1496fdb9cbb9b26335a114c6c Mon Sep 17 00:00:00 2001 From: jinna Date: Wed, 25 Mar 2026 17:33:40 +0800 Subject: [PATCH] =?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 --- .../inspectionArchiving/rbFilePreserve.js | 2 +- .../basicData/components/addRuleDialog.vue | 38 ++++++++++++++----- .../basic/qualityGrade.vue | 19 +++++----- .../productionTesting/productionQuality.vue | 6 +-- .../inspectionArchiving/auditFile/index.vue | 4 +- .../rbFilePreserve/addPreserve.vue | 6 +-- .../rbFilePreserve/index.vue | 4 +- .../leveragingManagement.vue | 1 + src/views/zhgd-work/workReport/index.vue | 4 +- 9 files changed, 52 insertions(+), 32 deletions(-) diff --git a/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js b/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js index b52c44d..6941eef 100644 --- a/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js +++ b/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js @@ -66,7 +66,7 @@ export const getWorkList = (params) =>{ // 获取工序下拉数据 export const getProcessList = (params) =>{ return request({ - url:'/api/blade-desk/dsProcess/list', + url:'/api/blade-desk/bsProcessSet/list', method:'get', params }) diff --git a/src/views/basicData/components/addRuleDialog.vue b/src/views/basicData/components/addRuleDialog.vue index a0d841d..011ecfb 100644 --- a/src/views/basicData/components/addRuleDialog.vue +++ b/src/views/basicData/components/addRuleDialog.vue @@ -27,6 +27,8 @@ v-model="scope.row.craftAbilityId" placeholder="请选择" style="width: 100%" + filterable + > @@ -153,6 +158,8 @@ v-model="scope.row.centerId" placeholder="请选择作业中心" style="width: 100%" + filterable + clearable > @@ -204,6 +211,7 @@ export default { form:{ tableData:[] }, + craftloading:false, formRules:{ craftAbilityId:[ { required: true, message: '请选择工艺能力', trigger: ['change', 'submit'] } @@ -253,6 +261,16 @@ export default { }, methods:{ + // remoteMethodCraft(query){ + // console.log('query', query) + // if(query){ + + // }else{ + // getCapability().then(res =>{ + // this.capabilityData = res.data.data + // }) + // } + // }, getPointRule(){ getPointRule().then(res =>{ this.pointRule = res.data.data @@ -311,16 +329,16 @@ export default { }); return; } - this.form.tableData.map(item =>{ - if(item.pointType == 1 && (!item.oemId || item.oemId == '')){ - this.formError = '指定类型为外协时，请选择外协厂商'; - return - } - if(item.pointType == 0 && (!item.centerId || item.centerId == '')){ - this.formError = '指定类型为厂内时，请选择作业中心'; - return - } - }) + // this.form.tableData.map(item =>{ + // if(item.pointType == 1 && (!item.oemId || item.oemId == '')){ + // this.formError = '指定类型为外协时，请选择外协厂商'; + // return + // } + // if(item.pointType == 0 && (!item.centerId || item.centerId == '')){ + // this.formError = '指定类型为厂内时，请选择作业中心'; + // return + // } + // }) console.log('form----------',this.form.tableData) // 校验通过：准备提交数据（过滤无用字段） diff --git a/src/views/productionSchedulingPlan/basic/qualityGrade.vue b/src/views/productionSchedulingPlan/basic/qualityGrade.vue index 623c155..dddfddf 100644 --- a/src/views/productionSchedulingPlan/basic/qualityGrade.vue +++ b/src/views/productionSchedulingPlan/basic/qualityGrade.vue @@ -142,7 +142,7 @@ export default { }, { label: '类型', - prop: 'type', + prop: 'types', search: false, multiple: true, sortable: true, @@ -184,11 +184,11 @@ export default { dicData:[ { label:'是', - value:1 + value:'1' }, { label:'否', - value:0 + value:'0' } ] }, @@ -199,11 +199,11 @@ export default { dicData:[ { label:'是', - value:1 + value:'1' }, { label:'否', - value:0 + value:'0' } ], rules:[ @@ -223,10 +223,11 @@ export default { methods: { beforeOpen(done, type) { if (['edit', 'view'].includes(type)) { + console.log('form----------',this.form) done(); }else if(['add'].includes(type)){ - this.form.isLocal = 0 - this.form.isThickness = 0 + this.form.isLocal = '0' + this.form.isThickness = '0' done(); } }, @@ -234,7 +235,7 @@ export default { console.log(row); let params = { qualityGrade:row.qualityGrade, - types:row.type, + types:row.types.join(','), isLocal:row.isLocal, isThickness:row.isThickness } @@ -258,7 +259,7 @@ export default { let params = { id:row.id, qualityGrade:row.qualityGrade, - types:row.type.split(',') + types:row.types.split(',') } updateGualityGrade(params).then( () => { diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue index d5bd14e..5e9a329 100644 --- a/src/views/productionTesting/productionQuality.vue +++ b/src/views/productionTesting/productionQuality.vue @@ -1269,15 +1269,15 @@ export default { this.vxeTableData.forEach(item =>{ console.log('item--------------',item) if(item.item.specialType == '2' && (item.checkUserId == -1 || item.checkUserRealName == '')){ - this.ydInterval = setInterval(() =>{ + // this.ydInterval = setInterval(() =>{ refreshHardness().then(res =>{ console.log('res2--------------------------',res) if (res.data.data.length > 0) { item.checkValue = res.data.data[0].formatted_hardness - clearInterval(this.ydInterval) + // clearInterval(this.ydInterval) } }) - },window.YINGDU_Trigger) + // },window.YINGDU_Trigger) } }) } diff --git a/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue b/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue index 57bf840..4742ef8 100644 --- a/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue +++ b/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue @@ -105,9 +105,9 @@ export default { type: 'select', filterable: true, remote: true, - dicUrl:`/api/blade-desk/dsProcess/list?processName={{key}}`, + dicUrl:`/api/blade-desk/bsProcessSet/list?name={{key}}`, props:{ - label: 'processName', + label: 'name', value: 'id', res: 'data.records', }, diff --git a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/addPreserve.vue b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/addPreserve.vue index 425be9a..9d1272e 100644 --- a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/addPreserve.vue +++ b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/addPreserve.vue @@ -85,7 +85,7 @@ @@ -224,7 +224,7 @@ export default { if (query) { this.loading = true getProcessList({ - processName:query + name:query }).then(res =>{ this.processList = res.data.data.records; this.loading = false @@ -234,7 +234,7 @@ export default { this.loading = true getProcessList({ size:9999, - count:1 + current:1 }).then(res =>{ this.processList = res.data.data.records; this.loading = false diff --git a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue index da08c5a..c9b8afd 100644 --- a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue +++ b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue @@ -202,9 +202,9 @@ export default { type: 'select', filterable: true, remote: true, - dicUrl:`/api/blade-desk/dsProcess/list?processName={{key}}`, + dicUrl:`/api/blade-desk/bsProcessSet/list?name={{key}}`, props:{ - label: 'processName', + label: 'name', value: 'id', res: 'data.records', }, diff --git a/src/views/warehouseManagement/leveragingManagement.vue b/src/views/warehouseManagement/leveragingManagement.vue index ea14f2e..e9bd3a3 100644 --- a/src/views/warehouseManagement/leveragingManagement.vue +++ b/src/views/warehouseManagement/leveragingManagement.vue @@ -876,6 +876,7 @@ export default { endLeDate:this.query.leDate && this.query.leDate.length > 0 && this.query.leDate[1], } const {leDate,...searchParams} = params + console.log('sezrch------------',searchParams) getList({ current:this.page.currentPage, size:this.page.pageSize, 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 @@