From 500d232b1c2880fab70aa69c31cd4cd50677b5fd Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Fri, 19 Jul 2024 15:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=BA=93=E5=AD=98=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=AD=E5=8C=BA=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=9D=E4=BF=AE=E4=BF=A1=E6=81=AF=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scm/equipmentrepairrecords/index.vue      | 907 +++++++++---------
 1 file changed, 441 insertions(+), 466 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/index.vue
index 18dcc73..dce2d75 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/index.vue
@@ -1,58 +1,49 @@
-
-
-
-
-
-
-
 <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="设备编码">
-                                        <el-input v-model="query.equipmentNumber" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="设备名称">
-                                        <el-input v-model="query.equipmentName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="空间">
-                                        <JnpfSelect v-model="query.spaceId" placeholder="请选择" clearable
-                                                    :options="spaceIdOptions"
-                                                    :props="spaceIdProps"  multiple >
-                                        </JnpfSelect>
-                                </el-form-item>
-                            </el-col>
-                        <template v-if="showAll">
-                                    <el-col :span="6">
-                                        <el-form-item label="报修人">
-                                                <el-input v-model="query.repairName" placeholder="请输入" clearable>  </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="是否紧急">
-                                                <JnpfSelect v-model="query.urgent" placeholder="请选择" clearable
-                                                            :options="urgentOptions"
-                                                            :props="urgentProps"  multiple >
-                                                </JnpfSelect>
-                                        </el-form-item>
-                                    </el-col>
-                        </template>
+                    <el-col :span="6">
+                        <el-form-item label="设备编码">
+                            <el-input v-model="query.equipmentNumber" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="设备名称">
+                            <el-input v-model="query.equipmentName" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="空间">
+                            <JnpfSelect v-model="query.spaceId" placeholder="请选择" clearable :options="spaceIdOptions"
+                                :props="spaceIdProps" multiple>
+                            </JnpfSelect>
+                        </el-form-item>
+                    </el-col>
+                    <template v-if="showAll">
+                        <el-col :span="6">
+                            <el-form-item label="报修人">
+                                <el-input v-model="query.repairName" placeholder="请输入" clearable> </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="是否紧急">
+                                <JnpfSelect v-model="query.urgent" placeholder="请选择" clearable :options="urgentOptions"
+                                    :props="urgentProps" multiple>
+                                </JnpfSelect>
+                            </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-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>
@@ -60,478 +51,462 @@
             <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>
+                        <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>
+                        <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="repairNumber"
- label="报修单号"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="equipmentNumber"
- label="设备编码"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="equipmentName"
- label="设备名称"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="spaceId"
- label="空间"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="causeOmalfunction"
- label="故障原因"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="repairName"
- label="报修人"  align="left"
- >
-                                                </el-table-column>
-                                                <el-table-column
-                                                            prop="contractInformation"
- label="联系方式"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="是否紧急"  prop="urgent" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.urgent}}
-                                            </template>
-                                        </el-table-column>
-                                                <el-table-column
-                                                            prop="repairTime"
- label="期望维修时间"  align="left"
- >
-                                                </el-table-column>
-                                        <el-table-column label="消息状态"  prop="messageStatus" algin="left"
- >
-                                            <template slot-scope="scope">
-                                                {{ scope.row.messageStatus}}
-                                            </template>
-                                        </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 v-loading="listLoading" :data="list" @sort-change='sortChange'
+                    :span-method="arraySpanMethod">
+                    <el-table-column prop="repairNumber" label="报修单号" align="left">
+                    </el-table-column>
+                    <el-table-column prop="equipmentNumber" label="设备编码" align="left">
+                    </el-table-column>
+                    <el-table-column prop="equipmentName" label="设备名称" align="left">
+                    </el-table-column>
+                    <el-table-column prop="spaceId" label="空间" align="left">
+                    </el-table-column>
+                    <el-table-column prop="causeOmalfunction" label="故障原因" align="left">
+                    </el-table-column>
+                    <el-table-column prop="repairName" label="报修人" align="left">
+                    </el-table-column>
+                    <el-table-column prop="contractInformation" label="联系方式" align="left">
+                    </el-table-column>
+                    <el-table-column label="是否紧急" prop="urgent" algin="left">
+                        <template slot-scope="scope">
+                            {{ scope.row.urgent }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="repairTime" label="期望维修时间" align="left">
+                    </el-table-column>
+                    <el-table-column label="消息状态" prop="messageStatus" algin="left">
+                        <template slot-scope="scope">
+                            {{ scope.row.messageStatus }}
+                        </template>
+                    </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)">删除
+                            </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>
+                <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"/>
+        <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"/>
+        <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" />
+        <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: {
-                        equipmentNumber:undefined,
-                        equipmentName:undefined,
-                        spaceId:undefined,
-                        repairName:undefined,
-                        urgent:undefined,
+            showAll: false,
+            superQueryVisible: false,
+            superQueryJson,
+            uploadBoxVisible: false,
+            detailVisible: false,
+            query: {
+                equipmentNumber: undefined,
+                equipmentName: undefined,
+                spaceId: undefined,
+                repairName: undefined,
+                urgent: undefined,
             },
             treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id',
-                    isLeaf: 'isLeaf'
+                children: 'children',
+                label: 'fullName',
+                value: 'id',
+                isLeaf: 'isLeaf'
             },
             list: [],
             listLoading: true,
