Browse Source

其他,专维,维修,维保表格字段的确认

zhulizhen1111 4 years ago
parent
commit
feab187433

+ 8 - 8
src/utils/plugins/components.js

@@ -64,7 +64,7 @@ var system = [
                         },
                         {
                             label: "其他事项",
-                            id: "GDZW2",
+                            id: "GDQT",
                             param: { tab_code: "1593" },
                         },
                     ],
@@ -166,7 +166,7 @@ var system = [
                         },
                         {
                             label: "其他事项",
-                            id: "NTZW2",
+                            id: "NTQT",
                             param: { tab_code: "1593" },
                         },
                     ],
@@ -263,7 +263,7 @@ var system = [
                         },
                         {
                             label: "其他事项",
-                            id: "XFZW2",
+                            id: "XFQT",
                             param: { tab_code: "1572" },
                         },
                     ],
@@ -366,7 +366,7 @@ var system = [
                         },
                         {
                             label: "其他事项",
-                            id: "RDZW2",
+                            id: "RDQT",
                             param: { tab_code: "1593" },
                         },
                     ],
@@ -454,7 +454,7 @@ var system = [
                         },
                         {
                             label: "其他事项",
-                            id: "GSZW3",
+                            id: "GSQT",
                             param: { tab_code: "1594" },
                         },
                     ],
@@ -518,7 +518,7 @@ var system = [
                         },
                         {
                             label: "其他事项",
-                            id: "DTZW2",
+                            id: "DTQT",
                         },
                     ],
                 },
@@ -573,7 +573,7 @@ var system = [
                         },
                         {
                             label: "其他事项",
-                            id: "RQZW2",
+                            id: "RQQT",
                             param: { tab_code: "1593" },
                         },
                     ],
@@ -642,7 +642,7 @@ var system = [
                         },
                         {
                             label: "其他事项",
-                            id: "TJZW2",
+                            id: "TJQT",
                             param: { tab_code: "1593" },
                         },
                     ],

+ 7 - 2
src/views/equipment/eqDialog.vue

@@ -27,9 +27,13 @@
                         <!-- 主要设备清单 标准设备表格加tab -->
                         <tableList v-else-if='value.id.slice(0,4)=="RDQD"' :param='param' ref='list1' major='弱电'></tableList>
                         <tableList v-else-if='value.id.slice(0,4)=="NTQD"' :param='param' ref='list2' major='暖通'></tableList>
+                        <!-- 维保维修的表格字段一样 -->
+                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' param major='维保' :systemName='systemName'></wb-table>
                         <wb-table v-else-if='value.id.slice(2,4)=="WX"' param major='维修'></wb-table>
+                        <!-- 专维 -->
                         <zw-table v-else-if='value.id.slice(2,4)=="ZW"' param major='专维'></zw-table>
-                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' param major='维保' :systemName='systemName'></wb-table>
+                        <!-- 其他 -->
+                        <other-table v-else-if='value.id.slice(2,4)=="QT"' param major='其他'></other-table>
                     </el-tab-pane>
                 </el-tabs>
             </div>
@@ -43,6 +47,7 @@ import wbTable from './table/wbTable'
 import zwTable from './table/zwTable'
 import lookPage from './table/lookPageTable'
 import standTable from './table/standTable'
