diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking-old.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking-old.vue
new file mode 100644
index 0000000..565ca55
--- /dev/null
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking-old.vue
@@ -0,0 +1,1704 @@
+<template>
+    <div>
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :rules="queryRules"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+        >
+            <el-form-item label="领用类型" prop="leaseType">
+                <el-select
+                    v-model="queryParams.leaseType"
+                    filterable
+                    placeholder="请选择领用类型"
+                    clearable
+                    style="width: 240px"
+                    :disabled="isEdit"
+                    @change="leaseTypeChange"
+                >
+                    <el-option
+                        v-for="item in typeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                        :disabled="isEdit"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="领料单位" prop="unitId">
+                <el-select
+                    v-model="queryParams.unitId"
+                    filterable
+                    clearable
+                    @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"
+                    filterable
+                    clearable
+                    @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 maxlength="50" v-model="queryParams.agreementCode" disabled style="width: 240px"></el-input>
+            </el-form-item>
+            <el-form-item label="成套设备" prop="agreementCode">
+                <el-select
+                    multiple
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择成套设备"
+                    @change="onChangeWholeTypeName"
+                    @remove-tag="onRemoveTag"
+                    v-model="queryParams.wholeTypeName"
+                    ref="WholeTypeRef"
+                >
+                    <el-option
+                        v-for="item in holdingPoleSelList"
+                        :key="item.id"
+                        :label="item.wholeTypeName"
+                        :value="item.id"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="类型名称" prop="status">
+                <el-cascader
+                    filterable
+                    collapse-tags
+                    :key="propsKey"
+                    style="width: 240px"
+                    v-model="deviceType"
+                    :show-all-levels="false"
+                    ref="deviceTypeCascader"
+                    :options="deviceTypeTree"
+                    @change="deviceTypeChange"
+                    placeholder="请输入类型名称"
+                    popper-class="popper-select"
+                    :props="deviceTypeTreeProps"
+                ></el-cascader>
+            </el-form-item>
+            <el-form-item label="规格型号" prop="typeId">
+                <el-select
+                    v-model="queryParams.typeId"
+                    filterable
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择规格型号"
+                    @change="changeType"
+                >
+                    <el-option
+                        v-for="item in typeListDev"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="预计领料时间" prop="estimateLeaseTime">
+                <el-date-picker
+                    v-model="queryParams.estimateLeaseTime"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetime"
+                    placeholder="预计领料时间"
+                ></el-date-picker>
+            </el-form-item>
+            <el-form-item label="领料人" prop="leasePerson">
+                <el-input
+                    maxlength="50"
+                    v-model="queryParams.leaseApplyInfo.leasePerson"
+                    placeholder="请输入领料人"
+                    clearable
+                    style="width: 240px"
+                />
+            </el-form-item>
+            <el-form-item label="领料人电话" prop="phone">
+                <el-input
+                    v-model="queryParams.leaseApplyInfo.phone"
+                    placeholder="请输入领料人电话"
+                    clearable
+                    style="width: 240px"
+                    maxlength="11"
+                    onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
+                />
+            </el-form-item>
+            <el-form-item
+                label="费用承担方"
+                prop="costBearingParty"
+                v-if="queryParams.leaseType && queryParams.leaseType == 0"
+            >
+                <el-select
+                    v-model="queryParams.costBearingParty"
+                    filterable
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择费用承担方"
+                    :disabled="isEdit"
+                >
+                    <el-option v-for="item in costBearingList" :key="item" :label="item" :value="item"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="roleName">
+                <el-input
+                    maxlength="100"
+                    v-model="queryParams.leaseApplyInfo.remark"
+                    placeholder="请输入备注"
+                    clearable
+                    rows="1"
+                    type="textarea"
+                    style="width: 240px"
+                />
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button plain size="mini" v-if="isView" type="primary" icon="el-icon-plus" @click="handleAdd">
+                    保存
+                </el-button>
+            </el-col>
+
+            <!-- <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+          >导出</el-button>
+        </el-col> -->
+        </el-row>
+
+        <el-table v-show="wholeTypeNameList.length > 0" :data="wholeTypeNameList">
+            <el-table-column type="index" align="center" />
+            <el-table-column type="expand">
+                <template slot-scope="props">
+                    <el-table :data="props.row.childrenList">
+                        <el-table-column align="center" prop="typeName" label="设备名称" />
+                        <el-table-column align="center" label="规格型号" prop="deviceType" />
+                        <el-table-column align="center" label="设备所属" prop="deviceAscription" />
+
+                        <el-table-column label="预领数量" prop="deviceNum" align="center" />
+                        <el-table-column align="center" label="库存数量" prop="num" />
+                    </el-table>
+                </template>
+            </el-table-column>
+            <el-table-column prop="wholeTypeName" align="center" label="抱杆设备名称" />
+            <el-table-column align="center" label="抱杆设备数量" width="260">
+                <template slot-scope="scope">
+                    <el-input-number
+                        :min="1"
+                        :max="1000"
+                        @change="onChangeInput($event, scope.$index)"
+                        v-model="scope.row.wholeTypeNum"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column align="center" label="操作" width="180">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="danger" @click="onHandelDelete(scope.$index)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <el-table
+            v-loading="loading"
+            :data="leaseApplyDetails"
+            v-show="wholeTypeNameList.length === 0"
+            @selection-change="handleSelectionChange"
+        >
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="序号" type="index" width="80" />
+            <el-table-column type="expand">
+                <template slot-scope="props">
+                    <el-table
+                        :data="props.row.childrenList"
+                        v-if="props.row.childrenList && props.row.childrenList.length > 0"
+                    >
+                        <!-- <el-table-column align="center" prop="typeName" label="设备名称" /> -->
+                        <el-table-column align="center" label="规格型号" prop="deviceType" />
+                        <el-table-column align="center" label="是否管理库存">
+                            <template slot-scope="{ row }">
+                                <el-tag size="mini" type="primary" v-if="row.isStorage == 1">是</el-tag>
+                                <el-tag size="mini" type="warning" v-if="row.isStorage == 0">否</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="预领数量" prop="deviceNum" align="center" />
+                        <el-table-column align="center" label="库存数量" prop="num" />
+                    </el-table>
+                </template>
+            </el-table-column>
+            <el-table-column prop="wholeTypeName" align="center" label="成套设备名称" />
+            <el-table-column label="机具名称" prop="typeCn" :show-overflow-tooltip="true" />
+            <el-table-column label="规格型号" prop="guigeCn" :show-overflow-tooltip="true" />
+            <el-table-column label="计量单位" prop="unitCn" align="center" />
+            <el-table-column label="库存数量" prop="num" align="center" />
+            <el-table-column label="预领数量" align="center">
+                <template slot-scope="scope">
+                    <el-input
+                        v-if="!scope.row.childrenList"
+                        v-model.number="scope.row.preNum"
+                        placeholder="请输入预领数量"
+                        type="number"
+                        min="1"
+                        clearable
+                        style="width: 100%"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="createTime">
+                <template slot-scope="scope">
+                    <el-input
+                        maxlength="100"
+                        v-model="scope.row.remark"
+                        placeholder="请输入备注"
+                        clearable
+                        style="width: 100%"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                fixed="right"
+                class-name="small-padding fixed-width"
+                v-if="isView"
+            >
+                <template slot-scope="scope">
+                    <!--          <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 {
+    addCompleteSetToolsApi,
+    queryCompleteSetToolsApi,
+    getCompleteSetToolsApi,
+    delCompleteSetToolsApi,
+} from '@/api/store/completeTools.js'
+import {
+    getProData,
+    getUnitData,
+    getDeviceTypeTree,
+    getAgreementInfoById,
+    submitLeaseApply,
+    getTaskDetail,
+    editLeaseApply,
+    getLeaseApplyListAll,
+    getLeaseApplyAuditListAll,
+    getCostBearingApi,
+    getAgreementInfoByIdApi,
+    getHoldingPoleSelListApi,
+    getLevelTwoUnitCbx,
+    getMaTypeDataById,
+} from '@/api/claimAndRefund/receive'
+import { getInfo } from '@/api/login'
+export default {
+    name: 'ReceiveApplyAdd',
+    props: {
+        isView: {
+            type: Boolean,
+            default: () => {
+                return false
+            },
+        },
+        isEdit: {
+            type: Boolean,
+            default: () => {
+                return false
+            },
+        },
+        viewTaskId: {
+            type: [String, Number],
+        },
+        rejectTaskStatus: {
+            type: [String, Number],
+            default: () => {
+                return null
+            },
+        },
+    },
+    data() {
+        const validatePhone = (rule, value, callback) => {
+            if (!value) {
+                callback(new Error('退料人电话不能为空'))
+                // this.$message.error("手机号不为空");
+            } else if (value.length < 11) {
+                callback(new Error('电话号码格式不正确'))
+                // this.$message.error("手机号格式不正确");
+            } else {
+                callback()
+            }
+        }
+        return {
+            user: null, // 用户信息
+            // 遮罩层
+            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,
+            // isEdit: 'true',
+            // 日期范围
+            dateRange: [],
+            // 数据范围选项
+            dataScopeOptions: [
+                {
+                    value: '1',
+                    label: '全部数据权限',
+                },
+                {
+                    value: '2',
+                    label: '自定数据权限',
+                },
+                {
+                    value: '3',
+                    label: '本部门数据权限',
+                },
+                {
+                    value: '4',
+                    label: '本部门及以下数据权限',
+                },
+                {
+                    value: '5',
+                    label: '仅本人数据权限',
+                },
+            ],
+            // 菜单列表
+            menuOptions: [],
+            // 部门列表
+            deptOptions: [],
+            // 查询参数
+            queryParams: {
+                typeId: null,
+                types: 2,
+                unitId: null,
+                proId: null,
+                agreementId: null, //协议id
+                agreementCode: null, //协议code
+                companyId: '', //登录信息中取
+                createBy: '', //用户名
+                estimateLeaseTime: '',
+                leaseType: '',
+                taskType: 29,
+                taskStatus: 31,
+                //领料人信息
+                leaseApplyInfo: {
+                    leasePerson: '',
+                    phone: '',
+                    remark: '',
+                },
+                //领料详情集合
+                leaseApplyDetails: [],
+                wholeTypeName: '',
+            },
+            typeList: [
+                { id: '0', name: '工程租赁' },
+                { id: '1', name: '长期领用' },
+            ], //集合
+            typeListDev: [], // 规格型号
+            selectParams: {},
+            leaseApplyDetails: [],
+            leaseApplyInfoList: [],
+            //领料详情单条模板
+            leaseApplyDetailsItem: {
+                parenntId: null,
+                createBy: null,
+                companyId: null,
+                status: 0,
+                typeId: null, //  树结构第4级   规格id
+                typeCn: '', //显示的设备类型
+                guigeCn: '', //显示的设备规格
+                unitCn: '', //显示的设备 单位
+                remark: '', //单条备注
+                preNum: 1, //预领数量
+                deviceNum: '',
+            },
+            //
+            queryRules: {
+                leaseType: [
+                    {
+                        required: true,
+                        message: '请选择领用类型',
+                        trigger: 'change',
+                    },
+                ],
+                unitId: [
+                    {
+                        required: true,
+                        message: '请选择领料单位',
+                        trigger: 'change',
+                    },
+                ],
+                proId: [
+                    {
+                        required: true,
+                        message: '请选择领料工程',
+                        trigger: 'change',
+                    },
+                ],
+                costBearingParty: [
+                    {
+                        required: true,
+                        message: '请选择费用承担方',
+                        trigger: 'change',
+                    },
+                ],
+                // leasePerson: [
+                //   {
+                //     required: true, message: '请输入领料人', trigger: 'blur',
+                //   }
+                // ],
+                // phone: [
+                //     {required: true, message: '请输入领料人手机号', trigger: 'change'},
+                //     { validator: validatePhone, trigger: "blur" },
+                //     { min: 11, message: "手机号不足11位", trigger: "blur" },
+                // ],
+            },
+            unitList: [], //单位 集合
+            proList: [], // 工程 集合
+            deviceTypeTree: [], // 设备 树结构数据
+
+            taskId: null, // 是否编辑
+
+            // 设备 树显示 配置
+            deviceTypeTreeProps: {
+                // multiple: true,
+                value: 'id',
+            },
+            // 选中的设备类型
+            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',
+                    },
+                ],
+            },
+            costBearingList: [],
+            isCost: false,
+            propsKey: 1000,
+            holdingPoleSelList: [],
+            wholeTypeNameList: [],
+            wholeTypeItemsList: [],
+        }
+    },
+    mounted() {
+        this.GetUserInfo()
+
+        this.GetUnitData()
+
+        this.GetProData()
+
+        this.getCostBearingFun()
+
+        this.getHoldingPoleSelListData()
+
+        // this.GetDeviceTypeTree()
+        // this.getList();
+        if (this.$route.query.taskId && !this.$route.query.isBack) {
+            console.log('查看')
+            this.GetTaskDetail(this.$route.query.taskId)
+        }
+        if (this.$route.query.taskId && this.$route.query.isBack) {
+            console.log('驳回提交查看')
+            this.GetTaskDetail2(this.$route.query.taskId)
+        }
+        // this.taskId = this.$route.query.taskId
+        // this.isEdit = this.$route.query.isEdit
+        this.taskId = this.viewTaskId
+
+        if (this.taskId) {
+            Promise.all([this.GetTaskDetail(this.taskId), this.GetDeviceTypeTree()]).then(() => {
+                let selectList = []
+                this.leaseApplyDetails.forEach((e) => {
+                    selectList.push(this.getParentsById(this.deviceTypeTree, e.typeId))
+                })
+                this.$nextTick(() => {
+                    this.deviceType = selectList
+                    this.propsKey++
+                })
+            })
+        } else {
+            this.GetDeviceTypeTree()
+        }
+
+        // console.log(typeof(this.isEdit))
+        // this.$set('isEdit',this.$route.query.isEdit)
+    },
+
+    methods: {
+        // 获取用户信息
+        async GetUserInfo() {
+            const res = await getInfo()
+            this.user = res.user
+        },
+
+        // 获取 来往单位 列表数据
+        async GetUnitData() {
+            const params = {
+                id: this.queryParams.proId,
+            }
+            const res = await getUnitData(params)
+            this.unitList = res.data
+
+            this.GetAgreementInfoById()
+        },
+        async getLevelTwoUnitCbx() {
+            const res = await getLevelTwoUnitCbx({ id: '' })
+            console.log('🚀 ~ getLevelTwoUnitCbx ~ res:', res)
+            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 GetDeviceTypeTree() {
+            const params = {
+                level: 3,
+            }
+            getDeviceTypeTree(params).then((res) => {
+                this.deviceTypeTree = res.data
+                console.log('🚀 ~ getDeviceTypeTree ~ this.deviceTypeTree:', this.deviceTypeTree)
+            })
+        },
+        getParentsById(list, id) {
+            for (let i in list) {
+                if (list[i].id == id) {
+                    //查询到就返回该数组对象的value
+                    return [list[i].id]
+                }
+                if (list[i].children) {
+                    let node = this.getParentsById(list[i].children, id)
+                    if (node !== undefined) {
+                        //查询到把父节把父节点加到数组前面
+                        node.unshift(list[i].id)
+                        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)
+
+                console.log(res, '根据工程和单位获取协议id')
+
+                if (res.data.isSlt == 1) {
+                    this.$message.error('当前协议下对应的工程已完成结算，不可重复领料！')
+                    this.isCost = true
+
+                    if (this.leaseApplyDetails.length > 0) {
+                        this.leaseApplyDetails = []
+                    }
+                } else {
+                    this.isCost = false
+                }
+                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
+
+                    // // 1. 判断当前协议对应的工程是否结算
+
+                    // getAgreementInfoByIdApi({
+                    //     agreementId: res.data.agreementId,
+                    // })
+                }
+            }
+        },
+
+        // 获取 任务详情数据
+        async GetTaskDetail(taskId) {
+            const res = await getLeaseApplyListAll({ taskId })
+
+            const data = res.rows[0]
+
+            // unitId:null,
+            // proId:null,
+            // agreementId:null, //协议id
+            // agreementCode: null,
+            if (data.taskStatus == 100) {
+                this.queryParams.taskStatus = 32
+                this.queryParams.examineStatusId = '32'
+            }
+            this.queryParams.unitId = data.unitId
+            this.queryParams.costBearingParty = data.costBearingParty
+            this.queryParams.proId = data.proId
+            this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
+            this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
+            this.queryParams.agreementCode = data.agreementCode
+            this.queryParams.agreementId = data.agreementId
+            this.queryParams.estimateLeaseTime = data.estimateLeaseTime
+            this.queryParams.wholeTypeName = data.wholeTypeName
+
+            // this.queryParams.leaseType = data.leaseType
+            this.$set(this.queryParams, 'leaseType', data.leaseType)
+            this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
+            this.leaseApplyInfoList = data.leaseApplyInfoList
+            this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
+                return this.handelEchoData(item)
+            })
+
+            //   guigeCn: j.deviceType,
+            //                         typeCn: j.typeName,
+            //                         createBy: this.user.name,
+            //                         typeId: j.deviceTypeId,
+            //                         preNum: j.deviceNum,
+            //                         num: j.num,
+            //                         isCt: 0,
+            //                         ctParentId: e.ctParentId,
+
+            if (data.ctLeaseApplyDetails) {
+                for (let key in data.ctLeaseApplyDetails) {
+                    const childrenList = data.ctLeaseApplyDetails[key].map((e) => {
+                        return {
+                            typeName: e.typeModelName,
+                            typeId: e.typeId,
+                            preNum: e.preNum,
+                            num: e.num,
+                            ctParentId: e.ctParentId,
+                            deviceType: e.typeModelName,
+                            deviceNum: e.preNum,
+                            isStorage: e.isStorage,
+                            deviceTypeId: e.typeId,
+                        }
+                    })
+
+                    console.log('childrenList', childrenList)
+                    this.leaseApplyDetails.push({
+                        wholeTypeName: key,
+                        childrenList,
+                        ctParentId: data.ctLeaseApplyDetails[key][0].ctParentId,
+                    })
+                }
+
+                console.log(' this.leaseApplyDetails', this.leaseApplyDetails)
+            }
+        },
+        // 驳回提交 任务详情数据
+        async GetTaskDetail2(taskId) {
+            const res = await getLeaseApplyAuditListAll({ taskId })
+
+            const data = res.rows[0]
+
+            // unitId:null,
+            // proId:null,
+            // agreementId:null, //协议id
+            // agreementCode: null,
+            if (data.taskStatus == 100) {
+                this.queryParams.taskStatus = 32
+                this.queryParams.examineStatusId = '32'
+            }
+            this.queryParams.unitId = data.unitId
+            this.queryParams.proId = data.proId
+            this.queryParams.costBearingParty = data.costBearingParty
+            this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
+            this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
+            this.queryParams.agreementCode = data.agreementCode
+            this.queryParams.agreementId = data.agreementId
+            this.queryParams.estimateLeaseTime = data.estimateLeaseTime
+            // this.queryParams.leaseType = data.leaseType
+            this.$set(this.queryParams, 'leaseType', data.leaseType)
+            this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
+            this.leaseApplyInfoList = data.leaseApplyInfoList
+            this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
+                return this.handelEchoData(item)
+            })
+        },
+        //生成回显数据
+        handelEchoData(item) {
+            const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
+            template.createBy = item.createBy
+            template.companyId = item.companyId
+            template.typeId = item.typeId
+            template.unitCn = item.unitName
+            template.typeCn = item.typeName
+            template.guigeCn = item.typeModelName
+            template.remark = item.remark
+            template.preNum = item.preNum
+            template.deviceNum = item.deviceNum
+            template.status = item.status
+            template.parenntId = item.parenntId
+            template.num = item.num
+            return template
+        },
+
+        methods: {
+            // 获取用户信息
+            async GetUserInfo() {
+                const res = await getInfo()
+                this.user = res.user
+            },
+
+            // 获取 来往单位 列表数据
+            async GetUnitData() {
+                const params = {
+                    id: this.queryParams.proId,
+                }
+                const res = await getUnitData(params)
+                this.unitList = res.data
+
+                this.GetAgreementInfoById()
+            },
+            async getLevelTwoUnitCbx() {
+                const res = await getLevelTwoUnitCbx({ id: '' })
+                console.log('🚀 ~ getLevelTwoUnitCbx ~ res:', res)
+                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 GetDeviceTypeTree() {
+                const params = {
+                    level: 3,
+                }
+                getDeviceTypeTree(params).then((res) => {
+                    this.deviceTypeTree = res.data
+                    console.log('🚀 ~ getDeviceTypeTree ~ this.deviceTypeTree:', this.deviceTypeTree)
+                })
+            },
+            getParentsById(list, id) {
+                for (let i in list) {
+                    if (list[i].id == id) {
+                        //查询到就返回该数组对象的value
+                        return [list[i].id]
+                    }
+                    if (list[i].children) {
+                        let node = this.getParentsById(list[i].children, id)
+                        if (node !== undefined) {
+                            //查询到把父节把父节点加到数组前面
+                            node.unshift(list[i].id)
+                            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)
+
+                    console.log(res, '根据工程和单位获取协议id')
+
+                    if (res.data.isSlt == 1) {
+                        this.$message.error('当前协议下对应的工程已完成结算，不可重复领料！')
+                        this.isCost = true
+
+                        if (this.leaseApplyDetails.length > 0) {
+                            this.leaseApplyDetails = []
+                        }
+                    } else {
+                        this.isCost = false
+                    }
+                    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
+
+                        // // 1. 判断当前协议对应的工程是否结算
+
+                        // getAgreementInfoByIdApi({
+                        //     agreementId: res.data.agreementId,
+                        // })
+                    }
+                }
+            },
+
+            // 获取 任务详情数据
+            async GetTaskDetail(taskId) {
+                const res = await getLeaseApplyListAll({ taskId })
+
+                const data = res.rows[0]
+
+                // unitId:null,
+                // proId:null,
+                // agreementId:null, //协议id
+                // agreementCode: null,
+                if (data.taskStatus == 100) {
+                    this.queryParams.taskStatus = 32
+                    this.queryParams.examineStatusId = '32'
+                }
+                this.queryParams.unitId = data.unitId
+                this.queryParams.costBearingParty = data.costBearingParty
+                this.queryParams.proId = data.proId
+                this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
+                this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
+                this.queryParams.agreementCode = data.agreementCode
+                this.queryParams.agreementId = data.agreementId
+                this.queryParams.estimateLeaseTime = data.estimateLeaseTime
+                this.queryParams.wholeTypeName = data.wholeTypeName
+
+                // this.queryParams.leaseType = data.leaseType
+                this.$set(this.queryParams, 'leaseType', data.leaseType)
+                this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
+                this.leaseApplyInfoList = data.leaseApplyInfoList
+                this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
+                    return this.handelEchoData(item)
+                })
+
+                if (data.ctLeaseApplyDetails) {
+                    for (let key in data.ctLeaseApplyDetails) {
+                        const childrenList = data.ctLeaseApplyDetails[key].map((e) => {
+                            return {
+                                typeName: e.typeModelName,
+                                typeId: e.typeId,
+                                preNum: e.preNum,
+                                num: e.num,
+                                ctParentId: e.ctParentId,
+                                deviceType: e.typeModelName,
+                                deviceNum: e.preNum,
+                                isStorage: e.isStorage,
+                                deviceTypeId: e.typeId,
+                            }
+                        })
+
+                        console.log('childrenList', childrenList)
+                        this.leaseApplyDetails.push({
+                            wholeTypeName: key,
+                            childrenList,
+                            ctParentId: data.ctLeaseApplyDetails[key][0].ctParentId,
+                        })
+                    }
+
+                    console.log(' this.leaseApplyDetails', this.leaseApplyDetails)
+                }
+            },
+            // 驳回提交 任务详情数据
+            async GetTaskDetail2(taskId) {
+                const res = await getLeaseApplyAuditListAll({ taskId })
+
+                const data = res.rows[0]
+
+                // unitId:null,
+                // proId:null,
+                // agreementId:null, //协议id
+                // agreementCode: null,
+                if (data.taskStatus == 100) {
+                    this.queryParams.taskStatus = 32
+                    this.queryParams.examineStatusId = '32'
+                }
+                this.queryParams.unitId = data.unitId
+                this.queryParams.proId = data.proId
+                this.queryParams.costBearingParty = data.costBearingParty
+                this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
+                this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
+                this.queryParams.agreementCode = data.agreementCode
+                this.queryParams.agreementId = data.agreementId
+                this.queryParams.estimateLeaseTime = data.estimateLeaseTime
+                // this.queryParams.leaseType = data.leaseType
+                this.$set(this.queryParams, 'leaseType', data.leaseType)
+                this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
+                this.leaseApplyInfoList = data.leaseApplyInfoList
+                this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
+                    return this.handelEchoData(item)
+                })
+            },
+            //生成回显数据
+            handelEchoData(item) {
+                const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
+                template.createBy = item.createBy
+                template.companyId = item.companyId
+                template.typeId = item.typeId
+                template.unitCn = item.unitName
+                template.typeCn = item.typeName
+                template.guigeCn = item.typeModelName
+                template.remark = item.remark
+                template.preNum = item.preNum
+                template.deviceNum = item.deviceNum
+                template.status = item.status
+                template.parenntId = item.parenntId
+                template.num = item.num
+                return template
+            },
+
+            // 表单重置
+            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
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.dateRange = []
+                this.resetForm('queryForm')
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                // this.queryParams.leaseApplyDetails = selection
+                this.single = selection.length != 1
+                this.multiple = !selection.length
+            },
+            // 更多操作触发
+            handleCommand(command, row) {
+                switch (command) {
+                    case 'handleDataScope':
+                        this.handleDataScope(row)
+                        break
+                    case 'handleAuthUser':
+                        this.handleAuthUser(row)
+                        break
+                    default:
+                        break
+                }
+            },
+
+            /** 保存按钮操作 */
+
+            /** 修改按钮操作 */
+            handleBack(row) {
+                this.$tab.closeOpenPage({
+                    path: '/claimAndRefund/receiveByCq/receiveApply',
+                })
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                // this.deviceType.forEach((e, index) => {
+                //     if (e[3] === row.typeId) {
+                //         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.num
+                if (row.preNum <= 1) {
+                    row.preNum = 1
+                } else if (row.preNum >= maxNum) {
+                    row.preNum = maxNum
+                }
+            },
+            /////// 设备类型树  切换
+            deviceTypeChange(val) {
+                console.log('🚀 ~ deviceTypeChange ~ val:', val)
+                this.queryParams.typeId = ''
+                this.typeListDev = []
+                // console.log('🚀 ~ deviceTypeChange ~ val:', val)
+                this.$nextTick(() => {
+                    const deviceTypeList = this.$refs.deviceTypeCascader.getCheckedNodes()
+                    console.log('🚀 ~ deviceTypeChange ~ deviceTypeList:', deviceTypeList[0])
+                    this.selectParams = {
+                        createBy: this.user.name,
+                        companyId: deviceTypeList[0].data.companyId,
+                        // num: deviceTypeList[0].data.num,
+                        typeCn: deviceTypeList[0].data.label,
+                    }
+                    console.log('🚀 ~ deviceTypeChange ~ this.selectParams:', this.selectParams)
+                    this.getMaTypeDataByIdFun(val[val.length - 1])
+                })
+
+                // 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.id === items[i]) {
+                //                 let { num, companyId, id, unitName } = deviceTypeList[z].data
+
+                //                 const isRepeat = this.leaseApplyDetails.some((e) => e.typeId === id)
+                //                 if (!isRepeat) {
+                //                     this.leaseApplyDetails.push({
+                //                         createBy: this.user.name,
+                //                         typeId: id,
+                //                         num,
+                //                         companyId,
+                //                         unitCn: unitName,
+                //                         typeCn: deviceTypeList[z].pathLabels[2],
+                //                         guigeCn: deviceTypeList[z].pathLabels[3],
+                //                     })
+                //                 }
+                //             }
+                //         }
+                //     }
+                //     console.log('🚀 ~ deviceTypeChange ~ this.leaseApplyDetails:', this.leaseApplyDetails)
+                // } else {
+                //     this.leaseApplyDetails = []
+                // }
+            },
+            // 获取规格型号
+            async getMaTypeDataByIdFun(val) {
+                const res = await getMaTypeDataById({ id: val })
+                this.typeListDev = res.data.filter((e) => e.isStorage == 1)
+                console.log('🚀 ~ getMaTypeDataByIdFun ~ res:', res)
+            },
+            // 选择规格型号
+            changeType(e) {
+                // console.log('🚀 ~ changeType ~ e:', e)
+                if (!e) return
+                // 获取选中的规格型号
+                const selectType = this.typeListDev.find((item) => item.id == e)
+                console.log('🚀 ~ changeType ~ selectType:', selectType)
+                this.selectParams.typeId = selectType.id
+                this.selectParams.guigeCn = selectType.name
+                this.selectParams.unitCn = selectType.unit
+                this.selectParams.num = selectType.num
+                console.log('🚀 ~ changeType ~ this.selectParams:', this.selectParams)
+                // 判断是否重复
+                const isRepeat = this.leaseApplyDetails.find((item) => item.typeId == selectType.id)
+                // console.log('🚀 ~ changeType ~ isRepeat:', isRepeat)
+                if (isRepeat) {
+                    this.$message.error('当前设备已添加，不可重复添加！')
+                    return
+                }
+                this.leaseApplyDetails.push({ ...this.selectParams })
+                console.log('🚀 ~ changeType ~ this.leaseApplyDetails:', this.leaseApplyDetails)
+            },
+            //// 将数据处理成 表格中需要的数据
+            handelTableItemData(node) {
+                const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
+                template.createBy = this.user.name
+                console.log(node.data)
+                template.num = node.data.num
+                template.companyId = node.data.companyId
+                template.typeId = node.data.id
+                template.unitCn = node.data.unitName
+                template.typeCn = node.pathLabels[2]
+                template.guigeCn = node.pathLabels[3]
+
+                if (this.taskId) {
+                    const index = this.leaseApplyInfoList.find((key) => key.companyId == node.data.companyId)
+                    template.parenntId = index ? index.id : ''
+                }
+
+                return template
+            },
+
+            // 获取费用承担方
+            async getCostBearingFun() {
+                const { data: res } = await getCostBearingApi()
+                this.costBearingList = res
+            },
+
+            // 领用类型修改时清空费用承担方
+            leaseTypeChange(val) {
+                console.log('🚀 ~ leaseTypeChange ~ val:', val)
+                if (val == 0) {
+                    this.$set(this.queryParams, 'costBearingParty', '')
+                    this.GetUnitData()
+                    this.GetProData()
+                } else {
+                    this.$delete(this.queryParams, 'costBearingParty')
+                    this.queryParams.unitId = ''
+                    this.queryParams.proId = ''
+                    this.proList = []
+                    this.getLevelTwoUnitCbx()
+                    this.$nextTick(() => {
+                        this.$refs.queryForm.clearValidate()
+                    })
+                }
+            },
+
+            /* 获取抱杆下拉数据 */
+            async getHoldingPoleSelListData() {
+                const { data: res } = await getHoldingPoleSelListApi()
+                this.holdingPoleSelList = res
+            },
+            /* 抱杆成套设备change事件 */
+            onChangeWholeTypeName(val) {
+                val.forEach((e) => {
+                    const selLable = this.holdingPoleSelList.find((j) => j.id === e)
+                    const isPush = this.leaseApplyDetails.some((z) => z.ctParentId == e)
+
+                    if (!isPush) {
+                        const wholeTypeNameData = {
+                            id: e,
+                            wholeTypeName: selLable.wholeTypeName,
+                            wholeTypeNum: 1,
+                            childrenList: [],
+                        }
+
+                        queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
+                            this.leaseApplyDetails.push({
+                                wholeTypeName: selLable.wholeTypeName,
+                                childrenList: res.data,
+                                ctParentId: e,
+                            })
+                        })
+                    }
+                })
+                // const selLable = this.holdingPoleSelList.find((e) => e.id === val)
+                // const wholeTypeNameData = {
+                //     id: val,
+                //     wholeTypeName: selLable.wholeTypeName,
+                //     wholeTypeNum: 1,
+                //     childrenList: [],
+                // }
+                // queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
+                //     console.log(res, '996')
+
+                //     this.leaseApplyDetails.push({
+                //         wholeTypeName: selLable.wholeTypeName,
+                //         childrenList: res.data,
+                //         ctParentId: val,
+                //     })
+                //     // wholeTypeNameData.childrenList = res.data
+                //     // wholeTypeNameData.childrenList.forEach((e) => (e.initNum = e.deviceNum))
+                //     // const isREpeat = this.wholeTypeNameList.find((e) => e.id === val)
+                //     // if (!isREpeat) {
+                //     //     this.wholeTypeNameList.push(wholeTypeNameData)
+                //     // } else {
+                //     //     this.$modal.msgError('当前抱杆成套设备已添加，不可重复添加！')
+                //     // }
+                //     // console.log(this.wholeTypeNameList, '处理后的数据---')
+                // })
+
+                // this.queryParams.wholeTypeName = ''
+            },
+
+            // 移除时触发
+            onRemoveTag(val) {
+                this.leaseApplyDetails = this.leaseApplyDetails.filter((e) => e.ctParentId !== val)
+            },
+
+            /* 删除 */
+            onHandelDelete(index) {
+                this.wholeTypeNameList.splice(index, 1)
+            },
+
+            /* 更改数量 */
+            onChangeInput(val, v) {
+                this.wholeTypeNameList[v].childrenList.forEach((e) => (e.deviceNum = e.initNum * val))
+            },
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            // this.queryParams.leaseApplyDetails = selection
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        // 更多操作触发
+        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 {
+                    if (this.leaseApplyDetails.length === 0 && this.wholeTypeNameList.length === 0) {
+                        this.$message.error('请添加机具类型或成套设备')
+                        return
+                    }
+
+                    let canSave = true
+                    if (this.leaseApplyDetails.length > 0) {
+                        this.queryParams.leaseApplyDetails = this.leaseApplyDetails
+                        try {
+                            this.queryParams.leaseApplyDetails.forEach((item) => {
+                                // if (item.num == 0) {
+                                //   this.$message.error('机具类型库存量为零无法领料')
+                                //   throw new Error()
+                                // }
+                                if (!item.childrenList && item.preNum == '') {
+                                    this.$message.error('请填写预领数量')
+                                    throw new Error()
+                                }
+                            })
+                        } catch (e) {
+                            throw e
+                        }
+                    }
+
+                    this.leaseApplyDetails.forEach((e) => {
+                        if (e.childrenList && e.childrenList.length > 0) {
+                            e.childrenList.forEach((j) => {
+                                const items = {
+                                    companyId: '101',
+                                    guigeCn: j.deviceType,
+                                    typeCn: j.typeName,
+                                    createBy: this.user.name,
+                                    typeId: j.deviceTypeId,
+                                    preNum: j.deviceNum,
+                                    num: j.num,
+                                    isCt: 0,
+                                    ctParentId: e.ctParentId,
+                                }
+
+                                this.queryParams.leaseApplyDetails.push(items)
+                            })
+                        }
+                    })
+
+                    this.queryParams.leaseApplyDetails = this.queryParams.leaseApplyDetails.filter(
+                        (e) => !e.childrenList,
+                    )
+                    // if (this.wholeTypeNameList.length > 0) {
+                    //     const wholeTypeList = []
+                    //     this.wholeTypeNameList.forEach((i) => {
+                    //         i.childrenList.forEach((e) => {
+                    //             const items = {
+                    //                 companyId: '101',
+                    //                 guigeCn: e.deviceType,
+                    //                 preNum: e.deviceNum,
+                    //                 typeCn: e.typeName,
+                    //                 typeId: e.deviceTypeId,
+                    //                 wholeTypeName: i.wholeTypeName,
+                    //             }
+
+                    //             wholeTypeList.push(items)
+                    //         })
+                    //     })
+
+                    //     this.queryParams.leaseApplyDetails = wholeTypeList
+                    // }
+
+                    if (!canSave) {
+                        return false
+                    }
+                    this.queryParams.createBy = this.user.userName
+                    this.queryParams.companyId = this.user.companyId
+                    this.queryParams.userId = this.user.userId
+                    let res
+                    if (this.queryParams.leaseType == 1) {
+                        this.queryParams.taskStatus = 117
+                    }
+                    if (this.taskId) {
+                        this.leaseApplyInfoList.forEach((v) => {
+                            v = Object.assign(v, this.queryParams.leaseApplyInfo)
+                            this.$set(v, 'leaseApplyDetails', this.queryParams.leaseApplyDetails)
+                        })
+                        if (this.$route.query.isBack) {
+                            this.queryParams.souceByRefuse = 1
+                        }
+                        if (this.rejectTaskStatus == 100) {
+                            this.queryParams.souceByRefuse = 1
+                        }
+                        const params = {
+                            ...this.queryParams,
+                            taskId: this.taskId,
+                            leaseApplyInfoList: this.leaseApplyInfoList,
+                        }
+
+                        res = await editLeaseApply(params)
+                    } else {
+                        console.log(this.queryParams, '参数---')
+                        res = await submitLeaseApply(this.queryParams)
+                    }
+                    if (res.code == 200) {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                        })
+                        // this.$tab.closeOpenPage({
+                        //     path: '/claimAndRefund/receiveByCq/receiveApply',
+                        // })
+                        this.$emit('goBackPage')
+                    }
+                }
+            })
+        },
+        /** 修改按钮操作 */
+        handleBack(row) {
+            this.$tab.closeOpenPage({
+                path: '/claimAndRefund/receiveByCq/receiveApply',
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            // this.deviceType.forEach((e, index) => {
+            //     if (e[3] === row.typeId) {
+            //         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.num
+            if (row.preNum <= 1) {
+                row.preNum = 1
+            } else if (row.preNum >= maxNum) {
+                row.preNum = maxNum
+            }
+        },
+        /////// 设备类型树  切换
+        deviceTypeChange(val) {
+            console.log('🚀 ~ deviceTypeChange ~ val:', val)
+            this.queryParams.typeId = ''
+            this.typeListDev = []
+            // console.log('🚀 ~ deviceTypeChange ~ val:', val)
+            this.$nextTick(() => {
+                const deviceTypeList = this.$refs.deviceTypeCascader.getCheckedNodes()
+                console.log('🚀 ~ deviceTypeChange ~ deviceTypeList:', deviceTypeList[0])
+                this.selectParams = {
+                    createBy: this.user.name,
+                    companyId: deviceTypeList[0].data.companyId,
+                    // num: deviceTypeList[0].data.num,
+                    typeCn: deviceTypeList[0].data.label,
+                }
+                console.log('🚀 ~ deviceTypeChange ~ this.selectParams:', this.selectParams)
+                this.getMaTypeDataByIdFun(val[val.length - 1])
+            })
+
+            // 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.id === items[i]) {
+            //                 let { num, companyId, id, unitName } = deviceTypeList[z].data
+
+            //                 const isRepeat = this.leaseApplyDetails.some((e) => e.typeId === id)
+            //                 if (!isRepeat) {
+            //                     this.leaseApplyDetails.push({
+            //                         createBy: this.user.name,
+            //                         typeId: id,
+            //                         num,
+            //                         companyId,
+            //                         unitCn: unitName,
+            //                         typeCn: deviceTypeList[z].pathLabels[2],
+            //                         guigeCn: deviceTypeList[z].pathLabels[3],
+            //                     })
+            //                 }
+            //             }
+            //         }
+            //     }
+            //     console.log('🚀 ~ deviceTypeChange ~ this.leaseApplyDetails:', this.leaseApplyDetails)
+            // } else {
+            //     this.leaseApplyDetails = []
+            // }
+        },
+        // 获取规格型号
+        async getMaTypeDataByIdFun(val) {
+            const res = await getMaTypeDataById({ id: val })
+            this.typeListDev = res.data.filter((e) => e.isStorage == 1)
+            console.log('🚀 ~ getMaTypeDataByIdFun ~ res:', res)
+        },
+        // 选择规格型号
+        changeType(e) {
+            // console.log('🚀 ~ changeType ~ e:', e)
+            if (!e) return
+            // 获取选中的规格型号
+            const selectType = this.typeListDev.find((item) => item.id == e)
+            console.log('🚀 ~ changeType ~ selectType:', selectType)
+            this.selectParams.typeId = selectType.id
+            this.selectParams.guigeCn = selectType.name
+            this.selectParams.unitCn = selectType.unit
+            this.selectParams.num = selectType.num
+            console.log('🚀 ~ changeType ~ this.selectParams:', this.selectParams)
+            // 判断是否重复
+            const isRepeat = this.leaseApplyDetails.find((item) => item.typeId == selectType.id)
+            // console.log('🚀 ~ changeType ~ isRepeat:', isRepeat)
+            if (isRepeat) {
+                this.$message.error('当前设备已添加，不可重复添加！')
+                return
+            }
+            this.leaseApplyDetails.push({ ...this.selectParams })
+            console.log('🚀 ~ changeType ~ this.leaseApplyDetails:', this.leaseApplyDetails)
+        },
+        //// 将数据处理成 表格中需要的数据
+        handelTableItemData(node) {
+            const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
+            template.createBy = this.user.name
+            console.log(node.data)
+            template.num = node.data.num
+            template.companyId = node.data.companyId
+            template.typeId = node.data.id
+            template.unitCn = node.data.unitName
+            template.typeCn = node.pathLabels[2]
+            template.guigeCn = node.pathLabels[3]
+
+            if (this.taskId) {
+                const index = this.leaseApplyInfoList.find((key) => key.companyId == node.data.companyId)
+                template.parenntId = index ? index.id : ''
+            }
+
+            return template
+        },
+
+        // 获取费用承担方
+        async getCostBearingFun() {
+            const { data: res } = await getCostBearingApi()
+            this.costBearingList = res
+        },
+
+        // 领用类型修改时清空费用承担方
+        leaseTypeChange(val) {
+            console.log('🚀 ~ leaseTypeChange ~ val:', val)
+            if (val == 0) {
+                this.$set(this.queryParams, 'costBearingParty', '')
+                this.GetUnitData()
+                this.GetProData()
+            } else {
+                this.$delete(this.queryParams, 'costBearingParty')
+                this.queryParams.unitId = ''
+                this.queryParams.proId = ''
+                this.proList = []
+                this.getLevelTwoUnitCbx()
+                this.$nextTick(() => {
+                    this.$refs.queryForm.clearValidate()
+                })
+            }
+        },
+
+        /* 获取抱杆下拉数据 */
+        async getHoldingPoleSelListData() {
+            const { data: res } = await getHoldingPoleSelListApi()
+            this.holdingPoleSelList = res
+        },
+        /* 抱杆成套设备change事件 */
+        onChangeWholeTypeName(val) {
+            val.forEach((e) => {
+                const selLable = this.holdingPoleSelList.find((j) => j.id === e)
+                const isPush = this.leaseApplyDetails.some((z) => z.ctParentId == e)
+
+                if (!isPush) {
+                    const wholeTypeNameData = {
+                        id: e,
+                        wholeTypeName: selLable.wholeTypeName,
+                        wholeTypeNum: 1,
+                        childrenList: [],
+                    }
+
+                    queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
+                        this.leaseApplyDetails.push({
+                            wholeTypeName: selLable.wholeTypeName,
+                            childrenList: res.data,
+                            ctParentId: e,
+                        })
+                    })
+                }
+            })
+            // const selLable = this.holdingPoleSelList.find((e) => e.id === val)
+            // const wholeTypeNameData = {
+            //     id: val,
+            //     wholeTypeName: selLable.wholeTypeName,
+            //     wholeTypeNum: 1,
+            //     childrenList: [],
+            // }
+            // queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
+            //     console.log(res, '996')
+
+            //     this.leaseApplyDetails.push({
+            //         wholeTypeName: selLable.wholeTypeName,
+            //         childrenList: res.data,
+            //         ctParentId: val,
+            //     })
+            //     // wholeTypeNameData.childrenList = res.data
+            //     // wholeTypeNameData.childrenList.forEach((e) => (e.initNum = e.deviceNum))
+            //     // const isREpeat = this.wholeTypeNameList.find((e) => e.id === val)
+            //     // if (!isREpeat) {
+            //     //     this.wholeTypeNameList.push(wholeTypeNameData)
+            //     // } else {
+            //     //     this.$modal.msgError('当前抱杆成套设备已添加，不可重复添加！')
+            //     // }
+            //     // console.log(this.wholeTypeNameList, '处理后的数据---')
+            // })
+
+            // this.queryParams.wholeTypeName = ''
+        },
+
+        // 移除时触发
+        onRemoveTag(val) {
+            this.leaseApplyDetails = this.leaseApplyDetails.filter((e) => e.ctParentId !== val)
+        },
+
+        /* 删除 */
+        onHandelDelete(index) {
+            this.wholeTypeNameList.splice(index, 1)
+        },
+
+        /* 更改数量 */
+        onChangeInput(val, v) {
+            this.wholeTypeNameList[v].childrenList.forEach((e) => (e.deviceNum = e.initNum * val))
+        },
+    },
+}
+</script>
+
+<style lang="scss">
+.popper-select {
+    // li[aria-haspopup='true'] {
+    //     .el-checkbox {
+    //         display: none;
+    //     }
+    // }
+
+    .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/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index ca352c0..1873b7b 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -1,1677 +1,1114 @@
 <template>
-  <div>
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :rules="queryRules"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
-      <el-form-item label="领用类型" prop="leaseType">
-        <el-select
-          v-model="queryParams.leaseType"
-          filterable
-          placeholder="请选择领用类型"
-          clearable
-          style="width: 240px"
-          :disabled="isEdit"
-          @change="leaseTypeChange"
+    <div>
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :rules="queryRules"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
         >
-          <el-option
-            v-for="item in typeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            :disabled="isEdit"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="领料单位" prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          filterable
-          clearable
-          @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"
-          filterable
-          clearable
-          @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 maxlength="50" v-model="queryParams.agreementCode" disabled style="width: 240px"></el-input>
-      </el-form-item>
-      <el-form-item label="成套设备" prop="agreementCode">
-        <el-select
-          multiple
-          clearable
-          style="width: 240px"
-          placeholder="请选择成套设备"
-          @change="onChangeWholeTypeName"
-          @remove-tag="onRemoveTag"
-          v-model="queryParams.wholeTypeName"
-          ref="WholeTypeRef"
-        >
-          <el-option v-for="item in holdingPoleSelList" :key="item.id" :label="item.wholeTypeName" :value="item.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="类型名称" prop="status">
-        <el-cascader
-          filterable
-          collapse-tags
-          :key="propsKey"
-          style="width: 240px"
-          v-model="deviceType"
-          :show-all-levels="false"
-          ref="deviceTypeCascader"
-          :options="deviceTypeTree"
-          @change="deviceTypeChange"
-          placeholder="请输入类型名称"
-          popper-class="popper-select"
-          :props="deviceTypeTreeProps"
-        ></el-cascader>
-      </el-form-item>
-      <el-form-item label="规格型号" prop="typeId">
-        <el-select
-          v-model="queryParams.typeId"
-          filterable
-          clearable
-          style="width: 240px"
-          placeholder="请选择规格型号"
-          @change="changeType"
-        >
-          <el-option v-for="item in typeListDev" :key="item.id" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="预计领料时间" prop="estimateLeaseTime">
-        <el-date-picker
-          v-model="queryParams.estimateLeaseTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
-          placeholder="预计领料时间"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item label="领料人" prop="leasePerson">
-        <el-input
-          maxlength="50"
-          v-model="queryParams.leaseApplyInfo.leasePerson"
-          placeholder="请输入领料人"
-          clearable
-          style="width: 240px"
-        />
-      </el-form-item>
-      <el-form-item label="领料人电话" prop="phone">
-        <el-input
-          v-model="queryParams.leaseApplyInfo.phone"
-          placeholder="请输入领料人电话"
-          clearable
-          style="width: 240px"
-          maxlength="11"
-          onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
-        />
-      </el-form-item>
-      <el-form-item
-        label="费用承担方"
-        prop="costBearingParty"
-        v-if="queryParams.leaseType && queryParams.leaseType == 0"
-      >
-        <el-select
-          v-model="queryParams.costBearingParty"
-          filterable
-          clearable
-          style="width: 240px"
-          placeholder="请选择费用承担方"
-          :disabled="isEdit"
-        >
-          <el-option v-for="item in costBearingList" :key="item" :label="item" :value="item"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="备注" prop="roleName">
-        <el-input
-          maxlength="100"
-          v-model="queryParams.leaseApplyInfo.remark"
-          placeholder="请输入备注"
-          clearable
-          rows="1"
-          type="textarea"
-          style="width: 240px"
-        />
-      </el-form-item>
-    </el-form>
+            <el-form-item label="领用类型" prop="leaseType">
+                <el-select
+                    v-model="queryParams.leaseType"
+                    filterable
+                    placeholder="请选择领用类型"
+                    clearable
+                    style="width: 240px"
+                    :disabled="isEdit"
+                    @change="leaseTypeChange"
+                >
+                    <el-option
+                        v-for="item in typeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                        :disabled="isEdit"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="领料单位" prop="unitId">
+                <el-select
+                    v-model="queryParams.unitId"
+                    filterable
+                    clearable
+                    @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"
+                    filterable
+                    clearable
+                    @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 maxlength="50" v-model="queryParams.agreementCode" disabled style="width: 240px"></el-input>
+            </el-form-item>
+            <el-form-item label="抱杆设备" prop="agreementCode">
+                <el-select
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择抱杆设备"
+                    @change="onChangeWholeTypeName"
+                    v-model="queryParams.wholeTypeName"
+                >
+                    <el-option
+                        v-for="item in holdingPoleSelList"
+                        :key="item.id"
+                        :label="item.wholeTypeName"
+                        :value="item.id"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="规格型号" prop="status">
+                <el-cascader
+                    filterable
+                    collapse-tags
+                    :key="propsKey"
+                    style="width: 240px"
+                    v-model="deviceType"
+                    :show-all-levels="false"
+                    ref="deviceTypeCascader"
+                    :options="deviceTypeTree"
+                    @change="deviceTypeChange"
+                    placeholder="请输入规格型号"
+                    popper-class="popper-select"
+                    :props="deviceTypeTreeProps"
+                    :disabled="(isEdit && !isView) || isCost || wholeTypeNameList.length > 0"
+                ></el-cascader>
+            </el-form-item>
+            <el-form-item label="预计领料时间" prop="estimateLeaseTime">
+                <el-date-picker
+                    v-model="queryParams.estimateLeaseTime"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetime"
+                    placeholder="预计领料时间"
+                ></el-date-picker>
+            </el-form-item>
+            <el-form-item label="领料人" prop="leasePerson">
+                <el-input
+                    maxlength="50"
+                    v-model="queryParams.leaseApplyInfo.leasePerson"
+                    placeholder="请输入领料人"
+                    clearable
+                    style="width: 240px"
+                />
+            </el-form-item>
+            <el-form-item label="领料人电话" prop="phone">
+                <el-input
+                    v-model="queryParams.leaseApplyInfo.phone"
+                    placeholder="请输入领料人电话"
+                    clearable
+                    style="width: 240px"
+                    maxlength="11"
+                    onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
+                />
+            </el-form-item>
+            <el-form-item
+                label="费用承担方"
+                prop="costBearingParty"
+                v-if="queryParams.leaseType && queryParams.leaseType == 0"
+            >
+                <el-select
+                    v-model="queryParams.costBearingParty"
+                    filterable
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择费用承担方"
+                    :disabled="isEdit"
+                >
+                    <el-option v-for="item in costBearingList" :key="item" :label="item" :value="item"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="roleName">
+                <el-input
+                    maxlength="100"
+                    v-model="queryParams.leaseApplyInfo.remark"
+                    placeholder="请输入备注"
+                    clearable
+                    rows="1"
+                    type="textarea"
+                    style="width: 240px"
+                />
+            </el-form-item>
+        </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button plain size="mini" v-if="isView" type="primary" icon="el-icon-plus" @click="handleAdd">
-          保存
-        </el-button>
-      </el-col>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button plain size="mini" v-if="isView" type="primary" icon="el-icon-plus" @click="handleAdd">
+                    保存
+                </el-button>
+            </el-col>
 
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col> -->
-    </el-row>
+            <!-- <el-col :span="1.5">
+      <el-button
+        type="warning"
+        plain
+        icon="el-icon-download"
+        size="mini"
+        @click="handleExport"
+      >导出</el-button>
+    </el-col> -->
+        </el-row>
 
-    <el-table v-show="wholeTypeNameList.length > 0" :data="wholeTypeNameList">
-      <el-table-column type="index" align="center" />
-      <el-table-column type="expand">
-        <template slot-scope="props">
-          <el-table :data="props.row.childrenList">
-            <el-table-column align="center" prop="typeName" label="设备名称" />
-            <el-table-column align="center" label="规格型号" prop="deviceType" />
-            <el-table-column align="center" label="设备所属" prop="deviceAscription" />
-
-            <el-table-column label="预领数量" prop="deviceNum" align="center" />
-            <el-table-column align="center" label="库存数量" prop="num" />
-          </el-table>
-        </template>
-      </el-table-column>
-      <el-table-column prop="wholeTypeName" align="center" label="抱杆设备名称" />
-      <el-table-column align="center" label="抱杆设备数量" width="260">
-        <template slot-scope="scope">
-          <el-input-number
-            :min="1"
-            :max="1000"
-            @change="onChangeInput($event, scope.$index)"
-            v-model="scope.row.wholeTypeNum"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="操作" width="180">
-        <template slot-scope="scope">
-          <el-button size="mini" type="danger" @click="onHandelDelete(scope.$index)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <el-table
-      v-loading="loading"
-      :data="leaseApplyDetails"
-      v-show="wholeTypeNameList.length === 0"
-      @selection-change="handleSelectionChange"
-    >
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" type="index" width="80" />
-      <el-table-column type="expand">
-        <template slot-scope="props">
-          <el-table :data="props.row.childrenList" v-if="props.row.childrenList && props.row.childrenList.length > 0">
-            <!-- <el-table-column align="center" prop="typeName" label="设备名称" /> -->
-            <el-table-column align="center" label="规格型号" prop="deviceType" />
-            <el-table-column align="center" label="是否管理库存">
-              <template slot-scope="{ row }">
-                <el-tag size="mini" type="primary" v-if="row.isStorage == 1">是</el-tag>
-                <el-tag size="mini" type="warning" v-if="row.isStorage == 0">否</el-tag>
-              </template>
+        <el-table v-show="wholeTypeNameList.length > 0" :data="wholeTypeNameList">
+            <el-table-column type="index" align="center" />
+            <el-table-column type="expand">
+                <template slot-scope="props">
+                    <el-table :data="props.row.childrenList">
+                        <el-table-column align="center" prop="typeName" label="设备名称" />
+                        <el-table-column align="center" label="规格型号" prop="deviceType" />
+                        <el-table-column align="center" label="设备所属" prop="deviceAscription" />
+                        <el-table-column label="预领数量" prop="deviceNum" align="center" />
+                        <el-table-column align="center" label="库存数量" prop="num" />
+                    </el-table>
+                </template>
             </el-table-column>
-            <el-table-column label="预领数量" prop="deviceNum" align="center" />
-            <el-table-column align="center" label="库存数量" prop="num" />
-          </el-table>
-        </template>
-      </el-table-column>
-      <el-table-column prop="wholeTypeName" align="center" label="成套设备名称" />
-      <el-table-column label="机具名称" prop="typeCn" :show-overflow-tooltip="true" />
-      <el-table-column label="规格型号" prop="guigeCn" :show-overflow-tooltip="true" />
-      <el-table-column label="计量单位" prop="unitCn" align="center" />
-      <el-table-column label="库存数量" prop="num" align="center" />
-      <el-table-column label="预领数量" align="center">
-        <template slot-scope="scope">
-          <el-input
-            v-if="!scope.row.childrenList"
-            v-model.number="scope.row.preNum"
-            placeholder="请输入预领数量"
-            type="number"
-            min="1"
-            clearable
-            style="width: 100%"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <el-input maxlength="100" v-model="scope.row.remark" placeholder="请输入备注" clearable style="width: 100%" />
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" v-if="isView">
-        <template slot-scope="scope">
-          <!--          <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>
+            <el-table-column prop="wholeTypeName" align="center" label="抱杆设备名称" />
+            <el-table-column align="center" label="抱杆设备数量" width="260">
+                <template slot-scope="scope">
+                    <el-input-number
+                        :min="1"
+                        :max="1000"
+                        @change="onChangeInput($event, scope.$index)"
+                        v-model="scope.row.wholeTypeNum"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column align="center" label="操作" width="180">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="danger" @click="onHandelDelete(scope.$index)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <el-table
+            v-loading="loading"
+            :data="leaseApplyDetails"
+            v-show="wholeTypeNameList.length === 0"
+            @selection-change="handleSelectionChange"
+        >
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="序号" type="index" width="80" />
+            <el-table-column label="机具名称" prop="typeCn" :show-overflow-tooltip="true" />
+            <el-table-column label="规格型号" prop="guigeCn" :show-overflow-tooltip="true" />
+            <el-table-column label="计量单位" prop="unitCn" />
+            <el-table-column label="库存数量" prop="num" />
+            <el-table-column label="预领数量" align="center">
+                <template slot-scope="scope">
+                    <el-input
+                        v-model.number="scope.row.preNum"
+                        placeholder="请输入预领数量"
+                        type="number"
+                        min="1"
+                        clearable
+                        style="width: 100%"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="createTime">
+                <template slot-scope="scope">
+                    <el-input
+                        maxlength="100"
+                        v-model="scope.row.remark"
+                        placeholder="请输入备注"
+                        clearable
+                        style="width: 100%"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                fixed="right"
+                class-name="small-padding fixed-width"
+                v-if="isView"
+            >
+                <template slot-scope="scope">
+                    <!--          <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 {
-  addCompleteSetToolsApi,
-  queryCompleteSetToolsApi,
-  getCompleteSetToolsApi,
-  delCompleteSetToolsApi,
+    addCompleteSetToolsApi,
+    queryCompleteSetToolsApi,
+    getCompleteSetToolsApi,
+    delCompleteSetToolsApi,
 } from '@/api/store/completeTools.js'
 import {
-  getProData,
-  getUnitData,
-  getDeviceTypeTree,
-  getAgreementInfoById,
-  submitLeaseApply,
-  getTaskDetail,
-  editLeaseApply,
-  getLeaseApplyListAll,
-  getLeaseApplyAuditListAll,
-  getCostBearingApi,
-  getAgreementInfoByIdApi,
-  getHoldingPoleSelListApi,
-  getLevelTwoUnitCbx,
-  getMaTypeDataById,
+    getProData,
+    getUnitData,
+    getDeviceTypeTree,
+    getAgreementInfoById,
+    submitLeaseApply,
+    getTaskDetail,
+    editLeaseApply,
+    getLeaseApplyListAll,
+    getLeaseApplyAuditListAll,
+    getCostBearingApi,
+    getAgreementInfoByIdApi,
+    getHoldingPoleSelListApi,
+    getLevelTwoUnitCbx,
 } from '@/api/claimAndRefund/receive'
 import { getInfo } from '@/api/login'
 export default {
-  name: 'ReceiveApplyAdd',
-  props: {
-    isView: {
-      type: Boolean,
-      default: () => {
-        return false
-      },
-    },
-    isEdit: {
-      type: Boolean,
-      default: () => {
-        return false
-      },
-    },
-    viewTaskId: {
-      type: [String, Number],
-    },
-    rejectTaskStatus: {
-      type: [String, Number],
-      default: () => {
-        return null
-      },
-    },
-  },
-  data() {
-    const validatePhone = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error('退料人电话不能为空'))
-        // this.$message.error("手机号不为空");
-      } else if (value.length < 11) {
-        callback(new Error('电话号码格式不正确'))
-        // this.$message.error("手机号格式不正确");
-      } else {
-        callback()
-      }
-    }
-    return {
-      user: null, // 用户信息
-      // 遮罩层
-      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,
-      // isEdit: 'true',
-      // 日期范围
-      dateRange: [],
-      // 数据范围选项
-      dataScopeOptions: [
-        {
-          value: '1',
-          label: '全部数据权限',
+    name: 'ReceiveApplyAdd',
+    props: {
+        isView: {
+            type: Boolean,
+            default: () => {
+                return false
+            },
         },
-        {
-          value: '2',
-          label: '自定数据权限',
+        isEdit: {
+            type: Boolean,
+            default: () => {
+                return false
+            },
         },
-        {
-          value: '3',
-          label: '本部门数据权限',
+        viewTaskId: {
+            type: [String, Number],
         },
-        {
-          value: '4',
-          label: '本部门及以下数据权限',
+        rejectTaskStatus: {
+            type: [String, Number],
+            default: () => {
+                return null
+            },
         },
-        {
-          value: '5',
-          label: '仅本人数据权限',
-        },
-      ],
-      // 菜单列表
-      menuOptions: [],
-      // 部门列表
-      deptOptions: [],
-      // 查询参数
-      queryParams: {
-        typeId: null,
-        types: 2,
-        unitId: null,
-        proId: null,
-        agreementId: null, //协议id
-        agreementCode: null, //协议code
-        companyId: '', //登录信息中取
-        createBy: '', //用户名
-        estimateLeaseTime: '',
-        leaseType: '',
-        taskType: 29,
-        taskStatus: 31,
-        //领料人信息
-        leaseApplyInfo: {
-          leasePerson: '',
-          phone: '',
-          remark: '',
-        },
-        //领料详情集合
-        leaseApplyDetails: [],
-        wholeTypeName: '',
-      },
-      typeList: [
-        { id: '0', name: '工程租赁' },
-        { id: '1', name: '长期领用' },
-      ], //集合
-      typeListDev: [], // 规格型号
-      selectParams: {},
-      leaseApplyDetails: [],
-      leaseApplyInfoList: [],
-      //领料详情单条模板
-      leaseApplyDetailsItem: {
-        parenntId: null,
-        createBy: null,
-        companyId: null,
-        status: 0,
-        typeId: null, //  树结构第4级   规格id
-        typeCn: '', //显示的设备类型
-        guigeCn: '', //显示的设备规格
-        unitCn: '', //显示的设备 单位
-        remark: '', //单条备注
-        preNum: 1, //预领数量
-        deviceNum: '',
-      },
-      //
-      queryRules: {
-        leaseType: [
-          {
-            required: true,
-            message: '请选择领用类型',
-            trigger: 'change',
-          },
-        ],
-        unitId: [
-          {
-            required: true,
-            message: '请选择领料单位',
-            trigger: 'change',
-          },
-        ],
-        proId: [
-          {
-            required: true,
-            message: '请选择领料工程',
-            trigger: 'change',
-          },
-        ],
-        costBearingParty: [
-          {
-            required: true,
-            message: '请选择费用承担方',
-            trigger: 'change',
-          },
-        ],
-        // leasePerson: [
-        //   {
-        //     required: true, message: '请输入领料人', trigger: 'blur',
-        //   }
-        // ],
-        // phone: [
-        //     {required: true, message: '请输入领料人手机号', trigger: 'change'},
-        //     { validator: validatePhone, trigger: "blur" },
-        //     { min: 11, message: "手机号不足11位", trigger: "blur" },
-        // ],
-      },
-      unitList: [], //单位 集合
-      proList: [], // 工程 集合
-      deviceTypeTree: [], // 设备 树结构数据
-
-      taskId: null, // 是否编辑
-
-      // 设备 树显示 配置
-      deviceTypeTreeProps: {
-        // multiple: true,
-        value: 'id',
-      },
-      // 选中的设备类型
-      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',
-          },
-        ],
-      },
-      costBearingList: [],
-      isCost: false,
-      propsKey: 1000,
-      holdingPoleSelList: [],
-      wholeTypeNameList: [],
-      wholeTypeItemsList: [],
-    }
-  },
-  mounted() {
-    this.GetUserInfo()
-
-    this.GetUnitData()
-
-    this.GetProData()
-
-    this.getCostBearingFun()
-
-    this.getHoldingPoleSelListData()
-
-    // this.GetDeviceTypeTree()
-    // this.getList();
-    if (this.$route.query.taskId && !this.$route.query.isBack) {
-      console.log('查看')
-      this.GetTaskDetail(this.$route.query.taskId)
-    }
-    if (this.$route.query.taskId && this.$route.query.isBack) {
-      console.log('驳回提交查看')
-      this.GetTaskDetail2(this.$route.query.taskId)
-    }
-    // this.taskId = this.$route.query.taskId
-    // this.isEdit = this.$route.query.isEdit
-    this.taskId = this.viewTaskId
-
-    if (this.taskId) {
-      Promise.all([this.GetTaskDetail(this.taskId), this.GetDeviceTypeTree()]).then(() => {
-        let selectList = []
-        this.leaseApplyDetails.forEach((e) => {
-          selectList.push(this.getParentsById(this.deviceTypeTree, e.typeId))
-        })
-        this.$nextTick(() => {
-          this.deviceType = selectList
-          this.propsKey++
-        })
-      })
-    } else {
-      this.GetDeviceTypeTree()
-    }
-
-    // console.log(typeof(this.isEdit))
-    // this.$set('isEdit',this.$route.query.isEdit)
-  },
-
-  methods: {
-    // 获取用户信息
-    async GetUserInfo() {
-      const res = await getInfo()
-      this.user = res.user
     },
-
-    // 获取 来往单位 列表数据
-    async GetUnitData() {
-      const params = {
-        id: this.queryParams.proId,
-      }
-      const res = await getUnitData(params)
-      this.unitList = res.data
-
-      this.GetAgreementInfoById()
-    },
-    async getLevelTwoUnitCbx() {
-      const res = await getLevelTwoUnitCbx({ id: '' })
-      console.log('🚀 ~ getLevelTwoUnitCbx ~ res:', res)
-      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 GetDeviceTypeTree() {
-      const params = {
-        level: 3,
-      }
-      getDeviceTypeTree(params).then((res) => {
-        this.deviceTypeTree = res.data
-        console.log('🚀 ~ getDeviceTypeTree ~ this.deviceTypeTree:', this.deviceTypeTree)
-      })
-    },
-    getParentsById(list, id) {
-      for (let i in list) {
-        if (list[i].id == id) {
-          //查询到就返回该数组对象的value
-          return [list[i].id]
-        }
-        if (list[i].children) {
-          let node = this.getParentsById(list[i].children, id)
-          if (node !== undefined) {
-            //查询到把父节把父节点加到数组前面
-            node.unshift(list[i].id)
-            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)
-
-        console.log(res, '根据工程和单位获取协议id')
-
-        if (res.data.isSlt == 1) {
-          this.$message.error('当前协议下对应的工程已完成结算，不可重复领料！')
-          this.isCost = true
-
-          if (this.leaseApplyDetails.length > 0) {
-            this.leaseApplyDetails = []
-          }
-        } else {
-          this.isCost = false
-        }
-        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
-
-          // // 1. 判断当前协议对应的工程是否结算
-
-          // getAgreementInfoByIdApi({
-          //     agreementId: res.data.agreementId,
-          // })
-        }
-      }
-    },
-
-    // 获取 任务详情数据
-    async GetTaskDetail(taskId) {
-      const res = await getLeaseApplyListAll({ taskId })
-
-      const data = res.rows[0]
-
-      // unitId:null,
-      // proId:null,
-      // agreementId:null, //协议id
-      // agreementCode: null,
-      if (data.taskStatus == 100) {
-        this.queryParams.taskStatus = 32
-        this.queryParams.examineStatusId = '32'
-      }
-      this.queryParams.unitId = data.unitId
-      this.queryParams.costBearingParty = data.costBearingParty
-      this.queryParams.proId = data.proId
-      this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
-      this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
-      this.queryParams.agreementCode = data.agreementCode
-      this.queryParams.agreementId = data.agreementId
-      this.queryParams.estimateLeaseTime = data.estimateLeaseTime
-      this.queryParams.wholeTypeName = data.wholeTypeName
-
-      // this.queryParams.leaseType = data.leaseType
-      this.$set(this.queryParams, 'leaseType', data.leaseType)
-      this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
-      this.leaseApplyInfoList = data.leaseApplyInfoList
-      this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
-        return this.handelEchoData(item)
-      })
-
-      //   guigeCn: j.deviceType,
-      //                         typeCn: j.typeName,
-      //                         createBy: this.user.name,
-      //                         typeId: j.deviceTypeId,
-      //                         preNum: j.deviceNum,
-      //                         num: j.num,
-      //                         isCt: 0,
-      //                         ctParentId: e.ctParentId,
-
-      if (data.ctLeaseApplyDetails) {
-        for (let key in data.ctLeaseApplyDetails) {
-          const childrenList = data.ctLeaseApplyDetails[key].map((e) => {
-            return {
-              typeName: e.typeModelName,
-              typeId: e.typeId,
-              preNum: e.preNum,
-              num: e.num,
-              ctParentId: e.ctParentId,
-              deviceType: e.typeModelName,
-              deviceNum: e.preNum,
-              isStorage: e.isStorage,
-              deviceTypeId: e.typeId,
+    data() {
+        const validatePhone = (rule, value, callback) => {
+            if (!value) {
+                callback(new Error('退料人电话不能为空'))
+                // this.$message.error("手机号不为空");
+            } else if (value.length < 11) {
+                callback(new Error('电话号码格式不正确'))
+                // this.$message.error("手机号格式不正确");
+            } else {
+                callback()
             }
-          })
+        }
+        return {
+            user: null, // 用户信息
+            // 遮罩层
+            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,
+            // isEdit: 'true',
+            // 日期范围
+            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: '', //用户名
+                estimateLeaseTime: '',
+                leaseType: '',
+                taskType: 29,
+                taskStatus: 31,
+                //领料人信息
+                leaseApplyInfo: {
+                    leasePerson: '',
+                    phone: '',
+                    remark: '',
+                },
+                //领料详情集合
+                leaseApplyDetails: [],
+                wholeTypeName: '',
+            },
+            typeList: [
+                { id: '0', name: '工程租赁' },
+                { id: '1', name: '长期领用' },
+            ], //集合
+            leaseApplyDetails: [],
+            leaseApplyInfoList: [],
+            //领料详情单条模板
+            leaseApplyDetailsItem: {
+                parenntId: null,
+                createBy: null,
+                companyId: null,
+                status: 0,
+                typeId: null, //  树结构第4级   规格id
+                typeCn: '', //显示的设备类型
+                guigeCn: '', //显示的设备规格
+                unitCn: '', //显示的设备 单位
+                remark: '', //单条备注
+                preNum: 1, //预领数量
+                deviceNum: '',
+            },
+            //
+            queryRules: {
+                leaseType: [
+                    {
+                        required: true,
+                        message: '请选择领用类型',
+                        trigger: 'change',
+                    },
+                ],
+                unitId: [
+                    {
+                        required: true,
+                        message: '请选择领料单位',
+                        trigger: 'change',
+                    },
+                ],
+                proId: [
+                    {
+                        required: true,
+                        message: '请选择领料工程',
+                        trigger: 'change',
+                    },
+                ],
+                costBearingParty: [
+                    {
+                        required: true,
+                        message: '请选择费用承担方',
+                        trigger: 'change',
+                    },
+                ],
+                // leasePerson: [
+                //   {
+                //     required: true, message: '请输入领料人', trigger: 'blur',
+                //   }
+                // ],
+                // phone: [
+                //     {required: true, message: '请输入领料人手机号', trigger: 'change'},
+                //     { validator: validatePhone, trigger: "blur" },
+                //     { min: 11, message: "手机号不足11位", trigger: "blur" },
+                // ],
+            },
+            unitList: [], //单位 集合
+            proList: [], // 工程 集合
+            deviceTypeTree: [], // 设备 树结构数据
 
-          console.log('childrenList', childrenList)
-          this.leaseApplyDetails.push({
-            wholeTypeName: key,
-            childrenList,
-            ctParentId: data.ctLeaseApplyDetails[key][0].ctParentId,
-          })
+            taskId: null, // 是否编辑
+
+            // 设备 树显示 配置
+            deviceTypeTreeProps: {
+                multiple: true,
+                value: 'id',
+            },
+            // 选中的设备类型
+            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',
+                    },
+                ],
+            },
+            costBearingList: [],
+            isCost: false,
+            propsKey: 1000,
+            holdingPoleSelList: [],
+            wholeTypeNameList: [],
+            wholeTypeItemsList: [],
+        }
+    },
+    mounted() {
+        this.GetUserInfo()
+
+        this.GetUnitData()
+
+        this.GetProData()
+
+        this.getCostBearingFun()
+
+        this.getHoldingPoleSelListData()
+
+        // this.GetDeviceTypeTree()
+        // this.getList();
+        if (this.$route.query.taskId && !this.$route.query.isBack) {
+            console.log('查看')
+            this.GetTaskDetail(this.$route.query.taskId)
+        }
+        if (this.$route.query.taskId && this.$route.query.isBack) {
+            console.log('驳回提交查看')
+            this.GetTaskDetail2(this.$route.query.taskId)
+        }
+        // this.taskId = this.$route.query.taskId
+        // this.isEdit = this.$route.query.isEdit
+        this.taskId = this.viewTaskId
+
+        if (this.taskId) {
+            Promise.all([this.GetTaskDetail(this.taskId), this.GetDeviceTypeTree()]).then(() => {
+                let selectList = []
+                this.leaseApplyDetails.forEach((e) => {
+                    selectList.push(this.getParentsById(this.deviceTypeTree, e.typeId))
+                })
+                this.$nextTick(() => {
+                    this.deviceType = selectList
+                    this.propsKey++
+                })
+            })
+        } else {
+            this.GetDeviceTypeTree()
         }
 
-        console.log(' this.leaseApplyDetails', this.leaseApplyDetails)
-      }
-    },
-    // 驳回提交 任务详情数据
-    async GetTaskDetail2(taskId) {
-      const res = await getLeaseApplyAuditListAll({ taskId })
-
-      const data = res.rows[0]
-
-      // unitId:null,
-      // proId:null,
-      // agreementId:null, //协议id
-      // agreementCode: null,
-      if (data.taskStatus == 100) {
-        this.queryParams.taskStatus = 32
-        this.queryParams.examineStatusId = '32'
-      }
-      this.queryParams.unitId = data.unitId
-      this.queryParams.proId = data.proId
-      this.queryParams.costBearingParty = data.costBearingParty
-      this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
-      this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
-      this.queryParams.agreementCode = data.agreementCode
-      this.queryParams.agreementId = data.agreementId
-      this.queryParams.estimateLeaseTime = data.estimateLeaseTime
-      // this.queryParams.leaseType = data.leaseType
-      this.$set(this.queryParams, 'leaseType', data.leaseType)
-      this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
-      this.leaseApplyInfoList = data.leaseApplyInfoList
-      this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
-        return this.handelEchoData(item)
-      })
-    },
-    //生成回显数据
-    handelEchoData(item) {
-      const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
-      template.createBy = item.createBy
-      template.companyId = item.companyId
-      template.typeId = item.typeId
-      template.unitCn = item.unitName
-      template.typeCn = item.typeName
-      template.guigeCn = item.typeModelName
-      template.remark = item.remark
-      template.preNum = item.preNum
-      template.deviceNum = item.deviceNum
-      template.status = item.status
-      template.parenntId = item.parenntId
-      template.num = item.num
-      return template
+        // console.log(typeof(this.isEdit))
+        // this.$set('isEdit',this.$route.query.isEdit)
     },
 
     methods: {
-      // 获取用户信息
-      async GetUserInfo() {
-        const res = await getInfo()
-        this.user = res.user
-      },
+        // 获取用户信息
+        async GetUserInfo() {
+            const res = await getInfo()
+            this.user = res.user
+        },
 
-      // 获取 来往单位 列表数据
-      async GetUnitData() {
-        const params = {
-          id: this.queryParams.proId,
-        }
-        const res = await getUnitData(params)
-        this.unitList = res.data
-
-        this.GetAgreementInfoById()
-      },
-      async getLevelTwoUnitCbx() {
-        const res = await getLevelTwoUnitCbx({ id: '' })
-        console.log('🚀 ~ getLevelTwoUnitCbx ~ res:', res)
-        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 GetDeviceTypeTree() {
-        const params = {
-          level: 3,
-        }
-        getDeviceTypeTree(params).then((res) => {
-          this.deviceTypeTree = res.data
-          console.log('🚀 ~ getDeviceTypeTree ~ this.deviceTypeTree:', this.deviceTypeTree)
-        })
-      },
-      getParentsById(list, id) {
-        for (let i in list) {
-          if (list[i].id == id) {
-            //查询到就返回该数组对象的value
-            return [list[i].id]
-          }
-          if (list[i].children) {
-            let node = this.getParentsById(list[i].children, id)
-            if (node !== undefined) {
-              //查询到把父节把父节点加到数组前面
-              node.unshift(list[i].id)
-              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)
-
-          console.log(res, '根据工程和单位获取协议id')
-
-          if (res.data.isSlt == 1) {
-            this.$message.error('当前协议下对应的工程已完成结算，不可重复领料！')
-            this.isCost = true
-
-            if (this.leaseApplyDetails.length > 0) {
-              this.leaseApplyDetails = []
-            }
-          } else {
-            this.isCost = false
-          }
-          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
-
-            // // 1. 判断当前协议对应的工程是否结算
-
-            // getAgreementInfoByIdApi({
-            //     agreementId: res.data.agreementId,
-            // })
-          }
-        }
-      },
-
-      // 获取 任务详情数据
-      async GetTaskDetail(taskId) {
-        const res = await getLeaseApplyListAll({ taskId })
-
-        const data = res.rows[0]
-
-        // unitId:null,
-        // proId:null,
-        // agreementId:null, //协议id
-        // agreementCode: null,
-        if (data.taskStatus == 100) {
-          this.queryParams.taskStatus = 32
-          this.queryParams.examineStatusId = '32'
-        }
-        this.queryParams.unitId = data.unitId
-        this.queryParams.costBearingParty = data.costBearingParty
-        this.queryParams.proId = data.proId
-        this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
-        this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
-        this.queryParams.agreementCode = data.agreementCode
-        this.queryParams.agreementId = data.agreementId
-        this.queryParams.estimateLeaseTime = data.estimateLeaseTime
-        this.queryParams.wholeTypeName = data.wholeTypeName
-
-        // this.queryParams.leaseType = data.leaseType
-        this.$set(this.queryParams, 'leaseType', data.leaseType)
-        this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
-        this.leaseApplyInfoList = data.leaseApplyInfoList
-        this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
-          return this.handelEchoData(item)
-        })
-
-        if (data.ctLeaseApplyDetails) {
-          for (let key in data.ctLeaseApplyDetails) {
-            const childrenList = data.ctLeaseApplyDetails[key].map((e) => {
-              return {
-                typeName: e.typeModelName,
-                typeId: e.typeId,
-                preNum: e.preNum,
-                num: e.num,
-                ctParentId: e.ctParentId,
-                deviceType: e.typeModelName,
-                deviceNum: e.preNum,
-                isStorage: e.isStorage,
-                deviceTypeId: e.typeId,
-              }
-            })
-
-            console.log('childrenList', childrenList)
-            this.leaseApplyDetails.push({
-              wholeTypeName: key,
-              childrenList,
-              ctParentId: data.ctLeaseApplyDetails[key][0].ctParentId,
-            })
-          }
-
-          console.log(' this.leaseApplyDetails', this.leaseApplyDetails)
-        }
-      },
-      // 驳回提交 任务详情数据
-      async GetTaskDetail2(taskId) {
-        const res = await getLeaseApplyAuditListAll({ taskId })
-
-        const data = res.rows[0]
-
-        // unitId:null,
-        // proId:null,
-        // agreementId:null, //协议id
-        // agreementCode: null,
-        if (data.taskStatus == 100) {
-          this.queryParams.taskStatus = 32
-          this.queryParams.examineStatusId = '32'
-        }
-        this.queryParams.unitId = data.unitId
-        this.queryParams.proId = data.proId
-        this.queryParams.costBearingParty = data.costBearingParty
-        this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
-        this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
-        this.queryParams.agreementCode = data.agreementCode
-        this.queryParams.agreementId = data.agreementId
-        this.queryParams.estimateLeaseTime = data.estimateLeaseTime
-        // this.queryParams.leaseType = data.leaseType
-        this.$set(this.queryParams, 'leaseType', data.leaseType)
-        this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
-        this.leaseApplyInfoList = data.leaseApplyInfoList
-        this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
-          return this.handelEchoData(item)
-        })
-      },
-      //生成回显数据
-      handelEchoData(item) {
-        const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
-        template.createBy = item.createBy
-        template.companyId = item.companyId
-        template.typeId = item.typeId
-        template.unitCn = item.unitName
-        template.typeCn = item.typeName
-        template.guigeCn = item.typeModelName
-        template.remark = item.remark
-        template.preNum = item.preNum
-        template.deviceNum = item.deviceNum
-        template.status = item.status
-        template.parenntId = item.parenntId
-        template.num = item.num
-        return template
-      },
-
-      // 表单重置
-      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
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = []
-        this.resetForm('queryForm')
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        // this.queryParams.leaseApplyDetails = selection
-        this.single = selection.length != 1
-        this.multiple = !selection.length
-      },
-      // 更多操作触发
-      handleCommand(command, row) {
-        switch (command) {
-          case 'handleDataScope':
-            this.handleDataScope(row)
-            break
-          case 'handleAuthUser':
-            this.handleAuthUser(row)
-            break
-          default:
-            break
-        }
-      },
-
-      /** 保存按钮操作 */
-
-      /** 修改按钮操作 */
-      handleBack(row) {
-        this.$tab.closeOpenPage({
-          path: '/claimAndRefund/receiveByCq/receiveApply',
-        })
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        // this.deviceType.forEach((e, index) => {
-        //     if (e[3] === row.typeId) {
-        //         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.num
-        if (row.preNum <= 1) {
-          row.preNum = 1
-        } else if (row.preNum >= maxNum) {
-          row.preNum = maxNum
-        }
-      },
-      /////// 设备类型树  切换
-      deviceTypeChange(val) {
-        console.log('🚀 ~ deviceTypeChange ~ val:', val)
-        this.queryParams.typeId = ''
-        this.typeListDev = []
-        // console.log('🚀 ~ deviceTypeChange ~ val:', val)
-        this.$nextTick(() => {
-          const deviceTypeList = this.$refs.deviceTypeCascader.getCheckedNodes()
-          console.log('🚀 ~ deviceTypeChange ~ deviceTypeList:', deviceTypeList[0])
-          this.selectParams = {
-            createBy: this.user.name,
-            companyId: deviceTypeList[0].data.companyId,
-            // num: deviceTypeList[0].data.num,
-            typeCn: deviceTypeList[0].data.label,
-          }
-          console.log('🚀 ~ deviceTypeChange ~ this.selectParams:', this.selectParams)
-          this.getMaTypeDataByIdFun(val[val.length - 1])
-        })
-
-        // 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.id === items[i]) {
-        //                 let { num, companyId, id, unitName } = deviceTypeList[z].data
-
-        //                 const isRepeat = this.leaseApplyDetails.some((e) => e.typeId === id)
-        //                 if (!isRepeat) {
-        //                     this.leaseApplyDetails.push({
-        //                         createBy: this.user.name,
-        //                         typeId: id,
-        //                         num,
-        //                         companyId,
-        //                         unitCn: unitName,
-        //                         typeCn: deviceTypeList[z].pathLabels[2],
-        //                         guigeCn: deviceTypeList[z].pathLabels[3],
-        //                     })
-        //                 }
-        //             }
-        //         }
-        //     }
-        //     console.log('🚀 ~ deviceTypeChange ~ this.leaseApplyDetails:', this.leaseApplyDetails)
-        // } else {
-        //     this.leaseApplyDetails = []
-        // }
-      },
-      // 获取规格型号
-      async getMaTypeDataByIdFun(val) {
-        const res = await getMaTypeDataById({ id: val })
-        this.typeListDev = res.data.filter((e) => e.isStorage == 1)
-        console.log('🚀 ~ getMaTypeDataByIdFun ~ res:', res)
-      },
-      // 选择规格型号
-      changeType(e) {
-        // console.log('🚀 ~ changeType ~ e:', e)
-        if (!e) return
-        // 获取选中的规格型号
-        const selectType = this.typeListDev.find((item) => item.id == e)
-        console.log('🚀 ~ changeType ~ selectType:', selectType)
-        this.selectParams.typeId = selectType.id
-        this.selectParams.guigeCn = selectType.name
-        this.selectParams.unitCn = selectType.unit
-        this.selectParams.num = selectType.num
-        console.log('🚀 ~ changeType ~ this.selectParams:', this.selectParams)
-        // 判断是否重复
-        const isRepeat = this.leaseApplyDetails.find((item) => item.typeId == selectType.id)
-        // console.log('🚀 ~ changeType ~ isRepeat:', isRepeat)
-        if (isRepeat) {
-          this.$message.error('当前设备已添加，不可重复添加！')
-          return
-        }
-        this.leaseApplyDetails.push({ ...this.selectParams })
-        console.log('🚀 ~ changeType ~ this.leaseApplyDetails:', this.leaseApplyDetails)
-      },
-      //// 将数据处理成 表格中需要的数据
-      handelTableItemData(node) {
-        const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
-        template.createBy = this.user.name
-        console.log(node.data)
-        template.num = node.data.num
-        template.companyId = node.data.companyId
-        template.typeId = node.data.id
-        template.unitCn = node.data.unitName
-        template.typeCn = node.pathLabels[2]
-        template.guigeCn = node.pathLabels[3]
-
-        if (this.taskId) {
-          const index = this.leaseApplyInfoList.find((key) => key.companyId == node.data.companyId)
-          template.parenntId = index ? index.id : ''
-        }
-
-        return template
-      },
-
-      // 获取费用承担方
-      async getCostBearingFun() {
-        const { data: res } = await getCostBearingApi()
-        this.costBearingList = res
-      },
-
-      // 领用类型修改时清空费用承担方
-      leaseTypeChange(val) {
-        console.log('🚀 ~ leaseTypeChange ~ val:', val)
-        if (val == 0) {
-          this.$set(this.queryParams, 'costBearingParty', '')
-          this.GetUnitData()
-          this.GetProData()
-        } else {
-          this.$delete(this.queryParams, 'costBearingParty')
-          this.queryParams.unitId = ''
-          this.queryParams.proId = ''
-          this.proList = []
-          this.getLevelTwoUnitCbx()
-          this.$nextTick(() => {
-            this.$refs.queryForm.clearValidate()
-          })
-        }
-      },
-
-      /* 获取抱杆下拉数据 */
-      async getHoldingPoleSelListData() {
-        const { data: res } = await getHoldingPoleSelListApi()
-        this.holdingPoleSelList = res
-      },
-      /* 抱杆成套设备change事件 */
-      onChangeWholeTypeName(val) {
-        val.forEach((e) => {
-          const selLable = this.holdingPoleSelList.find((j) => j.id === e)
-          const isPush = this.leaseApplyDetails.some((z) => z.ctParentId == e)
-
-          if (!isPush) {
-            const wholeTypeNameData = {
-              id: e,
-              wholeTypeName: selLable.wholeTypeName,
-              wholeTypeNum: 1,
-              childrenList: [],
-            }
-
-            queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
-              this.leaseApplyDetails.push({
-                wholeTypeName: selLable.wholeTypeName,
-                childrenList: res.data,
-                ctParentId: e,
-              })
-            })
-          }
-        })
-        // const selLable = this.holdingPoleSelList.find((e) => e.id === val)
-        // const wholeTypeNameData = {
-        //     id: val,
-        //     wholeTypeName: selLable.wholeTypeName,
-        //     wholeTypeNum: 1,
-        //     childrenList: [],
-        // }
-        // queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
-        //     console.log(res, '996')
-
-        //     this.leaseApplyDetails.push({
-        //         wholeTypeName: selLable.wholeTypeName,
-        //         childrenList: res.data,
-        //         ctParentId: val,
-        //     })
-        //     // wholeTypeNameData.childrenList = res.data
-        //     // wholeTypeNameData.childrenList.forEach((e) => (e.initNum = e.deviceNum))
-        //     // const isREpeat = this.wholeTypeNameList.find((e) => e.id === val)
-        //     // if (!isREpeat) {
-        //     //     this.wholeTypeNameList.push(wholeTypeNameData)
-        //     // } else {
-        //     //     this.$modal.msgError('当前抱杆成套设备已添加，不可重复添加！')
-        //     // }
-        //     // console.log(this.wholeTypeNameList, '处理后的数据---')
-        // })
-
-        // this.queryParams.wholeTypeName = ''
-      },
-
-      // 移除时触发
-      onRemoveTag(val) {
-        this.leaseApplyDetails = this.leaseApplyDetails.filter((e) => e.ctParentId !== val)
-      },
-
-      /* 删除 */
-      onHandelDelete(index) {
-        this.wholeTypeNameList.splice(index, 1)
-      },
-
-      /* 更改数量 */
-      onChangeInput(val, v) {
-        this.wholeTypeNameList[v].childrenList.forEach((e) => (e.deviceNum = e.initNum * val))
-      },
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = []
-      this.resetForm('queryForm')
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      // this.queryParams.leaseApplyDetails = selection
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-    // 更多操作触发
-    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 {
-          if (this.leaseApplyDetails.length === 0 && this.wholeTypeNameList.length === 0) {
-            this.$message.error('请添加机具类型或成套设备')
-            return
-          }
-
-          let canSave = true
-          if (this.leaseApplyDetails.length > 0) {
-            this.queryParams.leaseApplyDetails = this.leaseApplyDetails
-            try {
-              this.queryParams.leaseApplyDetails.forEach((item) => {
-                // if (item.num == 0) {
-                //   this.$message.error('机具类型库存量为零无法领料')
-                //   throw new Error()
-                // }
-                if (!item.childrenList && item.preNum == '') {
-                  this.$message.error('请填写预领数量')
-                  throw new Error()
-                }
-              })
-            } catch (e) {
-              throw e
-            }
-          }
-
-          this.leaseApplyDetails.forEach((e) => {
-            if (e.childrenList && e.childrenList.length > 0) {
-              e.childrenList.forEach((j) => {
-                const items = {
-                  companyId: '101',
-                  guigeCn: j.deviceType,
-                  typeCn: j.typeName,
-                  createBy: this.user.name,
-                  typeId: j.deviceTypeId,
-                  preNum: j.deviceNum,
-                  num: j.num,
-                  isCt: 0,
-                  ctParentId: e.ctParentId,
-                }
-
-                this.queryParams.leaseApplyDetails.push(items)
-              })
-            }
-          })
-
-          this.queryParams.leaseApplyDetails = this.queryParams.leaseApplyDetails.filter((e) => !e.childrenList)
-          // if (this.wholeTypeNameList.length > 0) {
-          //     const wholeTypeList = []
-          //     this.wholeTypeNameList.forEach((i) => {
-          //         i.childrenList.forEach((e) => {
-          //             const items = {
-          //                 companyId: '101',
-          //                 guigeCn: e.deviceType,
-          //                 preNum: e.deviceNum,
-          //                 typeCn: e.typeName,
-          //                 typeId: e.deviceTypeId,
-          //                 wholeTypeName: i.wholeTypeName,
-          //             }
-
-          //             wholeTypeList.push(items)
-          //         })
-          //     })
-
-          //     this.queryParams.leaseApplyDetails = wholeTypeList
-          // }
-
-          if (!canSave) {
-            return false
-          }
-          this.queryParams.createBy = this.user.userName
-          this.queryParams.companyId = this.user.companyId
-          this.queryParams.userId = this.user.userId
-          let res
-          if (this.queryParams.leaseType == 1) {
-            this.queryParams.taskStatus = 117
-          }
-          if (this.taskId) {
-            this.leaseApplyInfoList.forEach((v) => {
-              v = Object.assign(v, this.queryParams.leaseApplyInfo)
-              this.$set(v, 'leaseApplyDetails', this.queryParams.leaseApplyDetails)
-            })
-            if (this.$route.query.isBack) {
-              this.queryParams.souceByRefuse = 1
-            }
-            if (this.rejectTaskStatus == 100) {
-              this.queryParams.souceByRefuse = 1
-            }
+        // 获取 来往单位 列表数据
+        async GetUnitData() {
             const params = {
-              ...this.queryParams,
-              taskId: this.taskId,
-              leaseApplyInfoList: this.leaseApplyInfoList,
+                id: this.queryParams.proId,
+            }
+            const res = await getUnitData(params)
+            this.unitList = res.data
+
+            this.GetAgreementInfoById()
+        },
+        async getLevelTwoUnitCbx() {
+            const res = await getLevelTwoUnitCbx({ id: '' })
+            console.log('🚀 ~ getLevelTwoUnitCbx ~ res:', res)
+            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 GetDeviceTypeTree() {
+            const params = {
+                level: 4,
+            }
+            getDeviceTypeTree(params).then((res) => {
+                this.deviceTypeTree = res.data
+            })
+        },
+        getParentsById(list, id) {
+            for (let i in list) {
+                if (list[i].id == id) {
+                    //查询到就返回该数组对象的value
+                    return [list[i].id]
+                }
+                if (list[i].children) {
+                    let node = this.getParentsById(list[i].children, id)
+                    if (node !== undefined) {
+                        //查询到把父节把父节点加到数组前面
+                        node.unshift(list[i].id)
+                        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)
+
+                console.log(res, '根据工程和单位获取协议id')
+
+                if (res.data.isSlt == 1) {
+                    this.$message.error('当前协议下对应的工程已完成结算，不可重复领料！')
+                    this.isCost = true
+
+                    if (this.leaseApplyDetails.length > 0) {
+                        this.leaseApplyDetails = []
+                    }
+                } else {
+                    this.isCost = false
+                }
+                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
+
+                    // // 1. 判断当前协议对应的工程是否结算
+
+                    // getAgreementInfoByIdApi({
+                    //     agreementId: res.data.agreementId,
+                    // })
+                }
+            }
+        },
+
+        // 获取 任务详情数据
+        async GetTaskDetail(taskId) {
+            const res = await getLeaseApplyListAll({ taskId })
+
+            const data = res.rows[0]
+
+            // unitId:null,
+            // proId:null,
+            // agreementId:null, //协议id
+            // agreementCode: null,
+            if (data.taskStatus == 100) {
+                this.queryParams.taskStatus = 32
+                this.queryParams.examineStatusId = '32'
+            }
+            this.queryParams.unitId = data.unitId
+            this.queryParams.costBearingParty = data.costBearingParty
+            this.queryParams.proId = data.proId
+            this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
+            this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
+            this.queryParams.agreementCode = data.agreementCode
+            this.queryParams.agreementId = data.agreementId
+            this.queryParams.estimateLeaseTime = data.estimateLeaseTime
+
+            // this.queryParams.leaseType = data.leaseType
+            this.$set(this.queryParams, 'leaseType', data.leaseType)
+            this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
+            this.leaseApplyInfoList = data.leaseApplyInfoList
+            this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
+                return this.handelEchoData(item)
+            })
+        },
+        // 驳回提交 任务详情数据
+        async GetTaskDetail2(taskId) {
+            const res = await getLeaseApplyAuditListAll({ taskId })
+
+            const data = res.rows[0]
+
+            // unitId:null,
+            // proId:null,
+            // agreementId:null, //协议id
+            // agreementCode: null,
+            if (data.taskStatus == 100) {
+                this.queryParams.taskStatus = 32
+                this.queryParams.examineStatusId = '32'
+            }
+            this.queryParams.unitId = data.unitId
+            this.queryParams.proId = data.proId
+            this.queryParams.costBearingParty = data.costBearingParty
+            this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
+            this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
+            this.queryParams.agreementCode = data.agreementCode
+            this.queryParams.agreementId = data.agreementId
+            this.queryParams.estimateLeaseTime = data.estimateLeaseTime
+            // this.queryParams.leaseType = data.leaseType
+            this.$set(this.queryParams, 'leaseType', data.leaseType)
+            this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
+            this.leaseApplyInfoList = data.leaseApplyInfoList
+            this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
+                return this.handelEchoData(item)
+            })
+        },
+        //生成回显数据
+        handelEchoData(item) {
+            const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
+            template.createBy = item.createBy
+            template.companyId = item.companyId
+            template.typeId = item.typeId
+            template.unitCn = item.unitName
+            template.typeCn = item.typeName
+            template.guigeCn = item.typeModelName
+            template.remark = item.remark
+            template.preNum = item.preNum
+            template.deviceNum = item.deviceNum
+            template.status = item.status
+            template.parenntId = item.parenntId
+            template.num = item.num
+            return template
+        },
+
+        // 表单重置
+        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
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            // this.queryParams.leaseApplyDetails = selection
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        // 更多操作触发
+        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 {
+                    if (this.leaseApplyDetails.length === 0 && this.wholeTypeNameList.length === 0) {
+                        this.$message.error('请添加机具类型或成套设备')
+                        return
+                    }
+
+                    let canSave = true
+                    if (this.leaseApplyDetails.length > 0) {
+                        this.queryParams.leaseApplyDetails = this.leaseApplyDetails
+                        try {
+                            this.queryParams.leaseApplyDetails.forEach((item) => {
+                                if (item.num == 0) {
+                                    this.$message.error('机具类型库存量为零无法领料')
+                                    throw new Error()
+                                }
+                                if (item.preNum == '') {
+                                    this.$message.error('请填写预领数量')
+                                    throw new Error()
+                                }
+                            })
+                        } catch (e) {
+                            throw e
+                        }
+                    }
+
+                    if (this.wholeTypeNameList.length > 0) {
+                        const wholeTypeList = []
+                        this.wholeTypeNameList.forEach((i) => {
+                            i.childrenList.forEach((e) => {
+                                const items = {
+                                    companyId: '101',
+                                    guigeCn: e.deviceType,
+                                    preNum: e.deviceNum,
+                                    typeCn: e.typeName,
+                                    typeId: e.deviceTypeId,
+                                    wholeTypeName: i.wholeTypeName,
+                                }
+
+                                wholeTypeList.push(items)
+                            })
+                        })
+
+                        this.queryParams.leaseApplyDetails = wholeTypeList
+                    }
+
+                    if (!canSave) {
+                        return false
+                    }
+                    this.queryParams.createBy = this.user.userName
+                    this.queryParams.companyId = this.user.companyId
+                    this.queryParams.userId = this.user.userId
+                    let res
+                    if (this.queryParams.leaseType == 1) {
+                        this.queryParams.taskStatus = 117
+                    }
+                    if (this.taskId) {
+                        this.leaseApplyInfoList.forEach((v) => {
+                            v = Object.assign(v, this.queryParams.leaseApplyInfo)
+                            this.$set(v, 'leaseApplyDetails', this.queryParams.leaseApplyDetails)
+                        })
+                        if (this.$route.query.isBack) {
+                            this.queryParams.souceByRefuse = 1
+                        }
+                        if (this.rejectTaskStatus == 100) {
+                            this.queryParams.souceByRefuse = 1
+                        }
+                        const params = {
+                            ...this.queryParams,
+                            taskId: this.taskId,
+                            leaseApplyInfoList: this.leaseApplyInfoList,
+                        }
+
+                        res = await editLeaseApply(params)
+                    } else {
+                        // console.log(this.queryParams)
+                        res = await submitLeaseApply(this.queryParams)
+                    }
+                    if (res.code == 200) {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                        })
+                        // this.$tab.closeOpenPage({
+                        //     path: '/claimAndRefund/receiveByCq/receiveApply',
+                        // })
+                        this.$emit('goBackPage')
+                    }
+                }
+            })
+        },
+        /** 修改按钮操作 */
+        handleBack(row) {
+            this.$tab.closeOpenPage({
+                path: '/claimAndRefund/receiveByCq/receiveApply',
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            this.deviceType.forEach((e, index) => {
+                if (e[3] === row.typeId) {
+                    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.num
+            if (row.preNum <= 1) {
+                row.preNum = 1
+            } else if (row.preNum >= maxNum) {
+                row.preNum = maxNum
+            }
+        },
+        /////// 设备类型树  切换
+        deviceTypeChange(val) {
+            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.id === items[i]) {
+                            let { num, companyId, id, unitName } = deviceTypeList[z].data
+                            tempList.push({
+                                createBy: this.user.name,
+                                typeId: id,
+                                num,
+                                companyId,
+                                unitCn: unitName,
+                                typeCn: deviceTypeList[z].pathLabels[2],
+                                guigeCn: deviceTypeList[z].pathLabels[3],
+                            })
+                            break
+                        }
+                    }
+                }
+
+                const newDataList = [...this.leaseApplyDetails, ...tempList]
+                const map = new Map()
+                for (let item of newDataList) {
+                    if (!map.has(item.typeId)) {
+                        map.set(item.typeId, item)
+                    }
+                }
+                const newArray = [...map.values()]
+
+                let newArray_array = []
+                items.forEach((e) => {
+                    newArray.forEach((j) => {
+                        if (e == j.typeId) {
+                            newArray_array.push(j)
+                        }
+                    })
+                })
+                this.leaseApplyDetails = newArray_array
+            } else {
+                this.leaseApplyDetails = []
             }
 
-            res = await editLeaseApply(params)
-          } else {
-            console.log(this.queryParams, '参数---')
-            res = await submitLeaseApply(this.queryParams)
-          }
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-            })
-            // this.$tab.closeOpenPage({
-            //     path: '/claimAndRefund/receiveByCq/receiveApply',
+            // const templateList = deviceTypeList.map((e) => {
+            //     let { num, companyId, id, unitName } = e.data
+            //     return {
+            //         createBy: this.user.name,
+            //         num,
+            //         companyId,
+            //         typeId: id,
+            //         unitCn: unitName,
+            //         typeCn: e.pathLabels[2],
+            //         guigeCn: e.pathLabels[3],
+            //     }
             // })