-                    total: 0,
+            total: 0,
             queryData: {},
             listQuery: {
-                    superQueryJson: '',
-                        currentPage: 1,
-                        pageSize: 20,
+                superQueryJson: '',
+                currentPage: 1,
+                pageSize: 20,
                 sort: "desc",
-                        sidx: "",
+                sidx: "",
             },
             formVisible: false,
             flowVisible: false,
             flowListVisible: false,
             flowList: [],
             exportBoxVisible: false,
-                                                                                                                                                                spaceIdOptions:[],
-                        spaceIdProps:{"label":"name","value":"id"  },
-                            urgentOptions:[{"fullName":"非紧急","id":"1"},{"fullName":"紧急","id":"2"}],
-                        urgentProps:{"label":"fullName","value":"id"  },
-                            messageStatusOptions:[{"fullName":"已读","id":"1"},{"fullName":"未读","id":"2"}],
-                        messageStatusProps:{"label":"fullName","value":"id"  },
+            spaceIdOptions: [],
+            spaceIdProps: { "label": "name", "value": "id" },
+            urgentOptions: [{ "fullName": "非紧急", "id": "1" }, { "fullName": "紧急", "id": "2" }],
+            urgentProps: { "label": "fullName", "value": "id" },
+            messageStatusOptions: [{ "fullName": "已读", "id": "1" }, { "fullName": "未读", "id": "2" }],
+            messageStatusProps: { "label": "fullName", "value": "id" },
             interfaceRes: {
-                },
-            }
-        },
-        computed: {
-            ...mapGetters(['userInfo']),
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                        this.getColumnList(),
-                this.initSearchDataAndListData()
-                    this.getspaceIdOptions();
-            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
+        }
+    },
+    computed: {
+        ...mapGetters(['userInfo']),
+        menuId() {
+            return this.$route.meta.modelId || ''
+        }
+    },
+    created() {
+        this.getColumnList(),
+            this.initSearchDataAndListData()
+        this.getspaceIdOptions();
+        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.refreshTree = true
-                    this.$nextTick(() => {
-                        this.$refs.treeBox.setCurrentKey(null)
-                    })
+                    this.$refs.toFormDetail.init(formData, modelId, defaultValue)
                 })
-            },
-            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 || [],
+            })
+        },
+        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] || ''
                     }
-                    //接口
-                    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)
+                //参数
+                let query = {
+                    paramList: config.treeTemplateJson || [],
+                }
+                //接口
+                getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+                    let data = res.data
+                    if (Array.isArray(data)) {
+                        resolve(data);
                     } 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
-                            }
-                        }
+                        resolve([]);
                     }
-                }
-                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]
+                })
+            }
+        },
+        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: []
                     }
-                }
-            },
-            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'
+                    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
                         }
-                        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
-                        })
+                }
+            }
+            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'
                     }
-                })
-            },
-            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])
+                    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 {
-                        exportList.push(list[i])
+                    })
+                } 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
-            },
-                    getspaceIdOptions() {
-                        getDataInterfaceRes('582825768971670725').then(res => {
-                            let data = res.data
-                            this.spaceIdOptions = data
-                        })
-                    },
-            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:'582885544460025925',
-                    type:1,
-                };
-                request({
-                    url: `/api/example/EquipmentRepairRecords/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/EquipmentRepairRecords/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
+            }
+            this.exportList = exportList
+        },
+        getspaceIdOptions() {
+            getDataInterfaceRes('582825768971670725').then(res => {
+                let data = res.data
+                this.spaceIdOptions = data
+            })
+        },
+        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: '582885544460025925',
+                type: 1,
+            };
+            request({
+                url: `/api/example/EquipmentRepairRecords/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(row) {
+            if (row.repairOrderId && row.repairOrderId != '') {
+                this.$message({
+                    type: 'warning',
+                    message: '该报修单已维修，不允许修改保修单信息！'
                 });
-            },
-            handelUpload(){
-                this.uploadBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.UploadBox.init("","example/EquipmentRepairRecords")
-                })
-            },
-                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}
+                return
+            }
+            this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                type: 'warning'
+            }).then(() => {
                 request({
-                    url: `/api/example/EquipmentRepairRecords/Actions/Export`,
-                    method: 'post',
-                    data: query
+                    url: `/api/example/EquipmentRepairRecords/${row.id}`,
+                    method: 'DELETE'
                 }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        onClose: () => {
+                            this.initData()
+                        }
+                    });
                 })
-            },
-            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()
-            },
-        }
+            }).catch(() => {
+            });
+        },
+        handelUpload() {
+            this.uploadBoxVisible = true
+            this.$nextTick(() => {
+                this.$refs.UploadBox.init("", "example/EquipmentRepairRecords")
+            })
+        },
+        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) {
+            if (row && row.repairOrderId && row.repairOrderId != '') {
+                this.$message({
+                    type: 'warning',
+                    message: '该报修单已维修，不允许修改保修单信息！'
+                });
+                return
+            }
+            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/EquipmentRepairRecords/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>