From a6564d5bc5693596fe2512815cda96d302dd0809 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Fri, 6 Jun 2025 16:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/back/component/addReturn.vue     | 27 ++++----
 .../material/back/component/queryReturn.vue   | 64 +++++++------------
 .../outBound/component/addToolsApply.vue      |  3 +
 3 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue
index eb2183e4..d0d5e390 100644
--- a/src/views/material/back/component/addReturn.vue
+++ b/src/views/material/back/component/addReturn.vue
@@ -829,25 +829,29 @@ export default {
         // 获取 任务详情数据
         async GetViewByApply(params) {
             const res = await getBackApplyInfo(this.rowId)
+            console.log('🚀 ~ GetViewByApply ~ res:', res)
             if (res.msg && res.msg != '操作成功') {
                 this.$message.warning(res.msg)
             }
-            console.log(res)
             const data = res.data
-            this.queryParams.teamId = data.backApplyInfo.teamId
+            console.log('🚀 ~ GetViewByApply ~ data:', data)
+            this.queryParams = data.backApplyInfo
             // this.unitId = this.treeParentsById(this.unitList, this.queryParams.unitId)
-            this.GetProData()
-            setTimeout(() => {
-                this.queryParams.proId = data.backApplyInfo.proId
-            }, 500)
+            // this.GetProData()
+            // setTimeout(() => {
+            //     this.queryParams.proId = data.backApplyInfo.proId
+            // }, 500)
             // this.projectId = this.treeParentsById(this.proList, this.queryParams.proId)
-            this.queryParams.phone = data.backApplyInfo.phone
-            this.queryParams.backPerson = data.backApplyInfo.backPerson
-            this.queryParams.agreementId = data.backApplyInfo.agreementId
-            this.queryParams.remark = data.backApplyInfo.remark
+            // this.queryParams.phone = data.backApplyInfo.phone
+            // this.queryParams.backPerson = data.backApplyInfo.backPerson
+            // this.queryParams.agreementId = data.backApplyInfo.agreementId
+            // this.queryParams.remark = data.backApplyInfo.remark
             this.equipmentList = data.backApplyDetailsList
             this.equipmentList.forEach(item => {
                 item.tempMaCodeList = item.maCodeList
+                const temp = item.typeName
+                item.typeName = item.materialName
+                item.typeModel = temp
             })
             this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
         },
@@ -915,7 +919,8 @@ export default {
                         phone: this.queryParams.phone,
                         remark: this.queryParams.remark,
                         agreementId: this.queryParams.agreementId,
-                        isBack
+                        isBack,
+                        taskId: this.queryParams.taskId,
                         // backTime: this.queryParams.backTime,
                         // createBy: this.queryParams.createBy,
                         // companyId: this.queryParams.companyId,
diff --git a/src/views/material/back/component/queryReturn.vue b/src/views/material/back/component/queryReturn.vue
index 50012b20..cc0a95e2 100644
--- a/src/views/material/back/component/queryReturn.vue
+++ b/src/views/material/back/component/queryReturn.vue
@@ -10,18 +10,18 @@
             label-width="100px"
         >
             <el-row>
-                <el-form-item label="退料单位" prop="proName">
+                <el-form-item label="退料班组" prop="teamName">
                     <el-input
-                        v-model="queryParams.proName"
+                        v-model="queryParams.teamName"
                         placeholder="退料单位"
                         clearable 
                         style="width: 240px"
                         :disabled="isView"
                     />
                 </el-form-item>
-                <el-form-item label="退料工程" prop="unitName">
+                <el-form-item label="退料工程" prop="proName">
                     <el-input
-                        v-model="queryParams.unitName"
+                        v-model="queryParams.proName"
                         placeholder="退料工程"
                         clearable 
                         style="width: 240px"
@@ -446,32 +446,8 @@ export default {
                         type: 'number',
                     },
                 ],
-                backPerson: [
-                    {
-                        required: true,
-                        message: '请输入班组长',
-                        trigger: 'blur',
-                    },
-                ],
-                // backTime: [
-                //     {
-                //         required: true,
-                //         message: '请选择退料时间',
-                //         trigger: 'change',
-                //     },
-                // ],
-                phone: [
-                    {
-                        required: true,
-                        trigger: 'blur',
-                        message: '请输入班组长的手机号',
-                    },
-                    {
-                        pattern: /^1[3456789]\d{9}$/,
-                        message: '请输入正确的手机号码',
-                        trigger: 'blur',
-                    },
-                ],
+                
+                
             },
             unitList: [], //单位 集合
             proList: [], // 工程 集合
@@ -498,8 +474,8 @@ export default {
         }
     },
     mounted() {
-        this.GetUnitData()
-        this.GetProData() 
+        // this.GetUnitData()
+        // this.GetProData() 
          
         if (this.backId) {//编辑
             console.log(this.backId) 
@@ -636,16 +612,22 @@ export default {
             console.log(res) 
             const data = res.data
             console.log(data) 
-            this.queryParams.teamId = data.backApplyInfo.teamId
-            this.queryParams.proId = data.backApplyInfo.proId
-            this.queryParams.unitName = data.backApplyInfo.unitName
-            this.queryParams.proName = data.backApplyInfo.proName
-            this.queryParams.phone = data.backApplyInfo.phone
-            this.queryParams.backPerson = data.backApplyInfo.backPerson
-            this.queryParams.agreementId = data.backApplyInfo.agreementId
-            this.queryParams.remark = data.backApplyInfo.remark
+            this.queryParams = data.backApplyInfo
+            // this.queryParams.teamId = data.backApplyInfo.teamId
+            // this.queryParams.proId = data.backApplyInfo.proId
+            // this.queryParams.unitName = data.backApplyInfo.unitName
+            // this.queryParams.proName = data.backApplyInfo.proName
+            // this.queryParams.phone = data.backApplyInfo.phone
+            // this.queryParams.backPerson = data.backApplyInfo.backPerson
+            // this.queryParams.agreementId = data.backApplyInfo.agreementId
+            // this.queryParams.remark = data.backApplyInfo.remark
             this.equipmentList = data.backApplyDetailsList
-            this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
+            // this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
+            this.equipmentList.forEach((item) => {
+                const temp = item.typeName
+                item.typeName = item.materialName
+                item.typeModel = temp
+            })
             // this.$set(this.queryParams, 'phone', data.phone)
             // this.queryParams.backPerson = data.backPerson
             // this.queryParams.backTime = data.backTime
diff --git a/src/views/material/lease/outBound/component/addToolsApply.vue b/src/views/material/lease/outBound/component/addToolsApply.vue
index 01e15208..efb60757 100644
--- a/src/views/material/lease/outBound/component/addToolsApply.vue
+++ b/src/views/material/lease/outBound/component/addToolsApply.vue
@@ -601,6 +601,9 @@ export default {
     async getTaskInfo() {
       // this.loading = true;
       await getApplyInfo(this.id).then(response => {
+        if (response.msg && response.msg != '操作成功') {
+          this.$message.warning(response.msg)
+        }
         this.maForm = response.data.leaseApplyInfo
         this.maForm.teamId = response.data.leaseApplyInfo.teamId
         this.maForm.projectId = response.data.leaseApplyInfo.projectId