diff --git a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
index 27b2e50..cf0304d 100644
--- a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
@@ -538,7 +538,7 @@ export default {
                 })
                 .finally(() => {
                     // 刷新页面
-                    window.location.reload()
+                    // window.location.reload()
                 })
         },
         //审核  驳回
diff --git a/src/views/claimAndreturn/picking/auditing/component/home1.vue b/src/views/claimAndreturn/picking/auditing/component/home1.vue
index b0beb2a..d9cc33d 100644
--- a/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -354,47 +354,6 @@
                             align="center"
                             prop="typeName"
                         />
-                        <el-table-column type="expand">
-                            <template slot-scope="scope">
-                                <div class="nested-table-container">
-                                    <el-table
-                                        :data="scope.row.maTypeDetails"
-                                        style="width: 100%"
-                                    >
-                                        <!-- 子表格的列 -->
-                                        <el-table-column
-                                            label="序号"
-                                            align="center"
-                                            type="index"
-                                        />
-                                        <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="unitName"
-                                            :show-overflow-tooltip="true"
-                                        />
-                                        <el-table-column
-                                            label="预领数量"
-                                            align="center"
-                                            prop="partNum"
-                                            :show-overflow-tooltip="true"
-                                        />
-                                    </el-table>
-                                </div>
-                            </template>
-                        </el-table-column>
                         <el-table-column
                             label="规格型号"
                             align="center"
