Bläddra i källkod

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

shaun-sheep 4 år sedan
förälder
incheckning
97a25ec3b8

+ 37 - 0
src/utils/format.js

@@ -1,6 +1,43 @@
+let moment = require("moment")
 const formatTime = (time) => {
     return time > 10 ? time : "0" + time
 }
+const formatter = (date) => {
+    return moment.unix(date / 1000).format("YYYY/MM/DD")
+}
+const number_format = (number, decimals, dec_point, thousands_sep) => {
+    /*
+     * 参数说明:
+     * number:要格式化的数字
+     * decimals:保留几位小数
+     * dec_point:小数点符号
+     * thousands_sep:千分位符号
+     * */
+    number = (number + "").replace(/[^0-9+-Ee.]/g, "")
+    var n = !isFinite(+number) ? 0 : +number,
+        prec = !isFinite(+decimals) ? 2 : Math.abs(decimals),
+        sep = typeof thousands_sep === "undefined" ? "," : thousands_sep,
+        dec = typeof dec_point === "undefined" ? "." : dec_point,
+        s = "",
+        toFixedFix = function(n, prec) {
+            var k = Math.pow(10, prec)
+            return "" + Math.ceil(n * k) / k
+        }
+
+    s = (prec ? toFixedFix(n, prec) : "" + Math.round(n)).split(".")
+    var re = /(-?\d+)(\d{3})/
+    while (re.test(s[0])) {
+        s[0] = s[0].replace(re, "$1" + sep + "$2")
+    }
+
+    if ((s[1] || "").length < prec) {
+        s[1] = s[1] || ""
+        s[1] += new Array(prec - s[1].length + 1).join("0")
+    }
+    return s.join(dec)
+}
 module.exports = {
     formatTime,
+    formatter,
+    number_format,
 }

+ 3 - 3
src/views/equipment/table/lookPageTable.vue

@@ -21,13 +21,13 @@
             <el-table-column prop='sl' label='文件名称'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='unit' label='文件类型'>
+            <el-table-column prop='assetnum' label='文件类型'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='文件大小(M)'>
+            <el-table-column prop='assetnum' label='文件大小(M)'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='操作'>
+            <el-table-column label='操作'>
                 <template slot-scope='{row}'>
                     <el-button type='text' size='mini' @click='handleDown(row)'>
                         <i class='el-icon-download'></i>下载

+ 9 - 6
src/views/equipment/table/otherTable.vue

@@ -11,29 +11,29 @@
             <el-table-column type='index' label='序号' width='80'></el-table-column>
             <el-table-column prop='lb' label='其他事项详情' show-overflow-tooltip resizable>
                 <el-table-column prop='wzjc' label='位置' show-overflow-tooltip resizable>
-                    <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
+                    <template slot-scope='{row}'>{{row.description || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='unit' label='内容' show-overflow-tooltip resizable>
-                    <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+                    <template slot-scope='{row}'>{{row.content || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sl' label='数量'>
                     <template slot-scope='{row}'>{{row.sl || '--'}}</template>
                 </el-table-column>
             </el-table-column>
             <el-table-column prop='zfje' label='金额(万元)'>
-                <template slot-scope='{row}'>{{row.zfje || '--'}}</template>
+                <template slot-scope='{row}'>{{number_format(row.zfje,2) || '--'}}</template>
             </el-table-column>
             <el-table-column prop='city' label='处理日期'>
-                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+                <template slot-scope='{row}'>{{row.handledate?formatter(row.handledate): '--'}}</template>
             </el-table-column>
             <el-table-column prop='address' label='处置结果' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.address || '--'}}</template>
+                <template slot-scope='{row}'>{{row.handleresults || '--'}}</template>
             </el-table-column>
             <el-table-column prop='zlwfwz ' label='资料存放位置' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.zlwfwz || '--'}}</template>
             </el-table-column>
             <el-table-column prop='recordtime' label='记录日期'>
-                <template slot-scope='{row}'>{{row.recordtime || '--'}}</template>
+                <template slot-scope='{row}'>{{row.recordtime?formatter(row.recordtime): '--'}}</template>
             </el-table-column>
         </el-table>
         <div class='foot'>
