diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index a551483..370403b 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -1,166 +1,178 @@
 <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
-          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"
-        ></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"
+                    @remove-tag="onRemoveTag"
+                    v-model="queryParams.wholeTypeName"
+                    multiple
+                >
+                    <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-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-col :span="1.5">
       <el-button
         type="warning"
         plain
@@ -169,932 +181,1024 @@
         @click="handleExport"
       >导出</el-button>
     </el-col> -->
-    </el-row>
+        </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-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-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>
+                </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 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>
+        <el-table v-loading="loading" :data="leaseApplyDetails" @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" align="center" />
+            <el-table-column label="库存数量" prop="num" align="center" />
+            <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,
+    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: '全部数据权限',
+    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
-      })
-    },
-    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
+    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()
             }
-          }
-
-          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`)
-    },
+        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: [], // 设备 树结构数据
 
-    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,
+            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: [],
         }
-        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 = []
-      // }
     },
-    //// 将数据处理成 表格中需要的数据
-    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]
+    mounted() {
+        this.GetUserInfo()
 
-      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) {
-      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)
+        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.$modal.msgError('当前抱杆成套设备已添加，不可重复添加！')
+            this.GetDeviceTypeTree()
         }
 
-        console.log(this.wholeTypeNameList, '处理后的数据---')
-      })
-
-      this.queryParams.wholeTypeName = ''
+        // console.log(typeof(this.isEdit))
+        // this.$set('isEdit',this.$route.query.isEdit)
     },
 
-    /* 删除 */
-    onHandelDelete(index) {
-      this.wholeTypeNameList.splice(index, 1)
-    },
+    methods: {
+        // 获取用户信息
+        async GetUserInfo() {
+            const res = await getInfo()
+            this.user = res.user
+        },
 
-    /* 更改数量 */
-    onChangeInput(val, v) {
-      this.wholeTypeNameList[v].childrenList.forEach((e) => (e.deviceNum = e.initNum * val))
+        // 获取 来往单位 列表数据
+        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
+            })
+        },
+        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) {
+                this.getCtFileList(data.ctLeaseApplyDetails)
+            }
+        },
+        // 驳回提交 任务详情数据
+        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.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) {
+                this.getCtFileList(data.ctLeaseApplyDetails)
+            }
+        },
+
+        // 生成成套附属设备
+        getCtFileList(ctData) {
+            const ctList = []
+            for (const key in ctData) {
+                ctList.push({
+                    wholeTypeName: key,
+                    wholeTypeNum: ctData[key][0].setsNum,
+                    childrenList: [],
+                    id: ctData[key][0].ctParentId,
+                })
+            }
+
+            ctList.forEach((e) => {
+                queryCompleteSetToolsApi(e).then((res) => {
+                    e.childrenList = res.data.map((j) => {
+                        return {
+                            ...j,
+                            initNum: j.deviceNum,
+                        }
+                    })
+
+                    e.childrenList.forEach((i) => {
+                        i.deviceNum = i.initNum * e.wholeTypeNum
+                    })
+                    this.wholeTypeNameList.push(e)
+                })
+            })
+        },
+        //生成回显数据
+        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
+                        }
+                    }
+
+                    const submitQueryParams = JSON.parse(JSON.stringify(this.queryParams))
+
+                    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,
+                                    isCt: 0,
+                                    ctParentId: i.id,
+                                    setsNum: i.wholeTypeNum,
+                                }
+
+                                // wholeTypeList.push(items)
+                                submitQueryParams.leaseApplyDetails.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 = JSON.parse(JSON.stringify(this.queryParams))
+                        params.taskId = this.taskId
+                        params.leaseApplyInfoList = this.leaseApplyInfoList
+                        params.leaseApplyDetails.forEach((e) => {
+                            e.isCt = 1
+                        })
+                        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,
+                                        isCt: 0,
+                                        ctParentId: i.id,
+                                        setsNum: i.wholeTypeNum,
+                                    }
+
+                                    // wholeTypeList.push(items)
+                                    params.leaseApplyDetails.push(items)
+                                })
+                            })
+
+                            // this.queryParams.leaseApplyDetails = wholeTypeList
+                        }
+
+                        res = await editLeaseApply(params)
+                    } else {
+                        // console.log(this.queryParams)
+
+                        console.log('submitQueryParams', submitQueryParams)
+                        res = await submitLeaseApply(submitQueryParams)
+                    }
+                    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 = []
+            // }
+        },
+        //// 将数据处理成 表格中需要的数据
+        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事件 */
+        async onChangeWholeTypeName(val) {
+            val.forEach((e) => {
+                const selLable = this.holdingPoleSelList.find((j) => j.id === e)
+                const isPush = this.wholeTypeNameList.some((z) => z.id == e)
+
+                if (!isPush) {
+                    const wholeTypeNameData = {
+                        id: e,
+                        wholeTypeName: selLable.wholeTypeName,
+                        wholeTypeNum: 1,
+                        childrenList: [],
+                    }
+
+                    queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
+                        wholeTypeNameData.childrenList = res.data.map((e) => {
+                            return {
+                                ...e,
+                                initNum: e.deviceNum,
+                            }
+                        })
+                        this.wholeTypeNameList.push(wholeTypeNameData)
+                    })
+                }
+            })
+        },
+
+        // 移除时触发
+        onRemoveTag(val) {
+            this.wholeTypeNameList = this.wholeTypeNameList.filter((e) => e.id != val)
+        },
+
+        /* 删除 */
+        onHandelDelete(index) {
+            this.wholeTypeNameList.splice(index, 1)
+        },
+
+        /* 更改数量 */
+        onChangeInput(val, v) {
+            this.wholeTypeNameList[v].childrenList.forEach((e) => (e.deviceNum = e.initNum * val))
+        },
+        // 获取规格型号
+        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)
+        },
     },
-    // 获取规格型号
-    async getMaTypeDataByIdFun(val) {
-      const res = await getMaTypeDataById({ id: val })
-      this.typeListDev = res.data
-      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)
-    },
-  },
 }
 </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/claimAndreturn/picking/auditing/component/auditingPage1.vue b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
index 11ab0c2..9b796dc 100644
--- a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
@@ -163,6 +163,71 @@
                     <!--            </template>-->
                     <!--          </el-table-column>-->
                 </el-table>
+
+                <el-table v-if="wholeTypeNameList.length > 0" :data="wholeTypeNameList">
+                    <el-table-column type="index" align="center" />
+                    <el-table-column type="expand">
+                        <template slot-scope="{ row }">
+                            <el-table :data="row.childrenList">
+                                <el-table-column label="序号" align="center" type="index" />
+                                <el-table-column
+                                    label="机具名称"
+                                    align="center"
+                                    prop="typeName"
+                                    show-overflow-tooltip
+                                />
+                                <el-table-column
+                                    label="规格型号"
+                                    align="center"
+                                    prop="typeModelName"
+                                    show-overflow-tooltip
+                                />
+                                <el-table-column
+                                    label="计量单位"
+                                    align="center"
+                                    prop="unitName"
+                                    show-overflow-tooltip
+                                />
+                                <el-table-column label="当前库存" align="center" prop="num" show-overflow-tooltip />
+                                <el-table-column
+                                    label="预出库数量"
+                                    align="center"
+                                    prop="outNum"
+                                    show-overflow-tooltip
+                                />
+                                <el-table-column label="差缺量" align="center" prop="" show-overflow-tooltip>
+                                    <template
+                                        slot-scope="scope"
+                                        v-if="Number(scope.row.outNum) - Number(scope.row.num) > 0"
+                                    >
+                                        <span style="color: red; cursor: pointer" @click="handleDifference(scope.row)">
+                                            {{ Number(scope.row.outNum) - Number(scope.row.num) }}
+                                        </span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="预领数量" align="center" prop="preNum" show-overflow-tooltip />
+                                <el-table-column label="申请人" align="center" prop="applyFor" show-overflow-tooltip />
+                                <el-table-column
+                                    label="申请时间"
+                                    align="center"
+                                    prop="updateTimes"
+                                    show-overflow-tooltip
+                                />
+                                <el-table-column
+                                    label="任务状态"
+                                    align="center"
+                                    prop="taskName"
+                                    show-overflow-tooltip
+                                />
+
+                                <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+                            </el-table>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="wholeTypeName" align="center" label="成套设备名称" />
+                    <el-table-column align="center" prop="wholeTypeNum" label="成套设备数量" width="260">
+                    </el-table-column>
+                </el-table>
             </el-col>
 
             <el-col :span="6">
@@ -318,6 +383,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
+import { queryCompleteSetToolsApi } from '@/api/store/completeTools.js'
 import {
     auditLeaseByCompanyCq,
     getLeaseListAllCq,
@@ -476,6 +542,8 @@ export default {
                     label: '领料数量',
                 },
             ],
+
+            wholeTypeNameList: [],
         }
     },
     computed: {
@@ -661,6 +729,32 @@ export default {
             } else {
                 this.flowPath = this.flowPath
             }
+
+            if (res.rows[0].ctLeaseApplyDetails) {
+                this.getCtFileList(res.rows[0].ctLeaseApplyDetails)
+            }
+        },
+
+        // 生成成套附属设备
+        getCtFileList(ctData) {
+            for (const key in ctData) {
+                const ctList = {
+                    wholeTypeName: key,
+                    wholeTypeNum: ctData[key][0].setsNum,
+                    childrenList: [],
+                }
+                ctList.childrenList = ctData[key].map((e) => {
+                    return {
+                        ...e,
+                        applyFor: this.queryParams.applyFor,
+                        updateTimes: this.queryParams.updateTimes,
+                        taskName: this.queryParams.taskName,
+                    }
+                })
+                this.wholeTypeNameList.push(ctList)
+            }
+
+            console.log(this.wholeTypeNameList, ' this.wholeTypeNameList')
         },
         // 取消按钮
         cancel() {
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index 7cd4985..e045321 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -1,298 +1,330 @@
 <template>
-  <!-- 领料出库 -->
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="领料单号" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入领料单号"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="unitId">
-        <el-select v-model="queryParams.unitId" placeholder="请选择单位名称" clearable>
-          <el-option v-for="item in unitList" filterable :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 placeholder="请选择工程名称">
-          <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="taskStatus">
-        <el-select v-model="queryParams.taskStatus" placeholder="请选择出库状态" clearable>
-          <el-option
-            v-for="item in statusList"
-            filterable
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </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="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['picking:outbound:export']"
-          >导出</el-button
+    <!-- 领料出库 -->
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
         >
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+            <el-form-item label="领料单号" prop="code">
+                <el-input
+                    v-model="queryParams.code"
+                    placeholder="请输入领料单号"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="单位名称" prop="unitId">
+                <el-select v-model="queryParams.unitId" placeholder="请选择单位名称" clearable>
+                    <el-option
+                        v-for="item in unitList"
+                        filterable
+                        :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 placeholder="请选择工程名称">
+                    <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="taskStatus">
+                <el-select v-model="queryParams.taskStatus" placeholder="请选择出库状态" clearable>
+                    <el-option
+                        v-for="item in statusList"
+                        filterable
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
 
-    <el-table v-loading="loading" :data="leaseList" border>
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column
-        align="center"
-        label="序号"
-        type="index"
-        :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
-      />
-      <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
-      <el-table-column label="领料申请单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-      <el-table-column label="领料申请工程" align="center" prop="proName" :show-overflow-tooltip="true" />
-      <el-table-column
-        label="申请数量"
-        align="center"
-        prop="preCountNum"
-        :show-overflow-tooltip="true"
-      ></el-table-column>
-      <el-table-column
-        label="申请时间"
-        align="center"
-        prop="createTimes"
-        :show-overflow-tooltip="true"
-      ></el-table-column>
-      <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column label="出库状态" align="center" prop="taskName" :show-overflow-tooltip="true"></el-table-column>
-
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" @click="handleView(scope.row)" v-hasPermi="['picking:outbound:view']">查看</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            v-if="scope.row.taskStatus != 35"
-            @click="handleOut(scope.row)"
-            v-hasPermi="['picking:outbound:out']"
-          >
-            出库
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 出库弹窗 -->
-    <el-dialog :title="title" :visible.sync="openLeaseDevices" width="80%" append-to-body>
-      <el-form :model="dialogQuery" ref="dialogQuery" size="small" :inline="true" label-width="100px">
-        <el-form-item label="设备负责人" prop="userName">
-          <el-input v-model="dialogQuery.userName" maxlength="20" />
-        </el-form-item>
-        <el-form-item label="机具类型" prop="typeId">
-          <treeselect
-            v-model="dialogQuery.typeId"
-            default-expand-all
-            :options="equipmentTypeList"
-            placeholder="请选择规格型号"
-            :disable-branch-nodes="true"
-            style="width: 240px"
-            noChildrenText="没有数据了"
-            noOptionsText="没有数据"
-            noResultsText="没有搜索结果"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetDialogQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-
-      <el-table v-loading="loading" :data="dialogList">
-        <el-table-column
-          align="center"
-          label="序号"
-          type="index"
-          :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
-        />
-        <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-        <el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
-        <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
-        <el-table-column label="设备负责人" align="center" prop="userName" :show-overflow-tooltip="true" />
-        <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 prop="deviceType" align="center" label="是否成套管理">
-          <template slot-scope="{ row }">
-            <el-tag size="mini" type="primary" v-if="row.isCt == 0">是</el-tag>
-            <el-tag size="mini" type="warning" v-if="row.isCt == 1">否</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" v-if="isView">
-          <template slot-scope="{ row }" v-if="row.alNum > 0">
-            <el-button type="text" @click="onPreviewRecord(row)">出库记录</el-button>
-            <el-button type="text" @click="openLld(row)">出库单</el-button>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!isView">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              @click="codeOut(scope.row)"
-              v-if="scope.row.manageType == 0 && scope.row.status != 2 && scope.row.isStorage == 1"
-            >
-              编码出库
-            </el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              v-if="scope.row.manageType == 1 && scope.row.status != 2 && scope.row.isStorage == 1"
-              @click="numOut(scope.row)"
-            >
-              数量出库
-            </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.isCt == 0" @click="onViewFile(scope.row)">
-              查看附件
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-show="dialogTotal > 0"
-        :total="dialogTotal"
-        :page.sync="dialogQuery.pageNum"
-        :limit.sync="dialogQuery.pageSize"
-        @pagination="getDialogList"
-      />
-
-      <el-dialog title="出库记录" :visible.sync="outRecordVisible" width="70%" append-to-body>
-        <el-form inline>
-          <!-- 搜索表单 -->
-          <el-form-item label="时间">
-            <el-date-picker
-              clearable
-              type="daterange"
-              v-model="outTime"
-              style="width: 240px"
-              range-separator="至"
-              value-format="yyyy-MM-dd"
-              end-placeholder="结束日期"
-              start-placeholder="开始日期"
-              placeholder="请选择出库日期"
-              @change="onOutTimeChange"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button size="small" type="primary" @click="onHandleQuery">查询</el-button>
-            <el-button size="small" type="primary" @click="onHandleReset">重置</el-button>
-            <el-button size="small" type="primary" @click="onHandleExport">导出</el-button>
-          </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-table border :data="leaseOutDetailsList">
-          <el-table-column align="center" label="序号" show-overflow-tooltip type="index" />
-          <el-table-column align="center" label="机具名称" prop="typeName" show-overflow-tooltip />
-          <el-table-column align="center" label="规格型号" prop="typeModelName" show-overflow-tooltip />
-          <el-table-column align="center" label="出库时间" prop="createTime" show-overflow-tooltip />
-          <el-table-column align="center" label="本次出库数量" prop="outNum" show-overflow-tooltip />
-          <el-table-column align="center" label="出库人" prop="userName" show-overflow-tooltip />
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    v-hasPermi="['picking:outbound:export']"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="leaseList" border>
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                align="center"
+                label="序号"
+                type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
+            />
+            <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
+            <el-table-column label="领料申请单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+            <el-table-column label="领料申请工程" align="center" prop="proName" :show-overflow-tooltip="true" />
+            <el-table-column
+                label="申请数量"
+                align="center"
+                prop="preCountNum"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+                label="申请时间"
+                align="center"
+                prop="createTimes"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+                label="已出库数量"
+                align="center"
+                prop="alNum"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+                label="出库状态"
+                align="center"
+                prop="taskName"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" @click="handleView(scope.row)" v-hasPermi="['picking:outbound:view']"
+                        >查看</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        v-if="scope.row.taskStatus != 35"
+                        @click="handleOut(scope.row)"
+                        v-hasPermi="['picking:outbound:out']"
+                    >
+                        出库
+                    </el-button>
+                </template>
+            </el-table-column>
         </el-table>
-      </el-dialog>
 
-      <el-dialog title="附件详情" :visible.sync="openFileVisible" width="50%" append-to-body>
-        <el-table :data="fileList">
-          <!-- <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>
-      </el-dialog>
-    </el-dialog>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-    <!-- 编码出库 -->
-    <el-dialog :title="title" :visible.sync="openCode" width="1200px" append-to-body>
-      <el-form :model="codeOutForm" ref="codeOutForm" size="small" :inline="true" label-width="100px">
-        <span style="margin-right: 50px">待出库数量：{{ outNum }}</span>
-        <br />
-        <br />
-        <el-form-item label="请输入车牌号" prop="carCode">
-          <el-input v-model="codeOutForm.carCode" maxlength="20" />
-        </el-form-item>
-        <span style="margin-right: 50px; color: red">部分设备出库时，需进行装车,需记录车牌号码</span>
-        <br />
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="codeOutForm.remark" maxlength="50" />
-        </el-form-item>
-      </el-form>
+        <!-- 出库弹窗 -->
+        <el-dialog :title="title" :visible.sync="openLeaseDevices" width="80%" append-to-body>
+            <el-form :model="dialogQuery" ref="dialogQuery" size="small" :inline="true" label-width="100px">
+                <el-form-item label="设备负责人" prop="userName">
+                    <el-input v-model="dialogQuery.userName" maxlength="20" />
+                </el-form-item>
+                <el-form-item label="机具类型" prop="typeId">
+                    <treeselect
+                        v-model="dialogQuery.typeId"
+                        default-expand-all
+                        :options="equipmentTypeList"
+                        placeholder="请选择规格型号"
+                        :disable-branch-nodes="true"
+                        style="width: 240px"
+                        noChildrenText="没有数据了"
+                        noOptionsText="没有数据"
+                        noResultsText="没有搜索结果"
+                    />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery"
+                        >查询</el-button
+                    >
+                    <el-button icon="el-icon-refresh" size="mini" @click="resetDialogQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
 
-      <el-form :model="outQuery" ref="outQuery" size="small" :inline="true" label-width="100px">
-        <el-form-item label="设备编码" prop="maCode">
-          <el-input v-model="outQuery.maCode" maxlength="20" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleOutQuery">查询</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetOutQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" size="mini" @click="saveCodeOut">出库</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="loading" :data="outCodeList" height="500" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" :selectable="selectable" />
-        <el-table-column
-          label="序号"
-          align="center"
-          width="80"
-          type="index"
-          :index="indexContinuation(outQuery.pageNum, outQuery.pageSize)"
-        >
-          <!-- <template slot-scope="scope">
+            <el-table v-loading="loading" :data="dialogList">
+                <el-table-column
+                    align="center"
+                    label="序号"
+                    type="index"
+                    :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
+                />
+                <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
+                <el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
+                <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
+                <el-table-column label="设备负责人" align="center" prop="userName" :show-overflow-tooltip="true" />
+                <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 prop="deviceType" align="center" label="是否成套管理">
+                    <template slot-scope="{ row }">
+                        <el-tag size="mini" type="primary" v-if="row.isCt == 0">是</el-tag>
+                        <el-tag size="mini" type="warning" v-if="row.isCt == 1">否</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" v-if="isView">
+                    <template slot-scope="{ row }" v-if="row.alNum > 0">
+                        <el-button type="text" @click="onPreviewRecord(row)">出库记录</el-button>
+                        <el-button type="text" @click="openLld(row)">出库单</el-button>
+                    </template>
+                </el-table-column>
+
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!isView">
+                    <template slot-scope="scope">
+                        <el-button
+                            size="mini"
+                            @click="codeOut(scope.row)"
+                            v-if="scope.row.manageType == 0 && scope.row.status != 2 && scope.row.isStorage == 1"
+                        >
+                            编码出库
+                        </el-button>
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            v-if="scope.row.manageType == 1 && scope.row.status != 2 && scope.row.isStorage == 1"
+                            @click="numOut(scope.row)"
+                        >
+                            数量出库
+                        </el-button>
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            v-if="scope.row.isCt == 0 && scope.row.main"
+                            @click="onViewFile(scope.row)"
+                        >
+                            查看附件
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination
+                v-show="dialogTotal > 0"
+                :total="dialogTotal"
+                :page.sync="dialogQuery.pageNum"
+                :limit.sync="dialogQuery.pageSize"
+                @pagination="getDialogList"
+            />
+
+            <el-dialog title="出库记录" :visible.sync="outRecordVisible" width="70%" append-to-body>
+                <el-form inline>
+                    <!-- 搜索表单 -->
+                    <el-form-item label="时间">
+                        <el-date-picker
+                            clearable
+                            type="daterange"
+                            v-model="outTime"
+                            style="width: 240px"
+                            range-separator="至"
+                            value-format="yyyy-MM-dd"
+                            end-placeholder="结束日期"
+                            start-placeholder="开始日期"
+                            placeholder="请选择出库日期"
+                            @change="onOutTimeChange"
+                        />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button size="small" type="primary" @click="onHandleQuery">查询</el-button>
+                        <el-button size="small" type="primary" @click="onHandleReset">重置</el-button>
+                        <el-button size="small" type="primary" @click="onHandleExport">导出</el-button>
+                    </el-form-item>
+                </el-form>
+
+                <!-- 出库记录列表 -->
+                <el-table border :data="leaseOutDetailsList">
+                    <el-table-column align="center" label="序号" show-overflow-tooltip type="index" />
+                    <el-table-column align="center" label="机具名称" prop="typeName" show-overflow-tooltip />
+                    <el-table-column align="center" label="规格型号" prop="typeModelName" show-overflow-tooltip />
+                    <el-table-column align="center" label="出库时间" prop="createTime" show-overflow-tooltip />
+                    <el-table-column align="center" label="本次出库数量" prop="outNum" show-overflow-tooltip />
+                    <el-table-column align="center" label="出库人" prop="userName" show-overflow-tooltip />
+                </el-table>
+            </el-dialog>
+
+            <el-dialog title="附件详情" :visible.sync="openFileVisible" width="50%" append-to-body>
+                <el-table :data="fileList">
+                    <!-- <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="applyNum" align="center" />
+                    <el-table-column align="center" label="库存数量" prop="num" />
+                </el-table>
+            </el-dialog>
+        </el-dialog>
+
+        <!-- 编码出库 -->
+        <el-dialog :title="title" :visible.sync="openCode" width="1200px" append-to-body>
+            <el-form :model="codeOutForm" ref="codeOutForm" size="small" :inline="true" label-width="100px">
+                <span style="margin-right: 50px">待出库数量：{{ outNum }}</span>
+                <br />
+                <br />
+                <el-form-item label="请输入车牌号" prop="carCode">
+                    <el-input v-model="codeOutForm.carCode" maxlength="20" />
+                </el-form-item>
+                <span style="margin-right: 50px; color: red">部分设备出库时，需进行装车,需记录车牌号码</span>
+                <br />
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="codeOutForm.remark" maxlength="50" />
+                </el-form-item>
+            </el-form>
+
+            <el-form :model="outQuery" ref="outQuery" size="small" :inline="true" label-width="100px">
+                <el-form-item label="设备编码" prop="maCode">
+                    <el-input v-model="outQuery.maCode" maxlength="20" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleOutQuery">查询</el-button>
+                    <el-button icon="el-icon-refresh" size="mini" @click="resetOutQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+            <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                    <el-button type="primary" size="mini" @click="saveCodeOut">出库</el-button>
+                </el-col>
+            </el-row>
+            <el-table v-loading="loading" :data="outCodeList" height="500" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" :selectable="selectable" />
+                <el-table-column
+                    label="序号"
+                    align="center"
+                    width="80"
+                    type="index"
+                    :index="indexContinuation(outQuery.pageNum, outQuery.pageSize)"
+                >
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (outQuery.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
                     </template> -->
-        </el-table-column>
-        <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-        <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
-        <el-table-column label="设备状态" align="center" prop="maStatus" :show-overflow-tooltip="true" />
-        <!-- <el-table-column label="备注" align="center" prop="remark">
+                </el-table-column>
+                <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
+                <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
+                <el-table-column label="设备状态" align="center" prop="maStatus" :show-overflow-tooltip="true" />
+                <!-- <el-table-column label="备注" align="center" prop="remark">
                     <template slot-scope="scope">
                         <el-input
                             v-model="scope.row.remark"
@@ -303,57 +335,57 @@
                         />
                     </template>
                 </el-table-column> -->
-      </el-table>
+            </el-table>
 
-      <pagination
-        v-show="outTotal > 0"
-        :total="outTotal"
-        :page.sync="outQuery.pageNum"
-        :limit.sync="outQuery.pageSize"
-        @pagination="getCodeList"
-      />
-    </el-dialog>
+            <pagination
+                v-show="outTotal > 0"
+                :total="outTotal"
+                :page.sync="outQuery.pageNum"
+                :limit.sync="outQuery.pageSize"
+                @pagination="getCodeList"
+            />
+        </el-dialog>
 
-    <!-- 数量出库 -->
-    <el-dialog :title="title" :visible.sync="openNum" width="1200px" append-to-body>
-      <el-form :model="numOutForm" ref="numOutForm" size="small" :inline="true" label-width="100px">
-        <!-- <span style="margin-right: 50px;">
+        <!-- 数量出库 -->
+        <el-dialog :title="title" :visible.sync="openNum" width="1200px" append-to-body>
+            <el-form :model="numOutForm" ref="numOutForm" size="small" :inline="true" label-width="100px">
+                <!-- <span style="margin-right: 50px;">
             待出库数量：{{outNum}}
         </span>-->
-        <el-form-item label="请输入车牌号" prop="carCode">
-          <el-input v-model="numOutForm.carCode" maxlength="20" />
-        </el-form-item>
-        <span style="margin-right: 50px; color: red">部分设备出库时，需进行装车,需记录车牌号码</span>
-        <br />
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="numOutForm.remark" maxlength="50" />
-        </el-form-item>
-      </el-form>
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" size="mini" @click="saveNumOut">出库</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="loading" :data="outNumList" height="500">
-        <el-table-column label="序号" align="center" type="index" />
-        <el-table-column label="设备类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-        <el-table-column label="库存数量" align="center" prop="num" :show-overflow-tooltip="true" />
-        <el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
-        <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
-        <el-table-column label="出库数量" align="center">
-          <template slot-scope="scope">
-            <el-input
-              v-model.number="scope.row.inputNum"
-              placeholder="请输入出库数量"
-              type="number"
-              @input="checkNum(scope.row)"
-              clearable
-              style="width: 100%"
-            />
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="备注" align="center" prop="remark">
+                <el-form-item label="请输入车牌号" prop="carCode">
+                    <el-input v-model="numOutForm.carCode" maxlength="20" />
+                </el-form-item>
+                <span style="margin-right: 50px; color: red">部分设备出库时，需进行装车,需记录车牌号码</span>
+                <br />
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="numOutForm.remark" maxlength="50" />
+                </el-form-item>
+            </el-form>
+            <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                    <el-button type="primary" size="mini" @click="saveNumOut">出库</el-button>
+                </el-col>
+            </el-row>
+            <el-table v-loading="loading" :data="outNumList" height="500">
+                <el-table-column label="序号" align="center" type="index" />
+                <el-table-column label="设备类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
+                <el-table-column label="库存数量" align="center" prop="num" :show-overflow-tooltip="true" />
+                <el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
+                <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
+                <el-table-column label="出库数量" align="center">
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model.number="scope.row.inputNum"
+                            placeholder="请输入出库数量"
+                            type="number"
+                            @input="checkNum(scope.row)"
+                            clearable
+                            style="width: 100%"
+                        />
+                    </template>
+                </el-table-column>
+                <!-- <el-table-column label="备注" align="center" prop="remark">
                     <template slot-scope="scope">
                         <el-input
                             v-model="scope.row.remark"
@@ -364,76 +396,76 @@
                         />
                     </template>
                 </el-table-column> -->
-      </el-table>
-    </el-dialog>
+            </el-table>
+        </el-dialog>
 
-    <!-- 领料单弹窗 -->
-    <el-dialog :visible.sync="open" width="800px" append-to-body>
-      <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
-        <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-          <div class="title" style="text-align: center; font-weight: 600; font-size: 16px"> 出库单 </div>
-          <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
-            <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
-              <span>领料单位：</span>{{ leaseOutData.unitName }}
-            </div>
-            <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
-              <span>工程名称：</span>{{ leaseOutData.proName }}
-            </div>
-            <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
-              <span>时间：</span>{{ leaseOutData.updateTime }}
-            </div>
-            <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
-              <span>编号：</span>{{ leaseOutData.code }}
-            </div>
-          </div>
-          <el-table :data="leaseOutDetailRecord" class="table" border style="margin-top: 20px; padding: 1px">
-            <!--          <el-table-column type="selection" width="55" align="center" />-->
-            <el-table-column label="序号" align="center" type="index" />
-            <el-table-column label="类型名称" align="center" prop="typeName" />
-            <el-table-column label="规格型号" align="center" prop="typeModelName" />
-            <el-table-column label="计量单位" align="center" prop="unitName" />
-            <el-table-column label="出库数量" align="center" prop="outNum" />
-            <el-table-column label="设备编码" align="center" prop="maCode" />
-            <el-table-column label="备注" align="center" prop="remark" />
-            <el-table-column label="出库方式" align="center" prop="manageTypeName" />
-          </el-table>
+        <!-- 领料单弹窗 -->
+        <el-dialog :visible.sync="open" width="800px" append-to-body>
+            <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
+                <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+                    <div class="title" style="text-align: center; font-weight: 600; font-size: 16px"> 出库单 </div>
+                    <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
+                        <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
+                            <span>领料单位：</span>{{ leaseOutData.unitName }}
+                        </div>
+                        <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
+                            <span>工程名称：</span>{{ leaseOutData.proName }}
+                        </div>
+                        <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
+                            <span>时间：</span>{{ leaseOutData.updateTime }}
+                        </div>
+                        <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
+                            <span>编号：</span>{{ leaseOutData.code }}
+                        </div>
+                    </div>
+                    <el-table :data="leaseOutDetailRecord" class="table" border style="margin-top: 20px; padding: 1px">
+                        <!--          <el-table-column type="selection" width="55" align="center" />-->
+                        <el-table-column label="序号" align="center" type="index" />
+                        <el-table-column label="类型名称" align="center" prop="typeName" />
+                        <el-table-column label="规格型号" align="center" prop="typeModelName" />
+                        <el-table-column label="计量单位" align="center" prop="unitName" />
+                        <el-table-column label="出库数量" align="center" prop="outNum" />
+                        <el-table-column label="设备编码" align="center" prop="maCode" />
+                        <el-table-column label="备注" align="center" prop="remark" />
+                        <el-table-column label="出库方式" align="center" prop="manageTypeName" />
+                    </el-table>
 
-          <div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
-            <div class="item" style="width: 25%">
-              <span>审核：</span>
+                    <div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
+                        <div class="item" style="width: 25%">
+                            <span>审核：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>领料：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>仓库：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>操作人：</span>
+                        </div>
+                    </div>
+                </vue-easy-print>
             </div>
-            <div class="item" style="width: 25%">
-              <span>领料：</span>
+            <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button type="primary" @click="print">打 印</el-button>
+                <el-button @click="open = false">关 闭</el-button>
             </div>
-            <div class="item" style="width: 25%">
-              <span>仓库：</span>
-            </div>
-            <div class="item" style="width: 25%">
-              <span>操作人：</span>
-            </div>
-          </div>
-        </vue-easy-print>
-      </div>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="print">打 印</el-button>
-        <el-button @click="open = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import {
-  getUnitData,
-  getProData,
-  getLeaseAuditList,
-  getLeaseAuditListDetail,
-  getDetailsByTypeId,
-  submitOut,
-  submitNumOut,
-  getLeaseOutDetailRecordApi,
-  getLeaseListAll,
-  getLeaseOutOrder,
+    getUnitData,
+    getProData,
+    getLeaseAuditList,
+    getLeaseAuditListDetail,
+    getDetailsByTypeId,
+    submitOut,
+    submitNumOut,
+    getLeaseOutDetailRecordApi,
+    getLeaseListAll,
+    getLeaseOutOrder,
 } from '@/api/claimAndRefund/receive.js'
 import { queryCompleteSetToolsApi } from '@/api/store/completeTools.js'
 import { getTypeList } from '@/api/store/warehousing'
@@ -442,419 +474,424 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import vueEasyPrint from 'vue-easy-print'
 export default {
-  name: 'receiveOut',
-  components: { Treeselect, vueEasyPrint },
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 选中数组
-      maCodeList: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 是否显示弹出层
-      open: false,
-      // 表格数据
-      leaseList: [],
-      // 弹出层标题
-      title: '设备出库',
-      // 单位数据
-      unitList: [],
-      proList: [], //工程集合
-      statusList: [
-        { id: '33', name: '待出库' },
-        { id: '34', name: '出库进行中' },
-        { id: '35', name: '完成' },
-      ], //工程集合
-      //搜索下拉数据
-      typeList: [],
-      equipmentTypeList: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        flag: 1,
-        code: undefined,
-        unitId: undefined,
-        proId: undefined,
-        taskStatus: undefined,
-      },
-      // 表单参数 出库
-      form: {},
-      //弹窗
-      openLeaseDevices: false,
-      isView: false,
-      dialogQuery: {
-        pageNum: 1,
-        pageSize: 10,
-        director: undefined,
-        typeId: undefined,
-      },
-      dialogList: [],
-      dialogTotal: 0,
-      outObj: {},
-      openCode: false, //编码弹窗开关
-      openNum: false, //数量弹窗开关
-      outNum: 0, //待出库数量
-      codeOutForm: {
-        //编码表单-车牌号
-        carCode: undefined,
-        remark: undefined,
-      },
-      numOutForm: {
-        //数量表单-车牌号
-        carCode: '',
-        remark: '',
-      },
-      outQuery: {
-        //编码出库-搜索条件
-        pageNum: 1,
-        pageSize: 10,
-        maCode: undefined,
-      },
-      outTotal: 0, //编码弹窗分页-总数
-      outCodeList: [], //编码弹窗表格数据
-      outNumList: [], //数量弹窗表格数据
-      leaseType: '', // 领用类型 0 为工程租赁 1 为长期领用
+    name: 'receiveOut',
+    components: { Treeselect, vueEasyPrint },
+    data() {
+        return {
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            maCodeList: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 是否显示弹出层
+            open: false,
+            // 表格数据
+            leaseList: [],
+            // 弹出层标题
+            title: '设备出库',
+            // 单位数据
+            unitList: [],
+            proList: [], //工程集合
+            statusList: [
+                { id: '33', name: '待出库' },
+                { id: '34', name: '出库进行中' },
+                { id: '35', name: '完成' },
+            ], //工程集合
+            //搜索下拉数据
+            typeList: [],
+            equipmentTypeList: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                flag: 1,
+                code: undefined,
+                unitId: undefined,
+                proId: undefined,
+                taskStatus: undefined,
+            },
+            // 表单参数 出库
+            form: {},
+            //弹窗
+            openLeaseDevices: false,
+            isView: false,
+            dialogQuery: {
+                pageNum: 1,
+                pageSize: 10,
+                director: undefined,
+                typeId: undefined,
+            },
+            dialogList: [],
+            dialogTotal: 0,
+            outObj: {},
+            openCode: false, //编码弹窗开关
+            openNum: false, //数量弹窗开关
+            outNum: 0, //待出库数量
+            codeOutForm: {
+                //编码表单-车牌号
+                carCode: undefined,
+                remark: undefined,
+            },
+            numOutForm: {
+                //数量表单-车牌号
+                carCode: '',
+                remark: '',
+            },
+            outQuery: {
+                //编码出库-搜索条件
+                pageNum: 1,
+                pageSize: 10,
+                maCode: undefined,
+            },
+            outTotal: 0, //编码弹窗分页-总数
+            outCodeList: [], //编码弹窗表格数据
+            outNumList: [], //数量弹窗表格数据
+            leaseType: '', // 领用类型 0 为工程租赁 1 为长期领用
 
-      outRecordVisible: false,
-      leaseOutDetailParams: {
-        id: '',
-        typeId: '',
-        startTime: '',
-        endTime: '',
-      },
-      leaseOutDetailsList: [],
-      outTime: [],
-      // 领料任务详情数据
-      leaseOutDetailRecord: [],
-      leaseOutData: {},
-      openFileVisible: false,
-      fileList: [],
-    }
-  },
-  created() {
-    this.getTypeList()
-    this.getUnitList()
-    this.getProList()
-    this.equipmentType()
-
-    this.getList()
-  },
-  methods: {
-    //获取单位
-    getUnitList() {
-      getUnitData().then((response) => {
-        this.unitList = response.data
-      })
-    },
-    //获取单位
-    getProList() {
-      getProData().then((response) => {
-        this.proList = response.data
-      })
-    },
-    getTypeList() {
-      getTypeList({ level: '3' }).then((response) => {
-        this.typeList = response.data
-      })
-    },
-    //规格型号
-    equipmentType() {
-      equipmentTypeTree().then((response) => {
-        this.equipmentTypeList = response.data
-        this.equipmentTypeList.forEach((item, index) => {
-          if (item.children && item.children.length > 0) {
-            item.children.forEach((item2, index2) => {
-              if (item2.children && item2.children.length > 0) {
-                item2.children.forEach((item3) => {
-                  if (item3.children && item3.children.length > 0) {
-                    item3.children.forEach((item4) => {
-                      item4.machineTypeName = item3.typeName
-                      item4.specificationType = item4.typeName
-                      // this.$set(item4, 'purchasePrice', 0);
-                      // this.$set(item4, 'purchaseNum', 1);
-                    })
-                  }
-                })
-              }
-            })
-          }
-        })
-      })
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 查询列表 */
-    getList() {
-      this.loading = true
-      getLeaseAuditList(this.queryParams).then((response) => {
-        this.leaseList = response.data.rows
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    //查看按钮
-    handleView(row) {
-      this.openLeaseDevices = true
-      this.isView = true
-      this.dialogQuery.id = row.id
-      this.leaseOutDetailParams.id = row.id
-      this.resetDialogQuery()
-      // this.getDialogList();
-    },
-    /** 查询列表 */
-    getDialogList() {
-      // console.log(this.dialogQuery)
-      getLeaseAuditListDetail(this.dialogQuery).then((response) => {
-        this.dialogList = response.data.rows
-        this.dialogTotal = response.data.total
-      })
-    },
-    handleDialogQuery() {
-      this.dialogQuery.pageNum = 1
-      this.getDialogList()
-    },
-    resetDialogQuery() {
-      this.resetForm('dialogQuery')
-      this.handleDialogQuery()
-    },
-    /** 出库按钮操作 */
-    handleOut(row) {
-      this.openLeaseDevices = true
-      this.isView = false
-      this.dialogQuery.id = row.id
-      this.leaseType = row.leaseType
-      this.resetDialogQuery()
-      // this.getDialogList()
-    },
-
-    //编码出库
-    codeOut(row) {
-      // this.title = '编码出库'
-      this.openCode = true
-      this.resetForm('codeOutForm')
-      this.resetForm('outQuery')
-      this.outNum = row.outNum
-      this.outQuery.typeId = row.typeId
-      this.outObj = row
-      this.handleOutQuery()
-    },
-    //数量出库
-    numOut(row) {
-      console.log(row, '数量出库当前行数据--')
-      // this.title = '数量出库'
-      this.openNum = true
-      this.resetForm('codeOutForm')
-      this.resetForm('numOutForm')
-      // console.log(row)
-      let obj = {}
-      this.$set(obj, 'taskId', row.taskId)
-      this.$set(obj, 'id', row.id)
-      this.$set(obj, 'manageType', 1)
-      this.$set(obj, 'parentId', row.parentId)
-      this.$set(obj, 'typeName', row.typeName)
-      this.$set(obj, 'typeModelName', row.typeModelName)
-      this.$set(obj, 'typeId', row.typeId)
-      this.$set(obj, 'alNum', row.alNum) //已出库数量
-      this.$set(obj, 'outNum', row.outNum) //待出库数量
-      this.$set(obj, 'inputNum', 1) //出库数量
-      this.$set(obj, 'num', row.num) //库存
-      this.$set(obj, 'maModel', row.maModel) // 以大代小 规格
-      this.$set(obj, 'maName', row.maName) // 以大代小 类型
-      this.outNumList = [obj]
-    },
-    handleOutQuery() {
-      this.outQuery.pageNum = 1
-      this.getCodeList()
-    },
-    resetOutQuery() {
-      this.resetForm('outQuery')
-      this.handleOutQuery()
-    },
-    getCodeList() {
-      getDetailsByTypeId(this.outQuery).then((response) => {
-        this.outCodeList = response.data.rows
-        if (response.data.total) {
-          this.outTotal = response.data.total
+            outRecordVisible: false,
+            leaseOutDetailParams: {
+                id: '',
+                typeId: '',
+                startTime: '',
+                endTime: '',
+            },
+            leaseOutDetailsList: [],
+            outTime: [],
+            // 领料任务详情数据
+            leaseOutDetailRecord: [],
+            leaseOutData: {},
+            openFileVisible: false,
+            fileList: [],
         }
-      })
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.maCodeList = selection.map((item) => item.maId)
-    },
-    selectable(row) {
-      console.log(row)
-      if (row.maStatus == '在库') {
-        return true
-      } else {
-        return false
-      }
-    },
-    //编码出库保存
-    saveCodeOut() {
-      if (this.maCodeList.length <= this.outObj.outNum) {
-        let params = this.maCodeList.map((item) => {
-          let obj = {
-            id: this.outObj.id,
-            maId: item,
-            manageType: 0,
-            carCode: this.codeOutForm.carCode,
-            remark: this.codeOutForm.remark,
-            typeId: this.outObj.typeId,
-            parentId: this.outObj.parentId,
-            outNum: 1,
-            taskId: this.outObj.taskId,
-            leaseType: this.leaseType,
-            maModel: this.outObj.maModel,
-            maName: this.outObj.maName,
-            // remark: this.outCodeList.find((v) => v.maId == item).remark,
-          }
-          return obj
-        })
+    created() {
+        this.getTypeList()
+        this.getUnitList()
+        this.getProList()
+        this.equipmentType()
 
-        console.log(params, '编码出库时参数')
-        // console.log(params)
-        submitOut(params).then((response) => {
-          this.$modal.msgSuccess('出库成功')
-          this.openCode = false
-          this.handleDialogQuery()
-          this.handleQuery()
-        })
-      } else {
-        this.$modal.msgError('所选机具编码已超出出库数量！')
-      }
+        this.getList()
     },
-    //数量出库保存
-    saveNumOut() {
-      this.outNumList[0].carCode = this.numOutForm.carCode
-      this.outNumList[0].remark = this.numOutForm.remark
-      this.outNumList[0].leaseType = this.leaseType
-      let param = this.outNumList
-      // console.log(param, '数量出库时参数')
-      submitNumOut(param).then((response) => {
-        this.$modal.msgSuccess('出库成功')
-        this.openNum = false
-        this.handleDialogQuery()
-        this.handleQuery()
-      })
-    },
-
-    //输入出库数量
-    checkNum(row) {
-      let maxNum = row.outNum
-      if (row.inputNum <= 1) {
-        row.inputNum = 1
-      }
-      if (row.inputNum > row.outNum && row.num >= maxNum) {
-        row.inputNum = maxNum
-      }
-      if (row.inputNum > row.outNum && row.num < maxNum) {
-        row.inputNum = row.num
-      }
-    },
-
-    /** 导出按钮操作 */
-    handleExport() {
-      this.downloadJson(
-        'material/base/tm_task/export',
-        JSON.stringify(this.queryParams),
-        `领料出库_${new Date().getTime()}.xlsx`,
-      )
-    },
-
-    /* 查看出库记录 */
-    onPreviewRecord(row) {
-      this.leaseOutDetailParams.typeId = row.typeId
-      this.onHandleQuery().then(() => {
-        this.outRecordVisible = true
-      })
-    },
-    /* 打开出库单 */
-    async openLld(row) {
-      this.open = true
-
-      const res = await getLeaseOutOrder({ parentId: row.parentId, typeId: row.typeId })
-
-      this.leaseOutDetailRecord = res.data.leaseOutDetailRecord
-      this.leaseOutData = res.data
-
-      console.log('this.leaseApplyData ============', this.leaseApplyData)
-    },
-    // 领料单 打印
-    print() {
-      this.$refs.remarksPrintRef.print()
-    },
-
-    async onHandleQuery() {
-      const res = await getLeaseOutDetailRecordApi(this.leaseOutDetailParams)
-      this.leaseOutDetailsList = res.data
-    },
-    onHandleReset() {
-      this.outTime = []
-      this.leaseOutDetailParams.startTime = ''
-      this.leaseOutDetailParams.endTime = ''
-      this.onHandleQuery()
-    },
-    onHandleExport() {
-      this.download(
-        'material/base/tm_task/exportLeaseOutDetailRecord',
-        {
-          ...this.leaseOutDetailParams,
+    methods: {
+        //获取单位
+        getUnitList() {
+            getUnitData().then((response) => {
+                this.unitList = response.data
+            })
+        },
+        //获取单位
+        getProList() {
+            getProData().then((response) => {
+                this.proList = response.data
+            })
+        },
+        getTypeList() {
+            getTypeList({ level: '3' }).then((response) => {
+                this.typeList = response.data
+            })
+        },
+        //规格型号
+        equipmentType() {
+            equipmentTypeTree().then((response) => {
+                this.equipmentTypeList = response.data
+                this.equipmentTypeList.forEach((item, index) => {
+                    if (item.children && item.children.length > 0) {
+                        item.children.forEach((item2, index2) => {
+                            if (item2.children && item2.children.length > 0) {
+                                item2.children.forEach((item3) => {
+                                    if (item3.children && item3.children.length > 0) {
+                                        item3.children.forEach((item4) => {
+                                            item4.machineTypeName = item3.typeName
+                                            item4.specificationType = item4.typeName
+                                            // this.$set(item4, 'purchasePrice', 0);
+                                            // this.$set(item4, 'purchaseNum', 1);
+                                        })
+                                    }
+                                })
+                            }
+                        })
+                    }
+                })
+            })
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 查询列表 */
+        getList() {
+            this.loading = true
+            getLeaseAuditList(this.queryParams).then((response) => {
+                this.leaseList = response.data.rows
+                this.total = response.data.total
+                this.loading = false
+            })
+        },
+        //查看按钮
+        handleView(row) {
+            this.openLeaseDevices = true
+            this.isView = true
+            this.dialogQuery.id = row.id
+            this.leaseOutDetailParams.id = row.id
+            this.resetDialogQuery()
+            // this.getDialogList();
+        },
+        /** 查询列表 */
+        getDialogList() {
+            // console.log(this.dialogQuery)
+            getLeaseAuditListDetail(this.dialogQuery).then((response) => {
+                this.dialogList = response.data.rows
+                this.dialogTotal = response.data.total
+            })
+        },
+        handleDialogQuery() {
+            this.dialogQuery.pageNum = 1
+            this.getDialogList()
+        },
+        resetDialogQuery() {
+            this.resetForm('dialogQuery')
+            this.handleDialogQuery()
+        },
+        /** 出库按钮操作 */
+        handleOut(row) {
+            this.openLeaseDevices = true
+            this.isView = false
+            this.dialogQuery.id = row.id
+            this.leaseType = row.leaseType
+            this.resetDialogQuery()
+            // this.getDialogList()
+        },
+
+        //编码出库
+        codeOut(row) {
+            // this.title = '编码出库'
+            this.openCode = true
+            this.resetForm('codeOutForm')
+            this.resetForm('outQuery')
+            this.outNum = row.outNum
+            this.outQuery.typeId = row.typeId
+            this.outObj = row
+            this.handleOutQuery()
+        },
+        //数量出库
+        numOut(row) {
+            console.log(row, '数量出库当前行数据--')
+            // this.title = '数量出库'
+            this.openNum = true
+            this.resetForm('codeOutForm')
+            this.resetForm('numOutForm')
+            // console.log(row)
+            let obj = {}
+            this.$set(obj, 'taskId', row.taskId)
+            this.$set(obj, 'id', row.id)
+            this.$set(obj, 'manageType', 1)
+            this.$set(obj, 'parentId', row.parentId)
+            this.$set(obj, 'typeName', row.typeName)
+            this.$set(obj, 'typeModelName', row.typeModelName)
+            this.$set(obj, 'typeId', row.typeId)
+            this.$set(obj, 'alNum', row.alNum) //已出库数量
+            this.$set(obj, 'outNum', row.outNum) //待出库数量
+            this.$set(obj, 'inputNum', 1) //出库数量
+            this.$set(obj, 'num', row.num) //库存
+            this.$set(obj, 'maModel', row.maModel) // 以大代小 规格
+            this.$set(obj, 'maName', row.maName) // 以大代小 类型
+            this.outNumList = [obj]
+        },
+        handleOutQuery() {
+            this.outQuery.pageNum = 1
+            this.getCodeList()
+        },
+        resetOutQuery() {
+            this.resetForm('outQuery')
+            this.handleOutQuery()
+        },
+        getCodeList() {
+            getDetailsByTypeId(this.outQuery).then((response) => {
+                this.outCodeList = response.data.rows
+                if (response.data.total) {
+                    this.outTotal = response.data.total
+                }
+            })
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.maCodeList = selection.map((item) => item.maId)
+        },
+        selectable(row) {
+            console.log(row)
+            if (row.maStatus == '在库') {
+                return true
+            } else {
+                return false
+            }
+        },
+        //编码出库保存
+        saveCodeOut() {
+            if (this.maCodeList.length <= this.outObj.outNum) {
+                let params = this.maCodeList.map((item) => {
+                    let obj = {
+                        id: this.outObj.id,
+                        maId: item,
+                        manageType: 0,
+                        carCode: this.codeOutForm.carCode,
+                        remark: this.codeOutForm.remark,
+                        typeId: this.outObj.typeId,
+                        parentId: this.outObj.parentId,
+                        outNum: 1,
+                        taskId: this.outObj.taskId,
+                        leaseType: this.leaseType,
+                        maModel: this.outObj.maModel,
+                        maName: this.outObj.maName,
+                        // remark: this.outCodeList.find((v) => v.maId == item).remark,
+                    }
+                    return obj
+                })
+
+                console.log(params, '编码出库时参数')
+                // console.log(params)
+                submitOut(params).then((response) => {
+                    this.$modal.msgSuccess('出库成功')
+                    this.openCode = false
+                    this.handleDialogQuery()
+                    this.handleQuery()
+                })
+            } else {
+                this.$modal.msgError('所选机具编码已超出出库数量！')
+            }
+        },
+        //数量出库保存
+        saveNumOut() {
+            this.outNumList[0].carCode = this.numOutForm.carCode
+            this.outNumList[0].remark = this.numOutForm.remark
+            this.outNumList[0].leaseType = this.leaseType
+            let param = this.outNumList
+            // console.log(param, '数量出库时参数')
+            submitNumOut(param).then((response) => {
+                this.$modal.msgSuccess('出库成功')
+                this.openNum = false
+                this.handleDialogQuery()
+                this.handleQuery()
+            })
+        },
+
+        //输入出库数量
+        checkNum(row) {
+            let maxNum = row.outNum
+            if (row.inputNum <= 1) {
+                row.inputNum = 1
+            }
+            if (row.inputNum > row.outNum && row.num >= maxNum) {
+                row.inputNum = maxNum
+            }
+            if (row.inputNum > row.outNum && row.num < maxNum) {
+                row.inputNum = row.num
+            }
+        },
+
+        /** 导出按钮操作 */
+        handleExport() {
+            this.downloadJson(
+                'material/base/tm_task/export',
+                JSON.stringify(this.queryParams),
+                `领料出库_${new Date().getTime()}.xlsx`,
+            )
+        },
+
+        /* 查看出库记录 */
+        onPreviewRecord(row) {
+            this.leaseOutDetailParams.typeId = row.typeId
+            this.onHandleQuery().then(() => {
+                this.outRecordVisible = true
+            })
+        },
+        /* 打开出库单 */
+        async openLld(row) {
+            this.open = true
+
+            const res = await getLeaseOutOrder({ parentId: row.parentId, typeId: row.typeId })
+
+            this.leaseOutDetailRecord = res.data.leaseOutDetailRecord
+            this.leaseOutData = res.data
+
+            console.log('this.leaseApplyData ============', this.leaseApplyData)
+        },
+        // 领料单 打印
+        print() {
+            this.$refs.remarksPrintRef.print()
+        },
+
+        async onHandleQuery() {
+            const res = await getLeaseOutDetailRecordApi(this.leaseOutDetailParams)
+            this.leaseOutDetailsList = res.data
+        },
+        onHandleReset() {
+            this.outTime = []
+            this.leaseOutDetailParams.startTime = ''
+            this.leaseOutDetailParams.endTime = ''
+            this.onHandleQuery()
+        },
+        onHandleExport() {
+            this.download(
+                'material/base/tm_task/exportLeaseOutDetailRecord',
+                {
+                    ...this.leaseOutDetailParams,
+                },
+                `机具出库列表.xlsx`,
+            )
+        },
+        onOutTimeChange(val) {
+            if (val.length > 0) {
+                const [_1, _2] = val
+                this.leaseOutDetailParams.startTime = _1
+                this.leaseOutDetailParams.endTime = _2
+            } else {
+                this.leaseOutDetailParams.startTime = ''
+                this.leaseOutDetailParams.endTime = ''
+            }
+        },
+
+        // 查看附件
+        async onViewFile(row) {
+            const res = await queryCompleteSetToolsApi({
+                id: row.ctParentId,
+                wholeTypeName: row.wholeName,
+                wholeTypeNum: 1,
+            })
+
+            this.fileList = res.data
+                .filter((e) => e.isStorage == 1)
+                .map((j) => {
+                    return {
+                        ...j,
+                        applyNum: j.deviceNum * row.setsNum,
+                    }
+                })
+
+            this.openFileVisible = true
         },
-        `机具出库列表.xlsx`,
-      )
     },
-    onOutTimeChange(val) {
-      if (val.length > 0) {
-        const [_1, _2] = val
-        this.leaseOutDetailParams.startTime = _1
-        this.leaseOutDetailParams.endTime = _2
-      } else {
-        this.leaseOutDetailParams.startTime = ''
-        this.leaseOutDetailParams.endTime = ''
-      }
-    },
-
-    // 查看附件
-    async onViewFile(row) {
-      console.log(row)
-
-      const res = await queryCompleteSetToolsApi({
-        id: row.ctParentId,
-        wholeTypeName: row.typeName,
-        wholeTypeNum: 1,
-      })
-
-      this.fileList = res.data.filter((e) => e.isStorage == 0)
-
-      this.openFileVisible = true
-    },
-  },
 }
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 .clickText {
-  color: #02a7f0;
-  cursor: pointer;
+    color: #02a7f0;
+    cursor: pointer;
 }
 </style>
diff --git a/src/views/store/poleConfig/poleConfig.vue b/src/views/store/poleConfig/poleConfig.vue
index d8b61cb..06a7252 100644
--- a/src/views/store/poleConfig/poleConfig.vue
+++ b/src/views/store/poleConfig/poleConfig.vue
@@ -397,6 +397,8 @@ export default {
             }
             this.$message.closeAll()
             const checkNode = this.$refs['mainDeviceRef'].getCheckedNodes()
+
+            console.log('checkNode', checkNode)
             this.recursionGetDeviceName(this.deviceTypeTreeNew, val[val.length - 2])
             if (checkNode.length < 1) return
 
@@ -408,7 +410,7 @@ export default {
                 deviceAscription: '抱杆设备', // 所属类型
                 ascriptionType: 1, // 所属类型 1 主体设备 2 配套设备
                 typeName: this.deviceName,
-                isStorage: checkNode[0].isStorage,
+                isStorage: checkNode[0].data.isStorage,
             }
 
             if (this.tempList.length === 0) {
@@ -446,6 +448,7 @@ export default {
                 deviceAscription: '配套设备', // 所属类型
                 ascriptionType: 2, // 所属类型 1 主体设备 2 配套设备
                 typeName: this.deviceName,
+                isStorage: checkNode[0].data.isStorage,
             }
 
             // 先判断当前所选的配套设备是否已选择为主体设备