diff --git a/src/api/store/tools.js b/src/api/store/tools.js
index 9e9f63e..87e8d7d 100644
--- a/src/api/store/tools.js
+++ b/src/api/store/tools.js
@@ -1,288 +1,288 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 //机具类型管理
 export function getMaTypeList(query) {
-  return request({
-    url: "/material/base/type/getMaTypeList",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/type/getMaTypeList',
+        method: 'get',
+        params: query,
+    })
 }
 //获取机具类型列表
 export function getListByMaType(query) {
-  return request({
-    url: "/material/base/type/getListByMaType",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/type/getListByMaType',
+        method: 'get',
+        params: query,
+    })
 }
 //获取机具类型树2
 export function equipmentTypeTree(query) {
-  return request({
-    url: "/material/base/type/equipmentType",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/type/equipmentType',
+        method: 'get',
+        params: query,
+    })
 }
 //机具类型-详情
 export function getMaType(typeId) {
-  return request({
-    url: "/material/base/type/" + typeId,
-    method: "get",
-  });
+    return request({
+        url: '/material/base/type/' + typeId,
+        method: 'get',
+    })
 }
 //获取基层单位
 export function getunitInfoAll(query) {
-  return request({
-    url: "/material/base/bmUnitInfo/unitInfoAll",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/bmUnitInfo/unitInfoAll',
+        method: 'get',
+        params: query,
+    })
 }
 
 //机具类型--新增
 export function addMaType(data) {
-  return request({
-    url: "/material/base/type",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/type',
+        method: 'post',
+        data: data,
+    })
 }
 // 机具类型--修改
 export function updateMaType(data) {
-  return request({
-    url: "/material/base/type",
-    method: "put",
-    data: data,
-  });
+    return request({
+        url: '/material/base/type',
+        method: 'put',
+        data: data,
+    })
 }
 
 //供应商管理--删除
 export function delMaType(typeId) {
-  return request({
-    url: "/material/base/type/" + typeId,
-    method: "delete",
-  });
+    return request({
+        url: '/material/base/type/' + typeId,
+        method: 'delete',
+    })
 }
 
 //供应商管理-列表
 export function listSupplierInfo(query) {
-  return request({
-    url: "/material/base/supplierInfo/list",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/supplierInfo/list',
+        method: 'get',
+        params: query,
+    })
 }
 //供应商管理-详情
 export function getSupplierInfo(supplierId) {
-  return request({
-    url: "/material/base/supplierInfo/" + supplierId,
-    method: "get",
-  });
+    return request({
+        url: '/material/base/supplierInfo/' + supplierId,
+        method: 'get',
+    })
 }
 //供应商管理--新增
 export function addSupplier(data) {
-  return request({
-    url: "/material/base/supplierInfo",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/supplierInfo',
+        method: 'post',
+        data: data,
+    })
 }
 // 供应商管理--修改
 export function updateSupplier(data) {
-  return request({
-    url: "/material/base/supplierInfo",
-    method: "put",
-    data: data,
-  });
+    return request({
+        url: '/material/base/supplierInfo',
+        method: 'put',
+        data: data,
+    })
 }
 //供应商管理--删除
 export function delSupplier(supplierIds) {
-  return request({
-    url: "/material/base/supplierInfo/" + supplierIds,
-    method: "delete",
-  });
+    return request({
+        url: '/material/base/supplierInfo/' + supplierIds,
+        method: 'delete',
+    })
 }
 //供应商管理-下拉数据
 export function supplierInfoList(query) {
-  return request({
-    url: "/material/base/supplierInfo/supplierInfoList",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/supplierInfo/supplierInfoList',
+        method: 'get',
+        params: query,
+    })
 }
 
 //机具设备管理-列表
 export function listMachine(query) {
-  return request({
-    url: "/material/base/machine/getMachine",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/machine/getMachine',
+        method: 'get',
+        params: query,
+    })
 }
 //机具设备管理-详情
 export function getMachine(maId) {
-  return request({
-    url: "/material/base/machine/" + maId,
-    method: "get",
-  });
+    return request({
+        url: '/material/base/machine/' + maId,
+        method: 'get',
+    })
 }
 
 //机具设备管理--新增
 export function addMachine(data) {
-  return request({
-    url: "/material/base/machine",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/machine',
+        method: 'post',
+        data: data,
+    })
 }
 // 机具设备管理--修改
 export function updateMachine(data) {
-  return request({
-    url: "/material/base/machine",
-    method: "put",
-    data: data,
-  });
+    return request({
+        url: '/material/base/machine',
+        method: 'put',
+        data: data,
+    })
 }
 //机具设备管理--删除
 export function delMachine(maIds) {
-  return request({
-    url: "/material/base/machine/" + maIds,
-    method: "delete",
-  });
+    return request({
+        url: '/material/base/machine/' + maIds,
+        method: 'delete',
+    })
 }
 
 //
 // //配件管理-列表
 export function listPartType(query) {
-  return request({
-    url: "/material/base/maPartType/list",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/maPartType/list',
+        method: 'get',
+        params: query,
+    })
 }
 
 //配件管理--新增
 export function addPartType(data) {
-  return request({
-    url: "/material/base/maPartType",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/maPartType',
+        method: 'post',
+        data: data,
+    })
 }
 //配件管理--新增
 export function addMaPartType(data) {
-  return request({
-    url: "/material/base/maPartType",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/maPartType',
+        method: 'post',
+        data: data,
+    })
 }
 // 配件管理--修改
 export function updatePartType(data) {
-  return request({
-    url: "/material/base/maPartType",
-    method: "put",
-    data: data,
-  });
+    return request({
+        url: '/material/base/maPartType',
+        method: 'put',
+        data: data,
+    })
 }
 // 配件管理--修改
 export function updatePartTypeById(data) {
-  return request({
-    url: "/material/base/maPartType/updateById",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/maPartType/updateById',
+        method: 'post',
+        data: data,
+    })
 }
 //配件管理--删除
 export function delPartType(maIds) {
-  return request({
-    url: "/material/base/maPartType/" + maIds,
-    method: "delete",
-  });
+    return request({
+        url: '/material/base/maPartType/' + maIds,
+        method: 'delete',
+    })
 }
 //配件管理--查询
 export function getPartType(maIds) {
-  return request({
-    url: "/material/base/maPartType/" + maIds,
-    method: "get",
-  });
+    return request({
+        url: '/material/base/maPartType/' + maIds,
+        method: 'get',
+    })
 }
 
 // 获取库管员配置列表
 export function warehouseKeeperInfoAll(query) {
-  return request({
-    url: "/material/base/maWarehouseKeeper/warehouseKeeperInfoAll",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/maWarehouseKeeper/warehouseKeeperInfoAll',
+        method: 'get',
+        params: query,
+    })
 }
 //库管员配置-根据人员名称查询左侧列表
 export function getMaUserList(query) {
-  return request({
-    url: "/material/base/maWarehouseKeeper/getMaUserList",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/maWarehouseKeeper/getMaUserList',
+        method: 'get',
+        params: query,
+    })
 }
 
 //库管员配置-保存
 export function addHouseKeeper(data) {
-  return request({
-    url: "/material/base/maWarehouseKeeper/addList",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/maWarehouseKeeper/addList',
+        method: 'post',
+        data: data,
+    })
 }
 
 //库管员配置-删除
 export function delHouseKeeper(data) {
-  return request({
-    url: "/material/base/maWarehouseKeeper/remove",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/maWarehouseKeeper/remove',
+        method: 'post',
+        data: data,
+    })
 }
 
 // 获取维修班配置列表
 export function wareRepairerInfoAll(query) {
-  return request({
-    url: "/material/base/maintenanceGang/maintenanceGangInfoAll",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/maintenanceGang/maintenanceGangInfoAll',
+        method: 'get',
+        params: query,
+    })
 }
 //维修班配置-根据人员名称查询左侧列表
 export function getRepairerList(query) {
-  return request({
-    url: "/material/base/maintenanceGang/getMaUserList",
-    method: "get",
-    params: query,
-  });
+    return request({
+        url: '/material/base/maintenanceGang/getMaUserList',
+        method: 'get',
+        params: query,
+    })
 }
 
 //维修班配置-保存
 export function addRepairer(data) {
-  return request({
-    url: "/material/base/maintenanceGang/addList",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/maintenanceGang/addList',
+        method: 'post',
+        data: data,
+    })
 }
 
 //维修班配置-删除
 export function delRepairer(data) {
-  return request({
-    url: "/material/base/maintenanceGang/remove",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/maintenanceGang/remove',
+        method: 'post',
+        data: data,
+    })
 }
 
 //机具厂家-下拉数据
 export function getDeviceFactoryCbx(data) {
-  return request({
-    url: "/material/base/select/getDeviceFactoryCbx",
-    method: "post",
-    data: data,
-  });
+    return request({
+        url: '/material/base/select/getDeviceFactoryCbx',
+        method: 'post',
+        data: data,
+    })
 }
diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index 44b48d7..7483784 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -870,7 +870,6 @@ export default {
                     }
 
                     let canSave = true
-
                     if (this.leaseApplyDetails.length > 0) {
                         this.queryParams.leaseApplyDetails =
                             this.leaseApplyDetails
diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue
index a4dac2b..ff195d9 100644
--- a/src/views/cost/csotSettlement/component/finishAndDetails.vue
+++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue
@@ -7,7 +7,11 @@
             <div>工程名称：{{ currRowInfo.projectName }}</div>
             <div>总合计：{{ totalAmount }}元</div>
             <div>
-                <el-button size="mini" type="primary" @click="handleExportAll()"
+                <el-button
+                    size="mini"
+                    type="primary"
+                    @click="handleExportAll()"
+                    v-hasPermi="['cost:settlement:export']"
                     >导出全部明细表</el-button
                 >
             </div>
diff --git a/src/views/cost/csotSettlement/component/finishTable.vue b/src/views/cost/csotSettlement/component/finishTable.vue
index 4896851..18c6b87 100644
--- a/src/views/cost/csotSettlement/component/finishTable.vue
+++ b/src/views/cost/csotSettlement/component/finishTable.vue
@@ -34,6 +34,7 @@
                     type="warning"
                     v-if="!isEdit"
                     @click="handleExport"
+                    v-hasPermi="['cost:settlement:export']"
                     >导出</el-button
                 >
                 <el-button
diff --git a/src/views/cost/csotSettlement/component/monthRecord.vue b/src/views/cost/csotSettlement/component/monthRecord.vue
index 0d242a3..3e5b792 100644
--- a/src/views/cost/csotSettlement/component/monthRecord.vue
+++ b/src/views/cost/csotSettlement/component/monthRecord.vue
@@ -50,6 +50,7 @@
                         plain
                         size="mini"
                         @click="handelExport(null)"
+                        v-hasPermi="['cost:settlement:export']"
                         >批量导出</el-button
                     >
                 </el-form-item>
@@ -83,7 +84,10 @@
                         <el-button type="text" @click="previewDetails(row)"
                             >明细</el-button
                         >
-                        <el-button type="text" @click="handelExport(row)"
+                        <el-button
+                            type="text"
+                            @click="handelExport(row)"
+                            v-hasPermi="['cost:settlement:export']"
                             >导出明细表</el-button
                         >
                     </template>
diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue
index f13af02..9c0bfe5 100644
--- a/src/views/cost/csotSettlement/costApplyList.vue
+++ b/src/views/cost/csotSettlement/costApplyList.vue
@@ -143,6 +143,7 @@
                             type="primary"
                             style="padding: 5px 10px"
                             @click="handleMonthRecord(row)"
+                            v-hasPermi="['month:record:query']"
                             >月结记录</el-button
                         >
                         <el-button
@@ -150,6 +151,7 @@
                             :type="row.isSlt == 1 ? 'success' : 'primary'"
                             style="padding: 5px 10px"
                             @click="handleFinishCostAndDetails(row, row.isSlt)"
+                            v-hasPermi="['finis:record:details']"
                             >{{
                                 row.isSlt == 1 ? '结算明细' : '完工结算'
                             }}</el-button
diff --git a/src/views/store/label/labelBinding.vue b/src/views/store/label/labelBinding.vue
index 8d7ab65..5e1b175 100644
--- a/src/views/store/label/labelBinding.vue
+++ b/src/views/store/label/labelBinding.vue
@@ -645,8 +645,8 @@ export default {
         //选择设备类型
         selectDevice(id) {
             console.log(id)
-            getListByMaType({ typeId: id }).then((response) => {
-                this.modelList = response.data
+            getListByMaType({ typeId: id, level: '0' }).then((response) => {
+                this.modelList = response.data.rows
             })
         },
 
diff --git a/src/views/store/newBuy/newDevices/newDevicesCode.vue b/src/views/store/newBuy/newDevices/newDevicesCode.vue
index 0b8c6a1..cd67d40 100644
--- a/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -1,25 +1,43 @@
 <template>
-  <div class="app-container" id="newDevicesCode">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <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>
+    <div class="app-container" id="newDevicesCode">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
+        >
+            <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>
-        <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-row :gutter="10" class="mb8">
+            <!-- <el-col :span="1.5">
         <el-button
             type="primary"
             plain
@@ -28,63 +46,123 @@
             @click="handleAdd" 
         >新增</el-button>
       </el-col>-->
-      <el-col :span="1.5">
-        <el-button type="success" plain size="mini" icon="el-icon-back" @click="jumpList">新购验收管理</el-button>
-      </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="success"
+                    plain
+                    size="mini"
+                    icon="el-icon-back"
+                    @click="jumpList"
+                    >新购验收管理</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" @selection-change="handleSelectionChange">
-      <!-- <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" :show-overflow-tooltip="true" />
-      <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
-      <el-table-column label="采购时间" align="center" prop="purchaseTime" :show-overflow-tooltip="true" />
-      <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true" />
-      <el-table-column label="验收数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
-      <el-table-column label="绑定数量" align="center" prop="bindNum" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span v-if="scope.row.bindNum > 0">{{ scope.row.bindNum }}</span>
-          <span v-else>0</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否为固定资产" align="center" prop="fixCode" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span v-if="scope.row.fixCode == '0'">是</span>
-          <span v-if="scope.row.fixCode == '1'">否</span>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="编码类型" align="center" prop="codeType" :show-overflow-tooltip="true" />
+        <el-table
+            v-loading="loading"
+            :data="typeList"
+            @selection-change="handleSelectionChange"
+        >
+            <!-- <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"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="规格型号"
+                align="center"
+                prop="specificationType"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购时间"
+                align="center"
+                prop="purchaseTime"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购数量"
+                align="center"
+                prop="purchaseNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="验收数量"
+                align="center"
+                prop="checkNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="绑定数量"
+                align="center"
+                prop="bindNum"
+                :show-overflow-tooltip="true"
+            >
+                <template slot-scope="scope">
+                    <span v-if="scope.row.bindNum > 0">{{
+                        scope.row.bindNum
+                    }}</span>
+                    <span v-else>0</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="是否为固定资产"
+                align="center"
+                prop="fixCode"
+                :show-overflow-tooltip="true"
+            >
+                <template slot-scope="scope">
+                    <span v-if="scope.row.fixCode == '0'">是</span>
+                    <span v-if="scope.row.fixCode == '1'">否</span>
+                </template>
+            </el-table-column>
+            <!-- <el-table-column label="编码类型" align="center" prop="codeType" :show-overflow-tooltip="true" />
       <el-table-column label="二维码" align="center" prop="dictName" :show-overflow-tooltip="true" />-->
-      <el-table-column label="状态" align="center" prop="status" width="180">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status == 0">待入库</span>
-          <span v-if="scope.row.status == 1">已入库</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            icon="el-icon-view"
-            :disabled="scope.row.bindNum == 0"
-            @click="handleBindDetails(scope.row)"
-          >
-            查看
-          </el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            v-if="scope.row.bindNum < scope.row.checkNum"
-            @click="handleCode(scope.row)"
-          >
-            绑定编码
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 
+            <el-table-column
+                label="状态"
+                align="center"
+                prop="status"
+                width="180"
+            >
+                <template slot-scope="scope">
+                    <span v-if="scope.row.status == 0">待入库</span>
+                    <span v-if="scope.row.status == 1">已入库</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        icon="el-icon-view"
+                        :disabled="scope.row.bindNum == 0"
+                        @click="handleBindDetails(scope.row)"
+                    >
+                        查看
+                    </el-button>
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        v-if="scope.row.bindNum < scope.row.checkNum"
+                        @click="handleCode(scope.row)"
+                    >
+                        绑定编码
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- 
     <pagination
         v-show="total>0"
         :total="total"
@@ -93,40 +171,65 @@
         @pagination="getList"
     />-->
 
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
-      <el-row :gutter="24" class="mb8">
-        <el-form ref="form" :model="form" :rules="rules" label-width="78px" v-if="!isDetail">
-          <el-input v-model="form.typeId" disabled v-show="false" />
-          <el-col :span="7">
-            <el-form-item label="编码前缀" prop="exCode">
-              <el-input v-model="form.exCode" @change="fillingCodeList" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="后缀范围">
-              <div style="display: flex">
-                <el-input v-model="form.str" placeholder="0001" maxlength="4" @change="fillingCodeList"></el-input>
-                -
-                <el-input v-model="form.str1" placeholder="0005" maxlength="4" @change="fillingCodeList"></el-input>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="固定资产" prop="fixCode">
-              <el-select
-                v-model="form.fixCode"
-                placeholder="是否为固定资产"
-                @change="fillingCodeList"
-                clearable
-                allow-create
-              >
-                <el-option label="是" value="0" />
-                <el-option label="否" value="1" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="2">
+        <!-- 添加或修改参数配置对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="1000px"
+            append-to-body
+            :close-on-click-modal="false"
+        >
+            <el-row :gutter="24" class="mb8">
+                <el-form
+                    ref="form"
+                    :model="form"
+                    :rules="rules"
+                    label-width="78px"
+                    v-if="!isDetail"
+                >
+                    <el-input v-model="form.typeId" disabled v-show="false" />
+                    <el-col :span="7">
+                        <el-form-item label="编码前缀" prop="exCode">
+                            <el-input
+                                v-model="form.exCode"
+                                @change="fillingCodeList"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item label="后缀范围">
+                            <div style="display: flex">
+                                <el-input
+                                    v-model="form.str"
+                                    placeholder="0001"
+                                    maxlength="4"
+                                    @change="fillingCodeList"
+                                ></el-input>
+                                -
+                                <el-input
+                                    v-model="form.str1"
+                                    placeholder="0005"
+                                    maxlength="4"
+                                    @change="fillingCodeList"
+                                ></el-input>
+                            </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="固定资产" prop="fixCode">
+                            <el-select
+                                v-model="form.fixCode"
+                                placeholder="是否为固定资产"
+                                @change="fillingCodeList"
+                                clearable
+                                allow-create
+                            >
+                                <el-option label="是" value="0" />
+                                <el-option label="否" value="1" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <!-- <el-col :span="2">
             <el-button
               type="primary"
               plain
@@ -134,71 +237,118 @@
               @click="createCodeList"
             >生成</el-button>
           </el-col>-->
-          <el-col :span="2">
-            <el-button type="primary" plain size="mini" @click="fillingCodeList">填充</el-button>
-          </el-col>
-        </el-form>
-      </el-row>
-      <el-table v-loading="loading" :data="codeList" height="400">
-        <!-- <el-table-column type="selection" width="50" align="center" /> -->
-        <el-table-column label="序号" align="center" type="index" />
-        <el-table-column label="机具种类" align="center" prop="typeName" :show-overflow-tooltip="true" width="120" />
-        <el-table-column
-          label="规格型号"
-          align="center"
-          prop="specificationType"
-          :show-overflow-tooltip="true"
-          width="120"
-        />
-        <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <el-input
-              v-if="!isDetail"
-              v-model="scope.row.maCode"
-              :disabled="scope.row.statusFlag == 0"
-              οninput="value=value.replace(/[^0-9.]/g,'')"
-            ></el-input>
-            <span v-else>{{ scope.row.maCode }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="固定资产编码" align="center" prop="assetsCode">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.assetsCode" v-if="!isDetail" v-show="form.fixCode == '0'" maxlength="50"></el-input>
-            <span v-else>{{ scope.row.assetsCode }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" v-if="!isDetail">
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="delCode(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+                    <el-col :span="2">
+                        <el-button
+                            type="primary"
+                            plain
+                            size="mini"
+                            @click="fillingCodeList"
+                            >填充</el-button
+                        >
+                    </el-col>
+                </el-form>
+            </el-row>
+            <el-table v-loading="loading" :data="codeList" height="400">
+                <!-- <el-table-column type="selection" width="50" align="center" /> -->
+                <el-table-column label="序号" align="center" type="index" />
+                <el-table-column
+                    label="机具种类"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                    width="120"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="specificationType"
+                    :show-overflow-tooltip="true"
+                    width="120"
+                />
+                <el-table-column
+                    label="设备编码"
+                    align="center"
+                    prop="maCode"
+                    :show-overflow-tooltip="true"
+                >
+                    <template slot-scope="scope">
+                        <el-input
+                            v-if="!isDetail"
+                            v-model="scope.row.maCode"
+                            :disabled="scope.row.statusFlag == 0"
+                            οninput="value=value.replace(/[^0-9.]/g,'')"
+                        ></el-input>
+                        <span v-else>{{ scope.row.maCode }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="固定资产编码"
+                    align="center"
+                    prop="assetsCode"
+                >
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model="scope.row.assetsCode"
+                            v-if="!isDetail"
+                            v-show="form.fixCode == '0'"
+                            maxlength="50"
+                        ></el-input>
+                        <span v-else>{{ scope.row.assetsCode }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="操作"
+                    align="center"
+                    width="160"
+                    class-name="small-padding fixed-width"
+                    v-if="!isDetail"
+                >
+                    <template slot-scope="scope">
+                        <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-delete"
+                            @click="delCode(scope.row)"
+                            >删除</el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
 
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm" v-if="!isDetail">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+            <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button type="primary" @click="submitForm" v-if="!isDetail"
+                    >确 定</el-button
+                >
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
 import {
-  getPurchaseCheckInfo,
-  listPurchaseMacodeInfo,
-  addPurchaseMacode,
-  updateMacode,
-  delMacode,
-  getMacodeInfo,
+    listType,
+    getType,
+    delType,
+    addType,
+    updateType,
+    refreshCache,
+} from '@/api/system/dict/type'
+import {
+    getPurchaseCheckInfo,
+    listPurchaseMacodeInfo,
+    addPurchaseMacode,
+    updateMacode,
+    delMacode,
+    getMacodeInfo,
 } from '@/api/store/newBuy'
 import {
-  getMacodeList,
-  getMacodeDetailList,
-  makeEquipmentNumber,
-  editPurchaseMacode,
-  delMacodeList,
-  getBindCodeDetails
+    getMacodeList,
+    getMacodeDetailList,
+    makeEquipmentNumber,
+    editPurchaseMacode,
+    delMacodeList,
+    getBindCodeDetails,
 } from '@/api/store/newBuy'
 
 import { getTypeList } from '@/api/store/warehousing'
@@ -206,320 +356,339 @@ import { getListByMaType } from '@/api/store/tools'
 import { number } from 'echarts'
 
 export default {
-  name: 'NewDevicesCode',
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      typeList: [],
-      modelList: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      taskId: '',
-      // 表格数据
-      typeList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        // pageNum: 1,
-        // pageSize: 10,
-        typeName: undefined,
-      },
-      // 表单参数
-      form: {
-        exCode: '',
-        str: '',
-        str1: '',
-        fixCode: '1',
-        typeId: '',
-      },
-      codeList: [], //弹窗列表list
-      getCodeList: [], //已成过的编码list
-      newCodeList: [], //新的编码list
-      // 表单校验
-      rules: {
-        // typeId: [
-        //   { required: true, message: "机具类型名称不能为空", trigger: "blur" }
-        // ],
-        // modelId: [
-        //   { required: true, message: "规格型号不能为空", trigger: "blur" }
-        // ],
-        // maCode: [
-        //   { required: true, message: "设备编号不能为空", trigger: "blur" }
-        // ],
-      },
-      isDetail: false,
-    }
-  },
-  mounted() {
-    const taskId = this.$route.query && this.$route.query.taskId
-    this.taskId = taskId
-    // console.log(this.taskId)
-    this.getList()
-  },
-  methods: {
-    //获取类型数据
-    getTypeList() {
-      getTypeList({ level: '3' }).then(response => {
-        this.typeList = response.data
-      })
-    },
-    selectType(id) {
-      console.log(id)
-      getListByMaType({ typeId: id }).then(response => {
-        this.modelList = response.data
-      })
-    },
-    /** 查询列表 */
-    async getList() {
-      this.loading = true
-      this.queryParams.taskId = this.taskId
-      const { data: res } = await getMacodeList(this.queryParams)
-      this.typeList = res
-      this.loading = false
-    },
-    // 取消按钮
-    cancel() {
-      this.reset()
-      this.open = false
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        str: undefined,
-        str1: undefined,
-        fixCode: '1',
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = []
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加'
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.maId)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    }, //getCodeList newCodeList
-    /** 编码按钮操作 */ handleCode(row) {
-      console.log(row)
-      this.reset()
-      this.form = row
-      this.$set(this.form, 'str', '')
-      this.$set(this.form, 'str1', '')
-      // this.$set(this.form,'fixCode','1')
-      let arr = this.form.arrivalTime.split('-')
-      // this.form.exCode = ;
-      // this.form.typeCode=111
-      if (!this.form.typeCode) {
-        this.form.typeCode = ''
-      }
-      if (!this.form.specsCode) {
-        this.form.specsCode = ''
-      }
-      this.$set(this.form, 'exCode', 'NSJJ' + this.form.typeCode + this.form.specsCode + arr[0][2] + arr[0][3] + arr[1])
-
-      this.form.count = row.checkNum
-      this.codeList = []
-      this.open = true
-      this.title = '生成编码'
-      this.isDetail = false
-      // let param = {
-      //   taskId:this.taskId,
-      //   typeId:row.typeId,
-      // }
-      // getMacodeDetailList(param).then(response => {
-      //   this.codeList = response.data;
-
-      // });
-    },
-    //生成列表codeList
-    createCodeList() {
-      // if(this.codeList.length>=this.form.checkNum){
-      //   this.$modal.msgError("生成编码数量不可超过采购验收数量！！！");
-      // }else{
-      //   for(let i = 0; i < this.form.count; i++) {
-      //       let obj = {
-      //         typeName:this.form.typeName,
-      //         specificationType:this.form.specificationType,
-      //         typeId: this.form.typeId,
-      //         taskId: this.form.taskId,
-      //         assetsCode:'',
-      //         fixCode:this.form.fixCode,
-      //       }
-      //       this.newCodeList.push(obj)
-      //   }
-      //   console.log(this.newCodeList,'this.newCodeList')
-      //   this.codeList = this.getCodeList.concat(this.newCodeList)
-      // }
-    },
-    //填充按钮
-    fillingCodeList() {
-      console.log(Number(this.form.str))
-      this.codeList = []
-      let num = Number(this.form.str)
-      // console.log(Number(this.form.str1))
-      let num1 = Number(this.form.str1)
-      let count = num1 - num + 1 //生成数量
-      console.log()
-      let sum = count + this.form.bindNum
-      console.log(sum)
-      if (sum > this.form.checkNum) {
-        this.$modal.msgError('已绑定编码' + this.form.bindNum + '个,总数量已超过验收数量，请调整后缀范围。')
-      } else {
-        if (num1 => num) {
-          for (let i = 0; i < count; i++) {
-            let obj = {
-              typeName: this.form.typeName,
-              specificationType: this.form.specificationType,
-              typeId: this.form.typeId,
-              taskId: this.form.taskId,
-              maCode: this.form.exCode + ('00000' + (num + i)).slice(-4),
-              assetsCode: '',
-              fixCode: this.form.fixCode,
-            }
-            this.codeList.push(obj)
-          }
-        } else {
-          this.$modal.msgError('编码后缀范围输入格式不正确')
+    name: 'NewDevicesCode',
+    dicts: ['sys_normal_disable'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            typeList: [],
+            modelList: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            taskId: '',
+            // 表格数据
+            typeList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 日期范围
+            dateRange: [],
+            // 查询参数
+            queryParams: {
+                // pageNum: 1,
+                // pageSize: 10,
+                typeName: undefined,
+            },
+            // 表单参数
+            form: {
+                exCode: '',
+                str: '',
+                str1: '',
+                fixCode: '1',
+                typeId: '',
+            },
+            codeList: [], //弹窗列表list
+            getCodeList: [], //已成过的编码list
+            newCodeList: [], //新的编码list
+            // 表单校验
+            rules: {
+                // typeId: [
+                //   { required: true, message: "机具类型名称不能为空", trigger: "blur" }
+                // ],
+                // modelId: [
+                //   { required: true, message: "规格型号不能为空", trigger: "blur" }
+                // ],
+                // maCode: [
+                //   { required: true, message: "设备编号不能为空", trigger: "blur" }
+                // ],
+            },
+            isDetail: false,
         }
-      }
     },
-
-    /** 提交按钮 */
-    submitForm: function () {
-      // console.log(this.codeList)
-      if (this.form.fixCode == 0) {
-        if (this.hasDuplicateField(this.codeList, 'assetsCode')) {
-          this.$modal.msgError('固定资产编码不能为空')
-          return false
-        }
-      }
-      if (this.codeList.length == 0) {
-        this.$modal.msgError('无新增编码绑定')
-      } else {
-        const maCodeSet = new Set()
-        let hasDuplicates = false
-
-        for (const item of this.codeList) {
-          const maCode = item.maCode
-
-          if (maCodeSet.has(maCode)) {
-            hasDuplicates = true
-            break
-          }
-          maCodeSet.add(maCode)
-        }
-        console.log('codeList:', this.codeList)
-        if (hasDuplicates) {
-          this.$modal.msgError('编码绑定失败,存在重复编码，请重新输入')
-          return // 停止提交流程
-        }
-        editPurchaseMacode(this.codeList).then(response => {
-          console.log(this.codeList)
-          if (response.data && response.data.length > 0) {
-            this.codeList = response.data
-            this.$modal.msgError('编码绑定失败,存在重复编码，请重新输入')
-          } else {
-            this.$modal.msgSuccess('编码绑定成功')
+    mounted() {
+        const taskId = this.$route.query && this.$route.query.taskId
+        this.taskId = taskId
+        // console.log(this.taskId)
+        this.getList()
+    },
+    methods: {
+        //获取类型数据
+        getTypeList() {
+            getTypeList({ level: '3' }).then((response) => {
+                this.typeList = response.data
+            })
+        },
+        selectType(id) {
+            console.log(id)
+            getListByMaType({ typeId: id, level: '0' }).then((response) => {
+                this.modelList = response.data.rows
+            })
+        },
+        /** 查询列表 */
+        async getList() {
+            this.loading = true
+            this.queryParams.taskId = this.taskId
+            const { data: res } = await getMacodeList(this.queryParams)
+            this.typeList = res
+            this.loading = false
+        },
+        // 取消按钮
+        cancel() {
+            this.reset()
             this.open = false
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                str: undefined,
+                str1: undefined,
+                fixCode: '1',
+            }
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
             this.getList()
-          }
-        })
-      }
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加'
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.maId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        }, //getCodeList newCodeList
+        /** 编码按钮操作 */ handleCode(row) {
+            console.log(row)
+            this.reset()
+            this.form = row
+            this.$set(this.form, 'str', '')
+            this.$set(this.form, 'str1', '')
+            // this.$set(this.form,'fixCode','1')
+            let arr = this.form.arrivalTime.split('-')
+            // this.form.exCode = ;
+            // this.form.typeCode=111
+            if (!this.form.typeCode) {
+                this.form.typeCode = ''
+            }
+            if (!this.form.specsCode) {
+                this.form.specsCode = ''
+            }
+            this.$set(
+                this.form,
+                'exCode',
+                'NSJJ' +
+                    this.form.typeCode +
+                    this.form.specsCode +
+                    arr[0][2] +
+                    arr[0][3] +
+                    arr[1],
+            )
+
+            this.form.count = row.checkNum
+            this.codeList = []
+            this.open = true
+            this.title = '生成编码'
+            this.isDetail = false
+            // let param = {
+            //   taskId:this.taskId,
+            //   typeId:row.typeId,
+            // }
+            // getMacodeDetailList(param).then(response => {
+            //   this.codeList = response.data;
+
+            // });
+        },
+        //生成列表codeList
+        createCodeList() {
+            // if(this.codeList.length>=this.form.checkNum){
+            //   this.$modal.msgError("生成编码数量不可超过采购验收数量！！！");
+            // }else{
+            //   for(let i = 0; i < this.form.count; i++) {
+            //       let obj = {
+            //         typeName:this.form.typeName,
+            //         specificationType:this.form.specificationType,
+            //         typeId: this.form.typeId,
+            //         taskId: this.form.taskId,
+            //         assetsCode:'',
+            //         fixCode:this.form.fixCode,
+            //       }
+            //       this.newCodeList.push(obj)
+            //   }
+            //   console.log(this.newCodeList,'this.newCodeList')
+            //   this.codeList = this.getCodeList.concat(this.newCodeList)
+            // }
+        },
+        //填充按钮
+        fillingCodeList() {
+            console.log(Number(this.form.str))
+            this.codeList = []
+            let num = Number(this.form.str)
+            // console.log(Number(this.form.str1))
+            let num1 = Number(this.form.str1)
+            let count = num1 - num + 1 //生成数量
+            console.log()
+            let sum = count + this.form.bindNum
+            console.log(sum)
+            if (sum > this.form.checkNum) {
+                this.$modal.msgError(
+                    '已绑定编码' +
+                        this.form.bindNum +
+                        '个,总数量已超过验收数量，请调整后缀范围。',
+                )
+            } else {
+                if ((num1) => num) {
+                    for (let i = 0; i < count; i++) {
+                        let obj = {
+                            typeName: this.form.typeName,
+                            specificationType: this.form.specificationType,
+                            typeId: this.form.typeId,
+                            taskId: this.form.taskId,
+                            maCode:
+                                this.form.exCode +
+                                ('00000' + (num + i)).slice(-4),
+                            assetsCode: '',
+                            fixCode: this.form.fixCode,
+                        }
+                        this.codeList.push(obj)
+                    }
+                } else {
+                    this.$modal.msgError('编码后缀范围输入格式不正确')
+                }
+            }
+        },
+
+        /** 提交按钮 */
+        submitForm: function () {
+            // console.log(this.codeList)
+            if (this.form.fixCode == 0) {
+                if (this.hasDuplicateField(this.codeList, 'assetsCode')) {
+                    this.$modal.msgError('固定资产编码不能为空')
+                    return false
+                }
+            }
+            if (this.codeList.length == 0) {
+                this.$modal.msgError('无新增编码绑定')
+            } else {
+                const maCodeSet = new Set()
+                let hasDuplicates = false
+
+                for (const item of this.codeList) {
+                    const maCode = item.maCode
+
+                    if (maCodeSet.has(maCode)) {
+                        hasDuplicates = true
+                        break
+                    }
+                    maCodeSet.add(maCode)
+                }
+                console.log('codeList:', this.codeList)
+                if (hasDuplicates) {
+                    this.$modal.msgError(
+                        '编码绑定失败,存在重复编码，请重新输入',
+                    )
+                    return // 停止提交流程
+                }
+                editPurchaseMacode(this.codeList).then((response) => {
+                    console.log(this.codeList)
+                    if (response.data && response.data.length > 0) {
+                        this.codeList = response.data
+                        this.$modal.msgError(
+                            '编码绑定失败,存在重复编码，请重新输入',
+                        )
+                    } else {
+                        this.$modal.msgSuccess('编码绑定成功')
+                        this.open = false
+                        this.getList()
+                    }
+                })
+            }
+        },
+        hasDuplicateField(array, field) {
+            const map = {}
+            for (let i = 0; i < array.length; i++) {
+                const value = array[i][field]
+                if (map[value]) {
+                    return true
+                }
+                map[value] = true
+            }
+            return false
+        },
+        getdetailmaCodeList(data) {
+            console.log(data)
+            let param = {
+                taskId: this.taskId,
+                typeId: data.typeId,
+            }
+            getMacodeDetailList(param).then((response) => {
+                this.getCodeList = response.data
+                this.codeList = this.getCodeList.concat(this.newCodeList)
+            })
+        },
+        delCode(row) {
+            console.log(row)
+            this.codeList.forEach((item, index) => {
+                if (item.maCode == row.maCode) {
+                    this.codeList.splice(index, 1)
+                }
+            })
+            // const maCode = row.maCode ;
+            // this.$modal.confirm('是否确认删除该数据项？').then(function() {
+            //   return delMacodeList(maCode);
+            // }).then(() => {
+            //   this.getdetailmaCodeList(row);
+            //   this.$modal.msgSuccess("删除成功");
+            // }).catch(() => {});
+        },
+        // 返回列表页
+        jumpList() {
+            const obj = { path: '/store/newBuy/newDevicesList' }
+            this.$tab.closeOpenPage(obj)
+        },
+        async handleBindDetails(row) {
+            console.log('🚀 ~ handleBindDetails ~ row:', row.taskId)
+            this.open = true
+            this.isDetail = true
+            this.title = '编码绑定详情'
+            this.codeList = []
+            const res = await getBindCodeDetails({ taskId: row.taskId })
+            console.log('🚀 ~ handleBindDetails ~ res:', res)
+            this.codeList = res.data
+        },
     },
-    hasDuplicateField(array, field) {
-      const map = {}
-      for (let i = 0; i < array.length; i++) {
-        const value = array[i][field]
-        if (map[value]) {
-          return true
-        }
-        map[value] = true
-      }
-      return false
-    },
-    getdetailmaCodeList(data) {
-      console.log(data)
-      let param = {
-        taskId: this.taskId,
-        typeId: data.typeId,
-      }
-      getMacodeDetailList(param).then(response => {
-        this.getCodeList = response.data
-        this.codeList = this.getCodeList.concat(this.newCodeList)
-      })
-    },
-    delCode(row) {
-      console.log(row)
-      this.codeList.forEach((item, index) => {
-        if (item.maCode == row.maCode) {
-          this.codeList.splice(index, 1)
-        }
-      })
-      // const maCode = row.maCode ;
-      // this.$modal.confirm('是否确认删除该数据项？').then(function() {
-      //   return delMacodeList(maCode);
-      // }).then(() => {
-      //   this.getdetailmaCodeList(row);
-      //   this.$modal.msgSuccess("删除成功");
-      // }).catch(() => {});
-    },
-    // 返回列表页
-    jumpList() {
-      const obj = { path: '/store/newBuy/newDevicesList' }
-      this.$tab.closeOpenPage(obj)
-    },
-    async handleBindDetails(row) {
-      console.log('🚀 ~ handleBindDetails ~ row:', row.taskId);
-      this.open = true
-      this.isDetail = true
-      this.title = '编码绑定详情'
-      this.codeList = []
-      const res = await getBindCodeDetails({taskId: row.taskId})
-      console.log('🚀 ~ handleBindDetails ~ res:', res);
-      this.codeList = res.data
-    }
-  },
 }
 </script>
 
 <style scoped>
 .redColor {
-  color: red;
+    color: red;
 }
 </style>
 <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>
diff --git a/src/views/store/tools/devices.vue b/src/views/store/tools/devices.vue
index e6fad4f..0d5b153 100644
--- a/src/views/store/tools/devices.vue
+++ b/src/views/store/tools/devices.vue
@@ -640,15 +640,15 @@ export default {
         //选择物品种类
         selectItem(id) {
             console.log(id)
-            getListByMaType({ typeId: id }).then((response) => {
-                this.typeList = response.data
+            getListByMaType({ typeId: id, level: '3' }).then((response) => {
+                this.typeList = response.data.rows
             })
         },
         //选择设备类型
         selectDevice(id) {
             console.log(id)
-            getListByMaType({ typeId: id }).then((response) => {
-                this.modelList = response.data
+            getListByMaType({ typeId: id, level: '0' }).then((response) => {
+                this.modelList = response.data.rows
             })
         },
         /** 查询资产属性下拉 */
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 5b230e4..a49a033 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -115,7 +115,11 @@
                 align="center"
                 prop="noticeTitle"
                 :show-overflow-tooltip="true"
-            />
+            >
+                <template slot-scope="{ row }">
+                    <div v-dompurify-html="row.noticeTitle"></div>
+                </template>
+            </el-table-column>
             <el-table-column
                 label="公告内容"
                 align="center"
diff --git a/src/views/warehouseManage/machinery/coding-nw/index.vue b/src/views/warehouseManage/machinery/coding-nw/index.vue
index 75c34c7..a9c7c71 100644
--- a/src/views/warehouseManage/machinery/coding-nw/index.vue
+++ b/src/views/warehouseManage/machinery/coding-nw/index.vue
@@ -688,15 +688,15 @@ export default {
         //选择物品种类
         selectItem(id) {
             console.log(id)
-            getListByMaType({ typeId: id }).then((response) => {
-                this.typeList = response.data
+            getListByMaType({ typeId: id, level: '3' }).then((response) => {
+                this.typeList = response.data.rows
             })
         },
         //选择设备类型
         selectDevice(id) {
             console.log(id)
-            getListByMaType({ typeId: id }).then((response) => {
-                this.modelList = response.data
+            getListByMaType({ typeId: id, level: '0' }).then((response) => {
+                this.modelList = response.data.rows
             })
         },
         /** 查询资产属性下拉 */
diff --git a/src/views/warehouseManage/machinery/coding/index.vue b/src/views/warehouseManage/machinery/coding/index.vue
index d6d87ad..2d89687 100644
--- a/src/views/warehouseManage/machinery/coding/index.vue
+++ b/src/views/warehouseManage/machinery/coding/index.vue
@@ -637,15 +637,15 @@ export default {
         //选择物品种类
         selectItem(id) {
             console.log(id)
-            getListByMaType({ typeId: id }).then((response) => {
-                this.typeList = response.data
+            getListByMaType({ typeId: id, level: '3' }).then((response) => {
+                this.typeList = response.data.rows
             })
         },
         //选择设备类型
         selectDevice(id) {
             console.log(id)
-            getListByMaType({ typeId: id }).then((response) => {
-                this.modelList = response.data
+            getListByMaType({ typeId: id, level: '0' }).then((response) => {
+                this.modelList = response.data.rows
             })
         },
         /** 查询资产属性下拉 */
diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
index e67874f..629ca47 100644
--- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
+++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
@@ -485,8 +485,8 @@ export default {
         },
         selectType(id) {
             console.log(id)
-            getListByMaType({ typeId: id }).then((response) => {
-                this.modelList = response.data
+            getListByMaType({ typeId: id, level: '0' }).then((response) => {
+                this.modelList = response.data.rows
             })
         },
         /** 查询列表 */
diff --git a/src/views/warehouseManage/tagBind/bind/index.vue b/src/views/warehouseManage/tagBind/bind/index.vue
index 567d644..5f2b265 100644
--- a/src/views/warehouseManage/tagBind/bind/index.vue
+++ b/src/views/warehouseManage/tagBind/bind/index.vue
@@ -642,8 +642,8 @@ export default {
         //选择设备类型
         selectDevice(id) {
             console.log(id)
-            getListByMaType({ typeId: id }).then((response) => {
-                this.modelList = response.data
+            getListByMaType({ typeId: id, level: '0' }).then((response) => {
+                this.modelList = response.data.rows
             })
         },