diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index 6ab6930d..824c667c 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -1,570 +1,849 @@
 <template>
-  <div class="app-container" id="receiveOut">
-    <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"
+    <div class="app-container" id="receiveOut">
+        <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"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="leaseList">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+            >
+                <template scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <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)"
+                        >查看</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        v-if="scope.row.taskStatus != 35"
+                        @click="handleOut(scope.row)"
+                    >
+                        出库
+                    </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-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">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="leaseList">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" align="center" width="80" type="index">
-        <template scope="scope">
-          <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <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)">查看</el-button>
-          <el-button size="mini" type="primary" v-if="scope.row.taskStatus != 35" @click="handleOut(scope.row)">
-            出库
-          </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="1200px" 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" height="600">
-        <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
-            <span>{{ (dialogQuery.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="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 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.outNum != 0"
+        <!-- 出库弹窗 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openLeaseDevices"
+            width="1200px"
+            append-to-body
+        >
+            <el-form
+                :model="dialogQuery"
+                ref="dialogQuery"
+                size="small"
+                :inline="true"
+                label-width="100px"
             >
-              编码出库
-            </el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              v-if="(scope.row.manageType == 1 || scope.row.manageType == 2) && scope.row.outNum != 0"
-              @click="numOut(scope.row)"
+                <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" height="600">
+                <el-table-column
+                    label="序号"
+                    align="center"
+                    width="80"
+                    type="index"
+                >
+                    <template scope="scope">
+                        <span>{{
+                            (dialogQuery.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="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
+                    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.outNum != 0
+                            "
+                        >
+                            编码出库
+                        </el-button>
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            v-if="
+                                (scope.row.manageType == 1 ||
+                                    scope.row.manageType == 2) &&
+                                scope.row.outNum != 0
+                            "
+                            @click="numOut(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>
+
+        <!-- 编码出库 -->
+        <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"
             >
-              数量出库
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+                <span style="margin-right: 50px">待出库数量：{{ outNum }}</span>
+                <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
+                >
+            </el-form>
 
-      <pagination
-        v-show="dialogTotal > 0"
-        :total="dialogTotal"
-        :page.sync="dialogQuery.pageNum"
-        :limit.sync="dialogQuery.pageSize"
-        @pagination="getDialogList"
-      />
-    </el-dialog>
+            <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"
+                >
+                    <template 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>
 
-    <!-- 编码出库 -->
-    <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>
-        <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>
-      </el-form>
+            <pagination
+                v-show="outTotal > 0"
+                :total="outTotal"
+                :page.sync="outQuery.pageNum"
+                :limit.sync="outQuery.pageSize"
+                @pagination="getCodeList"
+            />
+        </el-dialog>
 
-      <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">
-          <template 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>
-
-      <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>
-      </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" prop="inputNum">
-          <template slot-scope="scope">
-            <el-input
-              v-model.number="scope.row.inputNum"
-              placeholder="请输入出库数量"
-              type="number"
-              min="1"
-              @input="checkNum(scope.row)"
-              clearable
-              style="width: 100%"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-  </div>
+                <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
+                >
+            </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"
+                    prop="inputNum"
+                >
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model.number="scope.row.inputNum"
+                            placeholder="请输入出库数量"
+                            type="number"
+                            min="1"
+                            @input="checkNum(scope.row)"
+                            clearable
+                            style="width: 100%"
+                        />
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import {
-  getUnitData,
-  getProData,
-  getLeaseAuditList,
-  getLeaseAuditListDetail,
-  getDetailsByTypeId,
-  submitOut,
-  submitNumOut,
+    getUnitData,
+    getProData,
+    getLeaseAuditList,
+    getLeaseAuditListDetail,
+    getDetailsByTypeId,
+    submitOut,
+    submitNumOut,
 } from '@/api/claimAndRefund/receive.js'
 import { getTypeList } from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
-  name: 'receiveOut',
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 选中数组
-      maCodeList: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      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,
-      },
-      numOutForm: {
-        //数量表单-车牌号
-        carCode: undefined,
-      },
-      outQuery: {
-        //编码出库-搜索条件
-        pageNum: 1,
-        pageSize: 20,
-        maCode: undefined,
-      },
-      outTotal: 0, //编码弹窗分页-总数
-      outCodeList: [], //编码弹窗表格数据
-      outNumList: [], //数量弹窗表格数据
-    }
-  },
-  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.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.resetDialogQuery()
-      // this.getDialogList()
-    },
-
-    //编码出库
-    codeOut(row) {
-      this.title = '编码出库'
-      this.openCode = true
-      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('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.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
+    name: 'receiveOut',
+    components: { Treeselect },
+    data() {
+        return {
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            maCodeList: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 表格数据
+            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,
+            },
+            numOutForm: {
+                //数量表单-车牌号
+                carCode: undefined,
+            },
+            outQuery: {
+                //编码出库-搜索条件
+                pageNum: 1,
+                pageSize: 20,
+                maCode: undefined,
+            },
+            outTotal: 0, //编码弹窗分页-总数
+            outCodeList: [], //编码弹窗表格数据
+            outNumList: [], //数量弹窗表格数据
         }
-      })
-    },
-    // 多选框选中数据
-    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,
-            typeId: this.outObj.typeId,
-            parentId: this.outObj.parentId,
-            outNum: 1,
-            taskId: this.outObj.taskId,
-          }
-          return obj
-        })
-        // 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
-      let param = this.outNumList
-      submitNumOut(param).then(response => {
-        this.$modal.msgSuccess('出库成功')
-        this.openNum = false
-        this.handleDialogQuery()
-        this.handleQuery()
-      })
     },
+    created() {
+        this.getTypeList()
+        this.getUnitList()
+        this.getProList()
+        this.equipmentType()
 
-    //输入出库数量
-    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
-      }
+        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.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.resetDialogQuery()
+            // this.getDialogList()
+        },
 
-    /** 导出按钮操作 */
-    handleExport() {
-      this.downloadJson(
-        'base/tm_task/export',
-        JSON.stringify(this.queryParams),
-        `领料出库_${new Date().getTime()}.xlsx`
-      )
+        //编码出库
+        codeOut(row) {
+            this.title = '编码出库'
+            this.openCode = true
+            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('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.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,
+                        typeId: this.outObj.typeId,
+                        parentId: this.outObj.parentId,
+                        outNum: 1,
+                        taskId: this.outObj.taskId,
+                    }
+                    return obj
+                })
+                // 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
+            let param = this.outNumList
+            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(
+                'base/tm_task/export',
+                JSON.stringify(this.queryParams),
+                `领料出库_${new Date().getTime()}.xlsx`,
+            )
+        },
     },
-  },
 }
 </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/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 4f4acd25..78944857 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -1,157 +1,409 @@
 <template>
-  <div class="app-container" id="newDevicesWarehousing">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="关键字" prop="keyWord">
-        <el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="设备类型" prop="typeId">
-        <el-select v-model="queryParams.typeId" placeholder="请选择设备类型" clearable filterable style="width: 240px">
-          <el-option v-for="typeItem in typesList" :key="typeItem.typeId" :label="typeItem.typeName"
-            :value="typeItem.typeId" />
-        </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>
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+        >
+            <el-form-item label="关键字" prop="keyWord">
+                <el-input
+                    v-model="queryParams.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="设备类型" prop="typeId">
+                <el-select
+                    v-model="queryParams.typeId"
+                    placeholder="请选择设备类型"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                >
+                    <el-option
+                        v-for="typeItem in typesList"
+                        :key="typeItem.typeId"
+                        :label="typeItem.typeName"
+                        :value="typeItem.typeId"
+                    />
+                </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="['system:dict:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="tableList">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
-          <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-          </template>
-      </el-table-column>
-      <el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true" width="160" />
-      <el-table-column label="采购日期" align="center" prop="purchaseTime" :show-overflow-tooltip="true" width="100" />
-      <el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" width="100" />
-      <el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true"
-        width="250" />
-      <el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100" />
-      <el-table-column label="入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100" />
-      <el-table-column label="入库时间" align="center" prop="updateTime" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center" prop="taskStatus">
-        <template slot-scope="scope">
-          <span v-if="scope.row.taskStatus == '26'">已验收合格</span>
-          <span v-if="scope.row.taskStatus == '28'">已审核</span>
-          <span v-if="scope.row.taskStatus == '105'">待审核</span>
-          <span v-if="scope.row.taskStatus == '107'">已驳回</span>
-        </template>
-      </el-table-column>
+        <el-table v-loading="loading" :data="tableList" border>
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+            >
+                <template scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="采购单号"
+                align="center"
+                prop="code"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="采购日期"
+                align="center"
+                prop="purchaseTime"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="到货日期"
+                align="center"
+                prop="arrivalTime"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="采购机具设备"
+                align="center"
+                prop="purchasingTypeName"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="采购员"
+                align="center"
+                prop="purchaserName"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="入库人员"
+                align="center"
+                prop="updateBy"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="入库时间"
+                align="center"
+                prop="updateTime"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="发布时间"
+                align="center"
+                prop="createTime"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+                show-overflow-tooltip
+            />
+            <el-table-column label="状态" align="center" prop="taskStatus">
+                <template slot-scope="scope">
+                    <el-tag
+                        size="mini"
+                        type="success"
+                        v-if="scope.row.taskStatus == '26'"
+                        >已验收合格</el-tag
+                    >
+                    <el-tag
+                        size="mini"
+                        type="primary"
+                        v-if="scope.row.taskStatus == '28'"
+                        >已审核</el-tag
+                    >
+                    <el-tag
+                        size="mini"
+                        type="warning"
+                        v-if="scope.row.taskStatus == '105'"
+                        >待审核</el-tag
+                    >
+                    <el-tag
+                        size="mini"
+                        type="danger"
+                        v-if="scope.row.taskStatus == '107'"
+                        >已驳回</el-tag
+                    >
+                </template>
+            </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
-        <template slot-scope="scope">
-          <el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
+            <el-table-column label="操作" align="center" width="180">
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-zoom-in"
+                        @click="handleView(scope.row)"
+                        >查看</el-button
+                    >
 
