浏览代码

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

yunxing 4 年之前
父节点
当前提交
03315e0b2a
共有 5 个文件被更改,包括 11 次插入6 次删除
  1. 2 2
      src/views/equipment/table/zwTable.vue
  2. 1 0
      src/views/other/zhsxOtherTable2.vue
  3. 3 1
      src/views/room/detail.vue
  4. 4 2
      src/views/room/room3.vue
  5. 1 1
      version.js

+ 2 - 2
src/views/equipment/table/zwTable.vue

@@ -98,8 +98,8 @@
                 <el-table-column prop='zfje' label='结算金额(元)' show-overflow-tooltip resizable width='105'>
                     <template slot-scope='{row}'>{{row.zfje || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable width='100'>
-                    <template slot-scope='{row}'>{{row.xlcfwz || '--'}}</template>
+                <el-table-column prop='zlcfwz' label='资料存放位置' show-overflow-tooltip resizable width='200'>
+                    <template slot-scope='{row}'>{{row.zlcfwz || '--'}}</template>
                 </el-table-column>
             </el-table>
         </div>

+ 1 - 0
src/views/other/zhsxOtherTable2.vue

@@ -145,6 +145,7 @@ export default {
             // console.log(resetPage)
             if (resetPage !== false) {
                 this.page = 1
+                this.total = 0
             }
             let getParams = {
                 plazaId: this.$store.state.plazaId,

+ 3 - 1
src/views/room/detail.vue

@@ -217,12 +217,14 @@ export default {
         row: {
             deep: true,
             handler: function (newV, oldV) {
+                // 不需要初始化了,在room3.vue页面中,执行了key修改,会重新渲染页面
+                // this.initPage()
                 if (newV != oldV) {
-                    this.initPage()
                     this.queryDetail()
                     this.query()
                 }
             },
+            immediate: true,
         },
     },
     methods: {

+ 4 - 2
src/views/room/room3.vue

@@ -37,13 +37,13 @@
                 layout='prev, pager, next'
                 :total='total'
                 :page-size='size'
-                :current-page.sync="page"
+                :current-page.sync='page'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
                 @current-change='pageChanged'
             ></el-pagination>
         </div>
-        <el-dialog width='90%' :title='`${systemName}-${row.type_name}`' :visible.sync='innerVisible' append-to-body>
+        <el-dialog width='90%' :title='`${systemName}-${row.type_name}`' :key='dialogKey' :visible.sync='innerVisible' append-to-body>
             <detail v-if='row' :row='row' :location='location' :floorChange='floorChange'></detail>
         </el-dialog>
     </div>
@@ -61,6 +61,7 @@ export default {
             innerVisible: false,
             row: {},
             tableMaxHeight: 0,
+            dialogKey: `dialog_${new Date().getTime()}`,
         }
     },
 
@@ -76,6 +77,7 @@ export default {
             this.$emit('Index2Emit', page)
         },
         innerTable(row) {
+            this.dialogKey = `dialog_${new Date().getTime()}`
             this.row = row
             this.innerVisible = true
         },

+ 1 - 1
version.js

@@ -1,6 +1,6 @@
 /** 自动记录版本信息**/
 const fs = require('fs')
-const buildPath = 'wandaBmGuide' //放置 version.txt的路径
+const buildPath = process.env.npm_package_remote_local //'wandaBmGuide' //放置 version.txt的路径
 const execSync = require('child_process').execSync //同步子进程
 const date = new Date() // Date对象