diff --git a/src/views/claimAndreturn/return/receive/component/addReturn1.vue b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
new file mode 100644
index 0000000..f7463e3
--- /dev/null
+++ b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
@@ -0,0 +1,1042 @@
+<template>
+    <div>
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :rules="queryRules"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+        >
+            <el-row>
+                <el-form-item label="退料单位" prop="unitId">
+                    <el-select
+                        v-model="queryParams.unitId"
+                        clearable
+                        filterable
+                        @change="GetProData"
+                        style="width: 240px"
+                        placeholder="请选择"
+                        :disabled="isEdit"
+                    >
+                        <el-option
+                            v-for="item in unitList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        >
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="退料工程" prop="proId">
+                    <el-select
+                        v-model="queryParams.proId"
+                        clearable
+                        filterable
+                        @change="GetUnitData"
+                        style="width: 240px"
+                        placeholder="请选择"
+                        :disabled="isEdit"
+                    >
+                        <el-option
+                            v-for="item in proList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        >
+                        </el-option>
+                    </el-select>
+                </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="status">
+                    <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="backPerson">
+                    <el-input
+                        v-model="queryParams.backPerson"
+                        placeholder="请输入退料人"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                        style="width: 240px"
+                    />
+                </el-form-item>
+                <el-form-item label="退料时间" prop="backTime">
+                    <el-date-picker
+                        v-model="queryParams.backTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择时间"
+                        style="width: 240px"
+                    >
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="退料人电话" prop="phone">
+                    <el-input
+                        v-model="queryParams.phone"
+                        placeholder="请输入退料人电话"
+                        clearable
+                        style="width: 240px"
+                        :maxlength="11"
+                    />
+                </el-form-item>
+                <el-form-item label="备注" prop="roleName">
+                    <el-input
+                        v-model="queryParams.remark"
+                        placeholder="请输入备注"
+                        clearable
+                        rows="1"
+                        type="textarea"
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+            </el-row>
+            <el-row> </el-row>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <!-- <el-col :span="1.5">
+                <el-button
+                    type="success"
+                    plain
+                    icon="el-icon-back"
+                    size="mini"
+                    @click="handleBack"
+                    >退料管理</el-button
+                >
+            </el-col> -->
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    >保存</el-button
+                >
+            </el-col>
+
+            <el-col :span="1.5">
+                <!-- <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['system:role:export']"
+          >导出</el-button> -->
+            </el-col>
+        </el-row>
+        <el-table
+            v-loading="loading"
+            :data="leaseApplyDetails"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column
+                type="selection"
+                min-width="55"
+                align="center"
+                :selectable="selectable"
+            />
+            <el-table-column label="序号" type="index" min-width="120" />
+            <el-table-column
+                label="机具名称"
+                prop="typeName"
+                min-width="200"
+                align="center"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="规格型号"
+                prop="typeCode"
+                min-width="200"
+                align="center"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="计量单位"
+                prop="unitNames"
+                min-width="100"
+                align="center"
+            />
+
+            <el-table-column
+                label="当前在用量"
+                align="center"
+                prop="useNum"
+                min-width="180"
+            >
+            </el-table-column>
+            <el-table-column
+                label="退料数量"
+                align="center"
+                prop="createTime"
+                min-width="180"
+            >
+                <template slot-scope="scope">
+                    <el-input
+                        v-model.number="scope.row.num"
+                        placeholder="请输入退料数量"
+                        type="number"
+                        min="1"
+                        clearable
+                        @input="checkNum(scope.row)"
+                        style="width: 100%"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+                min-width="180"
+            >
+                <template slot-scope="scope">
+                    <el-input
+                        v-model="scope.row.remark"
+                        placeholder="请输入备注"
+                        clearable
+                        style="width: 100%"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                fixed="right"
+                class-name="small-padding fixed-width"
+                width="160px"
+            >
+                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+                    <!--          <el-button-->
+                    <!--            size="mini"-->
+                    <!--            type="text"-->
+                    <!--            icon="el-icon-edit"-->
+                    <!--            @click="handleBack(scope.row)"-->
+                    <!--            v-hasPermi="['system:role:edit']"-->
+                    <!--          >修改</el-button>-->
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="
+                            handleDelete({ ...scope.row, index: scope.$index })
+                        "
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+</template>
+
+<script>
+import {
+    getRole,
+    delRole,
+    addRole,
+    updateRole,
+    dataScope,
+    changeRoleStatus,
+    deptTreeSelect,
+} from '@/api/system/role'
+import {
+    treeselect as menuTreeselect,
+    roleMenuTreeselect,
+} from '@/api/system/menu'
+import {
+    getProData,
+    getUnitData,
+    getDeviceTypeTree,
+    getAgreementInfoById,
+    submitLeaseApply,
+    getUseTypeTreee,
+    getUseNumByTypeId,
+} from '@/api/claimAndRefund/receive'
+import { submitBackApplyApi } from '@/api/claimAndRefund/return'
+import {
+    submitBackApplyApiByCq,
+    materialReturnNoteByApply,
+    submitRefuseBackApply,
+} from '@/api/claimAndRefund/return.js'
+import { mapState } from 'vuex'
+import { getInfo, h } from '@/api/login'
+export default {
+    name: 'ReturnApplyAdd',
+    props: {
+        rejectId: {
+            type: [String, Number],
+        },
+        agreementId: {
+            type: [String, Number],
+        },
+        isEdit: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    data() {
+        const validatePhone = (rule, value, callback) => {
+            const reg = /^[1][3-9][0-9]{9}$/
+            if (!reg.test(value)) {
+                this.queryParams.phone = ''
+            } else {
+                callback()
+            }
+        }
+        return {
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 角色表格数据
+            roleList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 是否显示弹出层（数据权限）
+            openDataScope: false,
+            menuExpand: false,
+            menuNodeAll: false,
+            deptExpand: true,
+            deptNodeAll: false,
+            // 日期范围
+            dateRange: [],
+            // 数据范围选项
+            dataScopeOptions: [
+                {
+                    value: '1',
+                    label: '全部数据权限',
+                },
+                {
+                    value: '2',
+                    label: '自定数据权限',
+                },
+                {
+                    value: '3',
+                    label: '本部门数据权限',
+                },
+                {
+                    value: '4',
+                    label: '本部门及以下数据权限',
+                },
+                {
+                    value: '5',
+                    label: '仅本人数据权限',
+                },
+            ],
+            // 菜单列表
+            menuOptions: [],
+            // 部门列表
+            deptOptions: [],
+            // 查询参数
+            queryParams: {
+                types: 2,
+
+                unitId: null,
+                proId: null,
+                agreementId: null, //协议id
+                agreementCode: null, //协议code
+                companyId: '', //登录信息中取
+                createBy: '', //用户名
+                taskType: 29,
+                taskStatus: 30,
+                backTime: '', //申请时间
+                //退料人信息
+                leaseApplyInfo: {
+                    backPerson: '',
+                    phone: '',
+                    remark: '',
+                },
+                //退料详情集合
+                leaseApplyDetails: [],
+            },
+            leaseApplyDetails: [],
+            //退料详情单条模板
+            leaseApplyDetailsItem: {
+                createBy: null,
+                companyId: null,
+                status: 0,
+                typeId: null, //  树结构第4级   规格id
+                typeName: '', //显示的设备类型
+                typeCode: '', //显示的设备规格
+                unitNames: '', //显示的设备 单位
+                useNum: '', //当前在用量
+                remark: '', //单条备注
+                preNum: 1, //预领数量
+            },
+            //
+            queryRules: {
+                unitId: [
+                    {
+                        required: true,
+                        message: '请选择退料单位',
+                        trigger: 'change',
+                        type: 'number',
+                    },
+                ],
+                proId: [
+                    {
+                        required: true,
+                        message: '请选择退料工程',
+                        trigger: 'change',
+                        type: 'number',
+                    },
+                ],
+                backPerson: [
+                    {
+                        required: true,
+                        message: '请输入退料人',
+                        trigger: 'blur',
+                    },
+                ],
+                backTime: [
+                    {
+                        required: true,
+                        message: '请选择退料时间',
+                        trigger: 'change',
+                    },
+                ],
+                phone: [
+                    {
+                        required: false,
+                        trigger: 'blur',
+                        message: '请输入退料人的手机号',
+                    },
+                    {
+                        pattern: /^1[3456789]\d{9}$/,
+                        message: '请输入正确的手机号码',
+                        trigger: 'blur',
+                    },
+                ],
+                // phone: [
+                //   { validator: validatePhone, trigger: "blur"},
+                //   {required: true, message: '请输入正确的手机号', trigger: 'change'},
+                // ],
+            },
+            unitList: [], //单位 集合
+            proList: [], // 工程 集合
+            deviceTypeTree: [], // 设备 树结构数据
+            // 设备 树显示 配置
+            deviceTypeTreeProps: {
+                children: 'children',
+                label: 'typeName',
+                // multiple: false,
+                value: 'typeId',
+                multiple: true,
+            },
+            // 选中的设备类型
+            deviceType: [],
+
+            // 表单参数
+            form: {},
+            // defaultProps: {
+            //   children: "children",
+            //   label: "label"
+            // },
+            // 表单校验
+            rules: {
+                roleName: [
+                    {
+                        required: true,
+                        message: '角色名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                roleKey: [
+                    {
+                        required: true,
+                        message: '权限字符不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                roleSort: [
+                    {
+                        required: true,
+                        message: '角色顺序不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+            companyId: '',
+            createBy: '',
+            // isEdit: 'true',
+            rowId: '',
+            propsKey: 2000,
+        }
+    },
+    mounted() {
+        this.GetUnitData()
+        this.GetProData()
+        // this.GetDeviceTypeTreeFn()
+        // this.getList();
+        // console.log('this.$route.query.isEdit', this.$route.query.isEdit)
+        // this.isEdit = this.$route.query.isEdit
+        // if (this.$route.query.Id) {
+        //     this.rowId = this.$route.query.Id
+        //     this.GetViewByApply(this.$route.query.Id)
+        // }
+        if (this.rejectId) {
+            this.rowId = this.rejectId
+            this.GetViewByApply({
+                id: this.rejectId,
+                agreementId: this.agreementId,
+            })
+        }
+        getInfo().then((res) => {
+            this.companyId = res.user.companyId
+            this.createBy = res.user.userName
+        })
+    },
+    computed: {
+        ...mapState(['user']),
+    },
+    methods: {
+        // 获取 来往单位 列表数据
+        async GetUnitData() {
+            const params = {
+                id: this.queryParams.proId /*  */,
+            }
+            const res = await getUnitData(params)
+            this.unitList = res.data
+
+            this.GetAgreementInfoById()
+        },
+        // 获取 工程名称 列表数据
+        async GetProData() {
+            const params = {
+                id: this.queryParams.unitId,
+            }
+            const res = await getProData(params)
+            this.proList = res.data
+            this.GetAgreementInfoById()
+        },
+
+        // 获取 设备树结构数据
+        async GetDeviceTypeTreeFn(agreementId) {
+            const params = {
+                agreementId: agreementId,
+                //  this.agreementId
+            }
+
+            getUseTypeTreee(params).then((res) => {
+                this.deviceTypeTree = res.data
+
+                // console.log(this.deviceTypeTree, this.leaseApplyDetails, '6666')
+
+                let selectList = []
+                this.leaseApplyDetails.forEach((e) => {
+                    selectList.push(
+                        this.getParentsById(this.deviceTypeTree, e.typeId),
+                    )
+                })
+                this.$nextTick(() => {
+                    this.deviceType = selectList
+                    this.propsKey++
+                })
+            })
+        },
+        getParentsById(list, id) {
+            for (let i in list) {
+                if (list[i].typeId == id) {
+                    //查询到就返回该数组对象的value
+                    return [list[i].typeId]
+                }
+                if (list[i].children) {
+                    let node = this.getParentsById(list[i].children, id)
+                    if (node !== undefined) {
+                        //查询到把父节把父节点加到数组前面
+                        node.unshift(list[i].typeId)
+                        return node
+                    }
+                }
+            }
+        },
+        // 获取 协议id
+        async GetAgreementInfoById() {
+            if (this.queryParams.unitId && this.queryParams.proId) {
+                const params = {
+                    unitId: this.queryParams.unitId,
+                    projectId: this.queryParams.proId,
+                }
+                const res = await getAgreementInfoById(params)
+                if (!(res.data && res.data.agreementId)) {
+                    this.$message.error('当前单位和工程未上传')
+                    this.queryParams.unitId = null
+                    this.queryParams.proId = null
+                    this.GetUnitData()
+                    this.GetProData()
+                } else {
+                    this.queryParams.agreementId = res.data.agreementId
+                    this.queryParams.agreementCode = res.data.agreementCode
+                    this.GetDeviceTypeTreeFn(res.data.agreementId)
+                }
+            }
+        },
+
+        // 获取 任务详情数据
+        async GetViewByApply(params) {
+            const res = await materialReturnNoteByApply({
+                id: params.id,
+                agreementId: params.agreementId,
+            })
+            const data = res.data[0]
+            // console.log(data)
+            // this.queryParams.taskId = data.taskId
+            this.queryParams.unitId = data.unitId
+            this.queryParams.proId = Number(data.proId)
+            this.$set(this.queryParams, 'phone', data.phone)
+            this.queryParams.backPerson = data.backPerson
+            this.queryParams.backTime = data.backTime
+            this.queryParams.agreementCode = data.agreementCode
+            this.queryParams.agreementId = data.agreementId
+            this.queryParams.remark = data.remark
+            this.leaseApplyDetails = res.data
+            this.GetDeviceTypeTreeFn(data.agreementId)
+        },
+        //生成回显数据
+        handelEchoData(item) {
+            // console.log('item======', item)
+            const template = JSON.parse(
+                JSON.stringify(this.leaseApplyDetailsItem),
+            )
+            template.createBy = item.createBy
+            template.parentId = item.data.parentId
+            template.typeId = item.data.typeId
+            template.companyId = item.companyId
+            // template.typeId = item.typeId
+            template.unitNames = item.unitNames
+            template.typeCn = item.typeName
+            template.guigeCn = item.typeModelName
+            template.remark = item.remark
+            template.preNum = item.preNum
+            template.status = item.status
+            return template
+        },
+
+        /** 查询角色列表 */
+        async getList() {},
+        /** 查询菜单树结构 */
+        getMenuTreeselect() {
+            menuTreeselect().then((response) => {
+                this.menuOptions = response.data
+            })
+        },
+        // 所有菜单节点数据
+        getMenuAllCheckedKeys() {
+            // 目前被选中的菜单节点
+            let checkedKeys = this.$refs.menu.getCheckedKeys()
+            // 半选中的菜单节点
+            let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys()
+            checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
+            return checkedKeys
+        },
+        // 所有部门节点数据
+        getDeptAllCheckedKeys() {
+            // 目前被选中的部门节点
+            let checkedKeys = this.$refs.dept.getCheckedKeys()
+            // 半选中的部门节点
+            let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys()
+            checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
+            return checkedKeys
+        },
+        /** 根据角色ID查询菜单树结构 */
+        getRoleMenuTreeselect(roleId) {
+            return roleMenuTreeselect(roleId).then((response) => {
+                this.menuOptions = response.menus
+                return response
+            })
+        },
+        /** 根据角色ID查询部门树结构 */
+        getDeptTree(roleId) {
+            return deptTreeSelect(roleId).then((response) => {
+                this.deptOptions = response.depts
+                return response
+            })
+        },
+        // 角色状态修改
+
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 取消按钮（数据权限）
+        cancelDataScope() {
+            this.openDataScope = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            if (this.$refs.menu != undefined) {
+                this.$refs.menu.setCheckedKeys([])
+            }
+            ;(this.menuExpand = false),
+                (this.menuNodeAll = false),
+                (this.deptExpand = true),
+                (this.deptNodeAll = false),
+                (this.form = {
+                    roleId: undefined,
+                    roleName: undefined,
+                    roleKey: undefined,
+                    roleSort: 0,
+                    status: '0',
+                    menuIds: [],
+                    deptIds: [],
+                    menuCheckStrictly: true,
+                    deptCheckStrictly: true,
+                    remark: undefined,
+                })
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        //是否可用勾选框
+        selectable(row) {
+            // console.log(row)
+            if (row.num != 0) {
+                return true
+            } else {
+                return false
+            }
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.queryParams.leaseApplyDetails = selection
+        },
+        // 更多操作触发
+        handleCommand(command, row) {
+            switch (command) {
+                case 'handleDataScope':
+                    this.handleDataScope(row)
+                    break
+                case 'handleAuthUser':
+                    this.handleAuthUser(row)
+                    break
+                default:
+                    break
+            }
+        },
+
+        /** 保存按钮操作 */
+        handleAdd() {
+            this.$refs.queryForm.validate(async (valid) => {
+                if (!valid) {
+                    return false
+                } else {
+                    let backApplyInfo = []
+                    if (this.queryParams.leaseApplyDetails.length == 0) {
+                        this.$message.error('请勾选要添加数据')
+                        return
+                    }
+                    // const isRemark = this.queryParams.leaseApplyDetails.some(
+                    //   (item) => item.remark == '' || item.remark == undefined
+                    // );
+                    const isNum = this.queryParams.leaseApplyDetails.some(
+                        (item) => item.num == '' || item.num == undefined,
+                    )
+                    if (isNum) {
+                        this.$message.error('退料数量不能为空！')
+                        return
+                    }
+
+                    this.queryParams.createBy = this.user.name
+                    this.queryParams.companyId = this.companyId
+                    this.queryParams.backApplyInfo = {
+                        backPerson: this.queryParams.backPerson,
+                        phone: this.queryParams.phone,
+                        remark: this.queryParams.remark,
+                        backTime: this.queryParams.backTime,
+                        companyId: this.companyId,
+                    }
+                    if (this.rowId != '') {
+                        let params = {
+                            companyId: this.companyId,
+                            createBy: this.createBy,
+                            id: this.rowId,
+                            agreementId: this.queryParams.agreementId,
+                            backApplyInfo: this.queryParams.backApplyInfo,
+                            backApplyDetails:
+                                this.queryParams.leaseApplyDetails,
+                        }
+                        const res = await submitRefuseBackApply(params)
+                        if (res.code == 200) {
+                            this.$message({ type: 'success', message: res.msg })
+                            setTimeout(() => {
+                                this.$emit('goBackPage')
+                                // this.$tab.closeOpenPage({
+                                //     path: '/claimAndRefund/return/returnApplyByCq',
+                                // })
+                            }, 1000)
+                        }
+                    } else {
+                        let params = {
+                            companyId: this.companyId,
+                            createBy: this.createBy,
+                            agreementId: this.queryParams.agreementId,
+                            backApplyInfo: this.queryParams.backApplyInfo,
+                            backApplyDetails:
+                                this.queryParams.leaseApplyDetails,
+                        }
+                        const res = await submitBackApplyApi(params)
+                        if (res.code == 200) {
+                            this.$message({ type: 'success', message: res.msg })
+                            setTimeout(() => {
+                                this.$emit('goBackPage')
+                                // this.$tab.closeOpenPage({
+                                //     path: '/claimAndRefund/return/returnApplyByCq',
+                                // })
+                            }, 1000)
+                        }
+                    }
+                }
+            })
+        },
+        /** 修改按钮操作 */
+        handleBack(row) {
+            this.$tab.closeOpenPage({
+                path: '/claimAndRefund/return/returnApplyByCq',
+            })
+        },
+
+        /** 分配数据权限操作 */
+        handleDataScope(row) {
+            this.reset()
+            const deptTreeSelect = this.getDeptTree(row.roleId)
+            getRole(row.roleId).then((response) => {
+                this.form = response.data
+                this.openDataScope = true
+                this.$nextTick(() => {
+                    deptTreeSelect.then((res) => {
+                        this.$refs.dept.setCheckedKeys(res.checkedKeys)
+                    })
+                })
+                this.title = '分配数据权限'
+            })
+        },
+        /** 分配用户操作 */
+        handleAuthUser: function (row) {
+            const roleId = row.roleId
+            this.$router.push('/system/role-auth/user/' + roleId)
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.roleId != undefined) {
+                        this.form.menuIds = this.getMenuAllCheckedKeys()
+                        updateRole(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        this.form.menuIds = this.getMenuAllCheckedKeys()
+                        addRole(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            this.deviceType.forEach((e, index) => {
+                if (e[3] == row.typeId) {
+                    this.$nextTick(() => {
+                        this.deviceType.splice(index, 1)
+                        this.propsKey++
+                    })
+                }
+            })
+            this.leaseApplyDetails.splice(row.index, 1)
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'system/role/export',
+                {
+                    ...this.queryParams,
+                },
+                `role_${new Date().getTime()}.xlsx`,
+            )
+        },
+
+        checkNum(row) {
+            let maxNum = row.useNum
+            if (row.num <= 1) {
+                row.num = 1
+            } else if (row.num >= maxNum) {
+                row.num = maxNum
+            }
+        },
+
+        /////// 设备类型树  切换
+        async deviceTypeChange(val) {
+            console.log(val, '*******************')
+            // let nodes = null
+            // console.log(
+            //     'vall1211221122',
+            //     this.$refs.deviceTypeCascader.getCheckedNodes().length,
+            //     this.$refs.deviceTypeCascader.getCheckedNodes(),
+            //     [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)],
+            // )
+            // nodes =
+            //     this.$refs.deviceTypeCascader.getCheckedNodes().length > 0
+            //         ? this.$refs.deviceTypeCascader.getCheckedNodes()
+            //         : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
+            // console.log('nodes', nodes)
+            // // const res = await getUseNumByTypeId({ typeId: nodes[0].data.typeId })
+            // nodes[0].data.useNum = nodes[0].data.num
+            // if (nodes[0].level != 4) {
+            //     return
+            // }
+            // if (nodes[0].data.useNum < 1) {
+            //     this.$modal.msgError('所选机具类型当前无在用!')
+            //     return
+            // }
+            // for (let i = 0; i < this.leaseApplyDetails.length; i++) {
+            //     if (this.leaseApplyDetails[i].typeId == nodes[0].data.typeId) {
+            //         this.leaseApplyDetails.splice(i, 1)
+            //         break
+            //     }
+            // }
+            // this.leaseApplyDetails.push(this.handelTableItemData(nodes[0]))
+            // this.$refs.cascader.$refs.panel.clearCheckedNodes()
+            // // 设置为空可以让节点不高亮显示
+            // this.$refs.cascader.$refs.panel.activePath = []
+            // this.deviceType = {}
+
+            const deviceTypeList =
+                this.$refs.deviceTypeCascader.getCheckedNodes()
+
+            // if (val.length > 0) {
+            //     for (let i in val) {
+            //         console.log(val[i], '----+++')
+            //     }
+            // }
+            let tempList = []
+
+            if (val.length > 0) {
+                const items = val.map((e) => {
+                    return e[3]
+                })
+                for (let i in items) {
+                    for (let z in deviceTypeList) {
+                        if (deviceTypeList[z].data.typeId == items[i]) {
+                            let { num, companyId, typeId, unitNames } =
+                                deviceTypeList[z].data
+                            tempList.push({
+                                createBy: this.createBy,
+                                typeId,
+                                preNum: num,
+                                num,
+                                companyId,
+                                unitNames,
+                                useNum: num,
+                                typeName: deviceTypeList[z].pathLabels[2],
+                                typeCode: deviceTypeList[z].pathLabels[3],
+                            })
+                            break
+                        }
+                    }
+                }
+
+                const newDataList = [...this.leaseApplyDetails, ...tempList]
+                const map = new Map()
+                for (let item of newDataList) {
+                    if (!map.has(item.typeId * 1)) {
+                        map.set(item.typeId * 1, item)
+                    }
+                }
+                const newArray = [...map.values()]
+
+                console.log(newArray, 'newArray', items, 'items')
+
+                let newArray_array = []
+                items.forEach((e) => {
+                    newArray.forEach((j) => {
+                        if (e == j.typeId) {
+                            newArray_array.push(j)
+                        }
+                    })
+                })
+                this.leaseApplyDetails = newArray_array
+            } else {
+                this.leaseApplyDetails = []
+            }
+        },
+        //// 将数据处理成 表格中需要的数据
+        handelTableItemData(node) {
+            const template = JSON.parse(
+                JSON.stringify(this.leaseApplyDetailsItem),
+            )
+            template.createBy = this.createBy
+            template.typeId = node.data.typeId
+            template.companyId = node.data.companyId
+            // template.typeId = node.data.id
+            template.unitNames = node.data.unitNames
+            template.preNum = node.data.num
+            template.typeName = node.pathLabels[2]
+            template.typeCode = node.pathLabels[3]
+            template.num = node.data.num
+            template.useNum = node.data.useNum
+            return template
+        },
+    },
+}
+</script>
+
+<style lang="scss">
+.popper-select {
+    .el-cascader-panel .el-scrollbar .el-checkbox {
+        display: none;
+    }
+
+    .el-cascader-panel .el-scrollbar:nth-child(4) .el-checkbox {
+        display: block !important;
+    }
+}
+</style>
diff --git a/src/views/claimAndreturn/return/receive/component/handlePage.vue b/src/views/claimAndreturn/return/receive/component/handlePage.vue
index e6b82dc..e1d1acc 100644
--- a/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/src/views/claimAndreturn/return/receive/component/handlePage.vue
@@ -180,7 +180,7 @@
                             (scope.row.partNum =
                                 scope.row.manageType == 0 ||
                                 scope.row.manageType == 1
-                                    ? scope.row.maxBackNum
+                                    ? scope.row.preNum
                                     : scope.row.partNum)
                         }}
                     </span>
@@ -222,7 +222,7 @@
                         v-if="
                             !isView &&
                             scope.row.manageType == '0' &&
-                            scope.row.maxBackNum > 0 &&
+                            scope.row.preNum > 0 &&
                             (userId == scope.row.userId || userId == 1)
                         "
                     >
@@ -236,7 +236,7 @@
                             !isView &&
                             (scope.row.manageType == '1' ||
                                 scope.row.manageType == '2') &&
-                            scope.row.maxBackNum > 0 &&
+                            scope.row.preNum > 0 &&
                             (userId == scope.row.userId || userId == 1)
                         "
                     >
@@ -881,7 +881,7 @@ export default {
                 this.codeQuery.parentId = row.id
                 this.codeQuery.typeId = row.modelId
                 this.dialogIsView = true
-                this.returnNum = Number(row.maxBackNum)
+                this.returnNum = Number(row.preNum)
                 this.handleCodeQuery()
             } else if (row.manageType == '2') {
                 this.handleNumReturn(row)
@@ -931,7 +931,7 @@ export default {
             this.codeQuery.typeId = row.modelId
             this.codeQuery.agreementId = row.agreementId
             this.dialogIsView = false
-            this.returnNum = Number(row.maxBackNum)
+            this.returnNum = Number(row.preNum)
             this.handleCodeQuery()
         },
         //数量退料
@@ -939,8 +939,8 @@ export default {
             this.title = '数量退料'
             this.openNum = true
             this.dialogIsView = false
-            this.$set(row, 'backNum', row.maxBackNum) //退料数量
-            this.returnNum = Number(row.maxBackNum)
+            this.$set(row, 'backNum', row.preNum) //退料数量
+            this.returnNum = Number(row.preNum)
             this.dialogData.typeMange = row.manageType
             this.dialogData.typeName = row.typeName
             this.dialogData.typeCode = row.typeCode
diff --git a/src/views/claimAndreturn/return/receive/component/home.vue b/src/views/claimAndreturn/return/receive/component/home.vue
index 0305bb0..dcf37da 100644
--- a/src/views/claimAndreturn/return/receive/component/home.vue
+++ b/src/views/claimAndreturn/return/receive/component/home.vue
@@ -126,6 +126,11 @@
             >批量审核</el-button
           >
         </el-col> -->
+            <el-col :span="1.5">
+                <el-button type="primary" plain size="mini" @click="handleAdd"
+                    >退料接收</el-button
+                >
+            </el-col>
             <el-col :span="1.5">
                 <el-button
                     type="success"
@@ -322,16 +327,16 @@ export default {
             unitList: [],
             proList: [],
             taskStatusList: [
+                // {
+                //     name: '待退料审核',
+                //     id: '37',
+                // },
+                // {
+                //     name: '退料审核通过',
+                //     id: '38',
+                // },
                 {
-                    name: '待退料审核',
-                    id: '37',
-                },
-                {
-                    name: '退料审核通过',
-                    id: '38',
-                },
-                {
-                    name: '退料核查中',
+                    name: '退料进行中',
                     id: '39',
                 },
                 {
@@ -339,9 +344,13 @@ export default {
                     id: '40',
                 },
                 {
-                    name: '退料审核驳回',
-                    id: '101',
+                    name: '退料未开始',
+                    id: '139',
                 },
+                // {
+                //     name: '退料审核驳回',
+                //     id: '101',
+                // },
             ],
             rowObj: {},
         }
@@ -446,6 +455,13 @@ export default {
             this.initSelectData()
             this.handleQuery()
         },
+
+        /** 新增按钮操作 */
+        handleAdd() {
+            // this.$tab.closeOpenPage('/claimAndRefund/return/returnApplyAddByCq')
+            this.$emit('returnApply')
+        },
+
         //打开退料单
         handlePrint(row) {
             // this.title = "退料单";
diff --git a/src/views/claimAndreturn/return/receive/index.vue b/src/views/claimAndreturn/return/receive/index.vue
index 67bd4c6..3b5f203 100644
--- a/src/views/claimAndreturn/return/receive/index.vue
+++ b/src/views/claimAndreturn/return/receive/index.vue
@@ -11,6 +11,8 @@
             :isView="isView"
             :rejectId="rejectId"
             :rejectTaskId="rejectTaskId"
+            :isEdit="isEdit"
+            @returnApply="returnApply"
             @receiveView="receiveView"
             @receiveReturn="receiveReturn"
             @goBackPage="goBack"
@@ -22,11 +24,13 @@
 import PageHeader from '@/components/pageHeader'
 import Home from './component/home.vue'
 import HandlePage from './component/handlePage.vue'
+import AddReturn from './component/addReturn1.vue'
 export default {
     components: {
         PageHeader,
         Home,
         HandlePage,
+        AddReturn,
     },
     data() {
         return {
@@ -35,9 +39,17 @@ export default {
             rejectId: '',
             rejectTaskId: '',
             isView: false,
+            isEdit: false,
         }
     },
     methods: {
+        // 退料申请
+        returnApply() {
+            this.rejectId = ''
+            this.pageContent = '新建退料任务'
+            this.isShowComponent = 'AddReturn'
+            this.isEdit = false
+        },
         // 查看
         receiveView(id) {
             this.pageContent = '退料详情'
diff --git a/src/views/warehouseManage/machinery/coding-nw/index.vue b/src/views/warehouseManage/machinery/coding-nw/index.vue
index dc32c7f..8cf73f2 100644
--- a/src/views/warehouseManage/machinery/coding-nw/index.vue
+++ b/src/views/warehouseManage/machinery/coding-nw/index.vue
@@ -548,12 +548,17 @@
             width="500px"
             append-to-body
         >
-            <div style="text-align: center">
+            <div >
                 <div class="uploadImg">
                     <div id="qrcode" class="qrcode" ref="codeItem"></div>
                     <!--        <img src="" alt="">-->
                 </div>
-                <div class="maCode">二维码编号：{{ rowObj.qrCode }}</div>
+                <div class="info-container">
+                    <div class="maCode">机具名称：{{ rowObj.deviceType }}</div>
+                    <div class="maCode">规格型号：{{ rowObj.specificationType }}</div>
+                    <div class="maCode">资产编号：{{ rowObj.maCode }}</div>
+                    <div class="maCode">二维码编号：{{ rowObj.qrCode }}</div>
+                </div>
             </div>
             <div slot="footer" class="dialog-footer" style="text-align: center">
                 <!-- <el-button type="primary" @click="downloadCode">下 载</el-button> -->
@@ -926,6 +931,14 @@ export default {
     align-items: center;
     justify-content: center;
 }
+.info-container {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    gap: 10px; /* 可根据需要调整间距 */
+    padding-left:100px;
+}
 .maCode {
     margin-top: 15px;
     font-size: 18px;
diff --git a/src/views/warehouseManage/tagBind/bind/index.vue b/src/views/warehouseManage/tagBind/bind/index.vue
index 5f2b265..7385411 100644
--- a/src/views/warehouseManage/tagBind/bind/index.vue
+++ b/src/views/warehouseManage/tagBind/bind/index.vue
@@ -437,7 +437,12 @@
                     <div id="qrcode" class="qrcode" ref="codeItem"></div>
                     <!--        <img src="" alt="">-->
                 </div>
-                <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
+                <div class="info-container">
+                    <div class="maCode">机具名称：{{ rowObj.modelName }}</div>
+                    <div class="maCode">规格型号：{{ rowObj.typeName }}</div>
+                    <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
+                    <div class="maCode">标签编号：{{ rowObj.labelCode }}</div>
+                </div>
             </div>
             <div slot="footer" class="dialog-footer" style="text-align: center">
                 <el-button type="primary" @click="downloadCode"
@@ -1114,10 +1119,18 @@ export default {
     align-items: center;
     justify-content: center;
 }
+.info-container {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    gap: 10px; /* 可根据需要调整间距 */
+    padding-left:80px;
+}
 .maCode {
-    margin-top: 10px;
-    padding-bottom: 20px;
+    margin-top: 15px;
     font-size: 18px;
+    // margin-left:40px;
 }
 ::v-deep.el-table .fixed-width .el-button--mini {
     width: 60px !important;
diff --git a/src/views/warehouseManage/tagBind/history/index.vue b/src/views/warehouseManage/tagBind/history/index.vue
index 6f40910..ae15fbf 100644
--- a/src/views/warehouseManage/tagBind/history/index.vue
+++ b/src/views/warehouseManage/tagBind/history/index.vue
@@ -171,7 +171,12 @@
                 <div class="uploadImg">
                     <div id="qrcode" class="qrcode" ref="codeItem"></div>
                 </div>
-                <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
+                <div class="info-container">
+                    <div class="maCode">机具名称：{{ rowObj.modelName }}</div>
+                    <div class="maCode">规格型号：{{ rowObj.typeName }}</div>
+                    <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
+                    <div class="maCode">标签编号：{{ rowObj.labelCode }}</div>
+                </div>
             </div>
         </el-dialog>
     </div>
@@ -345,9 +350,18 @@ export default {
     align-items: center;
     justify-content: center;
 }
+.info-container {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    gap: 10px; /* 可根据需要调整间距 */
+    padding-left:100px;
+}
 .maCode {
     margin-top: 15px;
     font-size: 18px;
+    // margin-left:40px;
 }
 ::v-deep.el-table .fixed-width .el-button--mini {
     width: 60px !important;
diff --git a/vue.config.js b/vue.config.js
index 43f5176..798ca46 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -46,7 +46,7 @@ module.exports = {
                 // target: `http://10.40.92.81:8080`, //韩/
                 // target: `http://192.168.2.74:49080`, //旭/
                 // target: `http://192.168.2.17:39080`, //帅
-                target: `http://192.168.2.209:49080`, //福
+                target: `http://localhost:39080`, //福
                 // target: `http://192.168.0.37:49080`, //跃
 
                 //******** 注意事项  ********* */