diff --git a/src/api/warning-analysis/engineering-in-use.js b/src/api/warning-analysis/engineering-in-use.js index baa454ff..5ff480ff 100644 --- a/src/api/warning-analysis/engineering-in-use.js +++ b/src/api/warning-analysis/engineering-in-use.js @@ -4,3 +4,8 @@ import request from '@/utils/request' export const getUseMaintenanceWarningApi = data => { return request.get('/material/useMaintenanceWarning/list', { params: data }) } + +// 获取4级类型内容 +export const getMaTypeApi = data => { + return request.post('/material/select/getMaType', data) +} \ No newline at end of file diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue index d449f801..9913277d 100644 --- a/src/views/material/lease/outBound/index.vue +++ b/src/views/material/lease/outBound/index.vue @@ -781,7 +781,8 @@ export default { approveSignList: [], currentRowData: null, // 当前查看的行数据 leaseLoading: false, - taskType: '' + taskType: '', + currentRow: {}, } }, created() { @@ -847,7 +848,12 @@ export default { parentId: this.parentIdTemp, outNum: 1, publishTask: this.publishTask, - jiJuType: item.jiJuType + jiJuType: item.jiJuType, + leaseUnit: this.currentRow.leaseUnit, + leaseUnitId: this.currentRow.leaseUnitId, + leaseProject: this.currentRow.leaseProject, + leaseProjectId: this.currentRow.leaseProjectId, + taskId: this.currentRow.taskId }) }) this.single = selection.length != 1 @@ -957,6 +963,8 @@ export default { /** 出库按钮操作 */ handleOut(row) { + this.currentRow = row + // console.log('🚀 ~ handleOut ~ this.currentRow:', this.currentRow) this.getListOutInfo = [] const { id, publishTask } = row this.publishTask = publishTask @@ -983,7 +991,7 @@ export default { // console.log(row) let obj = {} console.log('row', row) - this.$set(obj, 'taskId', row.taskId) + // this.$set(obj, 'taskId', row.taskId) this.$set(obj, 'id', row.id) this.$set(obj, 'manageType', 1) this.$set(obj, 'maId', row.maId) @@ -997,6 +1005,11 @@ export default { this.$set(obj, 'num', row.num) //库存 this.$set(obj, 'unitValue', row.unitValue) this.$set(obj, 'unitName', row.unitName) + this.$set(obj, 'leaseUnit', this.currentRow.leaseUnit) + this.$set(obj, 'leaseUnitId', this.currentRow.leaseUnitId) + this.$set(obj, 'leaseProject', this.currentRow.leaseProject) + this.$set(obj, 'leaseProjectId', this.currentRow.leaseProjectId) + this.$set(obj, 'taskId', this.currentRow.taskId) console.log('[obj]', [obj]) this.outNumList = [obj] }, diff --git a/src/views/material/materialStation/authorize/index.vue b/src/views/material/materialStation/authorize/index.vue index cc95c5a9..45821492 100644 --- a/src/views/material/materialStation/authorize/index.vue +++ b/src/views/material/materialStation/authorize/index.vue @@ -734,13 +734,14 @@ export default { this.isBatchMode = false this.dialogTitle = '新增授权' this.resetAuthForm() - this.getTeamList() + this.getTeamList(row.externalId) // 初始化领料人数据 this.materialReceivers = [ { name: '', idNumber: '', + phone:'', idFrontPhoto: null, idBackPhoto: null, frontUploading: false, @@ -763,18 +764,28 @@ export default { return } + // 检查所有选中的申请单是否属于同一个班组 + const firstTeamId = this.selectedItems[0].externalId + const allSameTeam = this.selectedItems.every(item => item.externalId === firstTeamId) + + if (!allSameTeam) { + this.$message.error('批量授权只能选择相同班组的申请单') + return + } + this.authDialogVisible = true this.isEditMode = false this.isBatchMode = true this.dialogTitle = `批量授权 (${this.selectedItems.length}条)` this.resetAuthForm() - this.getTeamList() + this.getTeamList(firstTeamId) // 初始化领料人数据 this.materialReceivers = [ { name: '', idNumber: '', + phone:'', idFrontPhoto: null, idBackPhoto: null, frontUploading: false, @@ -817,9 +828,9 @@ export default { } }, // 获取班组列表 - getTeamList() { + getTeamList(externalId) { const params = { - externalId: null + externalId: externalId } getTeamList(params).then(response => { this.teamList = response.data @@ -869,6 +880,7 @@ export default { this.materialReceivers.push({ name: '', idNumber: '', + phone:'', idFrontPhoto: null, idBackPhoto: null, frontUploading: false, @@ -1004,7 +1016,7 @@ export default { this.isEditMode = true this.isBatchMode = false this.dialogTitle = '编辑授权' - this.getTeamList() + this.getTeamList(row.externalId) // 重置表单状态 this.resetAuthForm() @@ -1046,6 +1058,7 @@ export default { idNumber: item.idNumber, idFrontPhoto: item.frontUrl, idBackPhoto: item.backUrl, + phone:item.phone, frontUploading: false, backUploading: false })) @@ -1112,8 +1125,10 @@ export default { }) // 获取选中的班组名称 - const selectedTeam = this.teamList.find(team => team.id === this.authForm.teamId) - const teamName = selectedTeam ? selectedTeam.name : '' + // const selectedTeam = this.teamList.find(team => team.id === this.authForm.teamId); + // const teamName = selectedTeam ? selectedTeam.name : ''; + const teamName = this.authForm.teamName; + console.log("teamName", teamName) const requestData = { teamId: this.authForm.teamId, @@ -1124,7 +1139,8 @@ export default { name: receiver.name, idNumber: receiver.idNumber, frontUrl: receiver.idFrontPhoto, - backUrl: receiver.idBackPhoto + backUrl: receiver.idBackPhoto, + phone:receiver.phone })) } diff --git a/src/views/warning-analysis/engineering-in-use/index.vue b/src/views/warning-analysis/engineering-in-use/index.vue index a580170f..38fe122e 100644 --- a/src/views/warning-analysis/engineering-in-use/index.vue +++ b/src/views/warning-analysis/engineering-in-use/index.vue @@ -24,16 +24,29 @@ @keyup.enter.native="handleQuery" /> - + @@ -43,16 +56,20 @@ - + + 导出数据 + +
总计:{{ total }}
+
@@ -91,7 +108,8 @@