diff --git a/src/views/repairTest/equipmentToRepair/dialogOneForm.vue b/src/views/repairTest/equipmentToRepair/dialogOneForm.vue index 84ea56d..53f3453 100644 --- a/src/views/repairTest/equipmentToRepair/dialogOneForm.vue +++ b/src/views/repairTest/equipmentToRepair/dialogOneForm.vue @@ -11,8 +11,30 @@ @close="cancel" >
-
总金额（元）：{{ totalPrice }}
+
总金额（元）：{{ totalPrice }}
+ + + + + - -
+ +

@@ -277,6 +299,129 @@ >
+
+

+
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + +
+
取消 @@ -369,6 +514,7 @@ export default { dynamicValidateForm: { equipmentId: null , maId:'', + repairType: null, premiumList: [ { selected: 'Y', @@ -385,6 +531,23 @@ export default { repairRemark: '', // 技术鉴定 }, ], + premiumListTwo: [ + { + selected: 'Y', + premium: undefined, + rate: undefined, + feeRate: undefined, + fee: undefined, + baofei1_unit: '', + shangyoufeiyonge_unit: '', + downRate: undefined, + downFee: undefined, + xiayoufeiyonge_unit: '', + fileList: [], + repairRemark: '', // 技术鉴定 + repairContent: '', + }, + ], }, deptList: [], userSelectList: [], @@ -406,6 +569,7 @@ export default { equipmentId: undefined, maId: '', maCodeSelectList: [], + repairTypeList:[{label:'内部维修',value:1},{label:'返厂维修',value:2}], // rules: { // equipmentId: [ // { required: true, message: '规格型号为必填项', trigger: 'change' } @@ -507,6 +671,16 @@ export default { } }, + repairTypeValidator(rule, value, callback) { + console.log("cccccc",value) + // 直接使用传入的 value 参数 + if (!value) { // 包括 null, undefined, '' 等情况 + callback(new Error('维修类型不能为空')); + } else { + callback(); // 验证通过 + } + }, + typeCodeValidator(rule, value, callback) { console.log("cccccc",this.dynamicValidateForm.maId) // 直接使用传入的 value 参数 @@ -566,6 +740,9 @@ export default { this.dynamicValidateForm.premiumList.forEach((domain) => { domain.repairNum = 1 }) + this.dynamicValidateForm.premiumListTwo.forEach((domain) => { + domain.repairNum = 1 + }) }) }else{ this.showSelect = false @@ -584,6 +761,20 @@ export default { }); }, + handleChangeRepairType(value) { + console.log("gggggggg",value) + this.$nextTick(() => { + this.$refs.dynamicValidateForm.validateField('repairType'); + }); + if(value==2){ + this.dynamicValidateForm.premiumList = [] + this.addDomainTwo() + }else if(value==1){ + this.dynamicValidateForm.premiumListTwo = [] + this.addDomainOne() + } + }, + // 获取 设备树结构数据 async GetDeviceTypeTree() { const params = { @@ -625,26 +816,43 @@ export default { this.dynamicValidateForm = { equipmentId: null, maId: '', - premiumList: [] + repairType: null, + premiumList: [], + premiumListTwo: [], }; console.log("xxxxxxxxxxxxxxx",this.rowObj) if(this.rowObj!=null && this.rowObj.id){ const res = await getEquipmentInfo({ id: this.rowObj.id}) - this.dynamicValidateForm.maId = res.data.maId this.dynamicValidateForm.equipmentId = res.data.typeId - this.dynamicValidateForm.premiumList = res.data.partList.map((item, index) => ({ - ...item, - key: `${Date.now()}_${index}` // 生成唯一 key - })) - this.dynamicValidateForm.premiumList.forEach((domain, index) => { - if (domain.partId) { - this.handleSelectTreeEdit(domain.partId, index) + this.dynamicValidateForm.maId = res.data.maId + this.dynamicValidateForm.repairType = res.data.repairType + this.maCodeSelectList = [] + if(res.data.repairType==1){ + // 内部维修 + this.dynamicValidateForm.premiumList = res.data.partList.map((item, index) => ({ + ...item, + key: `${Date.now()}_${index}` // 生成唯一 key + })) + this.dynamicValidateForm.premiumList.forEach((domain, index) => { + if (domain.partId) { + this.handleSelectTreeEdit(domain.partId, index) + } + }) + if(res.data.partList.length==0){ + this.dynamicValidateForm.premiumList.push({repairer:res.data.repairer,updateTime:res.data.repairTime,repairNum:res.data.repairNum}) + } + }else{ + // 返厂维修 + this.dynamicValidateForm.premiumListTwo = res.data.partList.map((item, index) => ({ + ...item, + })) + if(res.data.partList.length==0){ + this.dynamicValidateForm.premiumListTwo.push({repairNum:res.data.repairNum}) + } } - this.maCodeSelectList = [] - console.log("cccccccccccc",this.deviceTypeTreeData) this.selectedNodeData = this.findNodeDevice(this.deviceTypeTreeData, res.data.typeId); - console.log("jjjjjjjjjjj",this.selectedNodeData) + if(this.selectedNodeData.manageType==0){ GetMaCodeSelectApi({ typeId: res.data.typeId, @@ -657,12 +865,9 @@ export default { this.showSelect = false this.dynamicValidateForm.maId = '' } - }) - if(res.data.partList.length==0){ - this.dynamicValidateForm.premiumList.push({repairer:res.data.repairer,updateTime:res.data.repairTime,repairNum:res.data.repairNum}) - } + }else{ - this.addDomainOne() + // this.addDomainOne() } // 获取用户信息和用户选择列表 @@ -681,7 +886,9 @@ export default { this.$refs.dynamicValidateForm.resetFields(); this.dialogShowFlag = false this.dynamicValidateForm.premiumList = []; + this.dynamicValidateForm.premiumListTwo = []; this.dynamicValidateForm.maId = ''; + this.dynamicValidateForm.repairType = null; this.dynamicValidateForm.equipmentId = null; this.selectedNodeData = null; this.maCodeSelectList = []; @@ -719,7 +926,7 @@ export default { fileList: [], partChange: '', partChangeNum: '', - updateTime: formatDate(new Date()), + updateTime: formatDate(new Date()), }; this.dynamicValidateForm.premiumList.push(newDomain); }, @@ -729,20 +936,52 @@ export default { ) }, + + // 返厂 + addDomainTwo() { + this.dynamicValidateForm.premiumListTwo.push({ + selected: 'N', + partName: '', + repairer: '', + partType: 0, + partNum: '', + partCost: '', + repairContent: '', + repairContentBefore: '', + repairNum: 1, + key: Date.now(), + repairRemark: '', + fileList: [], + }) + }, + submit() { this.$refs['dynamicValidateForm'].validate((valid) => { if (valid) { //新增 if(this.rowObj==null || this.rowObj.id==''){ - // 编码管理传递参数 - console.log('this.dynamicValidateForm.premiumList1111)', this.dynamicValidateForm.premiumList) - let params = { - maId: this.dynamicValidateForm.maId === '' ? null : this.dynamicValidateForm.maId, - typeId: this.selectedNodeData.id, - companyId: this.companyId, - partStrList: JSON.stringify(this.dynamicValidateForm.premiumList), - manageType: this.selectedNodeData.manageType, - repairNum: this.dynamicValidateForm.premiumList[0]?.repairNum ?? 1, + let params = {} + // 如果是内部维修 + if(this.dynamicValidateForm.repairType==1){ + params = { + repairType: this.dynamicValidateForm.repairType, + maId: this.dynamicValidateForm.maId === '' ? null : this.dynamicValidateForm.maId, + typeId: this.selectedNodeData.id, + companyId: this.companyId, + partStrList: JSON.stringify(this.dynamicValidateForm.premiumList), + manageType: this.selectedNodeData.manageType, + repairNum: this.dynamicValidateForm.premiumList[0]?.repairNum ?? 1, + } + }else if(this.dynamicValidateForm.repairType==2){ + params = { + repairType: this.dynamicValidateForm.repairType, + maId: this.dynamicValidateForm.maId === '' ? null : this.dynamicValidateForm.maId, + typeId: this.selectedNodeData.id, + companyId: this.companyId, + partStrList: JSON.stringify(this.dynamicValidateForm.premiumListTwo), + manageType: this.selectedNodeData.manageType, + repairNum: this.dynamicValidateForm.premiumListTwo[0]?.repairNum ?? 1, + } } this.fullscreenLoading = true submitEquipmentApiNew(params) @@ -761,18 +1000,33 @@ export default { this.fullscreenLoading = false }) }else{ - //编辑 - // 编码管理传递参数 - console.log('this.dynamicValidateForm.premiumList1111)', this.dynamicValidateForm.premiumList) - let params = { - id: this.rowObj.id, - maId: this.dynamicValidateForm.maId === '' ? null : this.dynamicValidateForm.maId, - typeId: this.selectedNodeData.id, - companyId: this.companyId, - partStrList: JSON.stringify(this.dynamicValidateForm.premiumList), - manageType: this.selectedNodeData.manageType, - repairNum: this.dynamicValidateForm.premiumList[0]?.repairNum ?? 1, + // 编辑 + let params = {} + // 如果是内部维修 + if(this.dynamicValidateForm.repairType==1){ + params = { + id: this.rowObj.id, + repairType: this.dynamicValidateForm.repairType, + maId: this.dynamicValidateForm.maId === '' ? null : this.dynamicValidateForm.maId, + typeId: this.selectedNodeData.id, + companyId: this.companyId, + partStrList: JSON.stringify(this.dynamicValidateForm.premiumList), + manageType: this.selectedNodeData.manageType, + repairNum: this.dynamicValidateForm.premiumList[0]?.repairNum ?? 1, + } + }else if(this.dynamicValidateForm.repairType==2){ + params = { + id: this.rowObj.id, + repairType: this.dynamicValidateForm.repairType, + maId: this.dynamicValidateForm.maId === '' ? null : this.dynamicValidateForm.maId, + typeId: this.selectedNodeData.id, + companyId: this.companyId, + partStrList: JSON.stringify(this.dynamicValidateForm.premiumListTwo), + manageType: this.selectedNodeData.manageType, + repairNum: this.dynamicValidateForm.premiumListTwo[0]?.repairNum ?? 1, + } } + this.fullscreenLoading = true editEquipmentApiNew(params) .then((res) => { @@ -952,6 +1206,7 @@ export default { flex-direction: row; justify-content: flex-start; font-size: 12px; + margin-left:20px; } .form_box_line { diff --git a/src/views/repairTest/equipmentToRepair/index.vue b/src/views/repairTest/equipmentToRepair/index.vue index c08aac3..ace3366 100644 --- a/src/views/repairTest/equipmentToRepair/index.vue +++ b/src/views/repairTest/equipmentToRepair/index.vue @@ -95,6 +95,12 @@ + + +