From abf68c15706a88ff2eaa67beb18fc1912e552136 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Sat, 21 Jun 2025 17:46:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=8D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/business/leaseApply.vue | 25 +++++++-- .../repair/equipAssessment/batch-repair.vue | 21 ++++---- .../repair/equipAssessment/code-view.vue | 12 ++++- src/pages/repair/equipAssessment/details.vue | 52 ++++++++++++------- src/pages/repair/equipAssessment/index.vue | 19 +++++-- .../repair/equipAssessment/num-operate.vue | 28 +++++----- .../repair/equipAssessment/view-detail.vue | 22 +++----- src/pages/repair/equipAssessment/view.vue | 27 +++------- src/services/back.js | 9 ++++ src/services/repair/equipAssessment.js | 11 ++++ 10 files changed, 140 insertions(+), 86 deletions(-) diff --git a/src/pages/business/leaseApply.vue b/src/pages/business/leaseApply.vue index f8a7777..0dfdc88 100644 --- a/src/pages/business/leaseApply.vue +++ b/src/pages/business/leaseApply.vue @@ -23,7 +23,7 @@ > - + @@ -137,7 +137,7 @@ import { ref, reactive } from 'vue' import eselect from '@/components/tree-select/eselect.vue' import { onLoad,onReady } from '@dcloudio/uni-app' -import { getUnitList,getProjectList,getConfigList,getLevelThreeType,insertApp,getAgreementInfoById,getListsByConfigId,getTypeDataList,leaseTask } from '../../services/back.js'; +import { getUnitList,getProjectList,getConfigList,getLevelThreeType,insertApp,getAgreementInfoById,getListsByConfigId,getTypeDataList,leaseTask,getLeaseCode } from '../../services/back.js'; const taskInfo = ref({}) const treeSelect = ref(null) const treeSelect2 = ref(null) @@ -149,7 +149,7 @@ const formData = ref({ phone: '', configId: '', applyCode: '', - + code:'' } }) @@ -388,6 +388,23 @@ const getMaCode = () => { console.log(error) }) } +const getCode = () => { + let obj = { + "typeId":'' + } + getLeaseCode(obj).then(res => { + console.log('xxxxxxxxxxxx',res) + if(res.code == 200){ + formData.value.code = res.data.taskCode + } + }).catch(error => { + console.log(error) + }) +} + + + + //选择规格型号 const selectMaCode = (e) => { console.log(e) @@ -466,6 +483,7 @@ const submitNum = async() => { "agreementId":agreementId.value, "leasePerson":formData.value.leasePerson, "phone":formData.value.phone, + "code": formData.value.code, "standardConfigId":configId.value, "applyCode":formData.value.applyCode, "bmFileInfos": bmFileInfos.value, @@ -512,6 +530,7 @@ onLoad((options) => { getProject() getConfig() getMaType() + getCode() // formData.value = JSON.parse(options.item) }) //上传 diff --git a/src/pages/repair/equipAssessment/batch-repair.vue b/src/pages/repair/equipAssessment/batch-repair.vue index 0b1cb94..6cc06a8 100644 --- a/src/pages/repair/equipAssessment/batch-repair.vue +++ b/src/pages/repair/equipAssessment/batch-repair.vue @@ -384,15 +384,17 @@ const calculateCostAll = () => { //维修完成校验 const saveCode = () => { if (repairType.value == 1) { - let index1 = partItems.value.findIndex((v) => v.partId == '') - let index2 = partItems.value.findIndex((v) => v.partNum == 0) + // let index1 = partItems.value.findIndex((v) => v.partId == '') + // let index2 = partItems.value.findIndex((v) => v.partNum == 0) if (repairPerson.value == '') { uni.showToast({ title: '请先选择维修人员！', icon: 'none' }) - } else if (index1 > -1) { - uni.showToast({ title: '请先选择配件类型！', icon: 'none' }) - } else if (index2 > -1) { - uni.showToast({ title: '请填写配件数量！', icon: 'none' }) - } else { + } + // else if (index1 > -1) { + // uni.showToast({ title: '请先选择配件类型！', icon: 'none' }) + // } else if (index2 > -1) { + // uni.showToast({ title: '请填写配件数量！', icon: 'none' }) + // } + else { saveCodeApi() } } @@ -400,7 +402,8 @@ const saveCode = () => { //维修完成请求 const saveCodeApi = async () => { //请求接口 - rowData.value = queryParams.value + rowData.value.repairDeviceList = queryParams.value.selectedDevices + console.log("llllllllllllllll",queryParams.value) // 遍历所有设备列表项，为每一项设置相同的值 for (let i = 0; i < rowData.value.repairDeviceList.length; i++) { // 设置维修人员信息 @@ -432,7 +435,7 @@ const saveCodeApi = async () => { saveLossAssessmentRow(rowData.value.repairDeviceList).then(async (response) => { console.log("uuuuuuuuuuu",response) if (response.code == 200) { - uni.showToast({ title: '保存成功', icon: 'none' }) + uni.showToast({ title: '定损成功', icon: 'none' }) uni.navigateBack({ delta: 2, // 返回到已存在的页面 }) diff --git a/src/pages/repair/equipAssessment/code-view.vue b/src/pages/repair/equipAssessment/code-view.vue index 9813e53..859b339 100644 --- a/src/pages/repair/equipAssessment/code-view.vue +++ b/src/pages/repair/equipAssessment/code-view.vue @@ -31,10 +31,18 @@ - 待修数量： + 退料数量： {{ - queryParams.typeRepairNum - queryParams.typeRepairedNum + queryParams.typeRepairNum + }} + + + + 定损数量： + + {{ + queryParams.typeRepairedNum }} diff --git a/src/pages/repair/equipAssessment/details.vue b/src/pages/repair/equipAssessment/details.vue index e893b54..ea811f4 100644 --- a/src/pages/repair/equipAssessment/details.vue +++ b/src/pages/repair/equipAssessment/details.vue @@ -52,6 +52,7 @@ --> + {{ index + 1 }} 物资名称： {{ item.typeName }} @@ -73,24 +74,10 @@ {{ index + 1 }} - 已修数量： + 定损数量： {{ item.typeRepairedNum }} - - - {{ index + 1 }} - 报废数量： - - {{ item.typeScrapNum }} - - - - {{ index + 1 }} - 待修数量： - - {{ Number(item.typeRepairNum)-Number(item.typeRepairedNum)-Number(item.typeScrapNum) }} - {{ index + 1 }} @@ -117,6 +104,24 @@ /> + + {{ index + 1 }} + 状态： + + + + + @@ -206,18 +211,25 @@ const onRepairItem = (item) => { console.log(item) let codingUrl = '' if (item.manageType === 0) {// 编码维修 + // if(item.status==0){ codingUrl = '/pages/repair/equipAssessment/code-view' uni.navigateTo({ url: `${codingUrl}?queryParams=${JSON.stringify(item)}` }) + // }else{ + // uni.showToast({ + // title: '该规格已完成定损', + // icon: 'none', + // }) + // } } if (item.manageType == 1) {// 数量维修 - if(Number(item.typeRepairNum)-Number(item.typeRepairedNum)-Number(item.typeScrapNum)==0){ + if(item.status==0){ + codingUrl = '/pages/repair/equipAssessment/num-operate' + uni.navigateTo({ url: `${codingUrl}?queryParams=${JSON.stringify(item)}` }) + }else{ uni.showToast({ - title: '已完成维修', + title: '该规格已完成定损', icon: 'none', }) - }else{ - codingUrl = '/pages/repair/equipAssessment/num-operate' - uni.navigateTo({ url: `${codingUrl}?queryParams=${JSON.stringify(item)}` }) } } diff --git a/src/pages/repair/equipAssessment/index.vue b/src/pages/repair/equipAssessment/index.vue index aa5e3a0..2dfc50f 100644 --- a/src/pages/repair/equipAssessment/index.vue +++ b/src/pages/repair/equipAssessment/index.vue @@ -100,7 +100,7 @@