-            this.$emit('goBackPage')
-          }
-        }
-      })
-    },
-    /** 修改按钮操作 */
-    handleBack(row) {
-      this.$tab.closeOpenPage({
-        path: '/claimAndRefund/receiveByCq/receiveApply',
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      // this.deviceType.forEach((e, index) => {
-      //     if (e[3] === row.typeId) {
-      //         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`)
-    },
+            // this.leaseApplyDetails = [...new Set(templateList)]
+            // console.log(templateList, '----')
 
-    checkNum(row) {
-      let maxNum = row.num
-      if (row.preNum <= 1) {
-        row.preNum = 1
-      } else if (row.preNum >= maxNum) {
-        row.preNum = maxNum
-      }
-    },
-    /////// 设备类型树  切换
-    deviceTypeChange(val) {
-      console.log('🚀 ~ deviceTypeChange ~ val:', val)
-      this.queryParams.typeId = ''
-      this.typeListDev = []
-      // console.log('🚀 ~ deviceTypeChange ~ val:', val)
-      this.$nextTick(() => {
-        const deviceTypeList = this.$refs.deviceTypeCascader.getCheckedNodes()
-        console.log('🚀 ~ deviceTypeChange ~ deviceTypeList:', deviceTypeList[0])
-        this.selectParams = {
-          createBy: this.user.name,
-          companyId: deviceTypeList[0].data.companyId,
-          // num: deviceTypeList[0].data.num,
-          typeCn: deviceTypeList[0].data.label,
-        }
-        console.log('🚀 ~ deviceTypeChange ~ this.selectParams:', this.selectParams)
-        this.getMaTypeDataByIdFun(val[val.length - 1])
-      })
+            // let nodes = null
+            // nodes =
+            //     this.$refs.deviceTypeCascader.getCheckedNodes().length > 0
+            //         ? this.$refs.deviceTypeCascader.getCheckedNodes()
+            //         : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
+            // if (nodes[0].level != 4) {
+            //     return
+            // }
+            // // console.log(this.leaseApplyDetails)
+            // // console.log(nodes[0].data.id)
+            // for (let i = 0; i < this.leaseApplyDetails.length; i++) {
+            //     if (this.leaseApplyDetails[i].typeId == nodes[0].data.id) {
+            //         this.leaseApplyDetails.splice(i, 1)
+            //         break
+            //     }
+            // }
+            // this.leaseApplyDetails.push(this.handelTableItemData(nodes[0]))
+            // this.deviceType = {}
+        },
+        //// 将数据处理成 表格中需要的数据
+        handelTableItemData(node) {
+            const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
+            template.createBy = this.user.name
+            console.log(node.data)
+            template.num = node.data.num
+            template.companyId = node.data.companyId
+            template.typeId = node.data.id
+            template.unitCn = node.data.unitName
+            template.typeCn = node.pathLabels[2]
+            template.guigeCn = node.pathLabels[3]
 
-      // 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.id === items[i]) {
-      //                 let { num, companyId, id, unitName } = deviceTypeList[z].data
+            if (this.taskId) {
+                const index = this.leaseApplyInfoList.find((key) => key.companyId == node.data.companyId)
+                template.parenntId = index ? index.id : ''
+            }
 
-      //                 const isRepeat = this.leaseApplyDetails.some((e) => e.typeId === id)
-      //                 if (!isRepeat) {
-      //                     this.leaseApplyDetails.push({
-      //                         createBy: this.user.name,
-      //                         typeId: id,
-      //                         num,
-      //                         companyId,
-      //                         unitCn: unitName,
-      //                         typeCn: deviceTypeList[z].pathLabels[2],
-      //                         guigeCn: deviceTypeList[z].pathLabels[3],
-      //                     })
-      //                 }
-      //             }
-      //         }
-      //     }
-      //     console.log('🚀 ~ deviceTypeChange ~ this.leaseApplyDetails:', this.leaseApplyDetails)
-      // } else {
-      //     this.leaseApplyDetails = []
-      // }
-    },
-    // 获取规格型号
-    async getMaTypeDataByIdFun(val) {
-      const res = await getMaTypeDataById({ id: val })
-      this.typeListDev = res.data.filter((e) => e.isStorage == 1)
-      console.log('🚀 ~ getMaTypeDataByIdFun ~ res:', res)
-    },
-    // 选择规格型号
-    changeType(e) {
-      // console.log('🚀 ~ changeType ~ e:', e)
-      if (!e) return
-      // 获取选中的规格型号
-      const selectType = this.typeListDev.find((item) => item.id == e)
-      console.log('🚀 ~ changeType ~ selectType:', selectType)
-      this.selectParams.typeId = selectType.id
-      this.selectParams.guigeCn = selectType.name
-      this.selectParams.unitCn = selectType.unit
-      this.selectParams.num = selectType.num
-      console.log('🚀 ~ changeType ~ this.selectParams:', this.selectParams)
-      // 判断是否重复
-      const isRepeat = this.leaseApplyDetails.find((item) => item.typeId == selectType.id)
-      // console.log('🚀 ~ changeType ~ isRepeat:', isRepeat)
-      if (isRepeat) {
-        this.$message.error('当前设备已添加，不可重复添加！')
-        return
-      }
-      this.leaseApplyDetails.push({ ...this.selectParams })
-      console.log('🚀 ~ changeType ~ this.leaseApplyDetails:', this.leaseApplyDetails)
-    },
-    //// 将数据处理成 表格中需要的数据
-    handelTableItemData(node) {
-      const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
-      template.createBy = this.user.name
-      console.log(node.data)
-      template.num = node.data.num
-      template.companyId = node.data.companyId
-      template.typeId = node.data.id
-      template.unitCn = node.data.unitName
-      template.typeCn = node.pathLabels[2]
-      template.guigeCn = node.pathLabels[3]
+            return template
+        },
 
-      if (this.taskId) {
-        const index = this.leaseApplyInfoList.find((key) => key.companyId == node.data.companyId)
-        template.parenntId = index ? index.id : ''
-      }
+        // 获取费用承担方
+        async getCostBearingFun() {
+            const { data: res } = await getCostBearingApi()
+            this.costBearingList = res
+        },
 
-      return template
-    },
+        // 领用类型修改时清空费用承担方
+        leaseTypeChange(val) {
+            console.log('🚀 ~ leaseTypeChange ~ val:', val)
+            if (val == 0) {
+                this.$set(this.queryParams, 'costBearingParty', '')
+                this.GetUnitData()
+                this.GetProData()
+            } else {
+                this.$delete(this.queryParams, 'costBearingParty')
+                this.queryParams.unitId = ''
+                this.queryParams.proId = ''
+                this.proList = []
+                this.getLevelTwoUnitCbx()
+                this.$nextTick(() => {
+                    this.$refs.queryForm.clearValidate()
+                })
+            }
+        },
 
-    // 获取费用承担方
-    async getCostBearingFun() {
-      const { data: res } = await getCostBearingApi()
-      this.costBearingList = res
-    },
+        /* 获取抱杆下拉数据 */
+        async getHoldingPoleSelListData() {
+            const { data: res } = await getHoldingPoleSelListApi()
+            this.holdingPoleSelList = res
+        },
+        /* 抱杆成套设备change事件 */
+        onChangeWholeTypeName(val) {
+            const selLable = this.holdingPoleSelList.find((e) => e.id === val)
+            const wholeTypeNameData = {
+                id: val,
+                wholeTypeName: selLable.wholeTypeName,
+                wholeTypeNum: 1,
+                childrenList: [],
+            }
+            queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
+                wholeTypeNameData.childrenList = res.data
+                wholeTypeNameData.childrenList.forEach((e) => (e.initNum = e.deviceNum))
+                const isREpeat = this.wholeTypeNameList.find((e) => e.id === val)
+                if (!isREpeat) {
+                    this.wholeTypeNameList.push(wholeTypeNameData)
+                } else {
+                    this.$modal.msgError('当前抱杆成套设备已添加，不可重复添加！')
+                }
 
-    // 领用类型修改时清空费用承担方
-    leaseTypeChange(val) {
-      console.log('🚀 ~ leaseTypeChange ~ val:', val)
-      if (val == 0) {
-        this.$set(this.queryParams, 'costBearingParty', '')
-        this.GetUnitData()
-        this.GetProData()
-      } else {
-        this.$delete(this.queryParams, 'costBearingParty')
-        this.queryParams.unitId = ''
-        this.queryParams.proId = ''
-        this.proList = []
-        this.getLevelTwoUnitCbx()
-        this.$nextTick(() => {
-          this.$refs.queryForm.clearValidate()
-        })
-      }
-    },
-
-    /* 获取抱杆下拉数据 */
-    async getHoldingPoleSelListData() {
-      const { data: res } = await getHoldingPoleSelListApi()
-      this.holdingPoleSelList = res
-    },
-    /* 抱杆成套设备change事件 */
-    onChangeWholeTypeName(val) {
-      val.forEach((e) => {
-        const selLable = this.holdingPoleSelList.find((j) => j.id === e)
-        const isPush = this.leaseApplyDetails.some((z) => z.ctParentId == e)
-
-        if (!isPush) {
-          const wholeTypeNameData = {
-            id: e,
-            wholeTypeName: selLable.wholeTypeName,
-            wholeTypeNum: 1,
-            childrenList: [],
-          }
-
-          queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
-            this.leaseApplyDetails.push({
-              wholeTypeName: selLable.wholeTypeName,
-              childrenList: res.data,
-              ctParentId: e,
+                console.log(this.wholeTypeNameList, '处理后的数据---')
             })
-          })
-        }
-      })
-      // const selLable = this.holdingPoleSelList.find((e) => e.id === val)
-      // const wholeTypeNameData = {
-      //     id: val,
-      //     wholeTypeName: selLable.wholeTypeName,
-      //     wholeTypeNum: 1,
-      //     childrenList: [],
-      // }
-      // queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
-      //     console.log(res, '996')
 
-      //     this.leaseApplyDetails.push({
-      //         wholeTypeName: selLable.wholeTypeName,
-      //         childrenList: res.data,
-      //         ctParentId: val,
-      //     })
-      //     // wholeTypeNameData.childrenList = res.data
-      //     // wholeTypeNameData.childrenList.forEach((e) => (e.initNum = e.deviceNum))
-      //     // const isREpeat = this.wholeTypeNameList.find((e) => e.id === val)
-      //     // if (!isREpeat) {
-      //     //     this.wholeTypeNameList.push(wholeTypeNameData)
-      //     // } else {
-      //     //     this.$modal.msgError('当前抱杆成套设备已添加，不可重复添加！')
-      //     // }
-      //     // console.log(this.wholeTypeNameList, '处理后的数据---')
-      // })
+            this.queryParams.wholeTypeName = ''
+        },
 