+import otherTable from './table/otherTable'
 export default {
     props: ['systemName'],
     data() {
@@ -55,7 +60,7 @@ export default {
         }
     },
     mounted() {},
-    components: { tableList, tjTable, wbTable, zwTable, lookPage, standTable },
+    components: { tableList, tjTable, wbTable, zwTable, lookPage, standTable, otherTable },
     methods: {
         showModal(item) {
             this.visible = true

+ 3 - 2
src/views/equipment/index.vue

@@ -138,7 +138,7 @@ export default {
     display: flex;
     flex: 1;
     .eq-top {
-        margin-left: 240px;
+        margin-left: 245px;
         padding-top: 24px;
         position: fixed;
         z-index: 3;
@@ -172,6 +172,7 @@ export default {
             font-size: 14px;
             height: 100%;
             background: rgba(242, 245, 247, 1);
+            box-shadow: 2px 0px 10px 0px rgba(31, 36, 41, 0.06);
         }
         .li-style {
             padding: 0 0 18px 35px;
@@ -197,7 +198,7 @@ export default {
                     position: fixed;
                     z-index: 2;
                     top: 146px;
-                    left: 242px;
+                    left: 245px;
                     width: 141px;
                     height: 32px;
                     background: linear-gradient(270deg, rgba(199, 217, 234, 0) 0%, rgba(199, 217, 234, 1) 100%);

+ 105 - 0
src/views/equipment/table/otherTable.vue

@@ -0,0 +1,105 @@
+<!-- 设备清单的有select的表格 -->
+<template>
+    <div class='qt-list'>
+        <div class='eq-list-top'>
+            <Select width='146' tipPlace='top' caption='处理日期:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='146' tipPlace='top' caption='处置结果:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <a-input-search placeholder='按照位置和内容搜索' style='width: 192px;margin-bottom:12px;height:32px;' @search='onSearch' />
+        </div>
+        <el-table :data='tableData' style='width: 100%'>
+            <el-table-column type='index' label='序号' width='80'></el-table-column>
+            <el-table-column prop='lb' label='其他事项详情' width='160'>
+                <el-table-column prop='sl' label='位置'></el-table-column>
+                <el-table-column prop='unit' label='内容'></el-table-column>
+                <el-table-column prop='sl' label='数量'></el-table-column>
+            </el-table-column>
+            <el-table-column prop='zfje' label='金额(万元)' width='120'></el-table-column>
+            <el-table-column prop='city' label='处理日期' width='120'></el-table-column>
+            <el-table-column prop='address' label='处置结果' width='300'></el-table-column>
+            <el-table-column prop='zlwfwz ' label='资料存放位置' width='120'></el-table-column>
+            <el-table-column prop='zip' label='记录日期' width='120'></el-table-column>
+        </el-table>
+        <div class='foot'>
+            <el-pagination
+                background
+                layout='prev, pager, next'
+                :total='total/pageSize'
+                :page-size='size'
+                @prev-click='pageChanged'
+                @next-click='pageChanged'
+                @current-change='pageChanged'
+            ></el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { queryEquipmentList, queryWbsms } from '@/api/equipmentList.js'
+export default {
+    data() {
+        return {
+            pageSize: 10,
+            tableData: [],
+            total: 0,
+            currentPage: 1,
+            size: 10
+        }
+    },
+    props: ['major', 'systemName'],
+    methods: {
+        onSearch() {},
+        pageChanged(page, size) {
+            this.currentPage = page
+            this.size = size
+            this.getList()
+        },
+        getList() {
+            // let postParams = {}
+            // let data = {
+            //     page: this.currentPage,
+            //     size: this.size,
+            //     plazaId: this.$store.state.plazaId,
+            //    major: this.major,
+
+            // }
+            // queryEquipmentList({ data, postParams }).then(res => {
+            //     console.log(res)
+            //     this.tableData = res.data.data
+            //     this.total = res.data.count
+            // })
+            let getParams = {
+                data: {
+                    system: this.systemName,
+                    tab: this.major,
+                    plazaId: this.$store.state.plazaId,
+                    page: this.currentPage,
+                    size: this.size
+                }
+            }
+            queryWbsms(getParams).then(res => {
+                this.tableData = res.data.data
+                this.total = res.data.count
+            })
+        }
+    },
+    mounted() {
+        this.getList()
+    }
+}
+</script>
+<style lang="less" scoped>
+.qt-list {
+    .eq-list-top {
+        display: flex;
+    }
+    .foot {
+        position: absolute;
+        height: 32px;
+        right: 26px;
+    }
+    td {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+</style>

+ 11 - 9
src/views/equipment/table/wbTable.vue

@@ -6,18 +6,21 @@
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='lb' label='设备名称' width='160'></el-table-column>
-            <el-table-column prop='sl' label='设备编码'></el-table-column>
-            <el-table-column prop='unit' label='重要事项记录'></el-table-column>
-            <el-table-column prop='brand' label='描述'></el-table-column>
+            <el-table-column prop='sbjc' label='设备名称' width='160'></el-table-column>
+            <el-table-column prop='sbjbm' label='设备编码'></el-table-column>
+            <el-table-column prop='matters' label='重要事项记录'></el-table-column>
+            <el-table-column prop='description' label='描述'></el-table-column>
             <el-table-column label='更换配件信息'>
-                <el-table-column prop='province' label='是/否更换' width='120'></el-table-column>
-                <el-table-column prop='city' label='配件名称型号' width='120'></el-table-column>
+                <el-table-column prop='ischangepj' label='是/否更换' width='120'></el-table-column>
+                <el-table-column prop='model' label='配件名称型号' width='120'></el-table-column>
                 <el-table-column prop='address' label='数量' width='300'></el-table-column>
-                <el-table-column prop='zip' label='费用(万元)' width='120'></el-table-column>
-                <el-table-column prop='zip' label='费用出处' width='120'></el-table-column>
+                <el-table-column prop='cost' label='费用(万元)' width='120'></el-table-column>
+                <el-table-column prop='source' label='费用出处' width='120'></el-table-column>
             </el-table-column>
             <el-table-column prop='brand' label='现场照片'></el-table-column>
+            <el-table-column prop='startDate' label='填报时间'></el-table-column>
+            <el-table-column prop='enddate' label='验收时间'></el-table-column>
+            <el-table-column prop='wonum' label='任务编号'></el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -76,7 +79,6 @@ export default {
                 }
             }
             queryWbsms(getParams).then(res => {
-                debugger
                 this.tableData = res.data.data
                 this.total = res.data.count
             })

+ 18 - 10
src/views/equipment/table/zwTable.vue

@@ -2,21 +2,29 @@
 <template>
     <div class='zw-list'>
         <div class='eq-list-top'>
+            <Select width='146' tipPlace='top' caption='年度:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
             <Select width='146' tipPlace='top' caption='类别:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <Select width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect' style='margin:0 12px' @change='getList'></Select>
-            <Select width='224' tipPlace='top' caption='生产厂商:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <a-input-search placeholder style='width: 192px;margin-left:12px;height:32px;' @search='getList' />
+            <Select width='120' tipPlace='top' caption='项目 :' :selectdata='floorSelect' style='margin:0 12px' @change='getList'></Select>
+            <Select width='224' tipPlace='top' caption='当前阶段' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='224' tipPlace='top' caption='立项日期' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='224' tipPlace='top' caption='验收日期' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='224' tipPlace='top' caption='验收结果' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <a-input-search placeholder='按照实施方案说明搜索' style='width: 192px;margin-left:12px;height:32px;' @search='getList' />
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjbm' label='类别' width='160'></el-table-column>
-            <el-table-column prop='sl' label='项目'></el-table-column>
-            <el-table-column prop='brand' label='金额'></el-table-column>
-            <el-table-column prop='sbxh' label='费用说明'></el-table-column>
-            <el-table-column prop='floor' label='项目说明'></el-table-column>
+            <el-table-column prop='sbjbm' label='年度' width='160'></el-table-column>
+            <el-table-column prop='sbjbm' label='期数' width='160'></el-table-column>
+            <el-table-column prop='lb' label='类别'></el-table-column>
+            <el-table-column prop='xm' label='项目'></el-table-column>
+            <el-table-column prop='sl' label='数量'></el-table-column>
+            <el-table-column prop='ssfasm' label='实施方案说明'></el-table-column>
             <el-table-column prop='wzjc' label='当前阶段' show-overflow-tooltip resizable width='140'></el-table-column>
-            <el-table-column prop='manufacturer' label='开始日期'></el-table-column>
-            <el-table-column prop='manufacturer' label='验收日期'></el-table-column>
+            <el-table-column prop='startDate' label='立项日期'></el-table-column>
+            <el-table-column prop='endDate' label='验收日期'></el-table-column>
+            <el-table-column prop='status' label='验收结果'></el-table-column>
+            <el-table-column prop='zfje' label='结算金额'></el-table-column>
+            <el-table-column prop='zlwfwz' label='资料存放位置'></el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination

+ 8 - 4
src/views/legendLibrary/addForm.vue

@@ -11,7 +11,7 @@
                 <el-input v-model='ruleForm.Name' style='width:200px;height:32px;'></el-input>
                 <div class='title'>单位</div>
                 <div class='type'>图例类型</div>
-                <el-input v-model='ruleForm.unit' style='width:200px;height:32px;'></el-input>
+                <el-input v-model='ruleForm.Unit' style='width:200px;height:32px;'></el-input>
                 <el-select v-model='ruleForm.Type' placeholder='请选择' style='width:200px;height:32px;margin-left:46px'>
                     <el-option v-for='item in options' :key='item.value' :label='item.label' :value='item.value'></el-option>
                 </el-select>
@@ -197,9 +197,13 @@ export default {
         create() {
             //新增
             let postParams = {
-                Name: this.ruleForm.Name,
-                Type: this.ruleForm.Type,
-                Unit: this.ruleForm.Unit
+                Content: [
+                    {
+                        Name: this.ruleForm.Name,
+                        Type: this.ruleForm.Type,
+                        Unit: this.ruleForm.Unit
+                    }
+                ]
             }
             createLegend({ postParams }).then(res => {
                 if (res.Result == 'success') {