-          <el-button size="mini" type="primary" icon="el-icon-edit" v-if="
-            scope.row.taskStatus == '26' ||
-            scope.row.taskStatus == '105'
-          " @click="handleUpdate(scope.row)">审核</el-button>
-          <el-button size="mini" type="info" icon="el-icon-edit" v-if="scope.row.taskStatus == '28'"
-            @click="handlePrint(scope.row)">入库单</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        v-if="
+                            scope.row.taskStatus == '26' ||
+                            scope.row.taskStatus == '105'
+                        "
+                        @click="handleUpdate(scope.row)"
+                        >审核</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        v-if="scope.row.taskStatus == '28'"
+                        @click="handlePrint(scope.row)"
+                        >入库单</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" />
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-    <!--审批对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="关键字" prop="dictName">
-          <el-input v-model="query.dictName" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
+        <!--审批对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="1000px"
+            append-to-body
+        >
+            <el-form
+                :model="query"
+                ref="query"
+                size="small"
+                :inline="true"
+                v-show="showSearch"
+                label-width="68px"
+            >
+                <el-form-item label="关键字" prop="dictName">
+                    <el-input
+                        v-model="query.dictName"
+                        placeholder="请输入关键字"
+                        clearable
+                        maxlength="50"
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
 
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</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" v-if="showHandle">
-        <el-col :span="1.5">
-          <el-button type="primary" plain size="mini" :disabled="multiple" @click="passAll">批量通过</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" plain size="mini" @click="refusedAll" :disabled="multiple">批量不通过</el-button>
-        </el-col>
-        <!--        <el-col :span="1.5">-->
-        <!--          <el-button-->
-        <!--            type="warning"-->
-        <!--            plain-->
-        <!--            icon="el-icon-download"-->
-        <!--            size="mini"-->
-        <!--            @click="handleExport"-->
-        <!--            v-hasPermi="['system:dict:export']"-->
-        <!--          >导出</el-button>-->
-        <!--        </el-col>-->
-      </el-row>
-      <el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
-        <el-table-column type="selection" width="55" align="center" :selectable="selectable" />
-        <el-table-column label="序号" align="center" width="80" type="index">
-            <template scope="scope">
-            <span>{{ (query.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="specificationType" :show-overflow-tooltip="true" />
-        <el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
-        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" width="200" />
-        <el-table-column label="管理模式" align="center" prop="manageType">
-          <template slot-scope="scope">
-            <span v-if="scope.row.manageType == '0'">编码管理</span>
-            <span v-if="scope.row.manageType == '1'">数量管理</span>
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
-        <el-table-column label="状态" align="center" prop="status">
-          <template slot-scope="scope">
-            <span v-if="scope.row.status == '0'">未入库</span>
-            <span v-if="scope.row.status == '1'">已入库</span>
-            <span v-if="scope.row.status == '2'">已驳回</span>
-          </template>
-        </el-table-column>
+                <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="resetQuery">重置</el-button> -->
+                </el-form-item>
+            </el-form>
+            <el-row :gutter="10" class="mb8" v-if="showHandle">
+                <el-col :span="1.5">
+                    <el-button
+                        type="primary"
+                        plain
+                        size="mini"
+                        :disabled="multiple"
+                        @click="passAll"
+                        >批量通过</el-button
+                    >
+                </el-col>
+                <el-col :span="1.5">
+                    <el-button
+                        type="danger"
+                        plain
+                        size="mini"
+                        @click="refusedAll"
+                        :disabled="multiple"
+                        >批量不通过</el-button
+                    >
+                </el-col>
+                <!--        <el-col :span="1.5">-->
+                <!--          <el-button-->
+                <!--            type="warning"-->
+                <!--            plain-->
+                <!--            icon="el-icon-download"-->
+                <!--            size="mini"-->
+                <!--            @click="handleExport"-->
+                <!--            v-hasPermi="['system:dict:export']"-->
+                <!--          >导出</el-button>-->
+                <!--        </el-col>-->
+            </el-row>
+            <el-table
+                v-loading="loading"
+                :data="detailTableList"
+                height="600"
+                @selection-change="handleSelectionChange"
+                border
+            >
+                <el-table-column
+                    type="selection"
+                    width="55"
+                    align="center"
+                    :selectable="selectable"
+                />
+                <el-table-column
+                    label="序号"
+                    align="center"
+                    width="80"
+                    type="index"
+                >
+                    <template scope="scope">
+                        <span>{{
+                            (query.pageNum - 1) * 10 + scope.$index + 1
+                        }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="机具类型"
+                    align="center"
+                    prop="typeName"
+                    show-overflow-tooltip
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="specificationType"
+                    show-overflow-tooltip
+                />
+                <el-table-column
+                    label="数量"
+                    align="center"
+                    prop="checkNum"
+                    show-overflow-tooltip
+                />
+                <el-table-column
+                    label="编号"
+                    align="center"
+                    prop="maCode"
+                    show-overflow-tooltip
+                    width="200"
+                />
+                <el-table-column
+                    label="管理模式"
+                    align="center"
+                    prop="manageType"
+                >
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.manageType == '0'">编码管理</span>
+                        <span v-if="scope.row.manageType == '1'">数量管理</span>
+                    </template>
+                </el-table-column>
+                <!-- <el-table-column label="不通过原因" align="center" prop="remark" show-overflow-tooltip /> -->
+                <el-table-column label="状态" align="center" prop="status">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.status == '0'">未入库</span>
+                        <span v-if="scope.row.status == '1'">已入库</span>
+                        <span v-if="scope.row.status == '2'">已驳回</span>
+                    </template>
+                </el-table-column>
 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle" width="150">
-          <template slot-scope="scope" v-if="
-            scope.row.manageType == '1' || scope.row.manageType == '2' ||
-            (scope.row.manageType == '0' && scope.row.maCode)
-          ">
-            <el-button size="mini" type="text" v-if="scope.row.status == '0'" @click="pass(scope.row)">通过</el-button>
-            <el-button size="mini" type="text" v-if="scope.row.status == '0'"
-              @click="refused(scope.row)">不通过</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+                <el-table-column
+                    label="操作"
+                    align="center"
+                    class-name="small-padding fixed-width"
+                    v-if="showHandle"
+                    width="150"
+                >
+                    <template
+                        slot-scope="scope"
+                        v-if="
+                            scope.row.manageType == '1' ||
+                            scope.row.manageType == '2' ||
+                            (scope.row.manageType == '0' && scope.row.maCode)
+                        "
+                    >
+                        <el-button
+                            size="mini"
+                            type="text"
+                            v-if="scope.row.status == '0'"
+                            @click="pass(scope.row)"
+                            >通过</el-button
+                        >
+                        <el-button
+                            size="mini"
+                            type="text"
+                            v-if="scope.row.status == '0'"
+                            @click="refused(scope.row)"
+                            >不通过</el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
 
-      <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="query.pageNum" :limit.sync="query.pageSize"
-        @pagination="getDialogTable" />
-    </el-dialog>
+            <pagination
+                v-show="dialogTotal > 0"
+                :total="dialogTotal"
+                :page.sync="query.pageNum"
+                :limit.sync="query.pageSize"
+                @pagination="getDialogTable"
+            />
+        </el-dialog>
 
-    <!-- 入库单弹窗 -->
-    <el-dialog :visible.sync="openPrint" width="900px" append-to-body>
-      <div style="height: 600px; overflow-y: scroll">
-        <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-          <div class="title" style="
+        <!-- 入库单弹窗 -->
+        <el-dialog :visible.sync="openPrint" width="900px" append-to-body>
+            <div style="height: 600px; overflow-y: scroll">
+                <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
+                        "
+                        >入库单</div
+                    >
+                    <div
+                        class="info"
+                        style="margin-top: 10px; display: flex; flex-wrap: wrap"
+                    >
+                        <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -162,15 +414,18 @@
             >
               <span>工程名称：</span>
             </div> -->
-            <div class="item" style="
+                        <div
+                            class="item"
+                            style="
                                 width: 50%;
                                 flex-shrink: 0;
                                 margin-bottom: 5px;
                                 font-size: 14px;
-                            ">
-              <span>日期：</span>
-            </div>
-            <!-- <div
+                            "
+                        >
+                            <span>日期：</span>
+                        </div>
+                        <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -181,7 +436,7 @@
             >
               <span>领料单号</span>
             </div> -->
-            <!-- <div
+                        <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -192,398 +447,438 @@
             >
               <span>车辆信息：</span>
             </div> -->
-          </div>
-          <el-table :data="printTableData" class="table" style="
+                    </div>
+                    <el-table
+                        :data="printTableData"
+                        class="table"
+                        style="
                             margin-top: 20px;
                             padding-bottom: 1px;
                             padding-right: 1px;
-                        " border>
-            <!--          <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="specificationType" />
-            <el-table-column label="计量单位" align="center" prop="unitName" />
-            <el-table-column label="数量" align="center" prop="checkNum" />
-            <el-table-column label="备注" align="center" prop="remark" />
-            <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
-          </el-table>
+                        "
+                        border
+                    >
+                        <!--          <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="specificationType"
+                        />
+                        <el-table-column
+                            label="计量单位"
+                            align="center"
+                            prop="unitName"
+                        />
+                        <el-table-column
+                            label="数量"
+                            align="center"
+                            prop="checkNum"
+                        />
+                        <el-table-column
+                            label="备注"
+                            align="center"
+                            prop="remark"
+                        />
+                        <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
+                    </el-table>
 
-          <div class="fillIn" style="
+                    <div
+                        class="fillIn"
+                        style="
                             margin-top: 20px;
                             display: flex;
                             justify-content: space-between;
-                        ">
-            <div class="item" style="width: 25%">
-              <span>审核：</span>
+                        "
+                    >
+                        <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="openPrint = 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="openPrint = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import { getTypeList } from '@/api/store/warehousing'
-import { getPutInList, getPutinDetailsList, changePutinStatus, warehousingEntry } from '@/api/store/newBuy'
+import {
+    getPutInList,
+    getPutinDetailsList,
+    changePutinStatus,
+    warehousingEntry,
+} from '@/api/store/newBuy'
 import vueEasyPrint from 'vue-easy-print'
 export default {
-  // name: "NewDevicesWarehousing",
-  // dicts: ['sys_normal_disable'],
-  components: { vueEasyPrint },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 总条数
-      dialogTotal: 0,
-      //搜索下拉数据
-      typesList: [],
-      modelList: [],
-      // 表格数据
-      tableList: [],
-      detailTableList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      openPrint: false,
-      printData: {},
-      printTableData: [],
-      showHandle: true,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined,
-        keyWord: '',
-        typeId: '',
-      },
-      query: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          {
-            required: true,
-            message: '字典名称不能为空',
-            trigger: 'blur',
-          },
-        ],
-        dictType: [
-          {
-            required: true,
-            message: '字典类型不能为空',
-            trigger: 'blur',
-          },
-        ],
-      },
-    }
-  },
-  created() {
-    this.getTypeList()
-    this.getList()
-  },
-  methods: {
-    getTypeList() {
-      getTypeList({ level: '3' }).then(response => {
-        this.typesList = response.data
-      })
-    },
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true
-      getPutInList(this.queryParams).then(response => {
-        this.tableList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-    },
-
-    getDialogTable() {
-      this.loading = true
-      getPutinDetailsList(this.query).then(response => {
-        this.detailTableList = response.rows
-        this.dialogTotal = response.total
-        this.loading = false
-      })
-    },
-
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: '0',
-        remark: undefined,
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 搜索按钮操作 */
-    handleDialogQuery() {
-      this.query.pageNum = 1
-      this.getDialogTable()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    //是否可用勾选框
-    selectable(row) {
-      console.log(row)
-      if (row.status == '0') {
-        if ((row.manageType == '0' && row.maCode) || row.manageType == '1') {
-          return true
-        } else {
-          return false
+    // name: "NewDevicesWarehousing",
+    // dicts: ['sys_normal_disable'],
+    components: { vueEasyPrint },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 总条数
+            dialogTotal: 0,
+            //搜索下拉数据
+            typesList: [],
+            modelList: [],
+            // 表格数据
+            tableList: [],
+            detailTableList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            openPrint: false,
+            printData: {},
+            printTableData: [],
+            showHandle: true,
+            // 日期范围
+            dateRange: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                dictName: undefined,
+                dictType: undefined,
+                status: undefined,
+                keyWord: '',
+                typeId: '',
+            },
+            query: {
+                pageNum: 1,
+                pageSize: 10,
+                dictName: undefined,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                dictName: [
+                    {
+                        required: true,
+                        message: '字典名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                dictType: [
+                    {
+                        required: true,
+                        message: '字典类型不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
         }
-      } else {
-        return false
-      }
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
+    created() {
+        this.getTypeList()
+        this.getList()
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      // this.reset();
-      this.query.taskId = row.taskId
-      this.query.dictName = undefined
-      this.getDialogTable()
-      this.open = true
-      this.showHandle = true
-      this.title = '审核'
-    },
-
-    //通过
-    pass(row) {
-      console.log(row)
-      console.log(this.query.taskId)
-      row.taskId = this.query.taskId
-      let obj = {
-        taskId: this.query.taskId,
-        maId: row.maId,
-        inputNum: row.checkNum,
-        maCode: row.maCode,
-        typeId: row.typeId,
-      }
-
-      let param = {
-        taskId: this.query.taskId,
-        checkResult: '1',
-        inputRecordList: [obj],
-      }
-      changePutinStatus(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
-    },
-    passAll() {
-      console.log(this.query.taskId)
-      console.log(this.ids)
-      this.ids.forEach(item => {
-        item.taskId = this.query.taskId
-        item.typeId = item.typeId
-        item.maId = item.maId
-        item.inputNum = item.checkNum
-        item.maCode = item.maCode
-      })
-      let param = {
-        taskId: this.query.taskId,
-        checkResult: '1',
-        inputRecordList: this.ids,
-      }
-      changePutinStatus(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
-    },
-    //拒绝
-    refused(row) {
-      console.log(row)
-      console.log(this.query.taskId)
-      row.taskId = this.query.taskId
-      let obj = {
-        taskId: this.query.taskId,
-        maId: row.maId,
-        maCode: row.maCode,
-        inputNum: row.checkNum,
-        typeId: row.typeId,
-      }
-
-      let param = {
-        taskId: this.query.taskId,
-        checkResult: '2',
-        inputRecordList: [obj],
-      }
-      changePutinStatus(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
-    },
-    refusedAll() {
-      console.log(this.query.taskId)
-      console.log(this.ids)
-      this.ids.forEach(item => {
-        item.taskId = this.query.taskId
-        item.typeId = item.typeId
-        item.maId = item.maId
-        item.inputNum = item.checkNum
-        item.maCode = item.maCode
-      })
-      let param = {
-        taskId: this.query.taskId,
-        checkResult: '2',
-        inputRecordList: this.ids,
-      }
-
-      changePutinStatus(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
-    },
-    //查看操作
-    handleView(row) {
-      this.query.taskId = row.taskId
-      this.getDialogTable()
-      this.open = true
-      this.showHandle = false
-      this.title = '查看'
-    },
-    //获取入库单数据
-    getPrintTable(taskId) {
-      warehousingEntry({ taskId: taskId }).then(response => {
-        this.printTableData = response.data
-        // this.dialogTotal = response.total;
-      })
-    },
-    //查看入库单
-    handlePrint(row) {
-      this.query.taskId = row.taskId
-      this.getPrintTable(row.taskId)
-      this.openPrint = true
-      this.title = '入库单'
-    },
-    //打印
-    print() {
-      this.$refs.remarksPrintRef.print()
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        'material/purchaseCheckInfo/putInExport',
-        {
-          ...this.queryParams,
+    methods: {
+        getTypeList() {
+            getTypeList({ level: '3' }).then((response) => {
+                this.typesList = response.data
+            })
+        },
+        /** 查询字典类型列表 */
+        getList() {
+            this.loading = true
+            getPutInList(this.queryParams).then((response) => {
+                this.tableList = response.rows
+                this.total = response.total
+                this.loading = false
+            })
+        },
+
+        getDialogTable() {
+            this.loading = true
+            getPutinDetailsList(this.query).then((response) => {
+                this.detailTableList = response.rows
+                this.dialogTotal = response.total
+                this.loading = false
+            })
+        },
+
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                dictId: undefined,
+                dictName: undefined,
+                dictType: undefined,
+                status: '0',
+                remark: undefined,
+            }
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 搜索按钮操作 */
+        handleDialogQuery() {
+            this.query.pageNum = 1
+            this.getDialogTable()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        //是否可用勾选框
+        selectable(row) {
+            console.log(row)
+            if (row.status == '0') {
+                if (
+                    (row.manageType == '0' && row.maCode) ||
+                    row.manageType == '1'
+                ) {
+                    return true
+                } else {
+                    return false
+                }
+            } else {
+                return false
+            }
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            // this.reset();
+            this.query.taskId = row.taskId
+            this.query.dictName = undefined
+            this.getDialogTable()
+            this.open = true
+            this.showHandle = true
+            this.title = '审核'
+        },
+
+        //通过
+        pass(row) {
+            console.log(row)
+            console.log(this.query.taskId)
+            row.taskId = this.query.taskId
+            let obj = {
+                taskId: this.query.taskId,
+                maId: row.maId,
+                inputNum: row.checkNum,
+                maCode: row.maCode,
+                typeId: row.typeId,
+            }
+
+            let param = {
+                taskId: this.query.taskId,
+                checkResult: '1',
+                inputRecordList: [obj],
+            }
+            changePutinStatus(param).then((response) => {
+                if (response.code == 200) {
+                    this.$modal.msgSuccess('审批成功')
+                    this.getDialogTable()
+                    this.getList()
+                } else {
+                    this.$modal.msgSuccess('审批失败')
+                }
+            })
+        },
+        passAll() {
+            console.log(this.query.taskId)
+            console.log(this.ids)
+            this.ids.forEach((item) => {
+                item.taskId = this.query.taskId
+                item.typeId = item.typeId
+                item.maId = item.maId
+                item.inputNum = item.checkNum
+                item.maCode = item.maCode
+            })
+            let param = {
+                taskId: this.query.taskId,
+                checkResult: '1',
+                inputRecordList: this.ids,
+            }
+            changePutinStatus(param).then((response) => {
+                if (response.code == 200) {
+                    this.$modal.msgSuccess('审批成功')
+                    this.getDialogTable()
+                    this.getList()
+                } else {
+                    this.$modal.msgSuccess('审批失败')
+                }
+            })
+        },
+        //拒绝
+        refused(row) {
+            console.log(row)
+            console.log(this.query.taskId)
+            row.taskId = this.query.taskId
+            let obj = {
+                taskId: this.query.taskId,
+                maId: row.maId,
+                maCode: row.maCode,
+                inputNum: row.checkNum,
+                typeId: row.typeId,
+            }
+
+            let param = {
+                taskId: this.query.taskId,
+                checkResult: '2',
+                inputRecordList: [obj],
+            }
+            changePutinStatus(param).then((response) => {
+                if (response.code == 200) {
+                    this.$modal.msgSuccess('审批成功')
+                    this.getDialogTable()
+                    this.getList()
+                } else {
+                    this.$modal.msgSuccess('审批失败')
+                }
+            })
+        },
+        refusedAll() {
+            console.log(this.query.taskId)
+            console.log(this.ids)
+            this.ids.forEach((item) => {
+                item.taskId = this.query.taskId
+                item.typeId = item.typeId
+                item.maId = item.maId
+                item.inputNum = item.checkNum
+                item.maCode = item.maCode
+            })
+            let param = {
+                taskId: this.query.taskId,
+                checkResult: '2',
+                inputRecordList: this.ids,
+            }
+
+            changePutinStatus(param).then((response) => {
+                if (response.code == 200) {
+                    this.$modal.msgSuccess('审批成功')
+                    this.getDialogTable()
+                    this.getList()
+                } else {
+                    this.$modal.msgSuccess('审批失败')
+                }
+            })
+        },
+        //查看操作
+        handleView(row) {
+            this.query.taskId = row.taskId
+            this.getDialogTable()
+            this.open = true
+            this.showHandle = false
+            this.title = '查看'
+        },
+        //获取入库单数据
+        getPrintTable(taskId) {
+            warehousingEntry({ taskId: taskId }).then((response) => {
+                this.printTableData = response.data
+                // this.dialogTotal = response.total;
+            })
+        },
+        //查看入库单
+        handlePrint(row) {
+            this.query.taskId = row.taskId
+            this.getPrintTable(row.taskId)
+            this.openPrint = true
+            this.title = '入库单'
+        },
+        //打印
+        print() {
+            this.$refs.remarksPrintRef.print()
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'material/purchaseCheckInfo/putInExport',
+                {
+                    ...this.queryParams,
+                },
+                `新购工机具入库_${new Date().getTime()}.xlsx`,
+            )
         },
-        `新购工机具入库_${new Date().getTime()}.xlsx`
-      )
     },
-  },
 }
 </script>
 <style lang="scss" scoped>
 .print {
-  width: 90%;
-  padding-left: 5%;
-  padding-right: 1%;
+    width: 90%;
+    padding-left: 5%;
+    padding-right: 1%;
 
-  .title {
-    text-align: center;
-    font-weight: 600;
-    font-size: 16px;
-  }
-
-  .info {
-    margin-top: 10px;
-    display: flex;
-    flex-wrap: wrap;
-
-    .item {
-      width: 50%;
-      flex-shrink: 0;
-      margin-bottom: 5px;
-      font-size: 14px;
+    .title {
+        text-align: center;
+        font-weight: 600;
+        font-size: 16px;
     }
-  }
 
-  .fillIn {
-    margin-top: 15px;
-    display: flex;
-    justify-content: space-between;
-  }
+    .info {
+        margin-top: 10px;
+        display: flex;
+        flex-wrap: wrap;
+
+        .item {
+            width: 50%;
+            flex-shrink: 0;
+            margin-bottom: 5px;
+            font-size: 14px;
+        }
+    }
+
+    .fillIn {
+        margin-top: 15px;
+        display: flex;
+        justify-content: space-between;
+    }
 }
 
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 </style>
diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue
index 0df68e83..54bf034d 100644
--- a/sgzb-ui/src/views/store/tools/toolsType.vue
+++ b/sgzb-ui/src/views/store/tools/toolsType.vue
@@ -1,65 +1,83 @@
 <template>
-  <div class="app-container" id="toolsType">
-    <el-row :gutter="20">
-      <!--树数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input
-            v-model="typeName"
-            placeholder="请输入类型名称"
-            clearable
-            maxlength="50"
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container" style>
-          <el-tree
-            style="height: 700px; overflow: scroll"
-            :data="treeOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            node-key="id"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col>
-      <!--用户数据-->
-      <el-col :span="20" :xs="24">
-        <el-form
-          :model="queryParams"
-          ref="queryForm"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-        >
-          <el-form-item label="关键字" prop="typeName">
-            <el-input
-              v-model="queryParams.typeName"
-              placeholder="请输入关键字"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
+    <div class="app-container" id="toolsType">
+        <el-row :gutter="20">
+            <!--树数据-->
+            <el-col :span="4" :xs="24">
+                <div class="head-container">
+                    <el-input
+                        v-model="typeName"
+                        placeholder="请输入类型名称"
+                        clearable
+                        maxlength="50"
+                        size="small"
+                        prefix-icon="el-icon-search"
+                        style="margin-bottom: 20px"
+                    />
+                </div>
+                <div class="head-container" style>
+                    <el-tree
+                        style="height: 700px; overflow: scroll"
+                        :data="treeOptions"
+                        :props="defaultProps"
+                        :expand-on-click-node="false"
+                        :filter-node-method="filterNode"
+                        ref="tree"
+                        node-key="id"
+                        default-expand-all
+                        highlight-current
+                        @node-click="handleNodeClick"
+                    />
+                </div>
+            </el-col>
+            <!--用户数据-->
+            <el-col :span="20" :xs="24">
+                <el-form
+                    :model="queryParams"
+                    ref="queryForm"
+                    size="small"
+                    :inline="true"
+                    v-show="showSearch"
+                    label-width="68px"
+                >
+                    <el-form-item label="关键字" prop="typeName">
+                        <el-input
+                            v-model="queryParams.typeName"
+                            placeholder="请输入关键字"
+                            clearable
+                            style="width: 240px"
+                            @keyup.enter.native="handleQuery"
+                        />
+                    </el-form-item>
 
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
+                    <el-form-item>
+                        <el-button
+                            type="primary"
+                            icon="el-icon-search"
+                            size="mini"
+                            @click="handleQuery"
+                            >查询</el-button
+                        >
+                        <el-button
+                            icon="el-icon-refresh"
+                            size="mini"
+                            @click="resetQuery"
+                            >重置</el-button
+                        >
+                    </el-form-item>
+                </el-form>
 
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-          </el-col>
-          <!-- <el-col :span="1.5">
+                <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                        <el-button
+                            type="primary"
+                            plain
+                            icon="el-icon-plus"
+                            size="mini"
+                            @click="handleAdd"
+                            >新增</el-button
+                        >
+                    </el-col>
+                    <!-- <el-col :span="1.5">
             <el-button
               type="warning"
               plain
@@ -69,730 +87,937 @@
             >导出
             </el-button>
           </el-col>-->
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+                    <right-toolbar
+                        :showSearch.sync="showSearch"
+                        @queryTable="getList"
+                    ></right-toolbar>
+                </el-row>
 
-        <el-table v-loading="loading" :data="typeList" height="600" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="名称" align="center" key="typeName" prop="typeName" />
-          <el-table-column
-            label="计量单位"
-            align="center"
-            key="unitName"
-            prop="unitName"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="内部租赁价"
-            align="center"
-            key="leasePrice"
-            prop="leasePrice"
-            :show-overflow-tooltip="true"
-            width="100"
-          />
-          <el-table-column label="原值" align="center" key="buyPrice" prop="buyPrice" :show-overflow-tooltip="true" />
-          <el-table-column
-            label="丢失赔偿"
-            align="center"
-            key="payPrice"
-            prop="payPrice"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="库管员"
-            align="center"
-            key="keeperUserName"
-            prop="keeperUserName"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="管理模式"
-            align="center"
-            key="manageType"
-            prop="manageType"
-            :show-overflow-tooltip="true"
-          >
-            <template slot-scope="scope">
-              <span v-if="scope.row.manageType == '0'">编码管理</span>
-              <span v-if="scope.row.manageType == '1'">数量管理</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="图片" align="center" key="photoName" prop="photoName" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              <span @click="openImg(scope.row.photoUrl)" style="color: #02a7f0">{{ scope.row.photoName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="文档资料"
-            align="center"
-            key="documentName"
-            prop="documentName"
-            :show-overflow-tooltip="true"
-          >
-            <template slot-scope="scope">
-              <a :href="uploadUrl + scope.row.documentUrl" style="color: #02a7f0" :download="scope.row.documentName">
-                {{ scope.row.documentName }}
-              </a>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="资产属性"
-            align="center"
-            key="propName"
-            prop="propName"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="厂家规格型号"
-            align="center"
-            key="facModel"
-            prop="facModel"
-            :show-overflow-tooltip="true"
-            width="120"
-          />
-          <el-table-column label="备注信息" align="center" key="remark" prop="remark" :show-overflow-tooltip="true" />
+                <el-table
+                    v-loading="loading"
+                    :data="typeList"
+                    border
+                    @selection-change="handleSelectionChange"
+                >
+                    <!-- <el-table-column
+                        type="selection"
+                        width="50"
+                        align="center"
+                    /> -->
+                    <el-table-column
+                        label="名称"
+                        align="center"
+                        key="typeName"
+                        prop="typeName"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="计量单位"
+                        align="center"
+                        key="unitName"
+                        prop="unitName"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="内部租赁价"
+                        align="center"
+                        key="leasePrice"
+                        prop="leasePrice"
+                        show-overflow-tooltip
+                        width="100"
+                    />
+                    <el-table-column
+                        label="原值"
+                        align="center"
+                        key="buyPrice"
+                        prop="buyPrice"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="丢失赔偿"
+                        align="center"
+                        key="payPrice"
+                        prop="payPrice"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="库管员"
+                        align="center"
+                        key="keeperUserName"
+                        prop="keeperUserName"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="管理模式"
+                        align="center"
+                        key="manageType"
+                        prop="manageType"
+                    >
+                        <template slot-scope="{ row }">
+                            <el-tag size="mini" v-if="row.manageType == '0'">
+                                编码管理
+                            </el-tag>
+                            <el-tag
+                                size="mini"
+                                type="success"
+                                v-if="row.manageType == '1'"
+                            >
+                                数量管理
+                            </el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="图片"
+                        align="center"
+                        key="photoName"
+                        prop="photoName"
+                        show-overflow-tooltip
+                    >
+                        <template slot-scope="scope">
+                            <span
+                                @click="openImg(scope.row.photoUrl)"
+                                style="color: #02a7f0; cursor: pointer"
+                                >{{ scope.row.photoName }}</span
+                            >
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="文档资料"
+                        align="center"
+                        key="documentName"
+                        prop="documentName"
+                        show-overflow-tooltip
+                    >
+                        <template slot-scope="scope">
+                            <a
+                                :href="uploadUrl + scope.row.documentUrl"
+                                style="color: #02a7f0; cursor: pointer"
+                                :download="scope.row.documentName"
+                            >
+                                {{ scope.row.documentName }}
+                            </a>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="资产属性"
+                        align="center"
+                        key="propName"
+                        prop="propName"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="厂家规格型号"
+                        align="center"
+                        key="facModel"
+                        prop="facModel"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="备注信息"
+                        align="center"
+                        key="remark"
+                        prop="remark"
+                        show-overflow-tooltip
+                    />
 
-          <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
-            <template slot-scope="scope" v-if="scope.row.typeId !== 1">
-              <el-button size="mini" type="success" icon="el-icon-edit" @click="handleConfig(scope.row)">
-                配置
-              </el-button>
-              <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)">
-                修改
-              </el-button>
-              <el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+                    <el-table-column label="操作" align="center" width="180">
+                        <template
+                            slot-scope="scope"
+                            v-if="scope.row.typeId !== 1"
+                        >
+                            <el-button
+                                size="mini"
+                                type="text"
+                                icon="el-icon-edit"
+                                @click="handleConfig(scope.row)"
+                            >
+                                配置
+                            </el-button>
+                            <el-button
+                                size="mini"
+                                type="text"
+                                icon="el-icon-edit"
+                                @click="handleUpdate(scope.row)"
+                            >
+                                修改
+                            </el-button>
+                            <el-button
+                                size="mini"
+                                type="text"
+                                icon="el-icon-delete"
+                                @click="handleDelete(scope.row)"
+                            >
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
 
-        <!-- <pagination
+                <!-- <pagination
           v-show="total>0"
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />-->
-      </el-col>
-    </el-row>
-
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="所属上级" prop="parentId">
-              <treeselect
-                v-model="form.parentId"
-                :options="treeOptions"
-                :show-count="true"
-                noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果" 
-                placeholder="请选择所属上级分类"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="维修员" prop="repairUserId">
-              <el-select v-model="form.repairUserId" filterable placeholder="请选择维修员">
-                <el-option
-                  v-for="keeper in repairUserList"
-                  :key="keeper.userId"
-                  :label="keeper.nickName"
-                  :value="keeper.userId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="名称" prop="typeName">
-              <el-input v-model="form.typeName" placeholder="请输入名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="管理模式" prop="manageType">
-              <el-select v-model="form.manageType" filterable placeholder="请选择管理模式">
-                <el-option value="0" label="编码管理">编码管理</el-option>
-                <el-option value="1" label="数量管理">数量管理</el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+            </el-col>
         </el-row>
 
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="内部租赁价" prop="leasePrice">
-              <el-input v-model="form.leasePrice" type="number" placeholder="请输入租赁价格" maxlength="10" />
-            </el-form-item>
-          </el-col>
+        <!-- 添加或修改用户配置对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="850px"
+            append-to-body
+            :close-on-click-modal="false"
+        >
+            <el-form
+                ref="form"
+                :model="form"
+                :rules="rules"
+                label-width="100px"
+            >
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="所属上级" prop="parentId">
+                            <treeselect
+                                v-model="form.parentId"
+                                :options="treeOptions"
+                                :show-count="true"
+                                noChildrenText="没有数据了"
+                                noOptionsText="没有数据"
+                                noResultsText="没有搜索结果"
+                                placeholder="请选择所属上级分类"
+                                @select="treeChange"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="维修员" prop="repairUserId">
+                            <el-select
+                                v-model="form.repairUserId"
+                                filterable
+                                placeholder="请选择维修员"
+                                style="width: 100%"
+                            >
+                                <el-option
+                                    v-for="keeper in repairUserList"
+                                    :key="keeper.userId"
+                                    :label="keeper.nickName"
+                                    :value="keeper.userId"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="名称" prop="typeName">
+                            <el-input
+                                v-model="form.typeName"
+                                placeholder="请输入名称"
+                                maxlength="30"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="管理模式" prop="manageType">
+                            <el-select
+                                v-model="form.manageType"
+                                filterable
+                                placeholder="请选择管理模式"
+                                style="width: 100%"
+                            >
+                                <el-option value="0" label="编码管理"
+                                    >编码管理</el-option
+                                >
+                                <el-option value="1" label="数量管理"
+                                    >数量管理</el-option
+                                >
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-          <el-col :span="12">
-            <el-form-item label="外部租赁价" prop="rentPrice">
-              <el-input v-model="form.rentPrice" type="number" placeholder="请输入外部租赁价" maxlength="30" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="内部租赁价" prop="leasePrice">
+                            <el-input
+                                v-model="form.leasePrice"
+                                type="number"
+                                placeholder="请输入租赁价格"
+                                maxlength="10"
+                            />
+                        </el-form-item>
+                    </el-col>
 
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="原值" prop="buyPrice">
-              <el-input v-model="form.buyPrice" type="number" placeholder="请输入原值" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="计量单位" prop="unitName">
-              <el-input v-model="form.unitName" placeholder="请输入计量单位" maxlength="20" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="资产属性" prop="propId">
-              <el-select v-model="form.propId" filterable placeholder="请选择资产属性">
-                <el-option
-                  v-for="keeper in propList"
-                  :key="keeper.propId"
-                  :label="keeper.propName"
-                  :value="keeper.propId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="外部租赁价" prop="rentPrice">
+                            <el-input
+                                v-model="form.rentPrice"
+                                type="number"
+                                placeholder="请输入外部租赁价"
+                                maxlength="30"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-          <el-col :span="12">
-            <el-form-item label="库管员" prop="keeperUserId">
-              <el-select v-model="form.keeperUserId" filterable placeholder="请选择库管员">
-                <el-option
-                  v-for="keeper in keeperList"
-                  :key="keeper.userId"
-                  :label="keeper.nickName"
-                  :value="keeper.userId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="厂家规格型号" prop="facModel">
-              <el-input v-model="form.facModel" placeholder="请输入厂家规格型号" maxlength="100"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注内容" maxlength="150"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="文档资料" prop="field101">
-              <el-upload
-                ref="field101"
-                :file-list="field101fileList"
-                action="#"
-                :limit="1"
-                accept=".docx, .pdf"
-                :http-request="obj => fileUpLoad(obj, 'fileUrl')"
-                :on-exceed="exceedFile"
-              >
-                <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="图片" prop="photoName">
-              <el-upload
-                :http-request="obj => imgUpLoad(obj, 'fileUrl')"
-                action="#"
-                :file-list="fileList"
-                list-type="picture-card"
-                :show-file-list="false"
-                accept=".png, .jpg, .jpeg"
-                :on-success="handleAvatarSuccess"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove"
-              >
-                <!-- <el-button size="small" type="primary" icon="el-icon-upload">上传</el-button> -->
-                <img v-if="imageUrl" :src="uploadUrl + imageUrl" style="width: 140px; height: 140px" class="avatar" />
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="原值" prop="buyPrice">
+                            <el-input
+                                v-model="form.buyPrice"
+                                type="number"
+                                placeholder="请输入原值"
+                                maxlength="30"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="计量单位" prop="unitName">
+                            <el-input
+                                v-model="form.unitName"
+                                placeholder="请输入计量单位"
+                                maxlength="20"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="资产属性" prop="propId">
+                            <el-select
+                                v-model="form.propId"
+                                filterable
+                                placeholder="请选择资产属性"
+                                style="width: 100%"
+                            >
+                                <el-option
+                                    v-for="keeper in propList"
+                                    :key="keeper.propId"
+                                    :label="keeper.propName"
+                                    :value="keeper.propId"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
 
-    <el-dialog :visible.sync="dialogVisible">
-      <img width="100%" height="650px" :src="dialogImageUrl" alt />
-    </el-dialog>
+                    <el-col :span="12">
+                        <el-form-item label="库管员" prop="keeperUserId">
+                            <el-select
+                                v-model="form.keeperUserId"
+                                filterable
+                                placeholder="请选择库管员"
+                                style="width: 100%"
+                            >
+                                <el-option
+                                    v-for="keeper in keeperList"
+                                    :key="keeper.userId"
+                                    :label="keeper.nickName"
+                                    :value="keeper.userId"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="厂家规格型号" prop="facModel">
+                            <el-input
+                                v-model="form.facModel"
+                                placeholder="请输入厂家规格型号"
+                                maxlength="100"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input
+                                v-model="form.remark"
+                                type="textarea"
+                                placeholder="请输入备注内容"
+                                maxlength="150"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="文档资料" prop="field101">
+                            <el-upload
+                                ref="field101"
+                                :file-list="field101fileList"
+                                action="#"
+                                :limit="1"
+                                accept=".docx, .pdf"
+                                :http-request="
+                                    (obj) => fileUpLoad(obj, 'fileUrl')
+                                "
+                                :on-exceed="exceedFile"
+                            >
+                                <el-button
+                                    size="small"
+                                    type="primary"
+                                    icon="el-icon-upload"
+                                    >点击上传</el-button
+                                >
+                            </el-upload>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="图片" prop="photoName">
+                            <el-upload
+                                :http-request="
+                                    (obj) => imgUpLoad(obj, 'fileUrl')
+                                "
+                                action="#"
+                                :file-list="fileList"
+                                list-type="picture-card"
+                                :show-file-list="false"
+                                accept=".png, .jpg, .jpeg"
+                                :on-success="handleAvatarSuccess"
+                                :on-preview="handlePictureCardPreview"
+                                :on-remove="handleRemove"
+                            >
+                                <!-- <el-button size="small" type="primary" icon="el-icon-upload">上传</el-button> -->
+                                <img
+                                    v-if="imageUrl"
+                                    :src="uploadUrl + imageUrl"
+                                    style="width: 140px; height: 140px"
+                                    class="avatar"
+                                />
+                                <i
+                                    v-else
+                                    class="el-icon-plus avatar-uploader-icon"
+                                ></i>
+                            </el-upload>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
 
-    <!--    配置弹窗  -->
-    <el-dialog :title="title" :visible.sync="configOpen" width="650px" append-to-body :close-on-click-modal="false">
-      <el-form ref="cform" :model="cform" :rules="crules" label-width="110px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="调整前价格">
-              <el-input v-model="leasePrice" placeholder="调整前价格" disabled></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="调整后价格" prop="leasePrice">
-              <el-input-number
-                v-model="cform.leasePrice"
-                style="width: 100%"
-                controls-position="right"
-                :min="0"
-                maxlength="10"
-              ></el-input-number>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="开始使用日期" prop="effTime">
-              <el-date-picker
-                v-model="cform.effTime"
-                style="width: 100%"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetime"
-                placeholder="开始使用日期"
-              ></el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitConfig">确 定</el-button>
-        <el-button @click="cancelConfig">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" height="650px" :src="dialogImageUrl" alt />
+        </el-dialog>
+
+        <!--    配置弹窗  -->
+        <el-dialog
+            :title="title"
+            :visible.sync="configOpen"
+            width="650px"
+            append-to-body
+            :close-on-click-modal="false"
+        >
+            <el-form
+                ref="cform"
+                :model="cform"
+                :rules="crules"
+                label-width="110px"
+            >
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="调整前价格">
+                            <el-input
+                                v-model="leasePrice"
+                                placeholder="调整前价格"
+                                disabled
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="调整后价格" prop="leasePrice">
+                            <el-input-number
+                                v-model="cform.leasePrice"
+                                style="width: 100%"
+                                controls-position="right"
+                                :min="0"
+                                maxlength="10"
+                            ></el-input-number>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="开始使用日期" prop="effTime">
+                            <el-date-picker
+                                v-model="cform.effTime"
+                                style="width: 100%"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                type="datetime"
+                                placeholder="开始使用日期"
+                            ></el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitConfig"
+                    >确 定</el-button
+                >
+                <el-button @click="cancelConfig">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import {
-  listUser,
-  getUser,
-  delUser,
-  addUser,
-  updateUser,
-  // resetUserPwd,
-  // changeUserStatus,
-  deptTreeSelect,
-} from '@/api/system/user'
-
-import { getToken } from '@/utils/auth'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { getListByMaType, getMaTypeList, getMaType, addMaType, updateMaType, delMaType } from '@/api/store/tools'
+import {
+    getListByMaType,
+    getMaTypeList,
+    getMaType,
+    addMaType,
+    updateMaType,
+    delMaType,
+} from '@/api/store/tools'
 import { getUserByRoleList } from '@/api/system/user'
 import { getProLists } from '@/api/base/base'
 import { imgUpLoad, fileUpLoad } from '@/api/system/upload'
 import { getInfo } from '@/api/login'
 export default {
-  name: 'ToolsType',
-  // dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 库管员用户数据
-      keeperList: null,
-      //维修员用户数据
-      repairUserList: null,
-      //资产类型数据
-      propList: null,
-      // 类型名称
-      typeName: undefined,
-      // 树选项
-      treeOptions: undefined,
-      //列表数据
-      typeList: undefined,
-      // 是否显示弹出层
-      open: false,
-      // 弹出层标题
-      title: '',
-      // 默认密码
-      initPassword: undefined,
-      // 日期范围
-      dateRange: [],
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
-      // 表单参数
-      form: {},
-      chosenTypeId: '',
-      leasePrice: '',
-      uploadHeader: process.env.VUE_APP_BASE_API,
-      imageUrl: '',
-      imageName: '',
-      fileList: [],
-      field101fileList: [],
-      //上传地址
-      // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://192.168.5.12:9201',//本地测试
-      uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
-      defaultProps: {
-        children: 'children',
-        label: 'label',
-      },
+    name: 'ToolsType',
+    // dicts: ['sys_normal_disable', 'sys_user_sex'],
+    components: { Treeselect },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 库管员用户数据
+            keeperList: null,
+            //维修员用户数据
+            repairUserList: null,
+            //资产类型数据
+            propList: null,
+            // 类型名称
+            typeName: undefined,
+            // 树选项
+            treeOptions: undefined,
+            //列表数据
+            typeList: undefined,
+            // 是否显示弹出层
+            open: false,
+            // 弹出层标题
+            title: '',
+            // 默认密码
+            initPassword: undefined,
+            // 日期范围
+            dateRange: [],
+            // 岗位选项
+            postOptions: [],
+            // 角色选项
+            roleOptions: [],
+            // 表单参数
+            form: {
+                companyId: '',
+            },
+            chosenTypeId: '',
+            leasePrice: '',
+            uploadHeader: process.env.VUE_APP_BASE_API,
+            imageUrl: '',
+            imageName: '',
+            fileList: [],
+            field101fileList: [],
+            //上传地址
+            // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
+            // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
+            // uploadUrl:'http://192.168.5.12:9201',//本地测试
+            uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
+            defaultProps: {
+                children: 'children',
+                label: 'label',
+            },
 
-      // 查询参数
-      queryParams: {
-        // pageNum: 1,
-        // pageSize: 10,
-        typeName: undefined,
-        // phonenumber: undefined,
-        // status: undefined,
-        // typeId: undefined
-      },
+            // 查询参数
+            queryParams: {
+                // pageNum: 1,
+                // pageSize: 10,
+                typeName: undefined,
+                // phonenumber: undefined,
+                // status: undefined,
+                // typeId: undefined
+            },
 
-      // 表单校验
-      rules: {
-        typeName: [
-          { required: true, message: '设备名称不能为空', trigger: 'blur' },
-          {
-            min: 2,
-            max: 20,
-            message: '设备名称长度必须介于 2 和 20 之间',
-            trigger: 'blur',
-          },
-        ],
-        parentId: [{ required: true, message: '所属上级不能为空', trigger: 'blur' }],
-        manageType: [{ required: true, message: '请选择管理模式', trigger: 'change' }],
-        leasePrice:[{required: true, message: '内部租赁价格不能为空', trigger: 'blur' }]
-        // password: [
-        //   {required: true, message: "用户密码不能为空", trigger: "blur"},
-        //   {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'}
-        // ],
-        // email: [
-        //   {
-        //     type: "email",
-        //     message: "请输入正确的邮箱地址",
-        //     trigger: ["blur", "change"]
-        //   }
-        // ],
-        // phonenumber: [
-        //   {
-        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-        //     message: "请输入正确的手机号码",
-        //     trigger: "blur"
-        //   }
-        // ]
-      },
-      companyId: undefined,
-      dialogImageUrl: '',
-      dialogVisible: false,
-      configOpen: false,
-      cform: {
-        price: '',
-        afterPrice: '',
-        useDate: '',
-      },
-      crules: {
-        leasePrice: [
-          { required: true, message: '调整后价格不能为空', trigger: 'blur' },
-          // { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        // effTime: [
-        //   {required: true, message: "开始日期不能为空", trigger: "blur"}
-        // ],
-      },
-    }
-  },
-  watch: {
-    // 根据名称筛选部门树
-    typeName(val) {
-      this.$refs.tree.filter(val)
-    },
-  },
-  created() {
-    this.getInfo()
-    this.getList()
-    this.getTreeData()
-    this.getUserList()
-    this.getPropData()
-  },
-  methods: {
-    getInfo() {
-      getInfo().then(res => {
-        this.companyId = res.user.companyId
-      })
-    },
-    /** 查询用户列表--库管员，维修员 */
-    getUserList() {
-      getUserByRoleList({ roleId: '101' }).then(response => {
-        this.keeperList = response.data
-      })
-      getUserByRoleList({ roleId: '102' }).then(response => {
-        this.repairUserList = response.data
-      })
-    },
-    /** 查询新增页面-上级类型下拉树结构 */
-    getTreeData() {
-      getMaTypeList().then(response => {
-        this.treeOptions = response.data
-      })
-    },
-    /** 查询资产属性下拉 */
-    getPropData() {
-      getProLists().then(response => {
-        this.propList = response.rows
-      })
-    },
-    /** 查询列表 */
-    getList() {
-      this.loading = true
-      getListByMaType(this.queryParams).then(response => {
-        this.typeList = response.data
-        // this.total = response.total;
-        this.loading = false
-      })
-    },
-    // 筛选节点 - 左侧树
-    filterNode(value, data) {
-      if (!value) return true
-      return data.label.indexOf(value) !== -1
-    },
-    // 节点单击事件 - 左侧树
-    handleNodeClick(data) {
-      this.queryParams.typeId = data.id
-      this.handleQuery()
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        photoUrl: '',
-        photoName: '',
-        documentUrl: '',
-        documentName: '',
-      }
-      this.imageUrl = ''
-      this.fileList = []
-      this.field101fileList = []
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      // this.queryParams.pageNum = 1;
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = []
-      this.resetForm('queryForm')
-      this.queryParams.typeId = undefined
-      this.$refs.tree.setCurrentKey(null)
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.typeId)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '新增'
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const typeId = row.typeId || this.ids
-      getMaType(typeId).then(response => {
-        this.form = response.data
-        if (this.form.documentUrl) {
-          let file = {
-            name: this.form.documentName,
-            type: this.form.documentUrl,
-          }
-          this.field101fileList.push(file)
-        } else {
-          this.field101fileList = []
+            // 表单校验
+            rules: {
+                typeName: [
+                    {
+                        required: true,
+                        message: '设备名称不能为空',
+                        trigger: 'blur',
+                    },
+                    {
+                        min: 2,
+                        max: 20,
+                        message: '设备名称长度必须介于 2 和 20 之间',
+                        trigger: 'blur',
+                    },
+                ],
+                parentId: [
+                    {
+                        required: true,
+                        message: '所属上级不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                manageType: [
+                    {
+                        required: true,
+                        message: '请选择管理模式',
+                        trigger: 'change',
+                    },
+                ],
+                leasePrice: [
+                    {
+                        required: true,
+                        message: '内部租赁价格不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                // password: [
+                //   {required: true, message: "用户密码不能为空", trigger: "blur"},
+                //   {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'}
+                // ],
+                // email: [
+                //   {
+                //     type: "email",
+                //     message: "请输入正确的邮箱地址",
+                //     trigger: ["blur", "change"]
+                //   }
+                // ],
+                // phonenumber: [
+                //   {
+                //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                //     message: "请输入正确的手机号码",
+                //     trigger: "blur"
+                //   }
+                // ]
+            },
+            companyId: undefined,
+            dialogImageUrl: '',
+            dialogVisible: false,
+            configOpen: false,
+            cform: {
+                price: '',
+                afterPrice: '',
+                useDate: '',
+            },
+            crules: {
+                leasePrice: [
+                    {
+                        required: true,
+                        message: '调整后价格不能为空',
+                        trigger: 'blur',
+                    },
+                    // { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+                ],
+                // effTime: [
+                //   {required: true, message: "开始日期不能为空", trigger: "blur"}
+                // ],
+            },
         }
-
-        this.imageUrl = this.form.photoUrl
-        this.open = true
-        this.title = '修改'
-      })
     },
-    /** 提交按钮 */
-    submitForm: function () {
-      console.log(this.form)
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.typeId != undefined) {
-            updateMaType(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-              this.getTreeData()
+    watch: {
+        // 根据名称筛选部门树
+        typeName(val) {
+            this.$refs.tree.filter(val)
+        },
+    },
+    created() {
+        // this.getInfo()
+        this.getList()
+        this.getTreeData()
+        this.getUserList()
+        this.getPropData()
+    },
+    methods: {
+        // getInfo() {
+        //     getInfo().then((res) => {
+        //         console.log(res, 'companyId----')
+        //         this.companyId = res.user.companyId
+        //     })
+        // },
+        /** 查询用户列表--库管员，维修员 */
+        getUserList() {
+            getUserByRoleList({ roleId: '101' }).then((response) => {
+                this.keeperList = response.data
             })
-          } else {
-            this.form.companyId = this.companyId
-            addMaType(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
-              this.getTreeData()
+            getUserByRoleList({ roleId: '102' }).then((response) => {
+                this.repairUserList = response.data
             })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const typeIds = row.typeId
-      this.$modal
-        .confirm('是否确认删除数据项？')
-        .then(function () {
-          return delMaType(typeIds)
-        })
-        .then(() => {
-          this.getList()
-          this.$modal.msgSuccess('删除成功')
-        })
-        .catch(() => {})
-    },
-    //配置操作
-    handleConfig(row) {
-      this.resetForm('cform')
-      this.chosenTypeId = row.typeId
-      this.leasePrice = row.leasePrice
-      // this.cform.leasePrice = row.leasePrice;
-      this.$set(this.cform, 'leasePrice', row.leasePrice)
-      this.configOpen = true
-      this.title = '租赁价格调整'
-    },
-    submitConfig() {
-      let param = {
-        typeId: this.chosenTypeId,
-        effTime: this.cform.effTime,
-        leasePrice: this.cform.leasePrice,
-      }
-      console.log(param)
-      this.$refs['cform'].validate(valid => {
-        if (valid) {
-          updateMaType(param).then(response => {
-            this.$modal.msgSuccess('调整成功')
-            this.configOpen = false
+        },
+        /** 查询新增页面-上级类型下拉树结构 */
+        getTreeData() {
+            getMaTypeList().then((response) => {
+                this.treeOptions = response.data
+            })
+        },
+        /** 查询资产属性下拉 */
+        getPropData() {
+            getProLists().then((response) => {
+                this.propList = response.rows
+            })
+        },
+        /** 查询列表 */
+        getList() {
+            this.loading = true
+            getListByMaType(this.queryParams).then((response) => {
+                this.typeList = response.data
+                // this.total = response.total;
+                this.loading = false
+            })
+        },
+        // 筛选节点 - 左侧树
+        filterNode(value, data) {
+            if (!value) return true
+            return data.label.indexOf(value) !== -1
+        },
+        // 节点单击事件 - 左侧树
+        handleNodeClick(data) {
+            this.queryParams.typeId = data.id
+            this.handleQuery()
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                photoUrl: '',
+                photoName: '',
+                documentUrl: '',
+                documentName: '',
+            }
+            this.imageUrl = ''
+            this.fileList = []
+            this.field101fileList = []
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            // this.queryParams.pageNum = 1;
             this.getList()
-            this.getTreeData()
-          })
-        }
-      })
-      // this.configOpen = false;
-    },
-    cancelConfig() {
-      this.configOpen = false
-    },
-    // 图片上传
-    imgUpLoad(param, name, index) {
-      console.log(param, 'image')
-      param.type = 'ma'
-      imgUpLoad(param)
-        .then(res => {
-          if (res.code == 200) {
-            this.form.photoUrl = res.data.fileUrl
-            this.form.photoName = res.data.fileName
-            this.imageUrl = res.data.fileUrl
-            this.imageName = res.data.fileName
-          } else {
-            // this.$msgError(res.msg)
-            this.$modal.msgError(res.msg)
-          }
-        })
-        .catch(error => {
-          // this.$msgError(error)
-          this.$modal.msgError(error)
-        })
-    },
-    handleAvatarSuccess(res, file) {
-      console.log('success')
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList)
-      this.imageUrl = ''
-      this.form.photoUrl = ''
-      this.form.photoName = ''
-    },
-    //图片点击查看
-    handlePictureCardPreview(file) {
-      console.log(file)
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
-    },
-    //图片查看
-    openImg(url) {
-      this.dialogImageUrl = this.uploadUrl + url
-      this.dialogVisible = true
-    },
-    //文件上传
-    fileUpLoad(param, name, index) {
-      console.log(param, 'fileUpLoad')
-      param.type = 'ma'
-      imgUpLoad(param)
-        .then(res => {
-          if (res.code == 200) {
-            this.form.documentUrl = res.data.fileUrl
-            this.form.documentName = res.data.fileName
-            this.field101fileList[0] = param.file
-            console.log(this.field101fileList)
-          } else {
-            // this.$msgError(res.msg)
-            this.$modal.msgError(res.msg)
-          }
-        })
-        .catch(error => {
-          // this.$msgError(error)
-          this.$modal.msgError(error)
-        })
-    },
-    exceedFile(files, fileList) {
-      this.$message.warning(`只能选择 1 个文件导入，共选择了 ${files.length + fileList.length} 个文件`)
-    },
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.queryParams.typeId = undefined
+            this.$refs.tree.setCurrentKey(null)
+            this.handleQuery()
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.typeId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '新增'
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const typeId = row.typeId || this.ids
+            getMaType(typeId).then((response) => {
+                this.form = response.data
+                if (this.form.documentUrl) {
+                    let file = {
+                        name: this.form.documentName,
+                        type: this.form.documentUrl,
+                    }
+                    this.field101fileList.push(file)
+                } else {
+                    this.field101fileList = []
+                }
 
-    /** 导出按钮操作 */
-    handleExport() {
-      // this.download('system/user/export', {
-      //   ...this.queryParams
-      // }, `user_${new Date().getTime()}.xlsx`)
+                this.imageUrl = this.form.photoUrl
+                this.open = true
+                this.title = '修改'
+            })
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            console.log(this.form, '提交参数---')
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.typeId != undefined) {
+                        updateMaType(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                            this.getTreeData()
+                        })
+                    } else {
+                        // this.form.companyId = this.companyId
+                        addMaType(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                            this.getTreeData()
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const typeIds = row.typeId
+            this.$modal
+                .confirm('是否确认删除数据项？')
+                .then(function () {
+                    return delMaType(typeIds)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        //配置操作
+        handleConfig(row) {
+            this.resetForm('cform')
+            this.chosenTypeId = row.typeId
+            this.leasePrice = row.leasePrice
+            // this.cform.leasePrice = row.leasePrice;
+            this.$set(this.cform, 'leasePrice', row.leasePrice)
+            this.configOpen = true
+            this.title = '租赁价格调整'
+        },
+        submitConfig() {
+            let param = {
+                typeId: this.chosenTypeId,
+                effTime: this.cform.effTime,
+                leasePrice: this.cform.leasePrice,
+            }
+            console.log(param)
+            this.$refs['cform'].validate((valid) => {
+                if (valid) {
+                    updateMaType(param).then((response) => {
+                        this.$modal.msgSuccess('调整成功')
+                        this.configOpen = false
+                        this.getList()
+                        this.getTreeData()
+                    })
+                }
+            })
+            // this.configOpen = false;
+        },
+        cancelConfig() {
+            this.configOpen = false
+        },
+        // 图片上传
+        imgUpLoad(param, name, index) {
+            console.log(param, 'image')
+            param.type = 'ma'
+            imgUpLoad(param)
+                .then((res) => {
+                    if (res.code == 200) {
+                        this.form.photoUrl = res.data.fileUrl
+                        this.form.photoName = res.data.fileName
+                        this.imageUrl = res.data.fileUrl
+                        this.imageName = res.data.fileName
+                    } else {
+                        // this.$msgError(res.msg)
+                        this.$modal.msgError(res.msg)
+                    }
+                })
+                .catch((error) => {
+                    // this.$msgError(error)
+                    this.$modal.msgError(error)
+                })
+        },
+        handleAvatarSuccess(res, file) {
+            console.log('success')
+        },
+        handleRemove(file, fileList) {
+            console.log(file, fileList)
+            this.imageUrl = ''
+            this.form.photoUrl = ''
+            this.form.photoName = ''
+        },
+        //图片点击查看
+        handlePictureCardPreview(file) {
+            console.log(file)
+            this.dialogImageUrl = file.url
+            this.dialogVisible = true
+        },
+        //图片查看
+        openImg(url) {
+            this.dialogImageUrl = this.uploadUrl + url
+            this.dialogVisible = true
+        },
+        //文件上传
+        fileUpLoad(param, name, index) {
+            console.log(param, 'fileUpLoad')
+            param.type = 'ma'
+            imgUpLoad(param)
+                .then((res) => {
+                    if (res.code == 200) {
+                        this.form.documentUrl = res.data.fileUrl
+                        this.form.documentName = res.data.fileName
+                        this.field101fileList[0] = param.file
+                        console.log(this.field101fileList)
+                    } else {
+                        // this.$msgError(res.msg)
+                        this.$modal.msgError(res.msg)
+                    }
+                })
+                .catch((error) => {
+                    // this.$msgError(error)
+                    this.$modal.msgError(error)
+                })
+        },
+        exceedFile(files, fileList) {
+            this.$message.warning(
+                `只能选择 1 个文件导入，共选择了 ${
+                    files.length + fileList.length
+                } 个文件`,
+            )
+        },
+
+        /** 导出按钮操作 */
+        handleExport() {
+            // this.download('system/user/export', {
+            //   ...this.queryParams
+            // }, `user_${new Date().getTime()}.xlsx`)
+        },
+
+        /* 树节点操作 */
+        treeChange(val) {
+            console.log(val, '树节点')
+
+            this.form.companyId = val.companyId
+        },
     },
-  },
 }
 </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;
 }
 </style>