From 3dd88919723f2adc98dbe3a980bd0f5f6795b8b2 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Thu, 15 May 2025 13:35:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/equipment/index.js                    |  18 ++
 .../material/back/component/addReturn.vue     | 157 +++++++-----------
 .../back/component/dialogFormByCq.vue         |  46 ++---
 src/views/material/back/component/home.vue    |  46 +++--
 .../material/back/component/queryReturn.vue   |  35 ++--
 .../equipment/equipmentRecord/index.vue       |  97 ++++++-----
 .../lease/apply/component/addToolsApply.vue   |   2 +-
 .../outBound/component/addToolsApply.vue      |   2 +-
 8 files changed, 191 insertions(+), 212 deletions(-)

diff --git a/src/api/equipment/index.js b/src/api/equipment/index.js
index 73af42bf..552d159c 100644
--- a/src/api/equipment/index.js
+++ b/src/api/equipment/index.js
@@ -160,4 +160,22 @@ export const getSecondLeaseInfoApi = data => {
     method: 'get',
     params: data
   })
+}
+
+// 工器具台账管理-列表
+export const getRetainedEquipmentListApi = data => {
+  return request({
+    url: '/material/complex_query/getRetainedEquipmentList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 工器具台账管理-合计
+export const getRetainedEquipmentListNoPageApi = data => {
+  return request({
+    url: '/material/complex_query/getRetainedEquipmentListNoPage',
+    method: 'get',
+    params: data
+  })
 }
\ No newline at end of file
diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue
index 1663beb3..a3019e30 100644
--- a/src/views/material/back/component/addReturn.vue
+++ b/src/views/material/back/component/addReturn.vue
@@ -10,31 +10,24 @@
             label-width="100px"
         >
             <el-row>
-                <el-form-item label="退料班组" prop="unitId">
-                    <treeselect
-                        v-model="queryParams.unitId"
+                <el-form-item label="退料班组" prop="teamId">
+                    <el-select
+                        v-model="queryParams.teamId"
                         :disabled="backId != ''"
-                        :options="unitList"
-                        :normalizer="normalizer"
-                        :show-count="true"
-                        style="width: 240px"
-                        :disable-branch-nodes="true"
-                        noChildrenText="没有数据了"
-                        noOptionsText="没有数据"
-                        noResultsText="没有搜索结果"
-                        placeholder="请选择退料单位"
-                        @select="unitChange"
-                    />
-                    <!-- <el-cascader v-model="unitId"
-                        :show-all-levels="false"
-                        :options="unitList"
-                        :props="selectTreeProps"
+                        placeholder="请选择班组"
+                        clearable
                         filterable
-                        clearable 
-                        collapse-tags 
-                        @change="unitChange" 
-                        placeholder="请选择退料单位"
-                    ></el-cascader> -->
+                        style="width: 240px"
+                        @change="changeTeam"
+                        >
+                        <el-option
+                            v-for="(item, index) in teamList"
+                            :key="index"
+                            :label="item.teamName"
+                            :value="item.id"
+                            :data-key="item.id"
+                        />
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="退料工程" prop="proId">
                     <treeselect
@@ -49,25 +42,9 @@
                         noOptionsText="没有数据"
                         noResultsText="没有搜索结果"
                         placeholder="请选择退料工程"
-                        @select="proChange"
+                        @select="handleProChange"
                     />
-                    <!-- <el-cascader v-model="projectId"
-                        :show-all-levels="false"
-                        :options="proList"
-                        :props="selectTreeProps"
-                        filterable clearable
-                        collapse-tags 
-                        @change="proChange"
-                        placeholder="请选择退料工程"  
-                    ></el-cascader>   -->
                 </el-form-item>
-                <!-- <el-form-item label="协议号" prop="agreementCode">
-                    <el-input
-                        v-model="queryParams.agreementCode"
-                        disabled
-                        style="width: 240px"
-                    ></el-input>
-                </el-form-item> -->
                 <el-form-item label="退料人" prop="backPerson">
                     <el-input
                         v-model="queryParams.backPerson"
@@ -138,21 +115,6 @@
                         </template>
                     </el-input>
                 </el-col>
-                <!-- <el-cascader
-                        :key="propsKey"
-                        v-model="deviceType"
-                        :show-all-levels="false"
-                        :options="deviceTypeTree"
-                        :props="deviceTypeTreeProps"
-                        filterable
-                        collapse-tags
-                        style="width: 240px"
-                        placeholder="请选择规格型号"
-                        ref="deviceTypeCascader"
-                        popper-class="popper-select"
-                        @change="deviceTypeChange"
-                    ></el-cascader> -->
-                <!-- </el-form-item> -->
                 <el-form-item label="备注" prop="roleName">
                     <el-input
                         v-model="queryParams.remark"
@@ -210,13 +172,13 @@
             </el-table-column>
             <el-table-column label="退料数量" align="center" prop="preNum" min-width="100">
                 <template slot-scope="scope">
-                    <div
-                        style="color: rgb(2, 167, 240)"
+                    <span
+                        style="color: rgb(2, 167, 240); cursor: pointer"
                         @click="openAddCode(scope.row)"
                         v-if="scope.row.manageType == 0"
                     >
-                        添加编码
-                    </div>
+                        {{ scope.row.preNum > 0 ? scope.row.preNum : '添加编码' }}
+                    </span>
                     <el-input
                         v-if="scope.row.manageType == 1"
                         v-model.number="scope.row.preNum"
@@ -229,7 +191,7 @@
                     />
                 </template>
             </el-table-column>
-            <el-table-column label="完好数量" align="center" prop="goodNum" min-width="100">
+            <!-- <el-table-column label="完好数量" align="center" prop="goodNum" min-width="100">
                 <template slot-scope="scope">
                     <el-input
                         v-model.number="scope.row.goodNum"
@@ -252,19 +214,19 @@
                         :disabled="scope.row.manageType == 0"
                     />
                 </template>
-            </el-table-column>
-            <!-- <el-table-column label="外观判定11" align="center" prop="apDetection" min-width="120">
+            </el-table-column> -->
+            <el-table-column label="损坏价值判定" align="center" prop="apDetection" min-width="120">
                 <template slot-scope="scope">
                     <el-input
                         v-model.number="scope.row.apDetection"
-                        placeholder="外观判定"
+                        placeholder="损坏价值判定"
                         type="text"
                         clearable
                         maxlength="20"
                         style="width: 100%"
                     />
                 </template>
-            </el-table-column>  -->
+            </el-table-column> 
             <el-table-column label="备注" align="center" prop="remark" min-width="120">
                 <template slot-scope="scope">
                     <el-input
@@ -362,25 +324,25 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                    label="外观判定"
+                    label="损坏价值判断"
                     prop="apDetection"
                     align="center"
                     width="160"
                     :show-overflow-tooltip="true"
                 >
                     <template slot-scope="scope">
-                        <!-- <el-input
+                        <el-input
                             v-model.number="scope.row.apDetection"
-                            placeholder="外观判定"
+                            placeholder="损坏价值判断"
                             maxlength="20"
                             type="text"
                             clearable
                             style="width: 100%"
-                        /> -->
-                        <el-radio-group v-model="scope.row.apDetection">
+                        />
+                        <!-- <el-radio-group v-model="scope.row.apDetection">
                             <el-radio label="1">完好</el-radio>
                             <el-radio label="0">损坏</el-radio>
-                        </el-radio-group>
+                        </el-radio-group> -->
                     </template>
                 </el-table-column>
                 <el-table-column label="附件" align="center" width="120" :show-overflow-tooltip="true">
@@ -449,6 +411,7 @@ import {
 import { mapState } from 'vuex'
 import { getInfo, h } from '@/api/login'
 import { getToken } from '@/utils/auth'
+import { getBmTeamApi } from '@/api/equipment'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
@@ -506,6 +469,7 @@ export default {
                 // multiple: true,
             },
             unitList: [], //单位 集合
+            teamList: [], //班组 集合
             proList: [], // 工程 集合
             unitId: null,
             lastUnitId: null,
@@ -513,7 +477,7 @@ export default {
             lastProjectId: null,
             // 查询参数
             queryParams: {
-                unitId: null,
+                teamId: null,
                 proId: null,
                 agreementId: null, //协议id
                 agreementCode: null, //协议code
@@ -543,10 +507,10 @@ export default {
             },
             //
             queryRules: {
-                unitId: [
+                teamId: [
                     {
                         required: true,
-                        message: '请选择退料单位',
+                        message: '请选择退料班组',
                         trigger: 'change'
                     }
                 ],
@@ -673,14 +637,22 @@ export default {
                 children: node.children
             }
         },
+        changeTeam(val) {
+            console.log('🚀 ~ changeTeam ~ val:', val, this.queryParams)
+            setTimeout(() => {
+                this.GetAgreementInfoById()
+            }, 300)
+        },
+        handleProChange(val) {
+            console.log('🚀 ~ handleProChange ~ val:', val, this.queryParams)
+            setTimeout(() => {
+                this.GetAgreementInfoById()
+            }, 300)
+        },
         // 获取 来往单位 列表数据
         async GetUnitData() {
-            const params = {
-                // projectId: this.queryParams.proId /*  */,
-            }
-            const res = await getUnitList(params)
-            this.unitList = res.data
-            this.GetAgreementInfoById()
+            const res = await getBmTeamApi({ isAll: 0 })
+            this.teamList = res.data
         },
         unitChange(val) {
             // if(val&&val.length>0){
@@ -698,22 +670,11 @@ export default {
             const params = {
                 unitId: this.queryParams.unitId
             }
-            const res = await getProjectList(params)
+            const res = await getProjectList({})
             this.proList = res.data
             this.queryParams.proId = null
             this.GetAgreementInfoById()
         },
-        proChange(val) {
-            // if(val&&val.length>0){
-            //     this.queryParams.proId=this.projectId[this.projectId.length - 1]
-            // }else if(val&&val.length==0){
-            //     this.queryParams.proId=""
-            // }
-            // this.GetUnitData()
-            setTimeout(() => {
-                this.GetUnitData()
-            }, 500)
-        },
         // 获取 设备树结构数据
         async GetDeviceTypeTreeFn(agreementId) {
             const params = {
@@ -840,16 +801,16 @@ export default {
         },
         // 获取 协议id
         async GetAgreementInfoById() {
-            if (this.queryParams.unitId && this.queryParams.proId) {
+            if (this.queryParams.teamId && this.queryParams.proId) {
                 const params = {
-                    unitId: this.queryParams.unitId,
+                    teamId: this.queryParams.teamId,
                     projectId: this.queryParams.proId
                 }
                 const res = await getAgreementInfoById(params)
                 console.log(res)
                 if (!(res.data && res.data.agreementId)) {
-                    this.$message.error('当前单位和工程无协议！')
-                    this.queryParams.unitId = null
+                    // this.$message.error('当前单位和工程无协议！')
+                    this.queryParams.teamId = null
                     this.queryParams.proId = null
                     this.equipmentList = []
                     this.GetUnitData()
@@ -871,7 +832,7 @@ export default {
             }
             console.log(res)
             const data = res.data
-            this.queryParams.unitId = data.backApplyInfo.unitId
+            this.queryParams.teamId = data.backApplyInfo.teamId
             // this.unitId = this.treeParentsById(this.unitList, this.queryParams.unitId)
             this.GetProData()
             setTimeout(() => {
@@ -1101,7 +1062,7 @@ export default {
         //编码数据
         async getMachineById(typeId) {
             let param = {
-                unitId: this.queryParams.unitId,
+                teamId: this.queryParams.teamId,
                 proId: this.queryParams.proId,
                 typeId: typeId
             }
@@ -1110,7 +1071,7 @@ export default {
                 this.machineList = res.data
                 this.machineList.forEach(item => {
                     item.bmFileInfos = []
-                    item.apDetection = '1'
+                    item.apDetection = ''
                 })
             })
         },
diff --git a/src/views/material/back/component/dialogFormByCq.vue b/src/views/material/back/component/dialogFormByCq.vue
index 1fbabd47..18f0acfc 100644
--- a/src/views/material/back/component/dialogFormByCq.vue
+++ b/src/views/material/back/component/dialogFormByCq.vue
@@ -9,7 +9,7 @@
     width="1090px"
   >
     <div id="printcontent" style="height: 600px;overflow-y: scroll;padding: 0 20px;">
-      <!-- <vue-easy-print tableShow ref="printRef"> -->
+      <vue-easy-print tableShow ref="printRef">
         <div id="checkId">
         <div style="text-align: center;font-weight: 600;font-size: 16px;">
             机具设备退料单
@@ -25,14 +25,14 @@
           </div>
           <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;text-align: right;">
             <div>
-              <span>退料单位：</span><span>{{ rowObj.unitName }}</span>
+              <span>退料班组：</span><span>{{ rowObj.teamName }}</span>
             </div>
             <div>
               <span>单号：</span><span>{{ rowObj.code }}</span>
             </div>
           </div>
         </div>
-        <el-table :data="tableData" border style="width: 100%;">
+        <el-table :data="tableData" border style="width: 100%;padding: 1px 0">
           <el-table-column label="编号" align="center" type="index" width="60px"/>
           <el-table-column label="物资类型"
             align="center"
@@ -106,14 +106,14 @@
            </div>  
         </div>
       </div>
-      <!-- </vue-easy-print> -->
+      </vue-easy-print>
       <div>
         <el-button type="primary" @click="print">打印</el-button>
       </div>
     </div>
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <div style="height: 500px;overflow-y: scroll;padding: 0 20px;">
-      <!-- <vue-easy-print tableShow ref="remarksPrintRef"> -->
+      <vue-easy-print tableShow ref="remarksPrintRef">
         <div id="checkIdTwo">
         <div class="remarks_box">
           <div class="remarks_box_title">退料编码明细</div>
@@ -136,7 +136,7 @@
             </div>
           </div>
         </div>
-        <el-table :data="tableSubData" border style="width: 100%;">
+        <el-table :data="tableSubData" border style="width: 100%;padding: 1px 0">
           <el-table-column label="序号" align="center" type="index" width="60px"/>
           <el-table-column prop="materialType" label="物资类型" align="center">
           </el-table-column>
@@ -164,7 +164,7 @@
            </div>  
         </div>
       </div>
-      <!-- </vue-easy-print> -->
+      </vue-easy-print>
       </div>
       <div style="margin-top: 10px">
         <el-button type="primary" @click="remarksPrint">打印</el-button>
@@ -247,14 +247,14 @@ export default {
       this.dialogShowFlag = false;
     },
     print() {
-      // this.$refs.printRef.print();
-      printJS({
-        printable: 'checkId',
-        type: 'html',
-        targetStyles: ['*'],
-        maxWidth:'1400'
-        // 其他配置选项
-      });
+      this.$refs.printRef.print();
+      // printJS({
+      //   printable: 'checkId',
+      //   type: 'html',
+      //   targetStyles: ['*'],
+      //   maxWidth:'1400'
+      //   // 其他配置选项
+      // });
       console.log(this.rowObj)
       updatePrintStatus(this.rowObj.id).then(response => {
         if (response.code === 200) {
@@ -273,14 +273,14 @@ export default {
       this.open = true
     },
     remarksPrint() {
-      // this.$refs.remarksPrintRef.print();
-      printJS({
-        printable: 'checkIdTwo',
-        type: 'html',
-        targetStyles: ['*'],
-        maxWidth:'1400'
-        // 其他配置选项
-      });
+      this.$refs.remarksPrintRef.print();
+      // printJS({
+      //   printable: 'checkIdTwo',
+      //   type: 'html',
+      //   targetStyles: ['*'],
+      //   maxWidth:'1400'
+      //   // 其他配置选项
+      // });
     },
     
   }
diff --git a/src/views/material/back/component/home.vue b/src/views/material/back/component/home.vue
index 8cd2881a..e65a5a23 100644
--- a/src/views/material/back/component/home.vue
+++ b/src/views/material/back/component/home.vue
@@ -43,14 +43,22 @@
                     ></el-option> -->
                 </el-select>
             </el-form-item> 
-            <el-form-item  prop="unitId">
-                <treeselect
-                    v-model="queryParams.unitId"
-                    :options="unitList" :normalizer="normalizer"
-                    :show-count="true" style="width: 240px" :disable-branch-nodes="true"
-                    noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
-                    placeholder="请选择退料单位" @select="unitChange"
-                /> 
+            <el-form-item  prop="teamId">
+                 <el-select
+                    v-model="queryParams.teamId"
+                    placeholder="请选择班组"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                    >
+                    <el-option
+                        v-for="(item, index) in teamList"
+                        :key="index"
+                        :label="item.teamName"
+                        :value="item.id"
+                        :data-key="item.id"
+                    />
+                </el-select>
             </el-form-item>
             <el-form-item  prop="proId">
                 <treeselect
@@ -88,7 +96,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="typeList" border @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
             <!-- <el-table-column label="序号" align="center" width="80" type="index">
                 <template scope="scope">
@@ -100,7 +108,7 @@
                 <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="退料单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="150"/>
+            <el-table-column label="退料班组" align="center" prop="teamName" :show-overflow-tooltip="true" width="150"/>
             <el-table-column label="退料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="150"/>
             <el-table-column label="退料单号" align="center" prop="code" :show-overflow-tooltip="true" width="150"/>
             <el-table-column label="物资类型" align="center" prop="typeName" :show-overflow-tooltip="true" width="200"/>
@@ -200,6 +208,7 @@ import {
     backApplyRemove,
     submitBackApply
 } from '@/api/back/index.js'
+import { getBmTeamApi } from '@/api/equipment'
 // import { getInfo, h } from '@/api/login'
 // import {
 //     getUnitData,
@@ -245,7 +254,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 keyWord: '', //关键字
-                unitId: null, //单位id
+                teamId: '', //班组id
                 lotId: '', //工程id
                 status: '', //状态
                 typeId: '', //工机具类型
@@ -293,7 +302,7 @@ export default {
             openTextTwo: '',
             openTextThree: '',
             companyId: '', 
-            unitList: [],
+            teamList: [],
             proList: [],
             taskStatusList: [
                 {
@@ -336,8 +345,8 @@ export default {
                 const params = {
                     // projectId: this.queryParams.proId /*  */,
                 }
-                const res = await getUnitList(params)
-                this.unitList = res.data 
+                const res = await getBmTeamApi({  isAll: 0 })
+                this.teamList = res.data 
         },
         unitChange(val){ 
             setTimeout(()=>{
@@ -349,7 +358,7 @@ export default {
                 const params = {
                     unitId: this.queryParams.unitId,
                 }
-                const res = await getProjectList(params)
+                const res = await getProjectList({})
                 this.proList = res.data;
                 this.queryParams.proId=null
         },
@@ -377,7 +386,9 @@ export default {
                 this.typeList = res.data.rows
                 this.total = res.data.total
                 this.loading = false
-            } catch (error) {}
+            } catch (error) {
+                this.loading = false
+            }
         },
         /** 搜索按钮操作 */
         handleQuery() {
@@ -388,9 +399,8 @@ export default {
         resetQuery() {
             this.queryParams.time = []
             // this.resetForm("queryForm");
-            this.unitId=null;
+            this.queryParams.teamId = ""
             this.projectId=null;
-            this.queryParams.unitId = ""
             this.queryParams.proId = ""
             this.$refs.queryForm.resetFields()
             this.initSelectData()
diff --git a/src/views/material/back/component/queryReturn.vue b/src/views/material/back/component/queryReturn.vue
index d452d2b4..5f9d9a41 100644
--- a/src/views/material/back/component/queryReturn.vue
+++ b/src/views/material/back/component/queryReturn.vue
@@ -187,7 +187,7 @@
                     <div v-if="scope.row.manageType==1">{{ scope.row.preNum }}</div>
                 </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
                 label="完好数量"
                 align="center"
                 prop="goodNum"
@@ -200,23 +200,14 @@
                 prop="badNum"
                 min-width="120"
             >
-            </el-table-column>
-            <!-- <el-table-column
-                label="外观判定22"
+            </el-table-column> -->
+            <el-table-column
+                label="损坏价值判定"
                 align="center"
                 prop="apDetection"
                 min-width="120"
             >
-                <template slot-scope="scope">
-                    <el-input
-                        v-model.number="scope.row.apDetection"
-                        placeholder="外观判定"
-                        type="text" :readonly="isView"
-                        clearable  maxlength="20"
-                        style="width: 100%"
-                    />
-                </template>
-            </el-table-column> -->
+            </el-table-column>
 
             <el-table-column
                 label="备注"
@@ -297,19 +288,13 @@
                         <dict-tag :options="dict.type.ma_machine_status" :value="scope.row.maStatus"/>
                     </template>
                 </el-table-column>
-                <el-table-column label="外观判定" prop="apDetection" align="center" width="160" :show-overflow-tooltip="true">
-                    <template slot-scope="scope">
-                    <!-- <el-input
-                        v-model.number="scope.row.apDetection"
-                        placeholder="外观判定" maxlength="20"
-                        type="text"  clearable :readonly="isView"
-                        style="width: 100%"
-                    /> -->
+                <el-table-column label="损坏价值判定" prop="apDetection" align="center" width="160" :show-overflow-tooltip="true">
+                    <!-- <template slot-scope="scope">
                     <el-radio-group v-model="scope.row.apDetection" disabled>
                         <el-radio label="1">完好</el-radio>
                         <el-radio label="0">损坏</el-radio>
                     </el-radio-group>
-                </template>
+                </template> -->
                 </el-table-column>
                 <el-table-column label="附件" align="center" width="100">
                     <template slot-scope="scope">
@@ -651,7 +636,7 @@ export default {
             console.log(res) 
             const data = res.data
             console.log(data) 
-            this.queryParams.unitId = data.backApplyInfo.unitId
+            this.queryParams.teamId = data.backApplyInfo.teamId
             this.queryParams.proId = data.backApplyInfo.proId
             this.queryParams.unitName = data.backApplyInfo.unitName
             this.queryParams.proName = data.backApplyInfo.proName
@@ -861,7 +846,7 @@ export default {
         //编码下拉选数据
         getMachineById(typeId){
             let param = {
-                unitId:this.queryParams.unitId,
+                teamId:this.queryParams.teamId,
                 proId:this.queryParams.proId,
                 typeId:typeId
             }
diff --git a/src/views/material/equipment/equipmentRecord/index.vue b/src/views/material/equipment/equipmentRecord/index.vue
index e6211228..86155480 100644
--- a/src/views/material/equipment/equipmentRecord/index.vue
+++ b/src/views/material/equipment/equipmentRecord/index.vue
@@ -56,7 +56,7 @@
       <el-table-column label="在库数量" align="center" prop="storeNum" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
-          <span class="clickText" v-if="scope.row.manageType == '编码'" @click="openRecords(scope.row)">
+          <span class="clickText" v-if="scope.row.manageType == '编码' && scope.row.storeNum > 0" @click="openRecords(scope.row)">
             {{ scope.row.storeNum }}
           </span>
           <!-- 否则，直接显示数字 -->
@@ -67,13 +67,13 @@
       </el-table-column>
       <el-table-column label="在用数量" align="center" prop="usNum" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span class="clickText" @click="openUserRecords(scope.row)">
+          <span v-if="scope.row.manageType == '编码' && scope.row.usNum > 0" class="clickText" @click="openUserRecords(scope.row)">
             {{ scope.row.usNum }}
           </span>
           <!-- 否则，直接显示数字 -->
-          <!-- <span v-else>
-              {{ scope.row.usNum }}
-              </span> -->
+          <span v-else>
+            {{ scope.row.usNum }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="总保有量" align="center" prop="allNum" :show-overflow-tooltip="true"></el-table-column>
@@ -119,13 +119,13 @@
         ></el-table-column>
         <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
         <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-        <el-table-column label="入库数量" align="center" prop="storeNum" :show-overflow-tooltip="true" />
+        <!-- <el-table-column label="入库数量" align="center" prop="storeNum" :show-overflow-tooltip="true" /> -->
         <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true" />
         <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
-        <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true" />
+        <!-- <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true" /> -->
         <el-table-column label="操作人" align="center" prop="inputUser" :show-overflow-tooltip="true" />
         <el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true" />
-        <el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true" />
+        <!-- <el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true" /> -->
       </el-table>
       <pagination
         v-show="dialogTotal > 0"
@@ -169,7 +169,7 @@
         <el-table-column label="在用数量" align="center" prop="usNum" :show-overflow-tooltip="true" />
         <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true" />
         <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
-        <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true" />
+        <!-- <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true" /> -->
         <el-table-column label="操作人" align="center" prop="creator" :show-overflow-tooltip="true" />
         <el-table-column label="出库时间" align="center" prop="outTime" :show-overflow-tooltip="true" />
         <el-table-column
@@ -194,8 +194,8 @@
 
 <script>
 import {
-  getRetainedEquipmentListApi,
-  getRetainedEquipmentListNoPageApi,
+  // getRetainedEquipmentListApi,
+  // getRetainedEquipmentListNoPageApi,
   getStorageInfoListApi,
   getUserRecordListApi,
   getRepairRecordListApi,
@@ -204,6 +204,7 @@ import {
   getToScrapInputListApi,
   getAuditInputListApi
 } from '@/api/stquery/stquery'
+import { getRetainedEquipmentListApi, getRetainedEquipmentListNoPageApi } from '@/api/equipment'
 export default {
   name: '',
   dicts: [],
@@ -251,7 +252,7 @@ export default {
         keyWord: undefined
       },
       useRecordList: [], //在用设备列表
-      dialogUserTotal: 0,
+      dialogUserTotal: 0
     }
   },
   created() {
@@ -268,39 +269,43 @@ export default {
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum
       }
-      const res = await getRetainedEquipmentListApi(params)
-      if (res.data.rows.length > 0) {
-        this.tableList = res.data.rows
-      } else {
-        this.tableList = []
+      try {
+        const res = await getRetainedEquipmentListApi(params)
+        if (res.data.rows.length > 0) {
+          this.tableList = res.data.rows
+        } else {
+          this.tableList = []
+        }
+        this.total = res.data.total
+        console.log(this.tableList)
+        let param = {
+          keyWord: this.queryParams.keyWord,
+          typeName: this.queryParams.typeName,
+          typeModelName: this.queryParams.typeModelName
+        }
+        const response = await getRetainedEquipmentListNoPageApi(param)
+        let obj = {
+          // storeNum manageType usNum  repairNum inputNum repairInputNum allNum
+          storeNum: response.data.storeNum || 0,
+          usNum: response.data.usNum || 0,
+          repairNum: response.data.repairNum || 0,
+          inputNum: response.data.inputNum || 0,
+          repairInputNum: response.data.repairInputNum || 0,
+          pendingScrapNum: response.data.pendingScrapNum || 0,
+          scrapNum: response.data.scrapNum || 0,
+          allNum: response.data.allNum || 0,
+          totalPrice: response.data.totalPrice || 0,
+          fiveReplacementRate: response.data.fiveReplacementRate || 0,
+          tenReplacementRate: response.data.tenReplacementRate || 0,
+          tenPlusReplacementRate: response.data.tenPlusReplacementRate || 0,
+          manageType: response.data.manageType || ''
+        }
+        this.tableList.unshift(obj)
+        console.log(this.tableList)
+        this.loading = false
+      } catch (error) {
+        this.loading = false
       }
-      this.total = res.data.total
-      console.log(this.tableList)
-      let param = {
-        keyWord: this.queryParams.keyWord,
-        typeName: this.queryParams.typeName,
-        typeModelName: this.queryParams.typeModelName
-      }
-      const response = await getRetainedEquipmentListNoPageApi(param)
-      let obj = {
-        // storeNum manageType usNum  repairNum inputNum repairInputNum allNum
-        storeNum: response.data.storeNum || 0,
-        usNum: response.data.usNum || 0,
-        repairNum: response.data.repairNum || 0,
-        inputNum: response.data.inputNum || 0,
-        repairInputNum: response.data.repairInputNum || 0,
-        pendingScrapNum: response.data.pendingScrapNum || 0,
-        scrapNum: response.data.scrapNum || 0,
-        allNum: response.data.allNum || 0,
-        totalPrice: response.data.totalPrice || 0,
-        fiveReplacementRate: response.data.fiveReplacementRate || 0,
-        tenReplacementRate: response.data.tenReplacementRate || 0,
-        tenPlusReplacementRate: response.data.tenPlusReplacementRate || 0,
-        manageType: response.data.manageType || ''
-      }
-      this.tableList.unshift(obj)
-      console.log(this.tableList)
-      this.loading = false
     },
     indexContinuationForTable(num, size) {
       let number = (num - 1) * size
@@ -317,13 +322,13 @@ export default {
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (rowIndex === 0 && columnIndex == 0) {
         let rowspan = 1
-        let colspan = 7
+        let colspan = 6
         return { rowspan, colspan }
       }
       // 解决偏移的重要代码
       // 重点在 else if 判断必须加因为合并单元格数据会出现偏移、
       // 否则如果是 第二行 的 第二列 那么隐藏原有第二行 的 第二列的数据使他隐藏
-      else if (rowIndex === 0 && columnIndex < 7) {
+      else if (rowIndex === 0 && columnIndex < 6) {
         return {
           rowspan: 0,
           colspan: 0
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index af2437de..79df6b5a 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -15,7 +15,7 @@
           <el-option
             v-for="(item, index) in uniteList"
             :key="index"
-            :label="item.relName"
+            :label="item.teamName"
             :value="item.id"
             :data-key="item.id"
           />
diff --git a/src/views/material/lease/outBound/component/addToolsApply.vue b/src/views/material/lease/outBound/component/addToolsApply.vue
index 8497b684..cb443d44 100644
--- a/src/views/material/lease/outBound/component/addToolsApply.vue
+++ b/src/views/material/lease/outBound/component/addToolsApply.vue
@@ -15,7 +15,7 @@
           <el-option
             v-for="(item, index) in uniteList"
             :key="index"
-            :label="item.relName"
+            :label="item.teamName"
             :value="item.id"
             :data-key="item.id"
           />