diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentController.java
index bca53dc..0b9a61a 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentController.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentController.java
@@ -130,6 +130,26 @@ public class EquipmentController {
             return ActionResult.fail("更新失败，数据不存在");
         }
     }
+
+    /**
+     * 报废
+     * @param id
+     * @return
+     */
+    @Operation(summary = "报废")
+    @GetMapping("/baofei/{id}")
+    @Transactional
+    public ActionResult baofei(@PathVariable("id") String id){
+        EquipmentEntity entity= equipmentService.getInfo(id);
+        if(entity!=null && "1".equals(entity.getStatus())){
+            entity.setStatus("3");
+            equipmentService.update(id,entity);
+        }else {
+            return ActionResult.fail("该数据状态非可用或者不存在，请刷新列表");
+        }
+        return ActionResult.success("报废成功");
+    }
+
     /**
     * 删除
     * @param id
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipment/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipment/index.vue
index 46b720c..3754483 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipment/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipment/index.vue
@@ -1,534 +1,562 @@
-
-
-
-
-
-
-
 <template>
-    <div class="JNPF-common-layout">
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                            <el-col :span="6">
-                                <el-form-item label="设备类型">
-                                        <JnpfSelect v-model="query.type" placeholder="请选择" clearable
-                                                    :options="typeOptions"
-                                                    :props="typeProps"  multiple >
-                                        </JnpfSelect>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="设备品牌">
-                                        <el-input v-model="query.brand" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="设备名称">
-                                        <el-input v-model="query.name" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <template v-if="showAll">
-                                    <el-col :span="6">
-                                        <el-form-item label="设备编码">
-                                                <el-input v-model="query.code" placeholder="请输入" clearable>  </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                        </template>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                                <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
-                                    展开
-                                </el-button>
-                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                                    收起
-                                </el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                            <el-tooltip content="高级查询" placement="top" v-if="true">
-                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                         @click="openSuperQuery()" />
-                            </el-tooltip>
-                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                         @click="initData()" />
-                            </el-tooltip>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
- :span-method="arraySpanMethod"  
-
->
-                                                <el-table-column
-                                                            prop="code"
- label="设备编码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="name"
- label="设备名称"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="设备状态"  prop="status" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.status}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="batchNumber"
- label="批次号"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="设备类型"  prop="type" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.type}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="brand"
- label="设备品牌"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="model"
- label="设备型号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="supplier"
- label="供应商"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="supplierPhone"
- label="供应商联系电话"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="warrantyStartTime"
- label="保修开始时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="warrantyEndTime"
- label="保修结束时间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="defectsLiabilityPeriod"
- label="保修期"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="description"
- label="设备描述"  align="left"
- >
-                                                </el-table-column>
-                        <el-table-column label="操作"
- fixed="right" width="150" >
-                            <template slot-scope="scope"  >
-                                            <el-button type="text"
-                                                       @click="addOrUpdateHandle(scope.row)" >编辑
-                                            </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"  
-                                                   @click="goDetail(scope.row.id)">详情
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-             </div>
+  <div class="JNPF-common-layout">
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="设备类型">
+              <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions" :props="typeProps"
+                multiple>
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备品牌">
+              <el-input v-model="query.brand" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称">
+              <el-input v-model="query.name" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+          <template v-if="showAll">
+            <el-col :span="6">
+              <el-form-item label="设备编码">
+                <el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
+              </el-form-item>
+            </el-col>
+          </template>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+                展开
+              </el-button>
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+                收起
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
+            </el-button>
+          </div>
+          <div class="JNPF-common-head-right">
+            <el-tooltip content="高级查询" placement="top" v-if="true">
+              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                @click="openSuperQuery()" />
+            </el-tooltip>
+            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+            </el-tooltip>
+          </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
+          <el-table-column prop="code" label="设备编码" align="left">
+          </el-table-column>
+          <el-table-column prop="name" label="设备名称" align="left">
+          </el-table-column>
+          <el-table-column label="设备状态" prop="status" algin="left">
+            <template slot-scope="scope">
+              {{ scope.row.status}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="batchNumber" label="批次号" align="left">
+          </el-table-column>
+          <el-table-column label="设备类型" prop="type" algin="left">
+            <template slot-scope="scope">
+              {{ scope.row.type}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="brand" label="设备品牌" align="left">
+          </el-table-column>
+          <el-table-column prop="model" label="设备型号" align="left">
+          </el-table-column>
+          <el-table-column prop="supplier" label="供应商" align="left">
+          </el-table-column>
+          <el-table-column prop="supplierPhone" label="供应商联系电话" align="left">
+          </el-table-column>
+          <el-table-column prop="warrantyStartTime" label="保修开始时间" align="left">
+          </el-table-column>
+          <el-table-column prop="warrantyEndTime" label="保修结束时间" align="left">
+          </el-table-column>
+          <el-table-column prop="defectsLiabilityPeriod" label="保修期" align="left">
+          </el-table-column>
+          <el-table-column prop="description" label="设备描述" align="left">
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="200">
+            <template slot-scope="scope">
+              <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
+              </el-button>
+              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)">删除
+              </el-button>
+              <el-button type="text" @click="baofei(scope.row)">报废
+              </el-button>
+              <el-button type="text" @click="goDetail(scope.row.id)">详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
+      </div>
+    </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
 
 
 
-        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-                        @superQuery="superQuery" />
-    </div>
+    <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+  </div>
 </template>
 
 <script>
+  import request from '@/utils/request'
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
+  import JNPFForm from './form'
+  import Detail from './Detail'
+  import ExportBox from '@/components/ExportBox'
+  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
+  import {
+    getConfigData
+  } from '@/api/onlineDev/visualDev'
+  import {
+    getDefaultCurrentValueUserIdAsync
+  } from '@/api/permission/user'
+  import {
+    getDefaultCurrentValueDepartmentIdAsync
+  } from '@/api/permission/organize'
+  import columnList from './columnList'
+  import {
+    thousandsFormat
+  } from "@/components/Generator/utils/index"
+  import SuperQuery from '@/components/SuperQuery'
+  import superQueryJson from './superQueryJson'
 
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './form'
-    import Detail from './Detail'
-    import ExportBox from '@/components/ExportBox'
-    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-            import columnList from './columnList'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-        import SuperQuery from '@/components/SuperQuery'
-        import superQueryJson from './superQueryJson'
+  export default {
+    components: {
+      JNPFForm,
+      Detail,
+      ExportBox,
+      ToFormDetail,
+      SuperQuery
+    },
+    data() {
+      return {
 
-    export default {
-        components: {
-                JNPFForm,
-                Detail,
- ExportBox,ToFormDetail , SuperQuery
-        },
-        data() {
-            return {
-
-                keyword:'',
-                expandsTree: true,
-                refreshTree: true,
-                toFormDetailVisible:false,
-                                expandObj:{},
-                columnOptions: [],
-                mergeList: [],
-                exportList:[],
-                    columnList,
+        keyword: '',
+        expandsTree: true,
+        refreshTree: true,
+        toFormDetailVisible: false,
+        expandObj: {},
+        columnOptions: [],
+        mergeList: [],
+        exportList: [],
+        columnList,
 
-                    showAll: false,
-                    superQueryVisible: false,
-                    superQueryJson,
-                uploadBoxVisible: false,
-                detailVisible: false,
-                query: {
-                        type:undefined,
-                        brand:undefined,
-                        name:undefined,
-                        code:undefined,
-            },
-            treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
-            },
-            list: [],
-            listLoading: true,
-                    total: 0,
-            queryData: {},
-            listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
-                sort: "desc",
-                        sidx: "",
-            },
-            formVisible: false,
-            flowVisible: false,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-                                                                                                                                                                typeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}],
-                        typeProps:{"label":"fullName","value":"id"  },
-                            statusOptions:[{"fullName":"可用","id":"1"},{"fullName":"已租","id":"2"},{"fullName":"报废","id":"3"}],
-                        statusProps:{"label":"fullName","value":"id"  },
-            interfaceRes: {
-                },
-            }
+        showAll: false,
+        superQueryVisible: false,
+        superQueryJson,
+        uploadBoxVisible: false,
+        detailVisible: false,
+        query: {
+          type: undefined,
+          brand: undefined,
+          name: undefined,
+          code: undefined,
         },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id',
+          isLeaf: 'isLeaf'
         },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-            this.queryData = JSON.parse(JSON.stringify(this.query))
+        list: [],
+        listLoading: true,
+        total: 0,
+        queryData: {},
+        listQuery: {
+          superQueryJson: '',
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
         },
-        methods: {
-            toDetail(defaultValue, modelId) {
-                if (!defaultValue) return
-                getConfigData(modelId).then(res => {
-                    if (!res.data || !res.data.formData) return
-                    let formData = JSON.parse(res.data.formData)
-                    formData.popupType = 'general'
-                    this.toFormDetailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.toFormDetail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            toggleTreeExpand(expands) {
-                this.refreshTree = false
-                this.expandsTree = expands
-                this.$nextTick(() => {
-                    this.refreshTree = true
-                    this.$nextTick(() => {
-                        this.$refs.treeBox.setCurrentKey(null)
-                    })
-                })
-            },
-            filterNode(value, data) {
-                if (!value) return true;
-                return data[this.treeProps.label].indexOf(value) !== -1;
-            },
-            loadNode(node, resolve) {
-                const nodeData = node.data
-                const config ={
-                    treeInterfaceId:"",
-                    treeTemplateJson:[]
-                }
-                if (config.treeInterfaceId) {
-                    //这里是为了拿到参数中关联的字段的值，后端自行拿
-                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
-                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
-                            const element = config.treeTemplateJson[i];
-                            element.defaultValue = nodeData[element.relationField] || ''
-                        }
-                    }
-                    //参数
-                    let query = {
-                        paramList: config.treeTemplateJson || [],
-                    }
-                    //接口
-                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-                        let data = res.data
-                        if (Array.isArray(data)) {
-                            resolve(data);
-                        } else {
-                            resolve([]);
-                        }
-                    })
-                }
-            },
-                        getColumnList() {
-                    // 没有开启权限
-                    this.columnOptions = this.transformColumnList(this.columnList)
-            },
-            transformColumnList(columnList) {
-                let list = []
-                for (let i = 0; i < columnList.length; i++) {
-                    const e = columnList[i];
-                    if (!e.prop.includes('-')) {
-                        list.push(e)
-                    } else {
-                        let prop = e.prop.split('-')[0]
-                        let label = e.label.split('-')[0]
-                        let vModel = e.prop.split('-')[1]
-                        let newItem = {
-                            align: "center",
-                            jnpfKey: "table",
-                            prop,
-                            label,
-                            children: []
-                        }
-                        e.vModel = vModel
-                        if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-                        if (!list.some(o => o.prop === prop)) list.push(newItem)
-                        for (let i = 0; i < list.length; i++) {
-                            if (list[i].prop === prop) {
-                                list[i].children.push(e)
-                                break
-                            }
-                        }
-                    }
-                }
-                this.getMergeList(list)
-                this.getExportList(list)
-                return list
-            },
-            arraySpanMethod({ column }) {
-                for (let i = 0; i < this.mergeList.length; i++) {
-                    if (column.property == this.mergeList[i].prop) {
-                        return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
-                    }
-                }
-            },
-            getMergeList(list) {
-                let newList = JSON.parse(JSON.stringify(list))
-                newList.forEach(item => {
-                    if (item.children && item.children.length) {
-                        let child = {
-                            prop: item.prop + '-child-first'
-                        }
-                        item.children.unshift(child)
-                    }
-                })
-                newList.forEach(item => {
-                    if (item.children && item.children.length ) {
-                        item.children.forEach((child, index) => {
-                            if (index == 0) {
-                                this.mergeList.push({
-                                    prop: child.prop,
-                                    rowspan: 1,
-                                    colspan: item.children.length
-                                })
-                            } else {
-                                this.mergeList.push({
-                                    prop: child.prop,
-                                    rowspan: 0,
-                                    colspan: 0
-                                })
-                            }
-                        })
-                    } else {
-                        this.mergeList.push({
-                            prop: item.prop,
-                            rowspan: 1,
-                            colspan: 1
-                        })
-                    }
+        formVisible: false,
+        flowVisible: false,
+        flowListVisible: false,
+        flowList: [],
+        exportBoxVisible: false,
+        typeOptions: [{
+          "fullName": "类型1",
+          "id": "10"
+        }, {
+          "fullName": "类型2",
+          "id": "20"
+        }],
+        typeProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        statusOptions: [{
+          "fullName": "可用",
+          "id": "1"
+        }, {
+          "fullName": "已租",
+          "id": "2"
+        }, {
+          "fullName": "报废",
+          "id": "3"
+        }],
+        statusProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        interfaceRes: {},
+      }
+    },
+    computed: {
+      ...mapGetters(['userInfo']),
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      this.getColumnList(),
+        this.initSearchDataAndListData()
+      this.queryData = JSON.parse(JSON.stringify(this.query))
+    },
+    methods: {
+      toDetail(defaultValue, modelId) {
+        if (!defaultValue) return
+        getConfigData(modelId).then(res => {
+          if (!res.data || !res.data.formData) return
+          let formData = JSON.parse(res.data.formData)
+          formData.popupType = 'general'
+          this.toFormDetailVisible = true
+          this.$nextTick(() => {
+            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+          })
+        })
+      },
+      toggleTreeExpand(expands) {
+        this.refreshTree = false
+        this.expandsTree = expands
+        this.$nextTick(() => {
+          this.refreshTree = true
+          this.$nextTick(() => {
+            this.$refs.treeBox.setCurrentKey(null)
+          })
+        })
+      },
+      filterNode(value, data) {
+        if (!value) return true;
+        return data[this.treeProps.label].indexOf(value) !== -1;
+      },
+      loadNode(node, resolve) {
+        const nodeData = node.data
+        const config = {
+          treeInterfaceId: "",
+          treeTemplateJson: []
+        }
+        if (config.treeInterfaceId) {
+          //这里是为了拿到参数中关联的字段的值，后端自行拿
+          if (config.treeTemplateJson && config.treeTemplateJson.length) {
+            for (let i = 0; i < config.treeTemplateJson.length; i++) {
+              const element = config.treeTemplateJson[i];
+              element.defaultValue = nodeData[element.relationField] || ''
+            }
+          }
+          //参数
+          let query = {
+            paramList: config.treeTemplateJson || [],
+          }
+          //接口
+          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+            let data = res.data
+            if (Array.isArray(data)) {
+              resolve(data);
+            } else {
+              resolve([]);
+            }
+          })
+        }
+      },
+      getColumnList() {
+        // 没有开启权限
+        this.columnOptions = this.transformColumnList(this.columnList)
+      },
+      transformColumnList(columnList) {
+        let list = []
+        for (let i = 0; i < columnList.length; i++) {
+          const e = columnList[i];
+          if (!e.prop.includes('-')) {
+            list.push(e)
+          } else {
+            let prop = e.prop.split('-')[0]
+            let label = e.label.split('-')[0]
+            let vModel = e.prop.split('-')[1]
+            let newItem = {
+              align: "center",
+              jnpfKey: "table",
+              prop,
+              label,
+              children: []
+            }
+            e.vModel = vModel
+            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+            if (!list.some(o => o.prop === prop)) list.push(newItem)
+            for (let i = 0; i < list.length; i++) {
+              if (list[i].prop === prop) {
+                list[i].children.push(e)
+                break
+              }
+            }
+          }
+        }
+        this.getMergeList(list)
+        this.getExportList(list)
+        return list
+      },
+      arraySpanMethod({
+        column
+      }) {
+        for (let i = 0; i < this.mergeList.length; i++) {
+          if (column.property == this.mergeList[i].prop) {
+            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+          }
+        }
+      },
+      getMergeList(list) {
+        let newList = JSON.parse(JSON.stringify(list))
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            let child = {
+              prop: item.prop + '-child-first'
+            }
+            item.children.unshift(child)
+          }
+        })
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            item.children.forEach((child, index) => {
+              if (index == 0) {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 1,
+                  colspan: item.children.length
                 })
-            },
-            getExportList(list) {
-                let exportList = []
-                for (let i = 0; i < list.length; i++) {
-                    if (list[i].jnpfKey === 'table') {
-                        for (let j = 0; j < list[i].children.length; j++) {
-                            exportList.push(list[i].children[j])
-                        }
-                    } else {
-                        exportList.push(list[i])
-                    }
-                }
-                this.exportList = exportList
-            },
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
+              } else {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 0,
+                  colspan: 0
                 })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            async initSearchDataAndListData() {
-                await this.initSearchData()
+              }
+            })
+          } else {
+            this.mergeList.push({
+              prop: item.prop,
+              rowspan: 1,
+              colspan: 1
+            })
+          }
+        })
+      },
+      getExportList(list) {
+        let exportList = []
+        for (let i = 0; i < list.length; i++) {
+          if (list[i].jnpfKey === 'table') {
+            for (let j = 0; j < list[i].children.length; j++) {
+              exportList.push(list[i].children[j])
+            }
+          } else {
+            exportList.push(list[i])
+          }
+        }
+        this.exportList = exportList
+      },
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({
+        column,
+        prop,
+        order
+      }) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      async initSearchDataAndListData() {
+        await this.initSearchData()
+        this.initData()
+      },
+      //初始化查询的默认数据
+      async initSearchData() {},
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          keyword: this.keyword,
+          dataType: 0,
+          menuId: this.menuId,
+          moduleId: '582551166336897669',
+          type: 1,
+        };
+        request({
+          url: `/api/example/Equipment/getList`,
+          method: 'post',
+          data: _query
+        }).then(res => {
+          var _list = res.data.list;
+          this.list = _list.map(o => ({
+            ...o,
+            ...this.expandObj,
+          }))
+          this.total = res.data.pagination.total
+          this.listLoading = false
+        })
+      },
+      baofei(row){
+        if(row.status != '可用'){
+          this.$message({
+            type: 'error',
+            message: '该设备非可用状态，不允许报废，请确认！'
+          });
+          return
+        }
+        this.$confirm('此操作将报废该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/example/Equipment/baofei/${row.id}`,
+            method: 'GET'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
                 this.initData()
-            },
-            //初始化查询的默认数据
-            async initSearchData() {
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                        keyword: this.keyword,
-                        dataType: 0,
-                    menuId:this.menuId,
-                    moduleId:'582551166336897669',
-                    type:1,
-                };
-                request({
-                    url: `/api/example/Equipment/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =res.data.list;
-                                            this.list = _list.map(o => ({
-                            ...o,
-                            ...this.expandObj,
-                        }))
-                            this.total = res.data.pagination.total
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/example/Equipment/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","example/Equipment")
-                })
-            },
-                openSuperQuery() {
-                    this.superQueryVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.SuperQuery.init()
-                    })
-                },
-                superQuery(queryJson) {
-                    this.listQuery.superQueryJson = queryJson
-                    this.listQuery.currentPage = 1
-                    this.initData()
-                },
-            addOrUpdateHandle(row, isDetail) {
-                let id = row?row.id:""
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail,this.list)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.exportList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/example/Equipment/Actions/Export`,
-                    method: 'post',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                    this.listQuery.currentPage=1
-                        this.listQuery.pageSize=20
-                    this.listQuery.sort="desc"
-                this.listQuery.sidx=""
+              }
+            });
+          })
+        }).catch(() => {});
+      },
+      handleDel(row) {
+        if(row.status == '已租'){
+          this.$message({
+            type: 'error',
+            message: '该设备已租，不允许删除，请确认！'
+          });
+          return
+        }
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/example/Equipment/${row.id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
                 this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                this.query = JSON.parse(JSON.stringify(this.queryData))
-                this.search()
-            },
-            colseFlow(isrRefresh) {
-                this.flowVisible = false
-                if (isrRefresh) this.reset()
-            },
+              }
+            });
+          })
+        }).catch(() => {});
+      },
+      handelUpload() {
+        this.uploadBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.UploadBox.init("", "example/Equipment")
+        })
+      },
+      openSuperQuery() {
+        this.superQueryVisible = true
+        this.$nextTick(() => {
+          this.$refs.SuperQuery.init()
+        })
+      },
+      superQuery(queryJson) {
+        this.listQuery.superQueryJson = queryJson
+        this.listQuery.currentPage = 1
+        this.initData()
+      },
+      addOrUpdateHandle(row, isDetail) {
+        let id = row ? row.id : ""
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.JNPFForm.init(id, isDetail, this.list)
+        })
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.exportList)
+        })
+      },
+      download(data) {
+        let query = {
+          ...data,
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
         }
+        request({
+          url: `/api/example/Equipment/Actions/Export`,
+          method: 'post',
+          data: query
+        }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery.currentPage = 1
+        this.listQuery.pageSize = 20
+        this.listQuery.sort = "desc"
+        this.listQuery.sidx = ""
+        this.initData()
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        this.query = JSON.parse(JSON.stringify(this.queryData))
+        this.search()
+      },
+      colseFlow(isrRefresh) {
+        this.flowVisible = false
+        if (isrRefresh) this.reset()
+      },
     }
+  }
 </script>