-      // this.queryParams.wholeTypeName = ''
+        /* 删除 */
+        onHandelDelete(index) {
+            this.wholeTypeNameList.splice(index, 1)
+        },
+
+        /* 更改数量 */
+        onChangeInput(val, v) {
+            this.wholeTypeNameList[v].childrenList.forEach((e) => (e.deviceNum = e.initNum * val))
+        },
     },
-
-    // 移除时触发
-    onRemoveTag(val) {
-      this.leaseApplyDetails = this.leaseApplyDetails.filter((e) => e.ctParentId !== val)
-    },
-
-    /* 删除 */
-    onHandelDelete(index) {
-      this.wholeTypeNameList.splice(index, 1)
-    },
-
-    /* 更改数量 */
-    onChangeInput(val, v) {
-      this.wholeTypeNameList[v].childrenList.forEach((e) => (e.deviceNum = e.initNum * val))
-    },
-  },
 }
 </script>
 
 <style lang="scss">
 .popper-select {
-  // li[aria-haspopup='true'] {
-  //     .el-checkbox {
-  //         display: none;
-  //     }
-  // }
+    // li[aria-haspopup='true'] {
+    //     .el-checkbox {
+    //         display: none;
+    //     }
+    // }
 
-  .el-cascader-panel .el-scrollbar .el-checkbox {
-    display: none;
-  }
+    .el-cascader-panel .el-scrollbar .el-checkbox {
+        display: none;
+    }
 
-  .el-cascader-panel .el-scrollbar:nth-child(4) .el-checkbox {
-    display: block !important;
-  }
+    .el-cascader-panel .el-scrollbar:nth-child(4) .el-checkbox {
+        display: block !important;
+    }
 }
 </style>
