diff --git a/src/api/claimAndRefund/second-manage.js b/src/api/claimAndRefund/second-manage.js
index bc90865..8eff5f9 100644
--- a/src/api/claimAndRefund/second-manage.js
+++ b/src/api/claimAndRefund/second-manage.js
@@ -16,3 +16,24 @@ export function getMaStatusByMaIdApi(data) {
         params: data,
     })
 }
+// 二级库出库接口
+export function outboundApi(data) {
+    return request({
+        url: '/material/secondaryWarehouse/operate',
+        method: 'post',
+        data,
+    })
+}
+
+/**
+ *  出库记录 退库记录
+ */
+
+// 出库记录
+export function getRecordsApi(data) {
+    return request({
+        url: '/material/secondaryWarehouse/getRecords',
+        method: 'get',
+        params: data,
+    })
+}
diff --git a/src/views/claimAndRefund/secondStore/outbound-record/index.vue b/src/views/claimAndRefund/secondStore/outbound-record/index.vue
index 6de5ae4..08208fa 100644
--- a/src/views/claimAndRefund/secondStore/outbound-record/index.vue
+++ b/src/views/claimAndRefund/secondStore/outbound-record/index.vue
@@ -7,14 +7,15 @@
             size="small"
             :inline="true"
         >
-            <el-form-item prop="name">
+            <el-form-item prop="teamGroupId">
                 <el-select
-                    v-model="queryParams.unitId"
+                    v-model="queryParams.teamGroupId"
                     placeholder="请选择领用班组"
                     clearable
+                    style="width: 240px"
                 >
                     <el-option
-                        v-for="item in unitList"
+                        v-for="item in teamsList"
                         filterable
                         :key="item.id"
                         :label="item.name"
@@ -23,32 +24,42 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item prop="unitId">
+            <el-form-item prop="pickName">
                 <el-input
-                    v-model="queryParams.name"
+                    v-model="queryParams.pickName"
                     placeholder="请输入现场领料人"
                     clearable
                     style="width: 240px"
-                    @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
             <el-form-item prop="unitId">
-                <el-input
-                    v-model="queryParams.name"
-                    placeholder="请输入出库时间"
-                    clearable
+                <el-date-picker
+                    v-model="value1"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    placeholder="请选择出库时间"
+                    value-format="yyyy-MM-dd"
                     style="width: 240px"
-                    @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
             <el-form-item prop="unitId">
-                <el-input
-                    v-model="queryParams.name"
-                    placeholder="二级库"
+                <el-select
+                    v-model="queryParams.unitId"
+                    placeholder="请选择二级库"
                     clearable
                     style="width: 240px"
-                    @keyup.enter.native="handleQuery"
-                />
+                >
+                    <el-option
+                        v-for="item in configList"
+                        filterable
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
             </el-form-item>
 
             <el-form-item>
@@ -70,7 +81,7 @@
             </el-form-item>
         </el-form>
 
-        <el-table border v-loading="loading" :data="configList">
+        <el-table border v-loading="loading" :data="recordsList">
             <el-table-column
                 align="center"
                 label="序号"
@@ -80,13 +91,13 @@
                 "
             />
             <el-table-column
-                prop=""
+                prop="secondName"
                 align="center"
                 label="二级库名称"
                 show-overflow-tooltip
             />
             <el-table-column
-                prop="name"
+                prop="groupName"
                 align="center"
                 label="班组名称"
                 show-overflow-tooltip
@@ -95,13 +106,13 @@
             <el-table-column
                 label="机具名称"
                 align="center"
-                prop=""
+                prop="typeName"
                 show-overflow-tooltip
             />
             <el-table-column
                 label="规格型号"
                 align="center"
-                prop=""
+                prop="modelName"
                 show-overflow-tooltip
             />
             <el-table-column
@@ -110,16 +121,22 @@
                 prop=""
                 show-overflow-tooltip
             />
+            <el-table-column
+                label="现场领料人"
+                align="center"
+                prop="pickName"
+                show-overflow-tooltip
+            />
             <el-table-column
                 label="领用数量"
                 align="center"
