From be89648e5777ec74cbdc782c7f5d62335538adeb Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Thu, 26 Jun 2025 15:19:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/materialsStation/index.js             | 19 ++++++++++++++-----
 .../toolsBack/back/component/addReturn.vue    | 13 ++++++++++---
 .../toolsBack/back/component/home.vue         |  4 ++--
 .../apply/component/addToolsApply.vue         |  2 +-
 .../toolsLease/apply/component/homeApply.vue  | 11 +++++------
 .../outBound/component/OutCodeDlg.vue         |  9 ++++++---
 .../outBound/component/addToolsApply.vue      |  5 +++--
 .../outBound/component/homeApply.vue          | 15 +++++++--------
 8 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/src/api/materialsStation/index.js b/src/api/materialsStation/index.js
index 3e217813..ef450dbf 100644
--- a/src/api/materialsStation/index.js
+++ b/src/api/materialsStation/index.js
@@ -206,11 +206,11 @@ export function delProject(proId) {
 }
 
 // 工程项目-列表
-export function getProjectList(query) {
+export function getProjectList(data) {
   return request({
-    url: '/material/bm_project/list',
-    method: 'get',
-    params: query
+    url: '/material/select/getProjectList',
+    method: 'post',
+    data
   })
 }
 
@@ -438,7 +438,7 @@ export function submitBackApply(data) {
 // 可退料设备类型-根据协议查询
 export function getDeviceTreeByAgreementId(data) {
   return request({
-    url: '/material/select/getUseTypeTree',
+    url: '/material/material_back_apply_info/getUseTypeTree',
     method: 'post',
     data
   })
@@ -622,3 +622,12 @@ export const getBackDetailsListApi = data => {
     params: data
   })
 }
+
+// 领料出库-编码出库详情信息
+export function getDetailsByTypeId(query) {
+  return request({
+    url: '/material/material_lease_apply_info/getMachineById',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/materialsStation/toolsBack/back/component/addReturn.vue b/src/views/materialsStation/toolsBack/back/component/addReturn.vue
index c61c15a6..f131975f 100644
--- a/src/views/materialsStation/toolsBack/back/component/addReturn.vue
+++ b/src/views/materialsStation/toolsBack/back/component/addReturn.vue
@@ -31,6 +31,7 @@
         </el-form-item>
         <el-form-item label="退料工程" prop="proId">
           <el-select
+            v-if="backId == ''"
             v-model="queryParams.proId"
             placeholder="请选择退料工程"
             style="width: 240px"
@@ -38,6 +39,12 @@
           >
             <el-option v-for="item in proList" :key="item.id" :label="item.proName" :value="item.proId"></el-option>
           </el-select>
+          <el-input
+            v-else
+            v-model="queryParams.proName"
+            disabled
+            style="width: 240px"
+          />
         </el-form-item>
         <el-form-item label="班组长" prop="backPerson">
           <el-input v-model="queryParams.backPerson" placeholder="请输入班组长" disabled style="width: 240px" />
@@ -251,7 +258,7 @@
 <script>
 import {
   getProjectList,
-  getAgreementInfoById,
+  getAgreement,
   getDeviceTreeByAgreementId,
   addBackApply,
   getBackApplyInfo,
@@ -446,7 +453,7 @@ export default {
     },
     // 获取 工程名称 列表数据
     async GetProData() {
-      const res = await getProjectList({ unitId: null, isApp: true, teamName: this.queryParams.teamName })
+      const res = await getProjectList({ unitId: null, isApp: true, teamId: this.queryParams.teamId })
       this.proList = res.data
       this.queryParams.proId = null
       this.GetAgreementInfoById()
@@ -582,7 +589,7 @@ export default {
           teamId: this.queryParams.teamId,
           projectId: this.queryParams.proId
         }
-        const res = await getAgreementInfoById(params)
+        const res = await getAgreement(params)
         console.log(res)
         if (!(res.data && res.data.agreementId)) {
           // this.$message.error('当前单位和工程无协议！')
diff --git a/src/views/materialsStation/toolsBack/back/component/home.vue b/src/views/materialsStation/toolsBack/back/component/home.vue
index 65c36d31..6d03953f 100644
--- a/src/views/materialsStation/toolsBack/back/component/home.vue
+++ b/src/views/materialsStation/toolsBack/back/component/home.vue
@@ -191,7 +191,7 @@ import {
   submitBackApply,
   getBmTeamApi
 } from '@/api/materialsStation'
-import dialogFormByCq from '@/views/material/back/component/dialogFormByCq.vue'
+import dialogFormByCq from './dialogFormByCq.vue'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
@@ -333,7 +333,7 @@ export default {
       const params = {
         unitId: this.queryParams.unitId
       }
-      const res = await getProjectList({})
+      const res = await getProjectList({ unitId: null })
       this.proList = res.data
       this.queryParams.proId = null
     },
diff --git a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
index 7bfc1cc2..9f1e5165 100644
--- a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
@@ -439,7 +439,7 @@ export default {
             typeName: node.typeName,
             fullPath: path.join(' / '),
             searchKey: path.join('').toLowerCase(),
-            storageNum: node.storageNum || 0,
+            storageNum: node.num || 0,
             maTypeName: parents[parents.length - 1] || '',
             specificationType: node.typeName,
             unitName: node.unitName,
diff --git a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
index 40f40f75..2fbd1867 100644
--- a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
@@ -27,7 +27,7 @@
       <el-form-item label="状态" prop="taskStatus">
         <el-select v-model="queryParams.taskStatus" placeholder="请选择状态" clearable filterable style="width: 240px">
           <el-option
-            v-for="dict in dict.type.lease_task_status"
+            v-for="dict in dict.type.clz_lease_apply_task_status"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -66,19 +66,18 @@
       </el-table-column>
       <el-table-column label="申请时间" align="center" prop="createTime" width="160" :show-overflow-tooltip="true" />
       <el-table-column label="申请人" align="center" prop="createBy" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="领料班组" align="center" prop="teamName" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="租赁工程" align="center" prop="projectName" width="150px" :show-overflow-tooltip="true" />
+      <el-table-column label="领料班组" align="center" prop="teamName" :show-overflow-tooltip="true" />
+      <el-table-column label="租赁工程" align="center" prop="projectName" :show-overflow-tooltip="true" />
       <el-table-column
         label="领料工器具类型"
         align="center"
         prop="maTypeNames"
-        width="140px"
         :show-overflow-tooltip="true"
       ></el-table-column>
       <el-table-column label="班组长" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" width="150">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.lease_task_status" :value="scope.row.taskStatus" />
+          <dict-tag :options="dict.type.clz_lease_apply_task_status" :value="scope.row.taskStatus" />
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" width="100" prop="remark" :show-overflow-tooltip="true" />
@@ -278,7 +277,7 @@ import printJS from 'print-js'
 
 export default {
   name: 'Home',
-  dicts: ['lease_task_status', 'ma_type_manage_type'],
+  dicts: ['clz_lease_apply_task_status', 'ma_type_manage_type'],
   components: { vueEasyPrint },
   data() {
     return {
diff --git a/src/views/materialsStation/toolsLease/outBound/component/OutCodeDlg.vue b/src/views/materialsStation/toolsLease/outBound/component/OutCodeDlg.vue
index 62189de4..b7aa1e31 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/OutCodeDlg.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/OutCodeDlg.vue
@@ -28,7 +28,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
         <el-table-column label="类型名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="materialModel" :show-overflow-tooltip="true" />
+        <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
         <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
       </el-table>
     </el-dialog>
@@ -50,7 +50,9 @@ export default {
         // pageSize: 10,
         maCode: '',
         typeId: '',
-        maStatus: 1
+        // maStatus: 1,
+        teamId: '',
+        prodId: ''
       },
       outTotal: 0,
       outCodeList: [],
@@ -66,6 +68,8 @@ export default {
       this.parentIdTemp = row.parentId
       this.outNum = row.outNum
       this.outQuery.typeId = row.typeId
+      this.outQuery.teamId = row.teamId
+      this.outQuery.proId = row.proId
       this.outQuery.maCode = ''
       this.handleOutQuery()
     },
@@ -78,7 +82,6 @@ export default {
       this.selectedCodeList = val
     },
     handleOutQuery() {
-      this.outQuery.pageNum = 1
       this.getCodeList()
     },
 
diff --git a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
index 2ae62102..3ab0d5bf 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
@@ -475,7 +475,7 @@ export default {
             typeName: node.typeName,
             fullPath: path.join(' / '),
             searchKey: path.join('').toLowerCase(),
-            storageNum: node.storageNum || 0,
+            storageNum: node.num || 0,
             maTypeName: parents[parents.length - 1] || '',
             specificationType: node.typeName,
             unitName: node.unitName,
@@ -568,6 +568,7 @@ export default {
           this.equipmentList.forEach(item => {
             // item.preNum = item.preNum || 0
             item.outNum = item.preNum || 0
+            item.maCodeList = item.maCodeList || []
           })
           this.parentId = this.equipmentList[0].parentId
           console.log('🚀 ~ awaitgetApplyInfo ~ this.parentId:', this.parentId)
@@ -724,7 +725,7 @@ export default {
     // 打开出库编码弹窗
     handleOutCode(row) {
       this.rowData = row
-      this.$refs.outCode.handleOpenCode(row)
+      this.$refs.outCode.handleOpenCode({ ...row, teamId: this.maForm.teamId, proId: this.maForm.projectId })
     },
     // 选择的出库编码
     selectOutCode(val) {
diff --git a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
index 932c6f27..cf10d6d9 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
@@ -27,7 +27,7 @@
       <el-form-item label="状态" prop="taskStatus">
         <el-select v-model="queryParams.taskStatus" placeholder="请选择状态" clearable filterable style="width: 240px">
           <el-option
-            v-for="dict in dict.type.lease_task_status"
+            v-for="dict in dict.type.clz_lease_apply_task_status"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -59,19 +59,18 @@
       </el-table-column>
       <el-table-column label="申请时间" align="center" prop="createTime" width="160" :show-overflow-tooltip="true" />
       <el-table-column label="申请人" align="center" prop="createBy" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="领料班组" align="center" prop="teamName" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="租赁工程" align="center" prop="projectName" width="150px" :show-overflow-tooltip="true" />
+      <el-table-column label="领料班组" align="center" prop="teamName" :show-overflow-tooltip="true" />
+      <el-table-column label="租赁工程" align="center" prop="projectName" :show-overflow-tooltip="true" />
       <el-table-column
         label="领料工器具类型"
         align="center"
         prop="maTypeNames"
-        width="140px"
         :show-overflow-tooltip="true"
       ></el-table-column>
       <el-table-column label="班组长" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" width="150">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.lease_task_status" :value="scope.row.taskStatus" />
+          <dict-tag :options="dict.type.clz_lease_apply_task_status" :value="scope.row.taskStatus" />
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" width="100" prop="remark" :show-overflow-tooltip="true" />
@@ -249,7 +248,7 @@
           <el-table :data="getListViewInfo" style="padding: 1px">
             <el-table-column align="center" label="序号" type="index" width="55" />
             <el-table-column label="类型名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
-            <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
+            <el-table-column label="规格型号" align="center" prop="materialModel" :show-overflow-tooltip="true" />
             <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
           </el-table>
         </vue-easy-print>
@@ -269,7 +268,7 @@ import printJS from 'print-js'
 
 export default {
   name: 'Home',
-  dicts: ['lease_task_status', 'ma_type_manage_type'],
+  dicts: ['clz_lease_apply_task_status', 'ma_type_manage_type'],
   components: { vueEasyPrint },
   data() {
     return {
@@ -398,7 +397,7 @@ export default {
     codeInfo(row) {
       this.showView = true
       this.titleView = '查看'
-      this.getListViewInfo = row.outMaCodeVoList
+      this.getListViewInfo = row.maCodeList
     },
 
     //打印