diff --git a/src/views/store/poleConfig/copy-old.vue b/src/views/store/poleConfig/copy-old.vue
new file mode 100644
index 0000000..7877cf1
--- /dev/null
+++ b/src/views/store/poleConfig/copy-old.vue
@@ -0,0 +1,556 @@
+<template>
+    <div class="app-container">
+        <!-- 首页搜索 -->
+        <el-form
+            :model="formData"
+            ref="formData"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+            @submit.native.prevent
+        >
+            <el-form-item label="成套设备名称" prop="wholeTypeName">
+                <el-input
+                    v-model="formData.wholeTypeName"
+                    placeholder="请输入成套设备名称"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <!-- <el-form-item label="主体设备" prop="keyWord">
+                <el-input
+                    v-model="formData.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="创建日期" prop="keyWord">
+                <el-input
+                    v-model="formData.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item> -->
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+            </el-col>
+
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+        </el-row>
+
+        <!-- 列表 -->
+        <el-table :data="tableList" border>
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
+            >
+            </el-table-column>
+            <el-table-column prop="wholeTypeName" label="成套设备名称" align="center" />
+            <el-table-column prop="typeModelName" label="抱杆设备" align="center" />
+            <el-table-column prop="totalNum" label="配套设备种类数量" align="center" />
+            <el-table-column prop="nickName" label="创建人" align="center" />
+            <el-table-column prop="createTime" label="创建日期" align="center" />
+            <el-table-column label="操作" align="center">
+                <template v-slot="{ row }">
+                    <!-- <el-button
+                        type="text"
+                        icon="el-icon-search"
+                        @click="handleDetail(row)"
+                        >查看</el-button
+                    > -->
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-delete" @click="handleDeleteRow(row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="formData.pageNum"
+            :limit.sync="formData.pageSize"
+            @pagination="getList"
+        />
+
+        <!-- 弹框 -->
+        <el-dialog :title="title" :visible.sync="open" v-if="open" width="80%" :close-on-click-modal="false">
+            <el-form ref="addFormRef" :model="addCompleteForm" :rules="addCompleteRules" inline label-width="120px">
+                <el-form-item label="成套名称" prop="completeSetName">
+                    <el-input placeholder="请输入成套名称" v-model="addCompleteForm.completeSetName" />
+                </el-form-item>
+                <el-form-item label="抱杆设备" prop="mainDevice" class="is-required">
+                    <el-cascader
+                        clearable
+                        filterable
+                        ref="mainDeviceRef"
+                        @change="selMainDevice"
+                        :show-all-levels="false"
+                        placeholder="请选择抱杆设备"
+                        :options="deviceTypeTreeNew"
+                        :props="deviceTypeTreeProps"
+                        :disabled="mainDeviceDisabled"
+                        v-model="addCompleteForm.mainDevice"
+                    />
+                </el-form-item>
+                <el-form-item label="配套设备" prop="assortDevice">
+                    <el-cascader
+                        ref="assortDeviceRef"
+                        placeholder="请选择配套设备"
+                        :options="deviceTypeTreeNew"
+                        :props="deviceTypeTreeProps"
+                        v-model="addCompleteForm.assortDevice"
+                        @change="selAssortDevice"
+                        :show-all-levels="false"
+                        filterable
+                        clearable
+                    />
+                </el-form-item>
+            </el-form>
+
+            <el-row class="mb8">
+                <el-button type="primary" size="mini" @click="submitComplete">保 存</el-button>
+            </el-row>
+
+            <el-table :data="tempList" border max-height="400">
+                <el-table-column align="center" label="序号" type="index" />
+                <el-table-column prop="typeName" align="center" label="设备名称" />
+                <el-table-column prop="deviceType" align="center" label="设备型号" />
+                <el-table-column prop="deviceAscription" align="center" label="设备所属" />
+                <el-table-column align="center" label="数量">
+                    <template slot-scope="{ row }">
+                        <el-input
+                            v-model="row.deviceNum"
+                            style="width: 180px"
+                            placeholder="请输入数量"
+                            @change="deviceNumChange"
+                            maxlength="9"
+                        />
+                    </template>
+                </el-table-column>
+                <!-- 操作列 -->
+                <el-table-column align="center" label="操作">
+                    <template slot-scope="{ row }">
+                        <el-button size="mini" type="danger" @click="handleDelete(row)">删 除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+// import {
+//     getDeviceTypeTree,
+//     addOrUpdateWhole,
+//     searchSelectList,
+//     searchSelectListById,
+//     deleteById,
+//     editRequest,
+// } from '@/api/store/poleConfig'
+
+import { getDeviceTypeTree } from '@/api/claimAndRefund/receive'
+import {
+    addCompleteSetToolsApi,
+    queryCompleteSetToolsApi,
+    getCompleteSetToolsApi,
+    delCompleteSetToolsApi,
+} from '@/api/store/completeTools.js'
+export default {
+    name: 'poleConfig',
+    data() {
+        return {
+            isLoading: false,
+            showSearch: true,
+            formData: {
+                wholeTypeName: '',
+                pageNum: 1,
+                pageSize: 10,
+            },
+            houseList: [],
+            title: '新增',
+            open: false,
+            dialogForm: {
+                parentId: '',
+                mountingsValue: [],
+                keyWord: '',
+            },
+            typeOptions: [],
+            mountingsOptions: [],
+            dialogList: [],
+            selectList: [],
+            isDetail: false,
+            isEdit: false,
+            total: 0,
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                keyWord: '',
+            },
+            rowId: '',
+
+            wholeTypeName: [],
+            pageContent: '成套设备新增',
+            addCompleteForm: {
+                completeSetName: '',
+                mainDevice: '',
+                assortDevice: '',
+            },
+            addCompleteRules: {
+                completeSetName: [
+                    {
+                        required: true,
+                        trigger: 'blur',
+                        message: '请输入成套名称',
+                    },
+                    {
+                        max: 40,
+                        message: '长度不能超过40个字符',
+                    },
+                ],
+                // mainDevice: [
+                //     {
+                //         required: true,
+                //     },
+                // ],
+                // assortDevice: [
+                //     {
+                //         required: true,
+                //     },
+                // ],
+            },
+            deviceTypeTreeProps: {
+                multiple: false,
+                value: 'id',
+            },
+            deviceTypeTreeNew: [], // 设备选择数据源
+            tempList: [],
+            mainDeviceDisabled: false,
+            saveParams: {
+                wholeTypeName: '', // 成套名称
+                createBy: sessionStorage.getItem('userId'), // 创建人
+                parentId: '', // 主体设备ID
+                // companyId: 101,
+                deviceInfo: [],
+            },
+            isEdit: false,
+            deviceName: '',
+            tableList: [],
+        }
+    },
+    created() {
+        this.getList()
+        // 获取设备树
+        this.getDeviceTypeTree()
+        // getDeviceTypeTree().then((res) => {
+        //     // 处理为typeOptions需要的数据格式
+        //     const data = res.data
+        //     // this.typeOptions = this.getTree(data)
+        //     // this.mountingsOptions = this.getTree(data)
+        //     this.typeOptions = this.mountingsOptions = this.getTree(data)
+        // })
+        // getDeviceTypeTree().then(res => {
+        //   // 处理为mountingsOptions需要的数据格式
+        //   const data = res.data
+        //   this.mountingsOptions = this.getTree(data)
+        // })
+    },
+    methods: {
+        // 获取列表
+        async getList() {
+            const res = await getCompleteSetToolsApi(this.formData)
+            console.log(res, '成套列表')
+
+            this.tableList = res.rows
+            this.total = res.total
+            // this.houseList = []
+            // this.queryParams.pageNum = data.page || 1
+            // this.queryParams.pageSize = data.limit || 10
+            // this.queryParams.keyWord = this.formData.keyWord || ''
+            // const res = await searchSelectList({ ...this.queryParams })
+            // this.houseList = res.data.result
+            // this.total = res.data.totalCount || 0
+        },
+        // 查询
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            const keyWord = this.formData.wholeTypeName?.trim() || ''
+            this.getList({ keyWord })
+        },
+        handleSearch() {
+            const keyWord = this.dialogForm.keyWord?.trim() || ''
+            this.getDetail({ id: this.rowId, keyWord })
+        },
+        // 重置
+        resetQuery() {
+            this.formData.wholeTypeName = ''
+            this.getList()
+        },
+        resetSearch() {
+            this.dialogForm.wholeTypeName = ''
+            this.getDetail({ id: this.rowId })
+        },
+        // 新增
+        handleAdd() {
+            // 打开新增弹窗
+            this.title = '成套设备新增'
+            this.addCompleteForm = {
+                completeSetName: '',
+                mainDevice: '',
+                assortDevice: '',
+            }
+            this.tempList = []
+            this.mainDeviceDisabled = false
+            this.open = true
+        },
+        // 编辑
+        async handleEdit(row) {
+            this.title = '成套设备编辑'
+            this.addCompleteForm.completeSetName = row.wholeTypeName
+            this.addCompleteForm.mainDevice = row.deviceTypeId
+            this.saveParams.id = row.id
+            this.mainDeviceDisabled = true
+            this.isEdit = true
+            const queryParams = {
+                id: row.id,
+                wholeTypeName: row.wholeTypeName,
+                // pageNum: 1,
+                // pageSize: 99999,
+            }
+            const { data: res } = await queryCompleteSetToolsApi(queryParams)
+            this.tempList = res
+            this.open = true
+
+            this.$nextTick(() => {
+                const mainDeviceRef = this.$refs.mainDeviceRef
+                const input = mainDeviceRef.$el.querySelector('input')
+                if (input) {
+                    input.value = this.tempList[0].deviceType
+                }
+            })
+        },
+
+        // 删除当前行
+        handleDeleteRow(row) {
+            this.$confirm('是否确定删除?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    delCompleteSetToolsApi({
+                        id: row.id,
+                        wholeTypeName: row.wholeTypeName,
+                    })
+                        .then((res) => {
+                            this.$message({
+                                type: 'success',
+                                message: '删除成功!',
+                            })
+
+                            this.getList()
+                        })
+                        .catch((err) => {
+                            this.$message({
+                                type: 'error',
+                                message: '删除失败!',
+                            })
+                        })
+                })
+                .catch(() => {})
+        },
+
+        /**
+         *  重庆、宁夏共享成套 2024.8.30拷贝宁夏成套设备页面改造
+         *  以下为弹框内操作代码逻辑
+         */
+        //主体设备选择
+        selMainDevice(val) {
+            if (val.length < 4) {
+                this.$modal.msgError('请选择第四级规格型号的数据，如未添加可以添加后再操作！')
+                this.addCompleteForm.mainDevice = []
+                return
+            }
+            this.$message.closeAll()
+            const checkNode = this.$refs['mainDeviceRef'].getCheckedNodes()
+            this.recursionGetDeviceName(this.deviceTypeTreeNew, val[val.length - 2])
+            if (checkNode.length < 1) return
+
+            const mainDeviceObj = {
+                deviceType: checkNode[0].label, // 设备型号
+                deviceTypeId: val[val.length - 1], // 设备Id
+                deviceNum: '', // 数量
+                deviceAscription: '抱杆设备', // 所属类型
+                ascriptionType: 1, // 所属类型 1 主体设备 2 配套设备
+                typeName: this.deviceName,
+            }
+
+            if (this.tempList.length === 0) {
+                this.tempList.unshift(mainDeviceObj)
+            } else {
+                // 判断选择的配套设备是否和主体设备重复
+                const isRepeat = this.tempList.some((e) => e.deviceTypeId === mainDeviceObj.deviceTypeId)
+                if (isRepeat) {
+                    this.$message.error('该设备已选择作为配套设备，不可作为主体设备!')
+                    return
+                } else {
+                    this.tempList.unshift(mainDeviceObj)
+                }
+            }
+
+            this.mainDeviceDisabled = true
+        },
+        // 配套设备选择
+        selAssortDevice(val) {
+            if (val.length < 4) {
+                this.$modal.msgError('请选择第四级规格型号的数据，如未添加可以添加后再操作！')
+                this.addCompleteForm.assortDevice = []
+                return
+            }
+            this.$message.closeAll()
+            const checkNode = this.$refs['assortDeviceRef'].getCheckedNodes()
+            this.recursionGetDeviceName(this.deviceTypeTreeNew, val[val.length - 2])
+
+            if (checkNode.length < 1) return
+
+            const assortDeviceObj = {
+                deviceType: checkNode[0].label, // 设备名称
+                deviceTypeId: val[val.length - 1], // 设备Id
+                deviceNum: '', // 数量
+                deviceAscription: '配套设备', // 所属类型
+                ascriptionType: 2, // 所属类型 1 主体设备 2 配套设备
+                typeName: this.deviceName,
+            }
+
+            // 先判断当前所选的配套设备是否已选择为主体设备
+            if (this.tempList.length > 0 && this.tempList[0].deviceTypeId === assortDeviceObj.deviceTypeId) {
+                this.$message.error('所选设备已作为抱杆设备，不可再作为配套设备！')
+                return
+            }
+
+            // 再判断当前设备是否重复添加
+            const isRepeat = this.tempList.some((e) => e.deviceTypeId === assortDeviceObj.deviceTypeId)
+
+            if (isRepeat) {
+                this.$message.error('该设备已添加，不可重复添加!')
+                return
+            } else {
+                this.tempList.push(assortDeviceObj)
+            }
+        },
+        // 删除按钮
+        handleDelete(row) {
+            this.tempList = this.tempList.filter((e) => e.deviceTypeId !== row.deviceTypeId)
+            // 如果当前删除的设备为主体设备 解开表单禁用状态
+            if (row.ascriptionType === 1) {
+                this.mainDeviceDisabled = false
+            }
+        },
+        // 数量输入框校验
+        deviceNumChange(val) {
+            let reg = /^[1-9]\d*$/
+            if (!reg.test(val)) {
+                this.$message.error('请输入大于0的正整数！')
+            }
+        },
+        // 保存按钮
+        submitComplete() {
+            this.$refs.addFormRef.validate(async (valid) => {
+                if (valid) {
+                    let isNum = false
+                    const isMainDevice = this.tempList.some((e) => e.ascriptionType === 1)
+
+                    if (!isMainDevice) {
+                        this.$message.error('请添加抱杆设备！')
+                        return
+                    }
+
+                    // const isAssortDevice = this.tempList.some(
+                    //     (e) => e.ascriptionType === 2,
+                    // )
+
+                    // if (!isAssortDevice) {
+                    //     this.$message.error('请添加配套设备！')
+                    //     return
+                    // }
+                    try {
+                        this.tempList.forEach((e) => {
+                            if (!parseInt(e.deviceNum)) {
+                                this.$message.error('请输入数量！')
+                                isNum = true
+                                throw new Error()
+                            } else {
+                                e.deviceNum = parseInt(e.deviceNum)
+                            }
+                        })
+                    } catch (error) {}
+
+                    if (isNum) return
+
+                    this.saveParams.parentId = this.tempList[0].deviceTypeId
+                    this.saveParams.wholeTypeName = this.addCompleteForm.completeSetName
+
+                    this.saveParams.deviceInfo = this.tempList
+                    const res = await addCompleteSetToolsApi(this.saveParams)
+
+                    if (res.code == 200) {
+                        this.$message.success(!this.title === '成套设备新增' ? '新增成功！' : '修改成功！')
+                        this.open = false
+                        this.tempList = []
+                        this.getList()
+                    }
+                }
+            })
+        },
+
+        // 获取 设备树结构数据
+        async getDeviceTypeTree() {
+            const params = {
+                level: 4,
+            }
+            const res = await getDeviceTypeTree(params)
+            this.deviceTypeTreeNew = res.data
+        },
+        goBack() {
+            this.$emit('openHomePage')
+            this.tempList = []
+        },
+
+        // 递归获取设备名称
+        recursionGetDeviceName(list, id) {
+            try {
+                list.map((e) => {
+                    if (e.id == id) {
+                        this.deviceName = e.label
+                        throw new Error()
+                    } else {
+                        if (e.children && e.children.length > 0) {
+                            this.recursionGetDeviceName(e.children, id)
+                        }
+                    }
+                })
+            } catch (error) {}
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/store/poleConfig/poleConfig-old.vue b/src/views/store/poleConfig/poleConfig-old.vue
new file mode 100644
index 0000000..690b26e
--- /dev/null
+++ b/src/views/store/poleConfig/poleConfig-old.vue
@@ -0,0 +1,547 @@
+<template>
+    <div class="app-container">
+        <!-- 首页搜索 -->
+        <el-form
+            :model="formData"
+            ref="formData"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+            @submit.native.prevent
+        >
+            <el-form-item label="成套设备" prop="wholeTypeName">
+                <el-input
+                    v-model="formData.wholeTypeName"
+                    placeholder="请输入成套设备"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+            </el-col>
+
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+        </el-row>
+
+        <!-- 列表 -->
+        <el-table :data="tableList" border>
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
+            >
+            </el-table-column>
+            <el-table-column prop="wholeTypeName" label="成套设备" align="center" />
+            <!-- <el-table-column prop="typeModelName" label="抱杆设备" align="center" /> -->
+            <!-- <el-table-column prop="totalNum" label="配套设备种类数量" align="center" /> -->
+            <el-table-column prop="nickName" label="创建人" align="center" />
+            <el-table-column prop="createTime" label="创建日期" align="center" />
+            <el-table-column label="操作" align="center">
+                <template v-slot="{ row }">
+                    <!-- <el-button
+                        type="text"
+                        icon="el-icon-search"
+                        @click="handleDetail(row)"
+                        >查看</el-button
+                    > -->
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-search" @click="onHandleView(row)">附属配件</el-button>
+                    <el-button type="text" icon="el-icon-delete" @click="handleDeleteRow(row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="formData.pageNum"
+            :limit.sync="formData.pageSize"
+            @pagination="getList"
+        />
+
+        <!-- 弹框 -->
+        <el-dialog :title="title" :visible.sync="open" v-if="open" width="80%" :close-on-click-modal="false">
+            <template v-if="title !== '附件详情'">
+                <el-form ref="addFormRef" :model="addCompleteForm" :rules="addCompleteRules" inline label-width="120px">
+                    <el-form-item label="成套设备">
+                        <el-cascader
+                            clearable
+                            filterable
+                            ref="mainDeviceRef"
+                            @change="selMainDevice"
+                            :show-all-levels="false"
+                            placeholder="请选择抱杆设备"
+                            :options="deviceTypeTreeNew"
+                            :props="deviceTypeTreeProps"
+                            :disabled="mainDeviceDisabled"
+                            v-model="addCompleteForm.mainDevice"
+                        />
+                    </el-form-item>
+
+                    <el-form-item label="规格型号">
+                        <el-select
+                            v-model="addCompleteForm.assortDevice"
+                            @change="onChangeLastType"
+                            clearable
+                            filterable
+                        >
+                            <el-option
+                                :key="type.typeId"
+                                :value="type.typeId"
+                                :label="type.typeName"
+                                v-for="type in lastTypesList"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+
+                <el-row class="mb8">
+                    <el-button type="primary" size="mini" @click="submitComplete">保 存</el-button>
+                </el-row>
+
+                <el-table :data="tempList" border max-height="400">
+                    <el-table-column align="center" label="序号" type="index" />
+                    <el-table-column prop="typeName" align="center" label="成套设备" />
+                    <el-table-column prop="deviceType" align="center" label="规格型号" />
+                    <el-table-column align="center" label="数量">
+                        <template slot-scope="{ row }">
+                            <el-input
+                                v-model="row.deviceNum"
+                                style="width: 180px"
+                                placeholder="请输入数量"
+                                @change="deviceNumChange"
+                                maxlength="9"
+                            />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="deviceType" align="center" label="是否管理库存">
+                        <template slot-scope="{ row }">
+                            <el-tag size="mini" type="primary" v-if="row.isStorage == 1">是</el-tag>
+                            <el-tag size="mini" type="warning" v-if="row.isStorage == 0">否</el-tag>
+                        </template>
+                    </el-table-column>
+                    <!-- 操作列 -->
+                    <el-table-column align="center" label="操作">
+                        <template slot-scope="{ row }">
+                            <el-button size="mini" type="danger" @click="handleDelete(row)">删 除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </template>
+
+            <template v-else>
+                <el-table :data="detailsList" border max-height="400">
+                    <el-table-column align="center" label="序号" type="index" />
+                    <el-table-column prop="typeName" align="center" label="成套设备" />
+                    <el-table-column prop="deviceType" align="center" label="规格型号" />
+                    <el-table-column align="center" label="数量" prop="deviceNum"> </el-table-column>
+                    <el-table-column prop="deviceType" align="center" label="是否管理库存">
+                        <template slot-scope="{ row }">
+                            <el-tag size="mini" type="primary" v-if="row.isStorage == 1">是</el-tag>
+                            <el-tag size="mini" type="warning" v-if="row.isStorage == 0">否</el-tag>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+// import {
+//     getDeviceTypeTree,
+//     addOrUpdateWhole,
+//     searchSelectList,
+//     searchSelectListById,
+//     deleteById,
+//     editRequest,
+// } from '@/api/store/poleConfig'
+
+import { getDeviceTypeTree } from '@/api/claimAndRefund/receive'
+import { getInfoListByTypeApi } from '@/api/store/warehousing'
+import {
+    addCompleteSetToolsApi,
+    queryCompleteSetToolsApi,
+    getCompleteSetToolsApi,
+    delCompleteSetToolsApi,
+} from '@/api/store/completeTools.js'
+export default {
+    name: 'poleConfig',
+    data() {
+        return {
+            isLoading: false,
+            showSearch: true,
+            formData: {
+                wholeTypeName: '',
+                pageNum: 1,
+                pageSize: 10,
+            },
+            houseList: [],
+            title: '新增',
+            open: false,
+            dialogForm: {
+                parentId: '',
+                mountingsValue: [],
+                keyWord: '',
+            },
+            typeOptions: [],
+            mountingsOptions: [],
+            dialogList: [],
+            selectList: [],
+            isDetail: false,
+            isEdit: false,
+            total: 0,
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                keyWord: '',
+            },
+            rowId: '',
+
+            wholeTypeName: [],
+            pageContent: '成套设备新增',
+            addCompleteForm: {
+                completeSetName: '',
+                mainDevice: '',
+                assortDevice: '',
+            },
+            addCompleteRules: {
+                mainDevice: [
+                    {
+                        required: true,
+                        trigger: 'change',
+                        message: '请选择成套设备',
+                    },
+                ],
+                assortDevice: [
+                    {
+                        required: true,
+                        trigger: 'change',
+                        message: '请选择规格型号',
+                    },
+                ],
+            },
+            deviceTypeTreeProps: {
+                multiple: false,
+                value: 'id',
+            },
+            deviceTypeTreeNew: [], // 设备选择数据源
+            tempList: [],
+            mainDeviceDisabled: false,
+            saveParams: {
+                wholeTypeName: '', // 成套名称
+                createBy: sessionStorage.getItem('userId'), // 创建人
+                parentId: '', // 主体设备ID
+                // companyId: 101,
+                deviceInfo: [],
+            },
+            isEdit: false,
+            deviceName: '',
+            tableList: [],
+            typesList: [],
+            lastTypesList: [],
+            lastTypeId: '',
+            detailsList: [],
+            parentId: '',
+        }
+    },
+    created() {
+        this.getList()
+        // 获取设备树
+        this.getDeviceTypeTree()
+    },
+    methods: {
+        // 获取列表
+        async getList() {
+            const res = await getCompleteSetToolsApi(this.formData)
+            this.tableList = res.rows
+            this.total = res.total
+        },
+        // 查询
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            const keyWord = this.formData.wholeTypeName?.trim() || ''
+            this.getList({ keyWord })
+        },
+        handleSearch() {
+            const keyWord = this.dialogForm.keyWord?.trim() || ''
+            this.getDetail({ id: this.rowId, keyWord })
+        },
+        // 重置
+        resetQuery() {
+            this.formData.wholeTypeName = ''
+            this.getList()
+        },
+        resetSearch() {
+            this.dialogForm.wholeTypeName = ''
+            this.getDetail({ id: this.rowId })
+        },
+        // 新增
+        handleAdd() {
+            // 打开新增弹窗
+            this.title = '成套设备新增'
+            this.addCompleteForm = {
+                completeSetName: '',
+                mainDevice: '',
+                assortDevice: '',
+            }
+
+            this.$delete(this.saveParams, 'id')
+            this.tempList = []
+            this.mainDeviceDisabled = false
+            this.open = true
+        },
+        // 编辑
+        async handleEdit(row) {
+            this.title = '成套设备编辑'
+            this.addCompleteForm.mainDevice = [row.oneId, row.towId, row.id]
+            this.saveParams.id = row.id
+            this.parentId = row.id
+            this.saveParams.wholeTypeName = row.wholeTypeName
+            this.deviceName = row.wholeTypeName
+            this.mainDeviceDisabled = true
+            this.isEdit = true
+
+            const result = await getInfoListByTypeApi({ level: '4', parentId: row.id + '' })
+            this.lastTypesList = result.data
+            const queryParams = {
+                id: row.id,
+                wholeTypeName: row.wholeTypeName,
+            }
+            const { data: res } = await queryCompleteSetToolsApi(queryParams)
+            this.tempList = res
+            this.open = true
+        },
+
+        // 删除当前行
+        handleDeleteRow(row) {
+            this.$confirm('是否确定删除?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    delCompleteSetToolsApi({
+                        id: row.id,
+                        wholeTypeName: row.wholeTypeName,
+                    })
+                        .then((res) => {
+                            this.$message({
+                                type: 'success',
+                                message: '删除成功!',
+                            })
+
+                            this.getList()
+                        })
+                        .catch((err) => {
+                            this.$message({
+                                type: 'error',
+                                message: '删除失败!',
+                            })
+                        })
+                })
+                .catch(() => {})
+        },
+
+        /**
+         *  重庆、宁夏共享成套 2024.8.30拷贝宁夏成套设备页面改造
+         *  以下为弹框内操作代码逻辑
+         */
+        //主体设备选择
+        async selMainDevice(val) {
+            if (val.length < 3) {
+                this.$modal.msgError('请选择第三级设备类型，如未添加可以添加后再操作！')
+                this.addCompleteForm.mainDevice = []
+                return
+            }
+            this.$message.closeAll()
+            const checkNode = this.$refs['mainDeviceRef'].getCheckedNodes()
+
+            const label = checkNode[0].label
+            const value = checkNode[0].value
+            this.deviceName = label
+            this.parentId = value
+            const res = await getInfoListByTypeApi({ level: '4', parentId: value + '' })
+            this.lastTypesList = res.data
+            this.tempList = []
+            this.addCompleteForm.assortDevice = ''
+        },
+        // 配套设备选择
+        selAssortDevice(val) {
+            if (val.length < 4) {
+                this.$modal.msgError('请选择第四级规格型号的数据，如未添加可以添加后再操作！')
+                this.addCompleteForm.assortDevice = []
+                return
+            }
+            this.$message.closeAll()
+            const checkNode = this.$refs['assortDeviceRef'].getCheckedNodes()
+            this.recursionGetDeviceName(this.deviceTypeTreeNew, val[val.length - 2])
+
+            if (checkNode.length < 1) return
+
+            const assortDeviceObj = {
+                deviceType: checkNode[0].label, // 设备名称 （规格型号的名称）
+                deviceTypeId: val[val.length - 1], // 设备Id
+                deviceNum: '', // 数量
+                deviceAscription: '配套设备', // 所属类型
+                ascriptionType: 2, // 所属类型 1 主体设备 2 配套设备
+                typeName: this.deviceName,
+            }
+
+            // 先判断当前所选的配套设备是否已选择为主体设备
+            if (this.tempList.length > 0 && this.tempList[0].deviceTypeId === assortDeviceObj.deviceTypeId) {
+                this.$message.error('所选设备已作为抱杆设备，不可再作为配套设备！')
+                return
+            }
+
+            // 再判断当前设备是否重复添加
+            const isRepeat = this.tempList.some((e) => e.deviceTypeId === assortDeviceObj.deviceTypeId)
+
+            if (isRepeat) {
+                this.$message.error('该设备已添加，不可重复添加!')
+                return
+            } else {
+                this.tempList.push(assortDeviceObj)
+            }
+        },
+        // 删除按钮
+        handleDelete(row) {
+            this.tempList = this.tempList.filter((e) => e.deviceTypeId !== row.deviceTypeId)
+            // 如果当前删除的设备为主体设备 解开表单禁用状态
+            if (row.ascriptionType === 1) {
+                this.mainDeviceDisabled = false
+            }
+        },
+        // 数量输入框校验
+        deviceNumChange(val) {
+            let reg = /^[1-9]\d*$/
+            if (!reg.test(val)) {
+                this.$message.error('请输入大于0的正整数！')
+            }
+        },
+        // 保存按钮
+        submitComplete() {
+            this.$refs.addFormRef.validate(async (valid) => {
+                if (valid) {
+                    let isNum = false
+                    // const isMainDevice = this.tempList.some((e) => e.ascriptionType === 1)
+
+                    if (this.tempList.length === 0) {
+                        this.$message.error('请添加设备！')
+                        return
+                    }
+
+                    try {
+                        this.tempList.forEach((e) => {
+                            if (!parseInt(e.deviceNum)) {
+                                this.$message.error('请输入数量！')
+                                isNum = true
+                                throw new Error()
+                            } else {
+                                e.deviceNum = parseInt(e.deviceNum)
+                            }
+                        })
+                    } catch (error) {}
+
+                    this.saveParams.wholeTypeName = this.deviceName
+                    this.saveParams.parentId = this.parentId
+
+                    this.saveParams.deviceInfo = this.tempList
+                    const res = await addCompleteSetToolsApi(this.saveParams)
+
+                    if (res.code == 200) {
+                        this.$message.success(this.title === '成套设备新增' ? '新增成功！' : '修改成功！')
+                        this.open = false
+                        this.tempList = []
+                        this.getList()
+                    }
+                }
+            })
+        },
+
+        // 获取 设备树结构数据
+        async getDeviceTypeTree() {
+            const params = {
+                level: 3,
+            }
+            const res = await getDeviceTypeTree(params)
+            this.deviceTypeTreeNew = res.data
+        },
+        goBack() {
+            this.$emit('openHomePage')
+            this.tempList = []
+        },
+
+        // 递归获取设备名称
+        recursionGetDeviceName(list, id) {
+            try {
+                list.map((e) => {
+                    if (e.id == id) {
+                        this.deviceName = e.label
+                        throw new Error()
+                    } else {
+                        if (e.children && e.children.length > 0) {
+                            this.recursionGetDeviceName(e.children, id)
+                        }
+                    }
+                })
+            } catch (error) {}
+        },
+
+        // 规格型号的change事件
+        onChangeLastType(val) {
+            const typeLabel = this.lastTypesList.find((e) => e.typeId === val)
+
+            const { typeName, isStorage } = typeLabel
+            const assortDeviceObj = {
+                deviceType: typeName, // 设备名称
+                deviceTypeId: val, // 设备Id
+                deviceNum: '', // 数量
+                deviceAscription: '配套设备', // 所属类型
+                ascriptionType: 2, // 所属类型 1 主体设备 2 配套设备
+                typeName: this.deviceName,
+                isStorage,
+            }
+
+            const isRepeat = this.tempList.some((e) => e.deviceTypeId === assortDeviceObj.deviceTypeId)
+
+            if (isRepeat) {
+                this.$message.error('该设备已添加，不可重复添加!')
+                return
+            } else {
+                this.tempList.push(assortDeviceObj)
+            }
+        },
+
+        // 查看附属配件
+        async onHandleView(row) {
+            this.title = '附件详情'
+
+            this.saveParams.id = row.id
+            const queryParams = {
+                id: row.id,
+                wholeTypeName: row.wholeTypeName,
+            }
+            const { data: res } = await queryCompleteSetToolsApi(queryParams)
+            this.detailsList = res
+            this.open = true
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/store/poleConfig/poleConfig.vue b/src/views/store/poleConfig/poleConfig.vue
index 690b26e..d8b61cb 100644
--- a/src/views/store/poleConfig/poleConfig.vue
+++ b/src/views/store/poleConfig/poleConfig.vue
@@ -10,17 +10,36 @@
             label-width="100px"
             @submit.native.prevent
         >
-            <el-form-item label="成套设备" prop="wholeTypeName">
+            <el-form-item label="成套设备名称" prop="wholeTypeName">
                 <el-input
                     v-model="formData.wholeTypeName"
-                    placeholder="请输入成套设备"
+                    placeholder="请输入成套设备名称"
                     clearable
                     maxlength="50"
                     style="width: 240px"
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-
+            <!-- <el-form-item label="主体设备" prop="keyWord">
+                <el-input
+                    v-model="formData.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="创建日期" prop="keyWord">
+                <el-input
+                    v-model="formData.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item> -->
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -45,9 +64,9 @@
                 :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
             </el-table-column>
-            <el-table-column prop="wholeTypeName" label="成套设备" align="center" />
-            <!-- <el-table-column prop="typeModelName" label="抱杆设备" align="center" /> -->
-            <!-- <el-table-column prop="totalNum" label="配套设备种类数量" align="center" /> -->
+            <el-table-column prop="wholeTypeName" label="成套设备名称" align="center" />
+            <el-table-column prop="typeModelName" label="抱杆设备" align="center" />
+            <el-table-column prop="totalNum" label="配套设备种类数量" align="center" />
             <el-table-column prop="nickName" label="创建人" align="center" />
             <el-table-column prop="createTime" label="创建日期" align="center" />
             <el-table-column label="操作" align="center">
@@ -59,7 +78,6 @@
                         >查看</el-button
                     > -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-                    <el-button type="text" icon="el-icon-search" @click="onHandleView(row)">附属配件</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDeleteRow(row)">删除</el-button>
                 </template>
             </el-table-column>
@@ -75,88 +93,72 @@
 
         <!-- 弹框 -->
         <el-dialog :title="title" :visible.sync="open" v-if="open" width="80%" :close-on-click-modal="false">
-            <template v-if="title !== '附件详情'">
-                <el-form ref="addFormRef" :model="addCompleteForm" :rules="addCompleteRules" inline label-width="120px">
-                    <el-form-item label="成套设备">
-                        <el-cascader
-                            clearable
-                            filterable
-                            ref="mainDeviceRef"
-                            @change="selMainDevice"
-                            :show-all-levels="false"
-                            placeholder="请选择抱杆设备"
-                            :options="deviceTypeTreeNew"
-                            :props="deviceTypeTreeProps"
-                            :disabled="mainDeviceDisabled"
-                            v-model="addCompleteForm.mainDevice"
+            <el-form ref="addFormRef" :model="addCompleteForm" :rules="addCompleteRules" inline label-width="120px">
+                <el-form-item label="成套名称" prop="completeSetName">
+                    <el-input v-model="addCompleteForm.completeSetName" disabled />
+                </el-form-item>
+                <el-form-item label="抱杆设备" prop="mainDevice" class="is-required">
+                    <el-cascader
+                        clearable
+                        filterable
+                        ref="mainDeviceRef"
+                        @change="selMainDevice"
+                        :show-all-levels="false"
+                        placeholder="请选择抱杆设备"
+                        :options="deviceTypeTreeNew"
+                        :props="deviceTypeTreeProps"
+                        :disabled="mainDeviceDisabled"
+                        v-model="addCompleteForm.mainDevice"
+                    />
+                </el-form-item>
+                <el-form-item label="配套设备" prop="assortDevice">
+                    <el-cascader
+                        ref="assortDeviceRef"
+                        placeholder="请选择配套设备"
+                        :options="deviceTypeTreeNew"
+                        :props="deviceTypeTreeProps"
+                        v-model="addCompleteForm.assortDevice"
+                        @change="selAssortDevice"
+                        :show-all-levels="false"
+                        filterable
+                        clearable
+                    />
+                </el-form-item>
+            </el-form>
+
+            <el-row class="mb8">
+                <el-button type="primary" size="mini" @click="submitComplete">保 存</el-button>
+            </el-row>
+
+            <el-table :data="tempList" border max-height="400">
+                <el-table-column align="center" label="序号" type="index" />
+                <el-table-column prop="typeName" align="center" label="设备名称" />
+                <el-table-column prop="deviceType" align="center" label="设备型号" />
+                <el-table-column prop="deviceAscription" align="center" label="设备所属" />
+                <el-table-column align="center" label="数量">
+                    <template slot-scope="{ row }">
+                        <el-input
+                            v-model="row.deviceNum"
+                            style="width: 180px"
+                            placeholder="请输入数量"
+                            @change="deviceNumChange"
+                            maxlength="9"
                         />
-                    </el-form-item>
-
-                    <el-form-item label="规格型号">
-                        <el-select
-                            v-model="addCompleteForm.assortDevice"
-                            @change="onChangeLastType"
-                            clearable
-                            filterable
-                        >
-                            <el-option
-                                :key="type.typeId"
-                                :value="type.typeId"
-                                :label="type.typeName"
-                                v-for="type in lastTypesList"
-                            />
-                        </el-select>
-                    </el-form-item>
-                </el-form>
-
-                <el-row class="mb8">
-                    <el-button type="primary" size="mini" @click="submitComplete">保 存</el-button>
-                </el-row>
-
-                <el-table :data="tempList" border max-height="400">
-                    <el-table-column align="center" label="序号" type="index" />
-                    <el-table-column prop="typeName" align="center" label="成套设备" />
-                    <el-table-column prop="deviceType" align="center" label="规格型号" />
-                    <el-table-column align="center" label="数量">
-                        <template slot-scope="{ row }">
-                            <el-input
-                                v-model="row.deviceNum"
-                                style="width: 180px"
-                                placeholder="请输入数量"
-                                @change="deviceNumChange"
-                                maxlength="9"
-                            />
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="deviceType" align="center" label="是否管理库存">
-                        <template slot-scope="{ row }">
-                            <el-tag size="mini" type="primary" v-if="row.isStorage == 1">是</el-tag>
-                            <el-tag size="mini" type="warning" v-if="row.isStorage == 0">否</el-tag>
-                        </template>
-                    </el-table-column>
-                    <!-- 操作列 -->
-                    <el-table-column align="center" label="操作">
-                        <template slot-scope="{ row }">
-                            <el-button size="mini" type="danger" @click="handleDelete(row)">删 除</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </template>
-
-            <template v-else>
-                <el-table :data="detailsList" border max-height="400">
-                    <el-table-column align="center" label="序号" type="index" />
-                    <el-table-column prop="typeName" align="center" label="成套设备" />
-                    <el-table-column prop="deviceType" align="center" label="规格型号" />
-                    <el-table-column align="center" label="数量" prop="deviceNum"> </el-table-column>
-                    <el-table-column prop="deviceType" align="center" label="是否管理库存">
-                        <template slot-scope="{ row }">
-                            <el-tag size="mini" type="primary" v-if="row.isStorage == 1">是</el-tag>
-                            <el-tag size="mini" type="warning" v-if="row.isStorage == 0">否</el-tag>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </template>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="是否管理库存">
+                    <template slot-scope="{ row }">
+                        <el-tag size="mini" type="primary" v-if="row.isStorage == 1">是</el-tag>
+                        <el-tag size="mini" type="warning" v-if="row.isStorage == 0">否</el-tag>
+                    </template>
+                </el-table-column>
+                <!-- 操作列 -->
+                <el-table-column align="center" label="操作">
+                    <template slot-scope="{ row }">
+                        <el-button size="mini" type="danger" @click="handleDelete(row)">删 除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
         </el-dialog>
     </div>
 </template>
@@ -172,7 +174,6 @@
 // } from '@/api/store/poleConfig'
 
 import { getDeviceTypeTree } from '@/api/claimAndRefund/receive'
-import { getInfoListByTypeApi } from '@/api/store/warehousing'
 import {
     addCompleteSetToolsApi,
     queryCompleteSetToolsApi,
@@ -220,20 +221,27 @@ export default {
                 assortDevice: '',
             },
             addCompleteRules: {
-                mainDevice: [
+                completeSetName: [
                     {
                         required: true,
-                        trigger: 'change',
-                        message: '请选择成套设备',
+                        trigger: 'blur',
+                        message: '请输入成套名称',
                     },
-                ],
-                assortDevice: [
                     {
-                        required: true,
-                        trigger: 'change',
-                        message: '请选择规格型号',
+                        max: 40,
+                        message: '长度不能超过40个字符',
                     },
                 ],
+                // mainDevice: [
+                //     {
+                //         required: true,
+                //     },
+                // ],
+                // assortDevice: [
+                //     {
+                //         required: true,
+                //     },
+                // ],
             },
             deviceTypeTreeProps: {
                 multiple: false,
@@ -252,24 +260,40 @@ export default {
             isEdit: false,
             deviceName: '',
             tableList: [],
-            typesList: [],
-            lastTypesList: [],
-            lastTypeId: '',
-            detailsList: [],
-            parentId: '',
         }
     },
     created() {
         this.getList()
         // 获取设备树
         this.getDeviceTypeTree()
+        // getDeviceTypeTree().then((res) => {
+        //     // 处理为typeOptions需要的数据格式
+        //     const data = res.data
+        //     // this.typeOptions = this.getTree(data)
+        //     // this.mountingsOptions = this.getTree(data)
+        //     this.typeOptions = this.mountingsOptions = this.getTree(data)
+        // })
+        // getDeviceTypeTree().then(res => {
+        //   // 处理为mountingsOptions需要的数据格式
+        //   const data = res.data
+        //   this.mountingsOptions = this.getTree(data)
+        // })
     },
     methods: {
         // 获取列表
         async getList() {
             const res = await getCompleteSetToolsApi(this.formData)
+            console.log(res, '成套列表')
+
             this.tableList = res.rows
             this.total = res.total
+            // this.houseList = []
+            // this.queryParams.pageNum = data.page || 1
+            // this.queryParams.pageSize = data.limit || 10
+            // this.queryParams.keyWord = this.formData.keyWord || ''
+            // const res = await searchSelectList({ ...this.queryParams })
+            // this.houseList = res.data.result
+            // this.total = res.data.totalCount || 0
         },
         // 查询
         handleQuery() {
@@ -299,8 +323,6 @@ export default {
                 mainDevice: '',
                 assortDevice: '',
             }
-
-            this.$delete(this.saveParams, 'id')
             this.tempList = []
             this.mainDeviceDisabled = false
             this.open = true
@@ -308,23 +330,28 @@ export default {
         // 编辑
         async handleEdit(row) {
             this.title = '成套设备编辑'
-            this.addCompleteForm.mainDevice = [row.oneId, row.towId, row.id]
+            this.addCompleteForm.completeSetName = row.wholeTypeName
+            this.addCompleteForm.mainDevice = row.deviceTypeId
             this.saveParams.id = row.id
-            this.parentId = row.id
-            this.saveParams.wholeTypeName = row.wholeTypeName
-            this.deviceName = row.wholeTypeName
             this.mainDeviceDisabled = true
             this.isEdit = true
-
-            const result = await getInfoListByTypeApi({ level: '4', parentId: row.id + '' })
-            this.lastTypesList = result.data
             const queryParams = {
                 id: row.id,
                 wholeTypeName: row.wholeTypeName,
+                // pageNum: 1,
+                // pageSize: 99999,
             }
             const { data: res } = await queryCompleteSetToolsApi(queryParams)
             this.tempList = res
             this.open = true
+
+            this.$nextTick(() => {
+                const mainDeviceRef = this.$refs.mainDeviceRef
+                const input = mainDeviceRef.$el.querySelector('input')
+                if (input) {
+                    input.value = this.tempList[0].deviceType
+                }
+            })
         },
 
         // 删除当前行
@@ -362,23 +389,42 @@ export default {
          *  以下为弹框内操作代码逻辑
          */
         //主体设备选择
-        async selMainDevice(val) {
-            if (val.length < 3) {
-                this.$modal.msgError('请选择第三级设备类型，如未添加可以添加后再操作！')
+        selMainDevice(val) {
+            if (val.length < 4) {
+                this.$modal.msgError('请选择第四级规格型号的数据，如未添加可以添加后再操作！')
                 this.addCompleteForm.mainDevice = []
                 return
             }
             this.$message.closeAll()
             const checkNode = this.$refs['mainDeviceRef'].getCheckedNodes()
+            this.recursionGetDeviceName(this.deviceTypeTreeNew, val[val.length - 2])
+            if (checkNode.length < 1) return
 
-            const label = checkNode[0].label
-            const value = checkNode[0].value
-            this.deviceName = label
-            this.parentId = value
-            const res = await getInfoListByTypeApi({ level: '4', parentId: value + '' })
-            this.lastTypesList = res.data
-            this.tempList = []
-            this.addCompleteForm.assortDevice = ''
+            this.addCompleteForm.completeSetName = this.deviceName + '-' + checkNode[0].label
+            const mainDeviceObj = {
+                deviceType: checkNode[0].label, // 设备型号
+                deviceTypeId: val[val.length - 1], // 设备Id
+                deviceNum: '', // 数量
+                deviceAscription: '抱杆设备', // 所属类型
+                ascriptionType: 1, // 所属类型 1 主体设备 2 配套设备
+                typeName: this.deviceName,
+                isStorage: checkNode[0].isStorage,
+            }
+
+            if (this.tempList.length === 0) {
+                this.tempList.unshift(mainDeviceObj)
+            } else {
+                // 判断选择的配套设备是否和主体设备重复
+                const isRepeat = this.tempList.some((e) => e.deviceTypeId === mainDeviceObj.deviceTypeId)
+                if (isRepeat) {
+                    this.$message.error('该设备已选择作为配套设备，不可作为主体设备!')
+                    return
+                } else {
+                    this.tempList.unshift(mainDeviceObj)
+                }
+            }
+
+            this.mainDeviceDisabled = true
         },
         // 配套设备选择
         selAssortDevice(val) {
@@ -394,7 +440,7 @@ export default {
             if (checkNode.length < 1) return
 
             const assortDeviceObj = {
-                deviceType: checkNode[0].label, // 设备名称 （规格型号的名称）
+                deviceType: checkNode[0].label, // 设备名称
                 deviceTypeId: val[val.length - 1], // 设备Id
                 deviceNum: '', // 数量
                 deviceAscription: '配套设备', // 所属类型
@@ -438,13 +484,21 @@ export default {
             this.$refs.addFormRef.validate(async (valid) => {
                 if (valid) {
                     let isNum = false
-                    // const isMainDevice = this.tempList.some((e) => e.ascriptionType === 1)
+                    const isMainDevice = this.tempList.some((e) => e.ascriptionType === 1)
 
-                    if (this.tempList.length === 0) {
-                        this.$message.error('请添加设备！')
+                    if (!isMainDevice) {
+                        this.$message.error('请添加抱杆设备！')
                         return
                     }
 
+                    // const isAssortDevice = this.tempList.some(
+                    //     (e) => e.ascriptionType === 2,
+                    // )
+
+                    // if (!isAssortDevice) {
+                    //     this.$message.error('请添加配套设备！')
+                    //     return
+                    // }
                     try {
                         this.tempList.forEach((e) => {
                             if (!parseInt(e.deviceNum)) {
@@ -457,14 +511,16 @@ export default {
                         })
                     } catch (error) {}
 
-                    this.saveParams.wholeTypeName = this.deviceName
-                    this.saveParams.parentId = this.parentId
+                    if (isNum) return
+
+                    this.saveParams.parentId = this.tempList[0].deviceTypeId
+                    this.saveParams.wholeTypeName = this.addCompleteForm.completeSetName
 
                     this.saveParams.deviceInfo = this.tempList
                     const res = await addCompleteSetToolsApi(this.saveParams)
 
                     if (res.code == 200) {
-                        this.$message.success(this.title === '成套设备新增' ? '新增成功！' : '修改成功！')
+                        this.$message.success(!this.title === '成套设备新增' ? '新增成功！' : '修改成功！')
                         this.open = false
                         this.tempList = []
                         this.getList()
@@ -476,7 +532,7 @@ export default {
         // 获取 设备树结构数据
         async getDeviceTypeTree() {
             const params = {
-                level: 3,
+                level: 4,
             }
             const res = await getDeviceTypeTree(params)
             this.deviceTypeTreeNew = res.data
@@ -501,45 +557,6 @@ export default {
                 })
             } catch (error) {}
         },
-
-        // 规格型号的change事件
-        onChangeLastType(val) {
-            const typeLabel = this.lastTypesList.find((e) => e.typeId === val)
-
-            const { typeName, isStorage } = typeLabel
-            const assortDeviceObj = {
-                deviceType: typeName, // 设备名称
-                deviceTypeId: val, // 设备Id
-                deviceNum: '', // 数量
-                deviceAscription: '配套设备', // 所属类型
-                ascriptionType: 2, // 所属类型 1 主体设备 2 配套设备
-                typeName: this.deviceName,
-                isStorage,
-            }
-
-            const isRepeat = this.tempList.some((e) => e.deviceTypeId === assortDeviceObj.deviceTypeId)
-
-            if (isRepeat) {
-                this.$message.error('该设备已添加，不可重复添加!')
-                return
-            } else {
-                this.tempList.push(assortDeviceObj)
-            }
-        },
-
-        // 查看附属配件
-        async onHandleView(row) {
-            this.title = '附件详情'
-
-            this.saveParams.id = row.id
-            const queryParams = {
-                id: row.id,
-                wholeTypeName: row.wholeTypeName,
-            }
-            const { data: res } = await queryCompleteSetToolsApi(queryParams)
-            this.detailsList = res
-            this.open = true
-        },
     },
 }
 </script>
diff --git a/vue.config.js b/vue.config.js
index a9cd1ca..123406d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
 const path = require('path')
 
 function resolve(dir) {
-    return path.join(__dirname, dir)
+  return path.join(__dirname, dir)
 }
 
 const CompressionPlugin = require('compression-webpack-plugin')
@@ -16,142 +16,143 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 // 这里只列一部分，具体配置参考文档
 
 module.exports = {
-    // 部署生产环境和开发环境下的URL。
-    // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-    // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-    publicPath: process.env.VUE_APP_ENV === 'production-nw' ? '/gl' : '/', ///gl/
-    // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-    outputDir: 'dist',
-    // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-    assetsDir: 'static',
-    // 是否开启eslint保存检测，有效值：ture | false | 'error'
-    lintOnSave: process.env.NODE_ENV === 'development',
-    // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
-    productionSourceMap: false,
-    // webpack-dev-server 相关配置
-    devServer: {
-        host: '0.0.0.0',
-        port: port,
-        open: true,
-        proxy: {
-            [process.env.VUE_APP_BASE_API]: {
-                // target: `http://112.29.103.165:21626`, //线上环境-重庆
-                // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
-                // target: `http://192.168.0.56:39080`, //测试环境
-                // target: `http://1.12.248.179:23028`,//线上环境-南网
-                // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
-                // target: `https://z.csgmall.com.cn`,
+  // 部署生产环境和开发环境下的URL。
+  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+  publicPath: process.env.VUE_APP_ENV === 'production-nw' ? '/gl' : '/', ///gl/
+  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
+  outputDir: 'dist',
+  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
+  assetsDir: 'static',
+  // 是否开启eslint保存检测，有效值：ture | false | 'error'
+  lintOnSave: process.env.NODE_ENV === 'development',
+  // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
+  productionSourceMap: false,
+  // webpack-dev-server 相关配置
+  devServer: {
+    host: '0.0.0.0',
+    port: port,
+    open: true,
+    proxy: {
+      [process.env.VUE_APP_BASE_API]: {
+        // target: `http://112.29.103.165:21626`, //线上环境-重庆
+        // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
+        // target: `http://192.168.0.56:39080`, //测试环境
+        // target: `http://1.12.248.179:23028`,//线上环境-南网
+        // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
+        // target: `https://z.csgmall.com.cn`,
 
-                // target: `http://192.168.0.15:39080`, //韩
-                target: `http://192.168.0.133:39080`, //超
+        // target: `http://192.168.0.15:39080`, //韩
+        target: `http://192.168.0.133:39080`, //超
+        // target: `http://192.168.2.127:39080`, //超
 
-                // target: `http://192.168.2.74:49080`, //旭/
-                // target: `http://192.168.2.17:39080`, //帅
-                // target: `http://192.168.0.60:39080`, //福
-                // target: `http://192.168.0.96:39080`, //马
+        // target: `http://192.168.2.74:49080`, //旭/
+        // target: `http://192.168.2.17:39080`, //帅
+        // target: `http://192.168.0.60:39080`, //福
+        // target: `http://192.168.0.96:39080`, //马
 
-                //******** 注意事项  ********* */
-                //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;
-                //更改 utils/globalUrl.js 内qrUrl地址
-                //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址;
-                //3.只有南网项目产线gl发布打包时候需要注意：
-                //  将 publicPath:'static' 改为 '/gl/',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api';
-                //  router/indx.js文件中的base放开
-                //  登录跳转地址从/login换成/gl/login 3处;
-                //4. 重庆环境的时候 领料管理线上菜单与宁夏不同需要根据环境在线上菜单管理中修改组件路径
-                //******** 注意事项  ********* */
-                changeOrigin: true,
-                pathRewrite: {
-                    ['^' + process.env.VUE_APP_BASE_API]: '',
-                },
-            },
+        //******** 注意事项  ********* */
+        //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;
+        //更改 utils/globalUrl.js 内qrUrl地址
+        //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址;
+        //3.只有南网项目产线gl发布打包时候需要注意：
+        //  将 publicPath:'static' 改为 '/gl/',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api';
+        //  router/indx.js文件中的base放开
+        //  登录跳转地址从/login换成/gl/login 3处;
+        //4. 重庆环境的时候 领料管理线上菜单与宁夏不同需要根据环境在线上菜单管理中修改组件路径
+        //******** 注意事项  ********* */
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_API]: '',
         },
-        disableHostCheck: true,
+      },
     },
-    css: {
-        loaderOptions: {
-            sass: {
-                sassOptions: { outputStyle: 'expanded' },
-            },
+    disableHostCheck: true,
+  },
+  css: {
+    loaderOptions: {
+      sass: {
+        sassOptions: { outputStyle: 'expanded' },
+      },
+    },
+  },
+  configureWebpack: {
+    name: name,
+    resolve: {
+      alias: {
+        '@': resolve('src'),
+      },
+    },
+    plugins: [
+      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
+      new CompressionPlugin({
+        cache: false, // 不启用文件缓存
+        test: /\.(js|css|html)?$/i, // 压缩文件格式
+        filename: '[path].gz[query]', // 压缩后的文件名
+        algorithm: 'gzip', // 使用gzip压缩
+        minRatio: 0.8, // 压缩率小于1才会压缩
+      }),
+    ],
+  },
+  chainWebpack(config) {
+    config.plugins.delete('preload') // TODO: need test
+    config.plugins.delete('prefetch') // TODO: need test
+
+    // set svg-sprite-loader
+    config.module.rule('svg').exclude.add(resolve('src/assets/icons')).end()
+    config.module
+      .rule('icons')
+      .test(/\.svg$/)
+      .include.add(resolve('src/assets/icons'))
+      .end()
+      .use('svg-sprite-loader')
+      .loader('svg-sprite-loader')
+      .options({
+        symbolId: 'icon-[name]',
+      })
+      .end()
+
+    config.when(process.env.NODE_ENV !== 'development', (config) => {
+      config
+        .plugin('ScriptExtHtmlWebpackPlugin')
+        .after('html')
+        .use('script-ext-html-webpack-plugin', [
+          {
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+            inline: /runtime\..*\.js$/,
+          },
+        ])
+        .end()
+
+      config.optimization.splitChunks({
+        chunks: 'all',
+        cacheGroups: {
+          libs: {
+            name: 'chunk-libs',
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: 'initial', // only package third parties that are initially dependent
+          },
+          elementUI: {
+            name: 'chunk-elementUI', // split elementUI into a single package
+            test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
+            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+          },
+          commons: {
+            name: 'chunk-commons',
+            test: resolve('src/components'), // can customize your rules
+            minChunks: 3, //  minimum common number
+            priority: 5,
+            reuseExistingChunk: true,
+          },
         },
-    },
-    configureWebpack: {
-        name: name,
-        resolve: {
-            alias: {
-                '@': resolve('src'),
-            },
-        },
-        plugins: [
-            // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
-            new CompressionPlugin({
-                cache: false, // 不启用文件缓存
-                test: /\.(js|css|html)?$/i, // 压缩文件格式
-                filename: '[path].gz[query]', // 压缩后的文件名
-                algorithm: 'gzip', // 使用gzip压缩
-                minRatio: 0.8, // 压缩率小于1才会压缩
-            }),
-        ],
-    },
-    chainWebpack(config) {
-        config.plugins.delete('preload') // TODO: need test
-        config.plugins.delete('prefetch') // TODO: need test
+      })
 
-        // set svg-sprite-loader
-        config.module.rule('svg').exclude.add(resolve('src/assets/icons')).end()
-        config.module
-            .rule('icons')
-            .test(/\.svg$/)
-            .include.add(resolve('src/assets/icons'))
-            .end()
-            .use('svg-sprite-loader')
-            .loader('svg-sprite-loader')
-            .options({
-                symbolId: 'icon-[name]',
-            })
-            .end()
-
-        config.when(process.env.NODE_ENV !== 'development', (config) => {
-            config
-                .plugin('ScriptExtHtmlWebpackPlugin')
-                .after('html')
-                .use('script-ext-html-webpack-plugin', [
-                    {
-                        // `runtime` must same as runtimeChunk name. default is `runtime`
-                        inline: /runtime\..*\.js$/,
-                    },
-                ])
-                .end()
-
-            config.optimization.splitChunks({
-                chunks: 'all',
-                cacheGroups: {
-                    libs: {
-                        name: 'chunk-libs',
-                        test: /[\\/]node_modules[\\/]/,
-                        priority: 10,
-                        chunks: 'initial', // only package third parties that are initially dependent
-                    },
-                    elementUI: {
-                        name: 'chunk-elementUI', // split elementUI into a single package
-                        test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
-                        priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                    },
-                    commons: {
-                        name: 'chunk-commons',
-                        test: resolve('src/components'), // can customize your rules
-                        minChunks: 3, //  minimum common number
-                        priority: 5,
-                        reuseExistingChunk: true,
-                    },
-                },
-            })
-
-            config.optimization.runtimeChunk('single'),
-                {
-                    from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-                    to: './', //到根目录下
-                }
-        })
-    },
+      config.optimization.runtimeChunk('single'),
+        {
+          from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+          to: './', //到根目录下
+        }
+    })
+  },
 }