diff --git a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue index 9083215..e1752bb 100644 --- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue +++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue @@ -678,73 +678,12 @@ export default { this.formData = {}; this.$refs.form.resetFields(); }, - loadData(partId) { - this.formData = { sinTer: false, goldMark: false }; - this.notSinTer = true; - this.notGlassCake = true; - this.$refs.form.resetFields(); - // if (partId) { - // this.$ajax.get('dsPart/getByKey/' + partId).then((res) => { - // if (this.$ifAjax(res)) { - // this.formData = res.data; - - // if (this.rowObject != null) { - // // 由子件信息页面编辑带入信息 - // this.formData.partName = this.rowObject.subName; // 零件名称=子件名称 - // this.formData.productType = this.rowObject.productType; // 产品型号 - // this.formData.material = this.rowObject.material; // 材料 - // this.formData.area = this.rowObject.area; // 面积(dm²) - // this.formData.plate = this.rowObject.plate; // 镀种 - // this.formData.plateCode = this.rowObject.plateCode; // 镀层代号 - // this.formData.plateThickness = this.rowObject.plateThickness; // 镀层厚度 - // if (this.rowObject.sinTerType == 3) { - // this.formData.glassCake = true; - // } else if (this.rowObject.sinTerType == 5) { - // this.formData.sinTer = true; - // } else { - // this.formData.glassCake = false; - // this.formData.sinTer = false; - // } - // } - - // const craftWay = this.formData.craftWay; - // if ( - // craftWay.indexOf('涂色标') !== -1 || - // craftWay.indexOf('涂色带') !== -1 - // ) { - // this.formData.markingsTest = true; - // } - // if (craftWay.indexOf('热') !== -1) { - // this.validateObj.hotDispose = true; - // } - // if (craftWay.indexOf('荧光检') !== -1) { - // this.validateObj.fluorescenceCheck = true; - // } - // if (craftWay.indexOf('喷码') !== -1) { - // this.validateObj.inkjetPrinting = true; - // } - // this.setDataLocal(); - // } - // }); - // } - this.$refs.craftEdit.getData(partId, true); - }, + setDataLocal() { this.$setItem('零件信息信息验证', this.validateObj); }, - // validatorMethod(rule, value, callback) { - // const regex = /^[0-9]\d*$/; - // if (!value) { - // callback(new Error('请输入正整数')); - // } else if (!regex.test(value)) { - // callback(new Error('请输入正整数')); - // } else { - // callback(); - // } - // }, submit(flag) { this.submitLoading = true; - console.log(98989, this.formData); this.$refs.testForm.validate(valid => { if (valid) { let isReturn = false; @@ -789,16 +728,7 @@ export default { this.$message.success('操作成功'); this.cancel(flag, res.data); }); - // this.$ajax.post('dsPart/addOrEdit', this.formData).then((res) => { - // if (this.$ifAjax(res)) { - // this.$message.success( - // this.$t('videaVueLib.publics.message.success') - // ); - // this.cancel(flag, res.data); - // this.$refs.craftEdit.getData(this.partId, true); - // } - // this.submitLoading = false; - // }); + } else { this.submitLoading = false; } diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue index 821b864..65145d9 100644 --- a/src/views/processManagement/components/processMainte/processPlanning.vue +++ b/src/views/processManagement/components/processMainte/processPlanning.vue @@ -25,9 +25,26 @@ :data="data" :props="defaultProps" @node-click="handleNodeClick" + @node-contextmenu="handleNodeRightClick" :default-expand-all="true" :expand-on-click-node="false" /> +