-                prop=""
+                prop="outNum"
                 show-overflow-tooltip
             />
             <el-table-column
                 label="出库时间"
                 align="center"
-                prop=""
+                prop="outTime"
                 show-overflow-tooltip
             />
         </el-table>
@@ -128,31 +145,26 @@
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
-            @pagination="getConfigList()"
+            @pagination="getRecordsList()"
         />
     </div>
 </template>
 
 <script>
-import {
-    addTeamsApi,
-    // delConfigApi,
-    editTeamsApi,
-    getTeamsListApi,
-} from '@/api/claimAndRefund/teams-manage.js'
+import { getConfigListApi } from '@/api/claimAndRefund/config-pages.js'
+import { getRecordsApi } from '@/api/claimAndRefund/second-manage.js'
 import { getUnitData } from '@/api/claimAndRefund/receive.js'
+import { getTeamsListApi } from '@/api/claimAndRefund/teams-manage.js'
 
 export default {
     name: 'SecondStore',
     data() {
         return {
             configList: [],
+            teamsList: [],
+            value1: [],
             editId: '',
-            // 新增或修改表单
-            addAndEditForm: {
-                name: '',
-                unitId: '',
-            },
+            recordsList: [],
             // 遮罩层
             loading: false,
             // 总条数
@@ -163,39 +175,57 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
-                name: '',
-                unitId: undefined,
+                type: 1,
+                teamGroupId: '',
+                pickName: '',
+                startTime: '',
+                endTime: '',
+                unitId: '',
             },
         }
     },
     created() {
-        this.getUnitList()
+        // this.getUnitList()
         this.getConfigList()
+        this.getTeamsList()
+        this.getRecordsList()
     },
     methods: {
         // 获取列表
-        async getConfigList() {
+        async getRecordsList() {
             this.loading = true
-            const { data: res } = await getTeamsListApi(this.queryParams)
+            if (this.value1 && this.value1.length > 0) {
+                this.queryParams.startTime = this.value1[0]
+                this.queryParams.endTime = this.value1[1]
+            }
+            const res = await getRecordsApi(this.queryParams)
             this.loading = false
-            this.configList = res.rows
+            this.recordsList = res.rows
             this.total = res.total
         },
 
-        //获取单位
-        getUnitList() {
-            getUnitData().then((response) => {
-                this.unitList = response.data
+        // 获取列表
+        async getConfigList() {
+            const { data: res } = await getConfigListApi({
+                pageNum: 1,
+                pageSize: 999,
             })
+            this.configList = res.rows
+        },
+
+        async getTeamsList() {
+            const { data: res } = await getTeamsListApi(this.queryParams)
+            this.teamsList = res.rows
         },
 
         // 搜索按钮
         handleQuery() {
-            this.getConfigList()
+            this.getRecordsList()
         },
 
         /** 重置按钮操作 */
         resetQuery() {
+            this.value1 = []
             this.resetForm('queryForm')
             this.handleQuery()
         },
diff --git a/src/views/claimAndRefund/secondStore/return-record/index.vue b/src/views/claimAndRefund/secondStore/return-record/index.vue
index 800f94c..895bb4f 100644
--- a/src/views/claimAndRefund/secondStore/return-record/index.vue
+++ b/src/views/claimAndRefund/secondStore/return-record/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <!-- 退库记录 -->
+    <!-- 出库记录 -->
     <div class="app-container" id="secondStore">
         <el-form
             :model="queryParams"
@@ -7,14 +7,15 @@
             size="small"
             :inline="true"
         >
-            <el-form-item prop="name">
+            <el-form-item prop="teamGroupId">
                 <el-select
-                    v-model="queryParams.unitId"
-                    placeholder="请选择退料班组"
+                    v-model="queryParams.teamGroupId"
+                    placeholder="请选择领用班组"
                     clearable
+                    style="width: 240px"
                 >
                     <el-option
-                        v-for="item in unitList"
+                        v-for="item in teamsList"
                         filterable
                         :key="item.id"
                         :label="item.name"
@@ -23,32 +24,42 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item prop="unitId">
+            <el-form-item prop="pickName">
                 <el-input
-                    v-model="queryParams.name"
+                    v-model="queryParams.pickName"
                     placeholder="请输入现场退料人"
                     clearable
                     style="width: 240px"
-                    @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
             <el-form-item prop="unitId">
-                <el-input
-                    v-model="queryParams.name"
-                    placeholder="请输入退库时间"
-                    clearable
+                <el-date-picker
+                    v-model="value1"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    placeholder="请选择出库时间"
+                    value-format="yyyy-MM-dd"
                     style="width: 240px"
-                    @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
             <el-form-item prop="unitId">
-                <el-input
-                    v-model="queryParams.name"
-                    placeholder="二级库"
+                <el-select
+                    v-model="queryParams.unitId"
+                    placeholder="请选择二级库"
                     clearable
                     style="width: 240px"
-                    @keyup.enter.native="handleQuery"
-                />
+                >
+                    <el-option
+                        v-for="item in configList"
+                        filterable
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
             </el-form-item>
 
             <el-form-item>
@@ -70,7 +81,7 @@
             </el-form-item>
         </el-form>
 
-        <el-table border v-loading="loading" :data="configList">
+        <el-table border v-loading="loading" :data="recordsList">
             <el-table-column
                 align="center"
                 label="序号"
@@ -80,13 +91,13 @@
                 "
             />
             <el-table-column
-                prop=""
+                prop="secondName"
                 align="center"
                 label="二级库名称"
                 show-overflow-tooltip
             />
             <el-table-column
-                prop="name"
+                prop="groupName"
                 align="center"
                 label="班组名称"
                 show-overflow-tooltip
@@ -95,13 +106,13 @@
             <el-table-column
                 label="机具名称"
                 align="center"
-                prop=""
+                prop="typeName"
                 show-overflow-tooltip
             />
             <el-table-column
                 label="规格型号"
                 align="center"
-                prop=""
+                prop="modelName"
                 show-overflow-tooltip
             />
             <el-table-column
@@ -110,22 +121,22 @@
                 prop=""
                 show-overflow-tooltip
             />
-            <el-table-column
-                label="退库数量"
-                align="center"
-                prop=""
-                show-overflow-tooltip
-            />
-            <el-table-column
-                label="退库时间"
-                align="center"
-                prop=""
-                show-overflow-tooltip
-            />
             <el-table-column
                 label="现场退料人"
                 align="center"
-                prop=""
+                prop="pickName"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="领用数量"
+                align="center"
+                prop="outNum"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="出库时间"
+                align="center"
+                prop="outTime"
                 show-overflow-tooltip
             />
         </el-table>
@@ -134,31 +145,26 @@
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
-            @pagination="getConfigList()"
+            @pagination="getRecordsList()"
         />
     </div>
 </template>
 
 <script>
-import {
-    addTeamsApi,
-    // delConfigApi,
-    editTeamsApi,
-    getTeamsListApi,
-} from '@/api/claimAndRefund/teams-manage.js'
+import { getConfigListApi } from '@/api/claimAndRefund/config-pages.js'
+import { getRecordsApi } from '@/api/claimAndRefund/second-manage.js'
 import { getUnitData } from '@/api/claimAndRefund/receive.js'
+import { getTeamsListApi } from '@/api/claimAndRefund/teams-manage.js'
 
 export default {
     name: 'SecondStore',
     data() {
         return {
             configList: [],
+            teamsList: [],
+            value1: [],
             editId: '',
-            // 新增或修改表单
-            addAndEditForm: {
-                name: '',
-                unitId: '',
-            },
+            recordsList: [],
             // 遮罩层
             loading: false,
             // 总条数
@@ -169,39 +175,57 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
-                name: '',
-                unitId: undefined,
+                type: 2,
+                teamGroupId: '',
+                pickName: '',
+                startTime: '',
+                endTime: '',
+                unitId: '',
             },
         }
     },
     created() {
-        this.getUnitList()
+        // this.getUnitList()
         this.getConfigList()
+        this.getTeamsList()
+        this.getRecordsList()
     },
     methods: {
         // 获取列表
-        async getConfigList() {
+        async getRecordsList() {
             this.loading = true
-            const { data: res } = await getTeamsListApi(this.queryParams)
+            if (this.value1 && this.value1.length > 0) {
+                this.queryParams.startTime = this.value1[0]
+                this.queryParams.endTime = this.value1[1]
+            }
+            const res = await getRecordsApi(this.queryParams)
             this.loading = false
-            this.configList = res.rows
+            this.recordsList = res.rows
             this.total = res.total
         },
 
-        //获取单位
-        getUnitList() {
-            getUnitData().then((response) => {
-                this.unitList = response.data
+        // 获取列表
+        async getConfigList() {
+            const { data: res } = await getConfigListApi({
+                pageNum: 1,
+                pageSize: 999,
             })
+            this.configList = res.rows
+        },
+
+        async getTeamsList() {
+            const { data: res } = await getTeamsListApi(this.queryParams)
+            this.teamsList = res.rows
         },
 
         // 搜索按钮
         handleQuery() {
-            this.getConfigList()
+            this.getRecordsList()
         },
 
         /** 重置按钮操作 */
         resetQuery() {
+            this.value1 = []
             this.resetForm('queryForm')
             this.handleQuery()
         },
diff --git a/src/views/claimAndRefund/secondStore/second-manage/components/handle-pages.vue b/src/views/claimAndRefund/secondStore/second-manage/components/handle-pages.vue
index e855113..6ae7b01 100644
--- a/src/views/claimAndRefund/secondStore/second-manage/components/handle-pages.vue
+++ b/src/views/claimAndRefund/secondStore/second-manage/components/handle-pages.vue
@@ -2,17 +2,22 @@
     <div>
         <PageHeader :pageContent="pageContent" @goBack="goBack" />
         <el-form
-            ref="queryForm"
+            ref="queryFormRef"
             size="small"
             :inline="true"
-            :model="queryParams"
+            :model="outboundParams"
+            :rules="queryFormRules"
         >
             <el-form-item
-                prop="keyword"
+                prop="teamGroupId"
                 label="领用班组"
                 v-if="isHandleType === 1"
             >
-                <el-select placeholder="请选择领用班组" clearable>
+                <el-select
+                    clearable
+                    placeholder="请选择领用班组"
+                    v-model="outboundParams.teamGroupId"
+                >
                     <el-option
                         v-for="item in teamsList"
                         :key="item.id"
@@ -22,11 +27,16 @@
                 </el-select>
             </el-form-item>
             <el-form-item
-                prop="keyword"
+                prop="teamGroupId"
                 label="退库班组"
                 v-if="isHandleType === 2"
             >
-                <el-select placeholder="请选择退库班组" clearable>
+                <el-select
+                    clearable
+                    placeholder="请选择退库班组"
+                    v-model="outboundParams.teamGroupId"
+                    @change="onReturnChange"
+                >
                     <el-option
                         v-for="item in teamsList"
                         :key="item.id"
@@ -35,51 +45,42 @@
                     />
                 </el-select>
             </el-form-item>
-            <el-form-item
-                prop="unitId"
-                label="现场领料人"
-                v-if="isHandleType === 1"
-            >
-                <el-input placeholder="请输入现场领料人" clearable />
+            <el-form-item label="现场领料人" v-if="isHandleType === 1">
+                <el-input
+                    placeholder="请输入现场领料人"
+                    v-model="outboundParams.leaseMan"
+                    clearable
+                />
             </el-form-item>
             <el-form-item
                 prop="unitId"
                 label="现场退料人"
                 v-if="isHandleType === 2"
             >
-                <el-input placeholder="请输入现场退料人" clearable />
+                <el-input
+                    clearable
+                    placeholder="请输入现场退料人"
+                    v-model="outboundParams.leaseMan"
+                />
             </el-form-item>
-            <el-form-item prop="proId" label="退料人" v-if="isHandleType === 3">
-                <el-input placeholder="请输入退料人" clearable />
+            <el-form-item label="退料人" v-if="isHandleType === 3">
+                <el-input
+                    placeholder="请输入退料人"
+                    v-model="outboundParams.leaseMan"
+                    clearable
+                />
             </el-form-item>
-            <el-form-item
-                prop="proId"
-                label="退料时间"
-                v-if="isHandleType === 3"
-            >
-                <el-input placeholder="请输入退料时间" clearable />
+            <el-form-item label="联系电话" prop="phone">
+                <el-input
+                    clearable
+                    placeholder="请输入联系电话"
+                    v-model="outboundParams.phone"
+                />
             </el-form-item>
-            <el-form-item prop="proId" label="联系电话">
-                <el-input placeholder="请输入联系电话" clearable />
-            </el-form-item>
-            <!-- <el-form-item
-                prop="typeId"
-                label="规格型号"
-                v-if="isHandleType === 1 || isHandleType === 3"
-            >
-                <el-select placeholder="请选择规格型号" clearable filterable>
-                    <el-option
-                        v-for="typeItem in typeList"
-                        :key="typeItem.typeId"
-                        :label="typeItem.typeName"
-                        :value="typeItem.typeId"
-                    />
-                </el-select>
-            </el-form-item> -->
         </el-form>
 
         <el-row :gutter="8" class="mb8">
-            <el-col :span="1.5" :key="index">
+            <el-col :span="1.5">
                 <el-button
                     plain
                     size="mini"
@@ -147,19 +148,47 @@
                 align="center"
                 prop="stockNum"
                 show-overflow-tooltip
+                v-if="isHandleType === 1 || isHandleType === 3"
+            />
+            <el-table-column
+                label="在用数量"
+                align="center"
+                prop="receiveNum"
+                show-overflow-tooltip
+                v-if="isHandleType === 2"
             />
 
             <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                    <el-button
-                        size="mini"
-                        type="primary"
-                        v-if="row.manageType == 0"
-                        @click="onViewCode(scope.row.maIds, $scope.index)"
-                    >
-                        编码选择
-                    </el-button>
-                    <el-input placeholder="输入数量" v-else />
+                    <template v-if="scope.row.manageType == 0">
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            @click="onViewCode(scope.row.maIds, scope.$index)"
+                        >
+                            编码选择
+                            {{
+                                scope.row.maCodeList.length > 0
+                                    ? `(${scope.row.maCodeList.length})`
+                                    : ''
+                            }}
+                        </el-button>
+                    </template>
+
+                    <el-input-number
+                        v-else
+                        :min="0"
+                        :precision="0"
+                        :max="
+                            isHandleType == 1 || isHandleType === 3
+                                ? scope.row.stockNum
+                                : scope.row.receiveNum
+                        "
+                        v-model="scope.row.outNum"
+                        style="width: 120px"
+                        placeholder="输入数量"
+                        size="small"
+                    />
                 </template>
             </el-table-column>
         </el-table>
@@ -218,7 +247,9 @@
                     type="selection"
                     :selectable="
                         (row) => {
-                            return row.maStatus == 16
+                            if (isHandleType == 1 || isHandleType == 3)
+                                return row.maStatus == 16
+                            if (isHandleType == 2) return row.maStatus == 132
                         }
                     "
                 />
@@ -271,7 +302,7 @@
                 <el-button type="primary" @click="submitSelectCode()">
                     确 定
                 </el-button>
-                <el-button @click="selectCodeVisible = false">取 消</el-button>
+                <el-button @click="onHandleCancel">取 消</el-button>
             </div>
         </el-dialog>
     </div>
@@ -280,7 +311,10 @@
 <script>
 import PageHeader from '@/components/pageHeader'
 import { secondaryWarehouseList } from '@/api/claimAndRefund/secondStore'
-import { getMaStatusByMaIdApi } from '@/api/claimAndRefund/second-manage.js'
+import {
+    getMaStatusByMaIdApi,
+    outboundApi,
+} from '@/api/claimAndRefund/second-manage.js'
 import { getTeamsListApi } from '@/api/claimAndRefund/teams-manage.js'
 export default {
     components: { PageHeader },
@@ -289,6 +323,10 @@ export default {
             type: Number,
             default: () => 1,
         },
+        unitId: {
+            type: [String, Number],
+            default: () => '',
+        },
     },
     data() {
         return {
@@ -297,10 +335,14 @@ export default {
             typeList: [],
             tableList: [],
             codeList: [],
-            selectList: [],
             teamsList: [],
             dialogTotal: 0,
             currentIndex: 0,
+            outboundParams: {
+                teamGroupId: '',
+                leaseMan: '',
+                phone: '',
+            },
             queryCodeParams: {
                 maCode: '',
                 maIds: '',
@@ -311,6 +353,30 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                unitId: '',
+            },
+            queryParamsNew: {
+                pageNum: 1,
+                pageSize: 10,
+                unitId: '',
+                type: 2,
+                teamGroupId: '',
+            },
+            queryFormRules: {
+                teamGroupId: [
+                    {
+                        required: true,
+                        message: '请选择班组',
+                        trigger: 'change',
+                    },
+                ],
+                phone: [
+                    {
+                        pattern: /^1[3456789]\d{9}$/,
+                        message: '请输入正确的手机号码',
+                        trigger: 'blur',
+                    },
+                ],
             },
         }
     },
@@ -322,7 +388,13 @@ export default {
             secondaryWarehouseList(this.queryParams).then((res) => {
                 this.tableList = res.rows
 
-                // this.tableList = this.tableList.map((e) => {})
+                this.tableList = this.tableList.map((e) => {
+                    return {
+                        ...e,
+                        outNum: 0,
+                        maCodeList: [],
+                    }
+                })
             })
         },
         // 获取班组
@@ -330,38 +402,217 @@ export default {
             const { data: res } = await getTeamsListApi({
                 pageNum: 1,
                 pageSize: 999,
+                unitId: this.unitId,
             })
             this.teamsList = res.rows
         },
         // 出库
         onHandleOutbound() {
-            this.$confirm('是否确认出库？', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
+            this.$refs.queryFormRef.validate((valid) => {
+                if (valid) {
+                    // 组装参数
+                    const isCode = this.tableList.some(
+                        (e) => e.manageType == 0 && e.maCodeList.length > 0,
+                    )
+                    const isNum = this.tableList.some(
+                        (e) => e.manageType == 1 && e.outNum > 0,
+                    )
+                    if (!isCode && !isNum) {
+                        this.$modal.msgError('请操作需要出库的设备并设置数量')
+                        return
+                    }
+                    this.$confirm('是否确认出库？', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                    })
+                        .then(async () => {
+                            const params = {
+                                leaseMan: '',
+                                phone: '',
+                                unitId: this.unitId,
+                                teamGroupId: '',
+                                type: 1,
+                                teamLeaseInfos: [],
+                            }
+
+                            Object.assign(params, this.outboundParams)
+
+                            this.tableList.forEach((e) => {
+                                if (
+                                    e.manageType == 0 &&
+                                    e.maCodeList.length > 0
+                                ) {
+                                    params.teamLeaseInfos.push({
+                                        id: e.id,
+                                        typeId: e.typeId,
+                                        maIds: e.maCodeList
+                                            .map((i) => i.maId)
+                                            .join(','),
+                                    })
+                                }
+
+                                if (e.manageType == 1 && e.outNum > 0) {
+                                    params.teamLeaseInfos.push({
+                                        id: e.id,
+                                        typeId: e.typeId,
+                                        maId: null,
+                                        outNum: e.outNum,
+                                    })
+                                }
+                            })
+
+                            // console.log(params, 'params参数')
+                            const res = await outboundApi(params)
+                            console.log(res, '出库结果')
+
+                            if (res.code === 200) {
+                                this.$modal.msgSuccess('出库成功')
+                                this.$emit('openHomePage')
+                            }
+                        })
+                        .catch(() => {})
+                }
             })
-                .then(async () => {})
-                .catch(() => {})
         },
         // 退库
         onHandleStockReturn() {
-            this.$confirm('是否确认退库？', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
+            this.$refs.queryFormRef.validate((valid) => {
+                if (valid) {
+                    // 组装参数
+                    const isCode = this.tableList.some(
+                        (e) => e.manageType == 0 && e.maCodeList.length > 0,
+                    )
+                    const isNum = this.tableList.some(
+                        (e) => e.manageType == 1 && e.outNum > 0,
+                    )
+                    if (!isCode && !isNum) {
+                        this.$modal.msgError('请操作需要退库的设备并设置数量')
+                        return
+                    }
+                    this.$confirm('是否确认退库？', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                    })
+                        .then(async () => {
+                            const params = {
+                                leaseMan: '',
+                                phone: '',
+                                unitId: this.unitId,
+                                teamGroupId: '',
+                                type: 2,
+                                teamLeaseInfos: [],
+                            }
+
+                            Object.assign(params, this.outboundParams)
+
+                            this.tableList.forEach((e) => {
+                                if (
+                                    e.manageType == 0 &&
+                                    e.maCodeList.length > 0
+                                ) {
+                                    params.teamLeaseInfos.push({
+                                        id: e.id,
+                                        typeId: e.typeId,
+                                        maIds: e.maCodeList
+                                            .map((i) => i.maId)
+                                            .join(','),
+                                    })
+                                }
+
+                                if (e.manageType == 1 && e.outNum > 0) {
+                                    params.teamLeaseInfos.push({
+                                        id: e.id,
+                                        typeId: e.typeId,
+                                        maId: null,
+                                        outNum: e.outNum,
+                                    })
+                                }
+                            })
+
+                            // console.log(params, 'params参数')
+                            const res = await outboundApi(params)
+                            if (res.code === 200) {
+                                this.$modal.msgSuccess('退库成功')
+                                this.$emit('openHomePage')
+                            }
+                        })
+                        .catch(() => {})
+                }
             })
-                .then(async () => {})
-                .catch(() => {})
         },
         // 确认归还
         onHandleReturn() {
-            this.$confirm('是否确认归还？', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
+            this.$refs.queryFormRef.validate((valid) => {
+                if (valid) {
+                    // 组装参数
+                    const isCode = this.tableList.some(
+                        (e) => e.manageType == 0 && e.maCodeList.length > 0,
+                    )
+                    const isNum = this.tableList.some(
+                        (e) => e.manageType == 1 && e.outNum > 0,
+                    )
+                    if (!isCode && !isNum) {
+                        this.$modal.msgError('请操作需要归还的设备并设置数量')
+                        return
+                    }
+                    this.$confirm('是否确认归还？', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                    })
+                        .then(async () => {
+                            const params = {
+                                leaseMan: '',
+                                phone: '',
+                                unitId: this.unitId,
+                                teamGroupId: '',
+                                type: 3,
+                                teamLeaseInfos: [],
+                            }
+
+                            Object.assign(params, this.outboundParams)
+
+                            this.tableList.forEach((e) => {
+                                if (
+                                    e.manageType == 0 &&
+                                    e.maCodeList.length > 0
+                                ) {
+                                    params.teamLeaseInfos.push({
+                                        id: e.id,
+                                        typeId: e.typeId,
+                                        maIds: e.maCodeList
+                                            .map((i) => i.maId)
+                                            .join(','),
+                                    })
+                                }
+
+                                if (e.manageType == 1 && e.outNum > 0) {
+                                    params.teamLeaseInfos.push({
+                                        id: e.id,
+                                        typeId: e.typeId,
+                                        maId: null,
+                                        outNum: e.outNum,
+                                    })
+                                }
+                            })
+
+                            // console.log(params, 'params参数')
+                            const res = await outboundApi(params)
+                            if (res.code === 200) {
+                                this.$modal.msgSuccess('归还成功')
+                                this.$emit('openHomePage')
+                            }
+                        })
+                        .catch(() => {})
+                }
             })
-                .then(async () => {})
-                .catch(() => {})
+        },
+        onReturnChange(val) {
+            this.queryParamsNew.teamGroupId = val
+            this.queryParamsNew.unitId = this.unitId
+            this.getTableList()
         },
         // 编码选择弹框
         onViewCode(maIds, index) {
@@ -378,7 +629,7 @@ export default {
             this.dialogTotal = res.total
         },
         handleSelectionChange(list) {
-            this.selectList = list
+            this.tableList[this.currentIndex].maCodeList = list
         },
         handleQuery() {
             this.getMaStatusByMaIdData()
@@ -390,12 +641,28 @@ export default {
             this.getMaStatusByMaIdData()
         },
         submitSelectCode() {
-            if (this.selectList.length < 1) {
+            if (this.tableList[this.currentIndex].maCodeList < 1) {
                 this.$modal.msgError('请选择需要出库的编码设备')
                 return
             }
             this.selectCodeVisible = false
         },
+        async getTableList() {
+            const res = await getMaStatusByMaIdApi(this.queryParamsNew)
+            this.tableList = res.rows
+            this.tableList = this.tableList.map((e) => {
+                return {
+                    ...e,
+                    outNum: 0,
+                    maCodeList: [],
+                }
+            })
+        },
+
+        onHandleCancel() {
+            this.tableList[this.currentIndex].maCodeList = []
+            this.selectCodeVisible = false
+        },
     },
     computed: {
         pageContent() {
@@ -405,8 +672,12 @@ export default {
         },
     },
     created() {
+        this.queryParams.unitId = this.unitId
         this.getTeamsList()
-        this.getList()
+
+        if (this.isHandleType === 1 || this.isHandleType === 3) {
+            this.getList()
+        }
     },
 }
 </script>
diff --git a/src/views/claimAndRefund/secondStore/second-manage/components/home-pages.vue b/src/views/claimAndRefund/secondStore/second-manage/components/home-pages.vue
index 865a846..fc179ca 100644
--- a/src/views/claimAndRefund/secondStore/second-manage/components/home-pages.vue
+++ b/src/views/claimAndRefund/secondStore/second-manage/components/home-pages.vue
@@ -318,7 +318,7 @@ export default {
                 this.$modal.msgError('请先选择需要操作的二级库！')
                 return
             }
-            this.$emit('onClickSecond', type)
+            this.$emit('onClickSecond', type, this.queryParams.unitId)
         },
     },
     created() {
diff --git a/src/views/claimAndRefund/secondStore/second-manage/index.vue b/src/views/claimAndRefund/secondStore/second-manage/index.vue
index a28b44c..0ef8b80 100644
--- a/src/views/claimAndRefund/secondStore/second-manage/index.vue
+++ b/src/views/claimAndRefund/secondStore/second-manage/index.vue
@@ -3,7 +3,13 @@
     <div class="app-container">
         <transition name="el-fade-in-linear">
             <HomePages @onClickSecond="onClickSecond" v-if="isShowHome" />
-            <HandlePages @goBack="goBack" :isHandleType="isHandleType" v-else />
+            <HandlePages
+                @goBack="goBack"
+                @openHomePage="openHomePage"
+                :unitId="unitId"
+                :isHandleType="isHandleType"
+                v-else
+            />
         </transition>
     </div>
 </template>
@@ -23,13 +29,18 @@ export default {
         }
     },
     methods: {
-        onClickSecond(type) {
+        // 操作二级库
+        onClickSecond(type, unitId) {
             this.isHandleType = type
+            this.unitId = unitId
             this.isShowHome = false
         },
         goBack() {
             this.isShowHome = true
         },
+        openHomePage() {
+            this.isShowHome = true
+        },
     },
 }
 </script>