diff --git a/src/api/basic/basic.js b/src/api/basic/basic.js index a11370bf..453e2568 100644 --- a/src/api/basic/basic.js +++ b/src/api/basic/basic.js @@ -46,7 +46,7 @@ export function updateProject(data) { export function delProject(proId) { return request({ url: '/material/bm_project/' + proId, - method: 'post' + method: 'delete' }) } @@ -90,7 +90,7 @@ export function updateProjectLot(data) { export function delProjectLot(lotId) { return request({ url: '/material/base/bmProjectLot/' + lotId, - method: 'post' + method: 'delete' }) } //工程项目下拉数据 @@ -131,7 +131,7 @@ export function updateUnit(data) { export function delUnit(unitId) { return request({ url: '/material/bm_unit/' + unitId, - method: 'post' + method: 'delete' }) } @@ -174,7 +174,7 @@ export function unitPersonAll(query) { export function delUnitPerson(unitId) { return request({ url: '/material/bm_unit_person/' + unitId, - method: 'post' + method: 'delete' }) } @@ -266,7 +266,7 @@ export function statusUnitType(data) { export function delUnitType(typeIds) { return request({ url: '/material/bm_unit_type/' + typeIds, - method: 'post' + method: 'delete' }) } @@ -301,7 +301,7 @@ export function updatePropInfo(data) { export function delPropInfo(id) { return request({ url: `/material/bm_asset_attributes/${id}`, - method: 'post' + method: 'delete' }) } diff --git a/src/api/ma/base.js b/src/api/ma/base.js index 437b5301..b27a734f 100644 --- a/src/api/ma/base.js +++ b/src/api/ma/base.js @@ -74,7 +74,7 @@ export function queryKeeperNameApi(query) { export function delMaType(typeId) { return request({ url: '/material/ma_type/' + typeId, - method: 'post', + method: 'delete', }) } diff --git a/src/api/ma/device.js b/src/api/ma/device.js index 93d795b8..c5d052e2 100644 --- a/src/api/ma/device.js +++ b/src/api/ma/device.js @@ -40,7 +40,7 @@ export function getZichanType(query) { export function delDevice(id) { return request({ url: '/material/ma_machine/' + id, - method: 'post', + method: 'delete', }) } diff --git a/src/api/ma/partType.js b/src/api/ma/partType.js index 871ffb9a..1c20e51d 100644 --- a/src/api/ma/partType.js +++ b/src/api/ma/partType.js @@ -76,6 +76,6 @@ export function updateMaType(data) { export function delMaType(id) { return request({ url: '/material/ma_part_type/' + id, - method: 'post', + method: 'delete', }) } \ No newline at end of file diff --git a/src/api/ma/supplier.js b/src/api/ma/supplier.js index 001dfe47..a18efdec 100644 --- a/src/api/ma/supplier.js +++ b/src/api/ma/supplier.js @@ -32,7 +32,7 @@ export function getFacturerDetail(id) { export function delFacturer(id) { return request({ url: '/material/ma_supplier_info/' + id, - method: 'post', + method: 'delete', }) } diff --git a/src/api/ma/whHouse.js b/src/api/ma/whHouse.js index 2446b140..1815f1bb 100644 --- a/src/api/ma/whHouse.js +++ b/src/api/ma/whHouse.js @@ -31,7 +31,7 @@ export function queryKeeperNameApi(query) { export function delHouse(id) { return request({ url: '/material/wh_house_info/' + id, - method: 'post', + method: 'delete', }) } diff --git a/src/api/purchase/goodsBind.js b/src/api/purchase/goodsBind.js index 8009d275..5318fdfb 100644 --- a/src/api/purchase/goodsBind.js +++ b/src/api/purchase/goodsBind.js @@ -51,12 +51,11 @@ export function getListDetailById(query) { // 导出 -export function exportNewBuy(data) { +export function exportNewBuy(purchaseId) { return request({ - url: '/material/purchase/bind/downloadQrCode', + url: '/material/purchase/bind/downloadQrCode?purchaseId='+purchaseId, method: 'post', responseType: 'blob', - data: data, }) } diff --git a/src/api/repair/testExamine.js b/src/api/repair/testExamine.js index 90872f63..ae2f2775 100644 --- a/src/api/repair/testExamine.js +++ b/src/api/repair/testExamine.js @@ -20,7 +20,7 @@ export function getAuditInfo(query) { //修试审核二级-通过，驳回 export function auditPass(data) { return request({ - url: '/material/repair_audit_details', + url: '/material/repair_audit_details/innerAudit', method: 'put', data: data, }) diff --git a/src/api/repair/testedInBound.js b/src/api/repair/testedInBound.js index f989f7cc..96b13f7b 100644 --- a/src/api/repair/testedInBound.js +++ b/src/api/repair/testedInBound.js @@ -8,14 +8,14 @@ export function getListTested(query) { params: query }) } -// // 查询修试审核详细列表 -// export function getAuditInfo(query) { -// return request({ -// url: '/material/repair_audit_details/getRepairAuditList', -// method: 'get', -// params: query -// }) -// } + +// 查询修试审核详细列表 +export function getRepairedDetailList(taskId) { + return request({ + url: '/material/repair/getRepairedDetailList?taskId='+taskId, + method: 'get', + }) +} // //修试审核二级-通过，驳回 // export function auditPass(data) { diff --git a/src/views/material/basic/bmAssetAttributes/index.vue b/src/views/material/basic/bmAssetAttributes/index.vue index 985e11b1..bf7c2b8a 100644 --- a/src/views/material/basic/bmAssetAttributes/index.vue +++ b/src/views/material/basic/bmAssetAttributes/index.vue @@ -381,10 +381,9 @@ export default { /** 导出按钮操作 */ handleExport() { this.download( - 'material/base/maPropInfo/export', + 'material/bm_asset_attributes/export', { ...this.queryParams, - dataCondition: this.ids, }, `资产属性_${new Date().getTime()}.xlsx`, ) diff --git a/src/views/material/ma/supplier/index.vue b/src/views/material/ma/supplier/index.vue index 5533a04f..2157aecf 100644 --- a/src/views/material/ma/supplier/index.vue +++ b/src/views/material/ma/supplier/index.vue @@ -24,10 +24,10 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['machinery:type:add']" + v-hasPermi="['ma:info:add']" >新增 - + 编辑 @@ -76,7 +76,7 @@ type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" - v-hasPermi="['machinery:type:del']" + v-hasPermi="['ma:info:remove']" > 删除 diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue index 4496a00f..446bcb9d 100644 --- a/src/views/material/ma/type/index.vue +++ b/src/views/material/ma/type/index.vue @@ -185,7 +185,7 @@ type="text" icon="el-icon-edit" @click="handleView(scope.row)" - v-hasPermi="['machinery:type:config']" + v-hasPermi="['ma:type:query']" > 查看 diff --git a/src/views/material/ma/typeConfigKeeper/index.vue b/src/views/material/ma/typeConfigKeeper/index.vue index cd83b7be..670afa72 100644 --- a/src/views/material/ma/typeConfigKeeper/index.vue +++ b/src/views/material/ma/typeConfigKeeper/index.vue @@ -105,7 +105,7 @@ icon="el-icon-plus" size="mini" @click="handleBind" - v-hasPermi="['machinery:type:add']" + v-hasPermi="['ma:keeper:add']" >绑定 @@ -116,7 +116,7 @@ icon="el-icon-minus" size="mini" @click="handleNoBind" - v-hasPermi="['machinery:type:add']" + v-hasPermi="['ma:keeper:remove']" >解绑 diff --git a/src/views/material/ma/typeConfigRepair/index.vue b/src/views/material/ma/typeConfigRepair/index.vue index bde7c34a..786e0d57 100644 --- a/src/views/material/ma/typeConfigRepair/index.vue +++ b/src/views/material/ma/typeConfigRepair/index.vue @@ -105,7 +105,7 @@ icon="el-icon-plus" size="mini" @click="handleBind" - v-hasPermi="['machinery:type:add']" + v-hasPermi="['ma:repair:add']" >绑定 @@ -116,7 +116,7 @@ icon="el-icon-minus" size="mini" @click="handleNoBind" - v-hasPermi="['machinery:type:add']" + v-hasPermi="['ma:repair:remove']" >解绑 diff --git a/src/views/material/ma/whHouse/index.vue b/src/views/material/ma/whHouse/index.vue index f97137f1..c8465c35 100644 --- a/src/views/material/ma/whHouse/index.vue +++ b/src/views/material/ma/whHouse/index.vue @@ -39,7 +39,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['machinery:type:add']" + v-hasPermi="['warehouse:info:add']" >新增 @@ -118,7 +118,7 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['machinery:type:edit']" + v-hasPermi="['warehouse:info:edit']" > 编辑 @@ -127,7 +127,7 @@ type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" - v-hasPermi="['machinery:type:del']" + v-hasPermi="['warehouse:info:remove']" > 删除 diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue index 151ad64e..16bfba9b 100644 --- a/src/views/material/purchase/goodsBind/component/bindTools.vue +++ b/src/views/material/purchase/goodsBind/component/bindTools.vue @@ -130,7 +130,7 @@ - + diff --git a/src/views/material/repair/repairManage/component/edit.vue b/src/views/material/repair/repairManage/component/edit.vue index b5a1093b..6af84ace 100644 --- a/src/views/material/repair/repairManage/component/edit.vue +++ b/src/views/material/repair/repairManage/component/edit.vue @@ -102,6 +102,12 @@ align="center" prop="typeRepairedNum" show-overflow-tooltip + > + - - - 合格 - - { - e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); + e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum); }); // this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId) }, @@ -1306,7 +1308,7 @@ export default { const res = await getAppRepairMaTypeList(param); this.equipmentList = res.data; this.equipmentList.forEach((e) => { - e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); + e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum); }); this.$modal.msgSuccess("通过成功"); } @@ -1330,7 +1332,7 @@ export default { const res = await getAppRepairMaTypeList(param); this.equipmentList = res.data; this.equipmentList.forEach((e) => { - e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); + e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum); }); this.$modal.msgSuccess("合格成功"); }) @@ -1437,7 +1439,7 @@ export default { const res = await getAppRepairMaTypeList(param); this.equipmentList = res.data; this.equipmentList.forEach((e) => { - e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); + e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum); }); this.openCode = false; // console.log(this.equipmentList) @@ -1453,7 +1455,7 @@ export default { const res = await getAppRepairMaTypeList(param); this.equipmentList = res.data; this.equipmentList.forEach((e) => { - e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); + e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum); }); this.openCode = false; }, @@ -1863,111 +1865,188 @@ export default { } }, + async validateForms(refs){ + const validationResults = await Promise.all(refs.map(ref =>ref.validate())) + return validationResults.every(result=> result===true) + }, //数量管理保存 async saveNumAll() { - if(this.formRight.scrapNum!=0){ - this.$refs["formLeft","formMiddle","formRight"].validate(async(valid)=>{ - if(valid){ - for (let i = 0; i < this.partItems.length; i++) { - this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({ - isCharge: this.partItems[i].isCharge, - partId: this.partItems[i].partId, - partNum: this.partItems[i].partNum, - repairNum: this.formLeft.repairNum, - }); - } - for (let i = 0; i < this.partItemsMiddle.length; i++) { - this.innerRowData.repairDeviceList[0].numberOutRepairPartList.push({ - isCharge: this.partItemsMiddle[i].isCharge, - partPrice: this.partItemsMiddle[i].partPrice, - partNum: this.partItemsMiddle[i].partNum, - partName: this.partItemsMiddle[i].partName, - supplierId: this.formMiddle.supplierId, - repairNum: this.formMiddle.repairNum, - }); - } - this.uploadKey = Date.now(); - if(this.fileList.length!=0){ - await this.getImaUpload(), - this.formRight.fileList = this.fileListTemp; - }else{ - this.formRight.fileList = this.fileListTemp; - } - console.log('this.formRight',this.formRight) - this.innerRowData.repairDeviceList[0].numberScrapRepairPartList.push(this.formRight) - this.innerRowData.repairDeviceList[0].repairType = 1; - saveCodeList(this.innerRowData.repairDeviceList).then(async (response) => { - if (response.code == 200) { - this.$modal.msgSuccess("保存成功"); - this.fileList=[]; - this.fileListTemp=[]; - let param = { - taskId: this.repairRow.taskId, - keyword: "", - }; - this.taskIdTemp = this.repairRow.taskId; - const res = await getAppRepairMaTypeList(param); - this.equipmentList = res.data; - this.equipmentList.forEach((e) => { - e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); - }); - this.openNum=false; - } - }); - } - }) - }else{ - this.$refs["formLeft","formMiddle"].validate(async(valid)=>{ - if(valid){ - for (let i = 0; i < this.partItems.length; i++) { - this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({ - isCharge: this.partItems[i].isCharge, - partId: this.partItems[i].partId, - partNum: this.partItems[i].partNum, - repairNum: this.formLeft.repairNum, - }); - } - for (let i = 0; i < this.partItemsMiddle.length; i++) { - this.innerRowData.repairDeviceList[0].numberOutRepairPartList.push({ - isCharge: this.partItemsMiddle[i].isCharge, - partPrice: this.partItemsMiddle[i].partPrice, - partNum: this.partItemsMiddle[i].partNum, - partName: this.partItemsMiddle[i].partName, - supplierId: this.formMiddle.supplierId, - repairNum: this.formMiddle.repairNum, - }); - } - this.uploadKey = Date.now(); - if(this.fileList.length!=0){ - await this.getImaUpload(), - this.formRight.fileList = this.fileListTemp; - }else{ - this.formRight.fileList = this.fileListTemp; - } - console.log('this.formRight',this.formRight) - this.innerRowData.repairDeviceList[0].numberScrapRepairPartList.push(this.formRight) - this.innerRowData.repairDeviceList[0].repairType = 1; - saveCodeList(this.innerRowData.repairDeviceList).then(async (response) => { - if (response.code == 200) { - this.$modal.msgSuccess("保存成功"); - this.fileList=[]; - this.fileListTemp=[]; - let param = { - taskId: this.repairRow.taskId, - keyword: "", - }; - this.taskIdTemp = this.repairRow.taskId; - const res = await getAppRepairMaTypeList(param); - this.equipmentList = res.data; - this.equipmentList.forEach((e) => { - e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); - }); - this.openNum=false; - } - }); - } - }) + let refTemp = []; + if(this.formLeft.repairNum!=0){ + refTemp.push(this.$refs.formLeft) } + if(this.formMiddle.repairNum!=0){ + refTemp.push(this.$refs.formMiddle) + } + if(this.formRight.scrapNum!=0){ + refTemp.push(this.$refs.formRight) + } + const valid = await this.validateForms(refTemp) + if(valid){ + for (let i = 0; i < this.partItems.length; i++) { + this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({ + isCharge: this.partItems[i].isCharge, + partId: this.partItems[i].partId, + partNum: this.partItems[i].partNum, + repairNum: this.formLeft.repairNum, + }); + } + for (let i = 0; i < this.partItemsMiddle.length; i++) { + this.innerRowData.repairDeviceList[0].numberOutRepairPartList.push({ + isCharge: this.partItemsMiddle[i].isCharge, + partPrice: this.partItemsMiddle[i].partPrice, + partNum: this.partItemsMiddle[i].partNum, + partName: this.partItemsMiddle[i].partName, + supplierId: this.formMiddle.supplierId, + repairNum: this.formMiddle.repairNum, + }); + } + this.uploadKey = Date.now(); + if(this.fileList.length!=0){ + await this.getImaUpload(), + this.formRight.fileList = this.fileListTemp; + }else{ + this.formRight.fileList = this.fileListTemp; + } + console.log('this.formRight',this.formRight) + this.innerRowData.repairDeviceList[0].numberScrapRepairPartList.push(this.formRight) + this.innerRowData.repairDeviceList[0].repairType = 1; + saveCodeList(this.innerRowData.repairDeviceList).then(async (response) => { + if (response.code == 200) { + this.$modal.msgSuccess("保存成功"); + this.fileList=[]; + this.fileListTemp=[]; + let param = { + taskId: this.repairRow.taskId, + keyword: "", + }; + this.taskIdTemp = this.repairRow.taskId; + const res = await getAppRepairMaTypeList(param); + this.equipmentList = res.data; + this.equipmentList.forEach((e) => { + e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum); + }); + this.openNum=false; + } + }); + } + // this.$refs.refTemp.validate(async(valid)=>{ + // if(valid){ + // for (let i = 0; i < this.partItems.length; i++) { + // this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({ + // isCharge: this.partItems[i].isCharge, + // partId: this.partItems[i].partId, + // partNum: this.partItems[i].partNum, + // repairNum: this.formLeft.repairNum, + // }); + // } + // } + // }) + // } + // if(this.formRight.scrapNum!=0){ + // this.$refs["formLeft","formMiddle","formRight"].validate(async(valid)=>{ + // if(valid){ + // for (let i = 0; i < this.partItems.length; i++) { + // this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({ + // isCharge: this.partItems[i].isCharge, + // partId: this.partItems[i].partId, + // partNum: this.partItems[i].partNum, + // repairNum: this.formLeft.repairNum, + // }); + // } + // for (let i = 0; i < this.partItemsMiddle.length; i++) { + // this.innerRowData.repairDeviceList[0].numberOutRepairPartList.push({ + // isCharge: this.partItemsMiddle[i].isCharge, + // partPrice: this.partItemsMiddle[i].partPrice, + // partNum: this.partItemsMiddle[i].partNum, + // partName: this.partItemsMiddle[i].partName, + // supplierId: this.formMiddle.supplierId, + // repairNum: this.formMiddle.repairNum, + // }); + // } + // this.uploadKey = Date.now(); + // if(this.fileList.length!=0){ + // await this.getImaUpload(), + // this.formRight.fileList = this.fileListTemp; + // }else{ + // this.formRight.fileList = this.fileListTemp; + // } + // console.log('this.formRight',this.formRight) + // this.innerRowData.repairDeviceList[0].numberScrapRepairPartList.push(this.formRight) + // this.innerRowData.repairDeviceList[0].repairType = 1; + // saveCodeList(this.innerRowData.repairDeviceList).then(async (response) => { + // if (response.code == 200) { + // this.$modal.msgSuccess("保存成功"); + // this.fileList=[]; + // this.fileListTemp=[]; + // let param = { + // taskId: this.repairRow.taskId, + // keyword: "", + // }; + // this.taskIdTemp = this.repairRow.taskId; + // const res = await getAppRepairMaTypeList(param); + // this.equipmentList = res.data; + // this.equipmentList.forEach((e) => { + // e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum); + // }); + // this.openNum=false; + // } + // }); + // } + // }) + // }else{ + // this.$refs["formLeft","formMiddle"].validate(async(valid)=>{ + // if(valid){ + // for (let i = 0; i < this.partItems.length; i++) { + // this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({ + // isCharge: this.partItems[i].isCharge, + // partId: this.partItems[i].partId, + // partNum: this.partItems[i].partNum, + // repairNum: this.formLeft.repairNum, + // }); + // } + // for (let i = 0; i < this.partItemsMiddle.length; i++) { + // this.innerRowData.repairDeviceList[0].numberOutRepairPartList.push({ + // isCharge: this.partItemsMiddle[i].isCharge, + // partPrice: this.partItemsMiddle[i].partPrice, + // partNum: this.partItemsMiddle[i].partNum, + // partName: this.partItemsMiddle[i].partName, + // supplierId: this.formMiddle.supplierId, + // repairNum: this.formMiddle.repairNum, + // }); + // } + // this.uploadKey = Date.now(); + // if(this.fileList.length!=0){ + // await this.getImaUpload(), + // this.formRight.fileList = this.fileListTemp; + // }else{ + // this.formRight.fileList = this.fileListTemp; + // } + // console.log('this.formRight',this.formRight) + // this.innerRowData.repairDeviceList[0].numberScrapRepairPartList.push(this.formRight) + // this.innerRowData.repairDeviceList[0].repairType = 1; + // saveCodeList(this.innerRowData.repairDeviceList).then(async (response) => { + // if (response.code == 200) { + // this.$modal.msgSuccess("保存成功"); + // this.openNum=false; + // } + // }); + // this.fileList=[]; + // this.fileListTemp=[]; + // let param = { + // taskId: this.repairRow.taskId, + // keyword: "", + // }; + // this.taskIdTemp = this.repairRow.taskId; + // const res = await getAppRepairMaTypeList(param); + // this.equipmentList = res.data; + // this.equipmentList.forEach((e) => { + // e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum); + // }); + + // } + // }) + // } }, //数量管理取消 @@ -1995,6 +2074,12 @@ export default { }else{ this.flagSave = false; } + if(Number(this.formMiddle.repairNum)==0){ + this.resetForm("formMiddle") + } + if(Number(this.formRight.scrapNum)==0){ + this.resetForm("formRight") + } }, }, diff --git a/src/views/material/repair/testedInBound/index.vue b/src/views/material/repair/testedInBound/index.vue index b3120813..6d9425f9 100644 --- a/src/views/material/repair/testedInBound/index.vue +++ b/src/views/material/repair/testedInBound/index.vue @@ -189,19 +189,19 @@ - + - - - - - -