diff --git a/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue b/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue index 48af288..ce74a68 100644 --- a/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue +++ b/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue @@ -186,14 +186,14 @@ > - + diff --git a/src/views/processManagement/bathRefine/planClass.vue b/src/views/processManagement/bathRefine/planClass.vue index b816c10..c0f6935 100644 --- a/src/views/processManagement/bathRefine/planClass.vue +++ b/src/views/processManagement/bathRefine/planClass.vue @@ -217,8 +217,8 @@ export default { headerAlign: 'center', align: 'center', searchLabelWidth: 80, - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', rules: [ { required: true, @@ -325,6 +325,7 @@ export default { }); }, rowSave(row, done, loading) { + row.arrangeTime = row.arrangeTime+' 00:00:00'; add([{ ...row, bbpType: 1 }]).then( () => { this.onLoad(this.page); diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue index bc7b30b..d23ec3b 100644 --- a/src/views/processManagement/components/processMainte/processPlanning.vue +++ b/src/views/processManagement/components/processMainte/processPlanning.vue @@ -220,7 +220,7 @@ - + @@ -563,6 +558,7 @@ export default { modelLevelLoading: false, craftLoading: false, rank: '2', + lastConfirmedRank: '2', processLevel: '2', data: [], defaultProps: { @@ -835,7 +831,7 @@ export default { await getProcessAuthorized({ partId: this.partId, taskId: this.updateRow.id, - rank: this.rank, + rank: this.lastConfirmedRank, version: this.updateRow.version, }).then(res => { this.data = this.transformCraftTree(res.data.data); @@ -1010,13 +1006,33 @@ export default { this.form4.deleteIds = []; }, // 切换等级 - leavelChange() { + async leavelChange(newVal) { // this.$message.success('保存成功'); - this.getDetails(); - this.form1.deleteIds = []; - this.form2.deleteIds = []; - this.form3.deleteIds = []; - this.form4.deleteIds = []; + // this.getDetails(); + // this.form1.deleteIds = []; + // this.form2.deleteIds = []; + // this.form3.deleteIds = []; + // this.form4.deleteIds = []; + // 弹出确认框 + try { + await this.$confirm('确定要切换工艺级别吗?切换后当前编辑内容将丢失。', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }); + + // 用户确认:更新已确认的值,并加载数据 + this.lastConfirmedRank = newVal; + this.getDetails(); + // 清空表格选择状态(可选) + this.form1.deleteIds = []; + this.form2.deleteIds = []; + this.form3.deleteIds = []; + this.form4.deleteIds = []; + } catch (error) { + // 用户取消:恢复为上一次确认的值 + this.rank = this.lastConfirmedRank; + } }, // 获取工序号 getProcessNo(table) { diff --git a/src/views/qualityManagement/similarParts/index.vue b/src/views/qualityManagement/similarParts/index.vue index 40baa60..0cc8b48 100644 --- a/src/views/qualityManagement/similarParts/index.vue +++ b/src/views/qualityManagement/similarParts/index.vue @@ -160,12 +160,12 @@ export default { sortable: true, span: 24, filterable: true, - type: 'select', - dicUrl: '/blade-desk/dsPart/getPartList', - props: { - label: 'partCode', - value: 'id', - }, + // type: 'select', + // dicUrl: '/blade-desk/dsPart/getPartList', + // props: { + // label: 'partCode', + // value: 'id', + // }, rules: [ { required: true,