@@ -52,12 +52,15 @@
 <script>
 import { queryQtsx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
+import { formatter, number_format } from '@/utils/format.js'
 export default {
     data() {
         return {
             pageSize: 10,
             tableData: [],
             total: 0,
+            formatter,
+            number_format,
             currentPage: 1,
             size: 10,
             yssjwcsj: '',

+ 6 - 4
src/views/equipment/table/wbTable.vue

@@ -65,17 +65,17 @@
                     <template slot-scope='{row}'>{{row.cost || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable>
-                    <template slot-scope='{row}'>{{row.source || '--'}}</template>
+                    <template slot-scope='{row}'>{{number_format(row.source,2) || '--'}}</template>
                 </el-table-column>
             </el-table-column>
             <el-table-column prop='brand' label='现场照片'>
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
             <el-table-column prop='reportdate' label='填报时间'>
-                <template slot-scope='{row}'>{{row.reportdate || '--'}}</template>
+                <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
             </el-table-column>
             <el-table-column prop='sjjssj' label='验收时间'>
-                <template slot-scope='{row}'>{{row.sjjssj || '--'}}</template>
+                <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
             <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.wonum || '--'}}</template>
@@ -98,6 +98,7 @@
 import { queryWbsms } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import Select from '@/components/Select/Select.vue'
+import { formatter, number_format } from '@/utils/format.js'
 export default {
     components: { Select },
     data() {
@@ -109,6 +110,8 @@ export default {
             sjjssj: '',
             reportdate: '',
             ischange: '',
+            formatter,
+            number_format,
             changeOption: [
                 {
                     id: '1',
@@ -127,7 +130,6 @@ export default {
         ...mapGetters(['floorSelect'])
     },
     methods: {
-        onSearch() {},
         pageChanged(page) {
             this.currentPage = page
             this.getList()

+ 6 - 4
src/views/equipment/table/wxTable.vue

@@ -62,7 +62,7 @@
                     <template slot-scope='{row}'>{{row.sl || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='cost' label='费用(万元)'>
-                    <template slot-scope='{row}'>{{row.cost || '--'}}</template>
+                    <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.source || '--'}}</template>
@@ -72,10 +72,10 @@
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
             <el-table-column prop='reportdate' label='填报时间'>
-                <template slot-scope='{row}'>{{row.reportdate || '--'}}</template>
+                <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate): '--'}}</template>
             </el-table-column>
             <el-table-column prop='sjjssj' label='验收时间'>
-                <template slot-scope='{row}'>{{row.sjjssj || '--'}}</template>
+                <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
             <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.wonum || '--'}}</template>
@@ -98,6 +98,7 @@
 import { queryWx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import Select from '@/components/Select/Select.vue'
+import { formatter, number_format } from '@/utils/format.js'
 export default {
     components: { Select },
     data() {
@@ -109,6 +110,8 @@ export default {
             reportdate: '',
             sjjssj: '',
             ischange: '',
+            formatter,
+            number_format,
             changeOption: [
                 {
                     id: '1',
@@ -127,7 +130,6 @@ export default {
     },
     props: ['smsxt', 'major'],
     methods: {
-        onSearch() {},
         pageChanged(page) {
             this.currentPage = page
             this.getList()

+ 6 - 3
src/views/equipment/table/zwTable.vue

@@ -56,16 +56,16 @@
                 <template slot-scope='{row}'>{{row.sxjd || '--'}}</template>
             </el-table-column>
             <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.lxsjwcsj || '--'}}</template>
+                <template slot-scope='{row}'>{{row.lxsjwcsj?formatter(row.lxsjwcsj):'--'}}</template>
             </el-table-column>
             <el-table-column prop='yssjwcsj' label='验收日期' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.yssjwcsj || '--'}}</template>
+                <template slot-scope='{row}'>{{row.yssjwcsj?formatter(row.yssjwcsj):'--'}}</template>
             </el-table-column>
             <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.status || '--'}}</template>
             </el-table-column>
             <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.zfje || '--'}}</template>
+                <template slot-scope='{row}'>{{number_format(row.zfje,2)|| '--'}}</template>
             </el-table-column>
             <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.xlcfwz || '--'}}</template>
@@ -89,6 +89,7 @@ import Select from '@/components/Select/Select.vue'
 import { queryZw } from '@/api/equipmentList.js'
 import { querySelect } from '@/api/public.js'
 import { mapGetters } from 'vuex'
+import { formatter, number_format } from '@/utils/format.js'
 export default {
     components: { Select },
     data() {
@@ -103,6 +104,8 @@ export default {
             nd: '',
             lb: '',
             sxjd: '',
+            formatter,
+            number_format,
             xm: '',
             statusOption: [],
             sxjdOption: [],

+ 1 - 1
src/views/room/room4.vue

@@ -69,7 +69,7 @@
                     </el-table-column>
                 </el-table-column>
                 <el-table-column prop label='现场照片' show-overflow-tooltip resizable>
-                    <template slot-scope='{row}'>{{'--'}}</template>
+                    <template slot-scope='{row}'>{{row.pics || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='填报时间' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.reportedby?formatter(row.reportedby):'--'}}</template>

+ 2 - 2
src/views/room/room5.vue

@@ -74,14 +74,14 @@
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='现场照片'>
-                    <template slot-scope='{row}'>{{'--'}}</template>
+                    <template slot-scope='{row}'>{{row.pics ||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='维保任务' align='center'>
                     <el-table-column prop label='任务编号'>
                         <template slot-scope='{row}'>{{row.wb_gzglid||'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='维保任务名称' min-width='100'>
-                        <template slot-scope='{row}'>{{'--'}}</template>
+                        <template slot-scope='{row}'>{{row.wbrwmc || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='任务状态'>
                         <template slot-scope='{row}'>{{row.status||'--'}}</template>