From 630c6bd13ca028402a3d18b244f20850df67ee8b Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Sun, 31 Aug 2025 11:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/business/index.js | 9 + src/api/lease/apply.js | 9 + src/api/lease/out.js | 17 + .../business/businessHandling/directApply.vue | 4 +- .../businessHandling/groundDirect.vue | 1458 +++++++++++++++++ .../leasePublish/component/addToolsApply.vue | 30 +- src/views/material/lease/outBound/index.vue | 108 +- .../repair/repairManage/component/view.vue | 15 +- .../material/repair/repairTest/index.vue | 319 ++++ .../material/repair/testRecord/index.vue | 551 +++++++ 10 files changed, 2512 insertions(+), 8 deletions(-) create mode 100644 src/views/business/businessHandling/groundDirect.vue create mode 100644 src/views/material/repair/repairTest/index.vue create mode 100644 src/views/material/repair/testRecord/index.vue diff --git a/src/api/business/index.js b/src/api/business/index.js index 3c74a75a..7bcacafb 100644 --- a/src/api/business/index.js +++ b/src/api/business/index.js @@ -79,6 +79,15 @@ export function receiveSubmit(data) { }) } +// 领用申请提交-新增 +export function receiveSubmitTwo(data) { + return request({ + url: '/material/directRotation/submit', + method: 'post', + data + }) +} + // 领用申请提交-编辑 export function receiveEdit(data) { return request({ diff --git a/src/api/lease/apply.js b/src/api/lease/apply.js index 25791e39..6d708dcf 100644 --- a/src/api/lease/apply.js +++ b/src/api/lease/apply.js @@ -61,6 +61,15 @@ export function getListLeasePersonApi(data) { }) } + +// 领料申请-获取库存信息 +export function getPendingOutNumByTypeId(typeId) { + return request({ + url: '/material/leaseTask/getPendingOutNumByTypeId/' + typeId, + method: 'get', + }) +} + // 领料申请租赁工程下拉框 export function getListProject(data) { return request({ diff --git a/src/api/lease/out.js b/src/api/lease/out.js index 504df62a..8ed309c4 100644 --- a/src/api/lease/out.js +++ b/src/api/lease/out.js @@ -126,6 +126,23 @@ export function rejectLeaseOut(data) { }) } +// 领料出库-删除 +export function deleteLeaseOut(data) { + return request({ + url: '/material/leaseTask/delLeaseDetails', + method: 'post', + data: data + }) +} + +// 领料出库-修改预领数量 +export function updatePreNum(data) { + return request({ + url: '/material/lease_apply_info/updateLeaseNum', + method: 'post', + data: data + }) +} // 出库数量 export function getOutNumApi(data) { return request({ diff --git a/src/views/business/businessHandling/directApply.vue b/src/views/business/businessHandling/directApply.vue index ac3bbdb9..f8262994 100644 --- a/src/views/business/businessHandling/directApply.vue +++ b/src/views/business/businessHandling/directApply.vue @@ -334,7 +334,7 @@ import { getMaTypeOpt } from '@/api/ma/base' import { getListProject, getListUnite, getAgreement } from '@/api/lease/apply' import { downloadFile, downloadFileData } from '@/utils/download' -import { getUseringData, receiveSubmit, receiveEdit, receiveDetail, getEquipmentThreeTypes } from '@/api/business/index' +import { getUseringData, receiveSubmitTwo, receiveEdit, receiveDetail, getEquipmentThreeTypes } from '@/api/business/index' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import { getToken } from '@/utils/auth' @@ -1102,7 +1102,7 @@ export default { const res = await receiveEdit(params) console.log('🚀 ~ handleSave ~ res:', res) } else { - const res = await receiveSubmit(params) + const res = await receiveSubmitTwo(params) console.log('🚀 ~ handleSave ~ res:', res) } this.$message.success('操作成功') diff --git a/src/views/business/businessHandling/groundDirect.vue b/src/views/business/businessHandling/groundDirect.vue new file mode 100644 index 00000000..b9277bec --- /dev/null +++ b/src/views/business/businessHandling/groundDirect.vue @@ -0,0 +1,1458 @@ + + + + diff --git a/src/views/business/leasePublish/component/addToolsApply.vue b/src/views/business/leasePublish/component/addToolsApply.vue index 616e0447..77bf2a56 100644 --- a/src/views/business/leasePublish/component/addToolsApply.vue +++ b/src/views/business/leasePublish/component/addToolsApply.vue @@ -63,7 +63,7 @@ :data="leaseList" @selection-change="handleSelectionChange" > - + + @@ -107,6 +108,7 @@ placeholder="请选择规格型号" style="width: 100%" :key="scope.$index" + @change="handleChangeType(scope.row)" > row.pendingNum){ this.$message.error('领料数量不能大于待发布数量') this.$set(row, 'num', row.pendingNum) - + return } + if(row.num > (row.storageNum-row.pendingOutNum)){ + const excessNum = row.storageNum - row.pendingOutNum; + this.$message.error(`领料数量不能大于剩余可出库数量${excessNum}`); + this.$set(row, 'num', row.pendingNum) + return + } + + if (row.num < 1) { this.$set(row, 'num', 1) } }, + + //规格型号切换 + async handleChangeType(row) { + console.log("xxxxxxxx",row.newTypeId) + const res = await getPendingOutNumByTypeId(row.newTypeId) + console.log('yyyyyyyyy',res.data) + if(res.code==200){ + console.log('yyyyyyyyy',res.data.pendingOutNum) + this.$set(row, 'pendingOutNum', res.data.pendingOutNum) + } + // this.$set(row, 'newTypeId', row.newTypeId) + // this.$set(row, 'num', row.num) + }, + handleSign(){ this.closeView() this.$router.push({ path: '/lease/protocol' }) diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue index aa7de3a1..420668d6 100644 --- a/src/views/material/lease/outBound/index.vue +++ b/src/views/material/lease/outBound/index.vue @@ -232,6 +232,27 @@ + + + + + @@ -244,6 +265,14 @@ > 驳回 + + 删除 + @@ -686,7 +715,7 @@ diff --git a/src/views/material/repair/repairTest/index.vue b/src/views/material/repair/repairTest/index.vue new file mode 100644 index 00000000..264e1819 --- /dev/null +++ b/src/views/material/repair/repairTest/index.vue @@ -0,0 +1,319 @@ + + + + diff --git a/src/views/material/repair/testRecord/index.vue b/src/views/material/repair/testRecord/index.vue new file mode 100644 index 00000000..34f068e2 --- /dev/null +++ b/src/views/material/repair/testRecord/index.vue @@ -0,0 +1,551 @@ + + + +